Allow SPARC builds for versions 13 and 14.

psumbera · psumbera · commit efa305e67425 · 2023-05-30T15:28:50.000+02:00
diff --git a/README.md b/README.md
@@ -5,7 +5,8 @@ This project builds all OpenJDK versions from 9 till latest 20 for Solaris 11.4.
 Note that this was done based on great job of Peter Tribble:
 https://ptribble.blogspot.com/2021/12/keeping-java-alive-on-illumos.html
 
-At this time only amd64 platform is expected to work (not SPARC).
+At this time only amd64 platform is expected to work (for SPARC it can build
+up to version 14 only).
 
 You just need to have:
 - Oracle Solaris 11.4 (at least S11.4.24) with installed system header files
diff --git a/jdk-13.sh b/jdk-13.sh
@@ -19,7 +19,7 @@ CONFIGURE_OPTIONS+=" CXX=$GXX"
 
 git clone ${JDK_GITHUB_REPO}/$SRC_DIR "$BUILD_DIR"/$SRC_DIR
 cd "$BUILD_DIR"/$SRC_DIR
-git checkout jdk-13.0.11-ga
+git checkout jdk-13.0.12-ga
 
 apply_patch_series
 
diff --git a/patches-13/README.txt b/patches-13/README.txt
@@ -1,9 +1,24 @@
 This is derived from the pkgsrc-joyent set for openjdk11, building on
 my openjdk12 set.
 
-All patches -p0
+13.0.12
 
-This current set for 13.0.3+3
+Build broken by https://www.illumos.org/issues/14418. That did 2
+things -  (1) exposed memcntl and meminfo by default, and (2) changed
+the signature for memcntl from caddr_t to void so there's a
+mismatch. The fix adopted is to modify the internal java signature for
+memcntl to the new version, which still allows builds on older
+releases as the old definition in sys/mman.h was effectively invisible
+there. See illumos-port-7.patch.
+
+13.0.10
+
+fixed up patch-make_lib_Awt2dLibraries.gmk
+
+13.0.9
+A reasonable amount of patch noise.
+
+Need to add illumos-port-6.patch
 
 JDK13:
 openjdk13 fixes (besides fixing line number noise)
diff --git a/patches-13/Solaris11-gcc10.patch b/patches-13/Solaris11-gcc10.patch
diff --git a/patches-13/Solaris11-sparc.patch b/patches-13/Solaris11-sparc.patch
@@ -0,0 +1,40 @@
+Resolves build error with GCC 10.
+
+--- a/src/hotspot/cpu/sparc/nativeInst_sparc.hpp
++++ b/src/hotspot/cpu/sparc/nativeInst_sparc.hpp
+@@ -315,7 +315,7 @@
+ 
+ inline NativeCall* nativeCall_at(address instr);
+ inline NativeCall* nativeCall_overwriting_at(address instr,
+-                                             address destination);
++                                             address destination = NULL);
+ inline NativeCall* nativeCall_before(address return_address);
+ class NativeCall: public NativeInstruction {
+  public:
+@@ -344,7 +344,7 @@
+ 
+   // Creation
+   friend inline NativeCall* nativeCall_at(address instr);
+-  friend NativeCall* nativeCall_overwriting_at(address instr, address destination = NULL) {
++  friend NativeCall* nativeCall_overwriting_at(address instr, address destination) {
+     // insert a "blank" call:
+     NativeCall* call = (NativeCall*)instr;
+     call->set_long_at(0 * BytesPerInstWord, call_instruction(destination, instr));
+@@ -413,7 +413,7 @@
+ //      == sethi %hi54(addr), O7 ;  jumpl O7, %lo10(addr), O7 ;  <delay>
+ // That is, it is essentially the same as a NativeJump.
+ class NativeFarCall;
+-inline NativeFarCall* nativeFarCall_overwriting_at(address instr, address destination);
++inline NativeFarCall* nativeFarCall_overwriting_at(address instr, address destination = NULL);
+ inline NativeFarCall* nativeFarCall_at(address instr);
+ class NativeFarCall: public NativeInstruction {
+  public:
+@@ -452,7 +452,7 @@
+     return call;
+   }
+ 
+-  friend inline NativeFarCall* nativeFarCall_overwriting_at(address instr, address destination = NULL) {
++  friend inline NativeFarCall* nativeFarCall_overwriting_at(address instr, address destination) {
+     Unimplemented();
+     NativeFarCall* call = (NativeFarCall*)instr;
+     return call;
diff --git a/patches-13/patch-make_GenerateLinkOptData.gmk b/patches-13/patch-make_GenerateLinkOptData.gmk
@@ -11,4 +11,4 @@ Ensure java libraries can be found during build.
 +	LD_LIBRARY_PATH=$(INTERIM_IMAGE_DIR)/lib:$(INTERIM_IMAGE_DIR)/lib/jli \
  	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
  	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
- 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
+ 	    -Duser.language=en -Duser.country=US \
diff --git a/patches-13/patch-make_autoconf_basics.m4 b/patches-13/patch-make_autoconf_basics.m4
@@ -22,7 +22,7 @@ Shell portability, and remove annoying warning.
        fi
        # Try to locate tool using the code snippet
        $2
-@@ -1172,7 +1172,7 @@ AC_DEFUN([BASIC_CHECK_GREP],
+@@ -1173,7 +1173,7 @@ AC_DEFUN([BASIC_CHECK_GREP],
    NEEDLE_SPACES='ccc bbb aaa'
    NEEDLE_LIST=${NEEDLE_SPACES// /$'\n'}
    RESULT="$($GREP -Fvx "$STACK_LIST" <<< "$NEEDLE_LIST")"
diff --git a/patches-13/patch-make_autoconf_flags-cflags.m4 b/patches-13/patch-make_autoconf_flags-cflags.m4
@@ -18,7 +18,7 @@ Support for SunOS/gcc.
  
    elif test "x$TOOLCHAIN_TYPE" = xclang; then
      C_FLAG_REORDER=''
-@@ -508,6 +513,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
+@@ -503,6 +508,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
  
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
      ALWAYS_DEFINES_JVM="-D_GNU_SOURCE -D_REENTRANT"
diff --git a/patches-13/patch-make_autoconf_libraries.m4 b/patches-13/patch-make_autoconf_libraries.m4
@@ -12,11 +12,10 @@ Support SunOS/gcc.
      # Find the root of the Solaris Studio installation from the compiler path
      SOLARIS_STUDIO_DIR="$(dirname $CC)/.."
      STLPORT_LIB="$SOLARIS_STUDIO_DIR/lib/stlport4$OPENJDK_TARGET_CPU_ISADIR/libstlport.so.1"
-@@ -213,6 +214,7 @@ AC_DEFUN_ONCE([LIB_SETUP_SOLARIS_STLPORT
+@@ -213,5 +214,6 @@ AC_DEFUN_ONCE([LIB_SETUP_SOLARIS_STLPORT
        AC_MSG_ERROR([Failed to find libstlport.so.1, cannot build Hotspot gtests])
      fi
      AC_SUBST(STLPORT_LIB)
 +   fi
    fi
  ])
- 
diff --git a/patches-13/patch-make_autoconf_spec.gmk.in b/patches-13/patch-make_autoconf_spec.gmk.in
@@ -4,7 +4,7 @@ Ensure support libraries can be found during build.
 
 --- make/autoconf/spec.gmk.in.orig	2019-01-08 09:40:27.000000000 +0000
 +++ make/autoconf/spec.gmk.in
-@@ -516,12 +516,12 @@ LD:=@FIXPATH@ @LD@
+@@ -520,12 +520,12 @@ LD:=@FIXPATH@ @LD@
  SDKROOT:=@SDKROOT@
  
  # LDFLAGS used to link the jdk native libraries (C-code)
@@ -19,7 +19,7 @@ Ensure support libraries can be found during build.
  JDKEXE_LIBS:=@JDKEXE_LIBS@
  
  # LDFLAGS specific to C++ linking.
-@@ -636,9 +636,9 @@ JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_
+@@ -640,9 +640,9 @@ JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_
  JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS)
  JAVAC=@FIXPATH@ $(JAVAC_CMD)
  JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
@@ -32,7 +32,7 @@ Ensure support libraries can be found during build.
  JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD)
  # A specific java binary with specific options can be used to run
  # the long running background sjavac servers and other long running tasks.
-@@ -651,8 +651,8 @@ JAVAC_FLAGS?=@JAVAC_FLAGS@
+@@ -655,8 +655,8 @@ JAVAC_FLAGS?=@JAVAC_FLAGS@
  
  
  BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
diff --git a/patches-13/patch-make_hotspot_lib_CompileJvm.gmk b/patches-13/patch-make_hotspot_lib_CompileJvm.gmk
@@ -4,7 +4,7 @@ Support SunOS/gcc.
 
 --- make/hotspot/lib/CompileJvm.gmk.orig	2019-01-08 09:40:28.000000000 +0000
 +++ make/hotspot/lib/CompileJvm.gmk
-@@ -132,7 +132,7 @@ else ifeq ($(OPENJDK_TARGET_CPU), x86_64
+@@ -136,7 +136,7 @@ else ifeq ($(OPENJDK_TARGET_CPU), x86_64
  endif
  
  # Inline assembly for solaris
diff --git a/patches-13/patch-make_launcher_Launcher-jdk.pack.gmk b/patches-13/patch-make_launcher_Launcher-jdk.pack.gmk
@@ -12,5 +12,5 @@ Support for SunOS/gcc.
    LDFLAGS_JDKEXE += -Wl,--exclude-libs,ALL
 + endif
  else ifeq ($(TOOLCHAIN_TYPE), clang)
-   ifneq ($(OPENJDK_TARGET_OS), macosx)
+   ifeq ($(call isTargetOs, macosx), false)
      CXXFLAGS_JDKEXE += -fvisibility=hidden
diff --git a/patches-13/patch-make_launcher_LauncherCommon.gmk b/patches-13/patch-make_launcher_LauncherCommon.gmk
@@ -12,5 +12,5 @@ Support for SunOS/gcc.
    LDFLAGS_JDKEXE += -Wl,--exclude-libs,ALL
 + endif
  else ifeq ($(TOOLCHAIN_TYPE), clang)
-   ifneq ($(OPENJDK_TARGET_OS), macosx)
-     LAUNCHER_CFLAGS += -fvisibility=hidden
+   LAUNCHER_CFLAGS += -fvisibility=hidden
+ else ifeq ($(TOOLCHAIN_TYPE), solstudio)
diff --git a/patches-13/patch-make_lib_Awt2dLibraries.gmk b/patches-13/patch-make_lib_Awt2dLibraries.gmk
@@ -4,16 +4,15 @@ Support SunOS/gcc.  XXX: retain solstudio support.
 
 --- make/lib/Awt2dLibraries.gmk.orig	2019-01-08 09:40:28.000000000 +0000
 +++ make/lib/Awt2dLibraries.gmk
-@@ -552,7 +552,11 @@
+@@ -553,7 +553,11 @@ ifneq (, $(findstring $(OPENJDK_TARGET_O
                         -DHB_NO_PRAGMA_GCC_DIAGNOSTIC
    endif
    ifeq ($(call isTargetOs, solaris), true)
--    HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS
-+    ifeq ($(TOOLCHAIN_TYPE), gcc)
-+      HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
-+    else
-+      HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS
-+    endif
++   ifeq ($(TOOLCHAIN_TYPE), gcc)
++    HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
++   else
+     HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS
++   endif
    endif
    ifeq ($(call isTargetOs, linux macosx), true)
      HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
diff --git a/patches-13/patch-make_lib_LibCommon.gmk b/patches-13/patch-make_lib_LibCommon.gmk
@@ -13,5 +13,5 @@ Support SunOS/gcc.
    EXPORT_ALL_SYMBOLS := -fvisibility=default
 + endif
  else ifeq ($(TOOLCHAIN_TYPE), clang)
-   ifneq ($(OPENJDK_TARGET_OS), macosx)
-     CFLAGS_JDKLIB += -fvisibility=hidden
+   CFLAGS_JDKLIB += -fvisibility=hidden
+   CXXFLAGS_JDKLIB += -fvisibility=hidden
diff --git a/patches-13/patch-src_hotspot_os__cpu_solaris__x86_os__solaris__x86.inline.hpp b/patches-13/patch-src_hotspot_os__cpu_solaris__x86_os__solaris__x86.inline.hpp
@@ -20,4 +20,4 @@ Support SunOS/gcc.
  inline jlong os::rdtsc() { return _raw_rdtsc(); }
 +#endif
  
- #endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP
+ #endif // OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_INLINE_HPP
diff --git a/patches-13/patch-src_hotspot_os_solaris_os__solaris.cpp b/patches-13/patch-src_hotspot_os_solaris_os__solaris.cpp
@@ -13,7 +13,7 @@ Fix building on SunOS in C99 mode.
  }
  
  // "default" initializers for pthread-based synchronization
-@@ -2284,7 +2286,7 @@ void os::pd_commit_memory_or_exit(char*
+@@ -2288,7 +2290,7 @@ void os::pd_commit_memory_or_exit(char*
  
  // Uncommit the pages in a specified region.
  void os::pd_free_memory(char* addr, size_t bytes, size_t alignment_hint) {
@@ -22,7 +22,7 @@ Fix building on SunOS in C99 mode.
      debug_only(warning("MADV_FREE failed."));
      return;
    }
-@@ -2313,7 +2315,7 @@ void os::pd_realign_memory(char *addr, s
+@@ -2317,7 +2319,7 @@ void os::pd_realign_memory(char *addr, s
  // Tell the OS to make the range local to the first-touching LWP
  void os::numa_make_local(char *addr, size_t bytes, int lgrp_hint) {
    assert((intptr_t)addr % os::vm_page_size() == 0, "Address should be page-aligned.");
@@ -31,7 +31,7 @@ Fix building on SunOS in C99 mode.
      debug_only(warning("MADV_ACCESS_LWP failed."));
    }
  }
-@@ -2321,7 +2323,7 @@ void os::numa_make_local(char *addr, siz
+@@ -2325,7 +2327,7 @@ void os::numa_make_local(char *addr, siz
  // Tell the OS that this range would be accessed from different LWPs.
  void os::numa_make_global(char *addr, size_t bytes) {
    assert((intptr_t)addr % os::vm_page_size() == 0, "Address should be page-aligned.");
diff --git a/patches-13/series b/patches-13/series
@@ -37,10 +37,13 @@ tribblix-demangle3.patch -p0
 tribblix-demangle4.patch -p0
 tribblix-flags-cflags.patch -p0
 tribblix-flags-ldflags3.patch -p0
+tribblix-sparc1.patch
+tribblix-sparc2.patch
+tribblix-sparc3.patch
 Solaris11-EM_486.patch -p1
 Solaris11-TRAPNO.patch -p1
 Solaris11-memcntl.patch -p1
 Solaris11-as-m64.patch -p1
 Solaris11-ssp.patch -p1
-Solaris11-gcc10.patch -p1
 Solaris11-no-tm_gmtoff.patch -p1
+Solaris11-sparc.patch -p1
diff --git a/patches-13/tribblix-Launcher-jdk.patch b/patches-13/tribblix-Launcher-jdk.patch
@@ -7,5 +7,5 @@
 -    CFLAGS_solaris := -KPIC, \
 +    CFLAGS_solaris := -fPIC, \
      CFLAGS_macosx := -fPIC, \
-     LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
-         $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
+     DISABLED_WARNINGS_clang := format-nonliteral, \
+     LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
diff --git a/patches-13/tribblix-LauncherCommon.patch b/patches-13/tribblix-LauncherCommon.patch
@@ -1,7 +1,7 @@
 --- make/launcher/LauncherCommon.gmk~	Thu Apr  9 18:18:09 2020
 +++ make/launcher/LauncherCommon.gmk	Tue Nov 26 00:55:54 2019
-@@ -146,7 +146,7 @@
-           -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
+@@ -145,7 +145,7 @@
+           -DLAUNCHER_NAME='"$$(LAUNCHER_NAME)"' \
            -DPROGNAME='"$1"' \
            $$($1_CFLAGS), \
 -      CFLAGS_solaris := -KPIC, \
diff --git a/patches-13/tribblix-flags-cflags.patch b/patches-13/tribblix-flags-cflags.patch
@@ -1,6 +1,6 @@
 --- make/autoconf/flags-cflags.m4~	Sun Apr 12 19:51:35 2020
 +++ make/autoconf/flags-cflags.m4	Sun Apr 12 21:38:33 2020
-@@ -540,8 +540,8 @@
+@@ -535,8 +535,8 @@
    fi
  
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -11,7 +11,7 @@
      # technically NOT for CXX (but since this gives *worse* performance, use
      # no-strict-aliasing everywhere!)
      TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing"
-@@ -603,7 +603,12 @@
+@@ -598,7 +598,12 @@
    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xxlc; then
      # This raises the language level for older 4.8 gcc, while lowering it for later
      # versions. clang and xlclang support the same flag.
diff --git a/patches-13/tribblix-sparc1.patch b/patches-13/tribblix-sparc1.patch
diff --git a/patches-13/tribblix-sparc2.patch b/patches-13/tribblix-sparc2.patch
diff --git a/patches-13/tribblix-sparc3.patch b/patches-13/tribblix-sparc3.patch
diff --git a/patches-14/series b/patches-14/series
diff --git a/patches-14/tribblix-sparc1.patch b/patches-14/tribblix-sparc1.patch
diff --git a/patches-14/tribblix-sparc2.patch b/patches-14/tribblix-sparc2.patch
diff --git a/patches-14/tribblix-sparc3.patch b/patches-14/tribblix-sparc3.patch
