Rebuild with JDK 11

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>

.gitignore

@@ -1,3 +1,4 @@
 /systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 /shenandoah-jdk11-b516c8c7a0a4.tar.xz
 /shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz

JDK-8201495-s390-java-opts.patch

@@ -1,21 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1523874036 -7200
-#      Mon Apr 16 12:20:36 2018 +0200
-# Node ID fc3a72e286e0d5bf9b994d1b778b39f3b080c686
-# Parent  69bae761600bdbc97953500ac51a396d31f54ee9
-8201495: [Zero] Reduce limits of max heap size for boot JDK on s390
-Reviewed-by: ihse, aph, simonis
-
-diff --git a/make/autoconf/boot-jdk.m4 b/make/autoconf/boot-jdk.m4
---- a/make/autoconf/boot-jdk.m4
-+++ b/make/autoconf/boot-jdk.m4
-@@ -405,7 +405,7 @@
-   BOOTCYCLE_JVM_ARGS_BIG=-Xms64M
- 
-   # Maximum amount of heap memory and stack size.
--  JVM_HEAP_LIMIT_32="1024"
-+  JVM_HEAP_LIMIT_32="768"
-   # Running a 64 bit JVM allows for and requires a bigger heap
-   JVM_HEAP_LIMIT_64="1600"
-   STACK_SIZE_32=768

JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch

@@ -0,0 +1,84 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536142767 -7200
+#      Wed Sep 05 12:19:27 2018 +0200
+# Node ID 7ea57274e55054579d1532e757edb21e67beed83
+# Parent  3ee91722550680c18b977f0e00b1013323b5c9ef
+8210416: [linux] Poor StrictMath performance due to non-optimized compilation
+Summary: Compile fdlibm with -O2 -ffp-contract=off on gcc/clang arches.
+Reviewed-by: aph, erikj, dholmes, darcy
+
+diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
+--- a/make/autoconf/flags-cflags.m4
++++ b/make/autoconf/flags-cflags.m4
+@@ -373,6 +373,18 @@
+ 
+   FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
+ 
++  COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
++  # Check that the compiler supports -ffp-contract=off flag
++  # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
++  # otherwise.
++  # These flags are required for GCC-based builds of
++  # fdlibm with optimization without losing precision.
++  # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
++  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
++      IF_TRUE: [FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
++      IF_FALSE: [FDLIBM_CFLAGS=""])
++  AC_SUBST(FDLIBM_CFLAGS)
++
+   # Tests are only ever compiled for TARGET
+   CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
+   CXXFLAGS_TESTLIB="$CXXFLAGS_JDKLIB"
+diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
+--- a/make/autoconf/spec.gmk.in
++++ b/make/autoconf/spec.gmk.in
+@@ -450,6 +450,7 @@
+ LIBJSIG_HASHSTYLE_LDFLAGS := @LIBJSIG_HASHSTYLE_LDFLAGS@
+ LIBJSIG_NOEXECSTACK_LDFLAGS := @LIBJSIG_NOEXECSTACK_LDFLAGS@
+ 
++FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
+ JVM_CFLAGS := @JVM_CFLAGS@
+ JVM_LDFLAGS := @JVM_LDFLAGS@
+ JVM_ASFLAGS := @JVM_ASFLAGS@
+diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
+--- a/make/lib/CoreLibraries.gmk
++++ b/make/lib/CoreLibraries.gmk
+@@ -39,20 +39,15 @@
+   BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+ endif
+ 
+-ifeq ($(OPENJDK_TARGET_OS), linux)
+-  ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+-    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+-  else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
+-    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+-  else ifeq ($(OPENJDK_TARGET_CPU), s390x)
+-    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+-  else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+-    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+-  endif
++# If FDLIBM_CFLAGS is non-empty we know that we can optimize
++# fdlibm by adding those extra C flags. Currently GCC,
++# and clang only.
++ifneq ($(FDLIBM_CFLAGS), )
++  BUILD_LIBFDLIBM_OPTIMIZATION := LOW
+ endif
+ 
+ LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm
+-LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC)
++LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) $(FDLIBM_CFLAGS)
+ 
+ ifneq ($(OPENJDK_TARGET_OS), macosx)
+   $(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \
+@@ -64,10 +59,6 @@
+       CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
+       CFLAGS_windows_debug := -DLOGGING, \
+       CFLAGS_aix := -qfloat=nomaf, \
+-      CFLAGS_linux_ppc64 := -ffp-contract=off, \
+-      CFLAGS_linux_ppc64le := -ffp-contract=off, \
+-      CFLAGS_linux_s390x := -ffp-contract=off, \
+-      CFLAGS_linux_aarch64 := -ffp-contract=off, \
+       DISABLED_WARNINGS_gcc := sign-compare misleading-indentation, \
+       DISABLED_WARNINGS_microsoft := 4146 4244 4018, \
+       ARFLAGS := $(ARFLAGS), \

JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch

@@ -0,0 +1,48 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536682731 -7200
+#      Tue Sep 11 18:18:51 2018 +0200
+# Node ID 7157249fdd4366d95dd68f3d083ebb0ef84c753b
+# Parent  8d86b149e10f0a0896e5fd4d8d407e5fda64a529
+8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
+--- a/make/hotspot/lib/JvmOverrideFiles.gmk
++++ b/make/hotspot/lib/JvmOverrideFiles.gmk
+@@ -41,20 +41,26 @@
+   BUILD_LIBJVM_shenandoahTraversalGC.cpp_CXXFLAGS := --param inline-unit-growth=1000
+ endif
+ 
++LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
++# If the FDLIBM_CFLAGS variable is non-empty we know
++# that the fdlibm-fork in hotspot can get optimized
++# by using -ffp-contract=off on GCC/Clang platforms.
++ifneq ($(FDLIBM_CFLAGS), )
++  LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NORM)
++endif
++
+ ifeq ($(OPENJDK_TARGET_OS), linux)
+   BUILD_LIBJVM_ostream.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
+   BUILD_LIBJVM_logFileOutput.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
+ 
+-  ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
+-    BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
+-    BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
++  BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
++  BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
+ 
+-    ifeq ($(TOOLCHAIN_TYPE), clang)
+-      JVM_PRECOMPILED_HEADER_EXCLUDE := \
+-          sharedRuntimeTrig.cpp \
+-          sharedRuntimeTrans.cpp \
+-          #
+-    endif
++  ifeq ($(TOOLCHAIN_TYPE), clang)
++    JVM_PRECOMPILED_HEADER_EXCLUDE := \
++	sharedRuntimeTrig.cpp \
++	sharedRuntimeTrans.cpp \
++	#
+   endif
+ 
+   ifeq ($(OPENJDK_TARGET_CPU), x86)

JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch

@@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536751862 -7200
+#      Wed Sep 12 13:31:02 2018 +0200
+# Node ID f95c6746fe256fe0456e0ea0d2930631ef840286
+# Parent  7157249fdd4366d95dd68f3d083ebb0ef84c753b
+8210647: libsaproc is being compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
+--- a/make/lib/Lib-jdk.hotspot.agent.gmk
++++ b/make/lib/Lib-jdk.hotspot.agent.gmk
+@@ -52,7 +52,7 @@
+ 
+ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
+     NAME := saproc, \
+-    OPTIMIZATION := NONE, \
++    OPTIMIZATION := LOW, \
+     DISABLED_WARNINGS_microsoft := 4267, \
+     DISABLED_WARNINGS_gcc := sign-compare, \
+     DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \

JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch

@@ -0,0 +1,21 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1536829660 -7200
+#      Thu Sep 13 11:07:40 2018 +0200
+# Node ID 39ccca116f79139fc4b779f5df83cb32357b9ae9
+# Parent  7512bd28304cf0dc5676247990f1907162c719ca
+8210703: vmStructs.cpp compiled with -O0
+Reviewed-by: duke
+
+diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
+--- a/make/hotspot/lib/JvmOverrideFiles.gmk
++++ b/make/hotspot/lib/JvmOverrideFiles.gmk
+@@ -30,7 +30,7 @@
+ # status for individual files on specific platforms.
+ 
+ ifeq ($(TOOLCHAIN_TYPE), gcc)
+-  BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments -O0
++  BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments
+   BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
+   BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
+   BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized

JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch

@@ -0,0 +1,20 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537541916 -7200
+#      Fri Sep 21 16:58:36 2018 +0200
+# Node ID cd8483acfe56ade257685d93323f78e6e13704a0
+# Parent  e40fa3a70efdbc22f85c0d30350189f632779831
+8210761: libjsig is being compiled without optimization
+Reviewed-by: duke
+
+diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
+--- a/make/lib/Lib-java.base.gmk
++++ b/make/lib/Lib-java.base.gmk
+@@ -138,6 +138,7 @@
+ 
+     $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \
+         NAME := jsig, \
++        OPTIMIZATION := LOW, \
+         CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \
+         LDFLAGS := $(LDFLAGS_JDKLIB) \
+             $(call SET_SHARED_LIBRARY_ORIGIN), \

README.md

@@ -6,3 +6,4 @@ JDK11 is last LTS release of Java platform. It is bringing many cool improvement
 See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
 See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf
 
+https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview

RHBZ-1565658-system-nss-SunEC.patch

@@ -94,8 +94,13 @@ diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
    $(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \
        NAME := sunec, \
        TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
-@@ -58,6 +64,7 @@
-       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
+@@ -47,9 +52,11 @@
+       CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
+       DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \
+       DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
+-      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
++      LDFLAGS := $(subst -Xlinker --as-needed,, \
++                 $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
        LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
        LIBS := $(LIBCXX), \
 +      LIBS_linux := -lc $(NSS_LIBS), \

RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch

@@ -0,0 +1,18 @@
+diff -r 1ddf9a99e4ad src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp	Wed Aug 22 21:50:12 2018 +0200
++++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp	Thu Sep 13 13:51:53 2018 +0100
+@@ -5745,11 +5745,13 @@
+     }
+ 
+     if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {
+-      StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
++      // disabled pending fix and retest of generated code
++      // StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
+     }
+ 
+     if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
+-      StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
++      // disabled pending fix and retest of generated code
++      // StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
+     }
+   }

RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch

@@ -0,0 +1,13 @@
+diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
++++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+@@ -5741,7 +5741,8 @@
+     }
+ 
+     if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) {
+-      StubRoutines::_dlog = generate_dlog();
++      // disabled pending fix and retest of generated code
++      // StubRoutines::_dlog = generate_dlog();
+     }
+ 
+     if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {

java-11-openjdk-riscv64.patch

@@ -0,0 +1,71 @@
+diff --git a/openjdk/make/autoconf/platform.m4 b/openjdk/make/autoconf/platform.m4
+index e06c11af0..e1c55bb1b 100644
+--- a/openjdk/make/autoconf/platform.m4
++++ b/openjdk/make/autoconf/platform.m4
+@@ -150,6 +150,18 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
+       VAR_CPU_BITS=64
+       VAR_CPU_ENDIAN=big
+       ;;
++    riscv32)
++      VAR_CPU=riscv32
++      VAR_CPU_ARCH=riscv
++      VAR_CPU_BITS=32
++      VAR_CPU_ENDIAN=little
++      ;;
++    riscv64)
++      VAR_CPU=riscv64
++      VAR_CPU_ARCH=riscv
++      VAR_CPU_BITS=64
++      VAR_CPU_ENDIAN=little
++      ;;
+     *)
+       AC_MSG_ERROR([unsupported cpu $1])
+       ;;
+diff --git a/openjdk/src/hotspot/os/linux/os_linux.cpp b/openjdk/src/hotspot/os/linux/os_linux.cpp
+index 8496e3db1..a154fd3e3 100644
+--- a/openjdk/src/hotspot/os/linux/os_linux.cpp
++++ b/openjdk/src/hotspot/os/linux/os_linux.cpp
+@@ -1728,6 +1728,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+ #ifndef EM_AARCH64
+   #define EM_AARCH64    183               /* ARM AARCH64 */
+ #endif
++#ifndef EM_RISCV
++  #define EM_RISCV      243               /* RISC-V */
++#endif
+ 
+   static const arch_t arch_array[]={
+     {EM_386,         EM_386,     ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
+@@ -1753,6 +1756,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+     {EM_PARISC,      EM_PARISC,  ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
+     {EM_68K,         EM_68K,     ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
+     {EM_AARCH64,     EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"},
++    {EM_RISCV,       EM_RISCV,   ELFCLASSNONE, ELFDATA2MSB, (char*)"RISC-V"},
+   };
+ 
+ #if  (defined IA32)
+@@ -1787,9 +1791,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+   static  Elf32_Half running_arch_code=EM_68K;
+ #elif  (defined SH)
+   static  Elf32_Half running_arch_code=EM_SH;
++#elif  (defined __riscv)
++  static  Elf32_Half running_arch_code=EM_RISCV;
+ #else
+     #error Method os::dll_load requires that one of following is defined:\
+-        AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, S390, SH, __sparc
++        AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, S390, SH, __sparc, __riscv
+ #endif
+ 
+   // Identify compatability class for VM's architecture and library's architecture
+@@ -1822,10 +1828,12 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+   }
+ 
+ #ifndef S390
++#ifndef __riscv
+   if (lib_arch.elf_class != arch_array[running_arch_index].elf_class) {
+     ::snprintf(diag_msg_buf, diag_msg_max_length-1," (Possible cause: architecture word width mismatch)");
+     return NULL;
+   }
++#endif // !__riscv
+ #endif // !S390
+ 
+   if (lib_arch.compat_class != arch_array[running_arch_index].compat_class) {

java-11-openjdk.spec

@@ -167,6 +167,9 @@
 %ifarch %{aarch64}
 %global archinstall aarch64
 %endif
+%ifarch riscv64
+%global archinstall riscv64
+%endif
 # 32 bit sparc, optimized for v9
 %ifarch sparcv9
 %global archinstall sparc
@@ -189,14 +192,14 @@
 
 # New Version-String scheme-style defines
 %global majorver 11
-%global securityver ea
+%global securityver 0
 
 # Standard JPackage naming and versioning defines
 %global origin          openjdk
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        22
+%global buildver        28
 # priority must be 7 digits in total
 # setting to 1, so debug ones can have 0
 %global priority        00000%{minorver}1
@@ -212,7 +215,7 @@
 # output dir stub
 %define buildoutputdir() %{expand:openjdk/build%{?1}}
 # we can copy the javadoc to not arched dir, or make it not noarch
-%define uniquejavadocdir()    %{expand:%{fullversion}%{?1}}
+%define uniquejavadocdir()    %{expand:%{fullversion}.%{_arch}%{?1}}
 # main id and dir of this jdk
 %define uniquesuffix()        %{expand:%{fullversion}.%{_arch}%{?1}}
 
@@ -349,7 +352,11 @@ alternatives \\
 %endif
   --slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
   --slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
+%ifarch %{jit_arches}
+%ifnarch s390x
   --slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\
+%endif
+%endif
   --slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\
   --slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
   --slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
@@ -499,7 +506,9 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
+%ifarch %{jit_arches}
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
+%endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jrt-fs.jar
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/modules
@@ -546,12 +555,9 @@ exit 0
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
-# Zero does not have JFR
-%ifarch %{jit_arches}
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
-%endif
 %{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
 %{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
@@ -597,8 +603,6 @@ exit 0
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/management/management.properties
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/net.properties
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/sound.properties
-# accessibility have package over user maintenance, so not config-noreplace
-%config  %{etcjavadir -- %{?1}}/conf/accessibility.properties
 %{_jvmdir}/%{sdkdir -- %{?1}}/conf
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/security
 }
@@ -704,16 +708,16 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
 # for java-X-openjdk package's desktop binding
 Recommends: gtk3%{?_isa}
 
-Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
+Provides: java-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
 
 # Standard JPackage base provides
-Provides: jre = %{javaver}%{?1}
-Provides: jre-%{origin}%{?1} = %{epoch}:%{version}-%{release}
+#Provides: jre = %{javaver}%{?1}
+#Provides: jre-%{origin}%{?1} = %{epoch}:%{version}-%{release}
 Provides: jre-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
 Provides: jre-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
 Provides: java-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
-Provides: java-%{origin}%{?1} = %{epoch}:%{version}-%{release}
-Provides: java%{?1} = %{epoch}:%{javaver}
+#Provides: java-%{origin}%{?1} = %{epoch}:%{version}-%{release}
+#Provides: java%{?1} = %{epoch}:%{javaver}
 }
 
 %define java_headless_rpo() %{expand:
@@ -745,14 +749,14 @@ Requires(postun):   chkconfig >= 1.7
 Suggests: lksctp-tools%{?_isa}, pcsc-lite-devel%{?_isa}, cups
 
 # Standard JPackage base provides
-Provides: jre-headless%{?1} = %{epoch}:%{javaver}
+#Provides: jre-headless%{?1} = %{epoch}:%{javaver}
 Provides: jre-%{javaver}-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
-Provides: jre-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
+#Provides: jre-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
 Provides: jre-%{javaver}-headless%{?1} = %{epoch}:%{version}-%{release}
 Provides: java-%{javaver}-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
 Provides: java-%{javaver}-headless%{?1} = %{epoch}:%{version}-%{release}
-Provides: java-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
-Provides: java-headless%{?1} = %{epoch}:%{javaver}
+#Provides: java-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release}
+#Provides: java-headless%{?1} = %{epoch}:%{javaver}
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1312019
 Provides: /usr/bin/jjs
@@ -837,7 +841,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 6%{?dist}
+Release: 1.2.riscv64%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
 # and this change was brought into RHEL-4. java-1.5.0-ibm packages
 # also included the epoch in their virtual provides. This created a
@@ -890,6 +894,10 @@ Source13: TestCryptoLevel.java
 # Ensure ECDSA is working
 Source14: TestECDSA.java
 
+# New versions of config files with RISC-V (riscv64) support.
+Source100: config.guess
+Source101: config.sub
+
 ############################################
 #
 # RPM/distribution specific patches
@@ -909,6 +917,16 @@ Patch3:    libjpeg-turbo-1.4-compat.patch
 Patch4:    RHBZ-1249083-system-crypto-policy-PR3183.patch
 # System NSS via SunEC Provider
 Patch5:    RHBZ-1565658-system-nss-SunEC.patch
+# Temporarily disable dsin/dcos intrinsics on aarch64, falling
+# back to C code. Re-enable once JDK-8210461 is fixed and
+# available in jdk11u.
+Patch6:    RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch
+# Temporarily disable log intrinsics on aarch64, falling
+# back to C code. Re-enable once JDK-8210858 is fixed and
+# available in jdk11u.
+Patch7:    RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch
+
+Patch30: java-11-openjdk-riscv64.patch
 
 #############################################
 #
@@ -916,6 +934,24 @@ Patch5:    RHBZ-1565658-system-nss-SunEC.patch
 #
 #############################################
 
+# 8210416, RHBZ#1632174: [linux] Poor StrictMath performance due to non-optimized compilation
+Patch8:    JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch
+# 8210425, RHBZ#1632174: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
+Patch9:    JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
+
+#############################################
+#
+# JDK 9+ only patches
+#
+#############################################
+
+# 8210647, RHBZ#1632174: libsaproc is being compiled without optimization
+Patch10:    JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch
+# 8210761, RHBZ#1632174: libjsig is being compiled without optimization
+Patch11:    JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch
+# 8210703, RHBZ#1632174: vmStructs.cpp compiled with -O0
+Patch12:    JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch
+
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -1169,6 +1205,10 @@ if [ $prioritylength -ne 7 ] ; then
  exit 14
 fi
 
+# Update config.{guess,sub} with RISC-V (riscv64) support
+cp %{SOURCE100} openjdk/make/autoconf/build-aux/
+cp %{SOURCE101} openjdk/make/autoconf/build-aux/
+
 # OpenJDK patches
 
 # Remove libraries that are linked
@@ -1179,6 +1219,14 @@ pushd %{top_level_dir_name}
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch30 -p2
 
 popd # openjdk
 
@@ -1238,7 +1286,7 @@ export NUM_PROC=${NUM_PROC:-1}
 [ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
 %endif
 
-%ifarch s390x sparc64 alpha %{power64} %{aarch64}
+%ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64
 export ARCH_DATA_MODEL=64
 %endif
 %ifarch alpha
@@ -1279,7 +1327,7 @@ bash ../configure \
     --with-jobs=1 \
 %endif
     --with-version-build=%{buildver} \
-    --with-version-pre="ea" \
+    --with-version-pre="" \
     --with-version-opt="" \
     --with-boot-jdk=/usr/lib/jvm/java-11-openjdk \
     --with-debug-level=$debugbuild \
@@ -1297,6 +1345,9 @@ bash ../configure \
     --with-extra-ldflags="%{ourldflags}" \
     --with-num-cores="$NUM_PROC" \
     --disable-javac-server \
+%ifarch x86_64
+    --with-jvm-features=zgc \
+%endif
     --disable-warnings-as-errors
 
 make \
@@ -1496,7 +1547,7 @@ popd
 # Install Javadoc documentation
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
 cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}-ea+%{buildver}-docs.zip  $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}+%{buildver}-docs.zip  $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
 
 # Install icons and menu entries
 for s in 16 24 32 48 ; do
@@ -1519,12 +1570,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs
 # copy samples next to demos; samples are mostly js files
 cp -r %{top_level_dir_name}/src/sample  $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/
 
-pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/conf/
-  echo "#Config file to  enable java-atk-wrapper" > accessibility.properties
-  echo "" >> accessibility.properties
-  echo "assistive_technologies=org.GNOME.Accessibility.AtkWrapper" >> accessibility.properties
-  echo "" >> accessibility.properties
-popd
 
 # moving config files to /etc
 mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}
@@ -1732,6 +1777,80 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Thu Oct 18 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:11.0.0.28-1.2.riscv64
+- Rebuild using JDK 11
+
+* Tue Oct 16 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:11.0.0.28-1.1.riscv64
+- Add support for RISC-V (riscv64)
+
+* Fri Sep 28 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.0.28-1
+- Identify as GA version and no longer as early access (EA).
+- JDK 11 has been released for GA on 2018-09-25.
+
+* Fri Sep 28 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.28-9
+- Rework changes from 1:11.0.ea.22-6. RHBZ#1632174 supercedes
+  RHBZ-1624122.
+- Add patch, JDK-8210416-RHBZ-1632174-fdlibm-opt-fix.patch, so as to
+  optimize compilation of fdlibm library.
+- Add patch, JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch, so
+  as to optimize compilation of sharedRuntime{Trig,Trans}.cpp
+- Add patch, JDK-8210647-RHBZ-1632174-libsaproc-opt-fix.patch, so as to
+  optimize compilation of libsaproc (extra c flags won't override
+  optimization).
+- Add patch, JDK-8210761-RHBZ-1632174-libjsig-opt-fix.patch, so as to
+  optimize compilation of libjsig.
+- Add patch, JDK-8210703-RHBZ-1632174-vmStructs-opt-fix.patch, so as to
+  optimize compilation of vmStructs.cpp (part of libjvm.so).
+- Reinstate filtering of opt flags coming from redhat-rpm-config.
+
+* Thu Sep 27 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.28-8
+- removed version less provides
+- javadocdir moved to arched dir as it is no longer noarch
+
+* Thu Sep 20 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.28-6
+- Add patch, RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch,
+  so as to disable log math intrinsic on aarch64. Work-around for
+  JDK-8210858
+
+* Thu Sep 13 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.28-5
+- Add patch, RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch,
+  so as to disable dsin/dcos math intrinsics on aarch64. Work-around for
+  JDK-8210461.
+
+* Wed Sep 12 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.22-6
+- Add patch, JDK-8210416-RHBZ-1624122-fdlibm-opt-fix.patch, so as to
+  optimize compilation of fdlibm library.
+- Add patch, JDK-8210425-RHBZ-1624122-sharedRuntimeTrig-opt-fix.patch, so
+  as to optimize compilation of sharedRuntime{Trig,Trans}.cpp
+- Add patch, JDK-8210647-RHBZ-1624122-libsaproc-opt-fix.patch, so as to
+  optimize compilation of libsaproc (extra c flags won't override
+  optimization).
+- Add patch, JDK-8210703-RHBZ-1624122-vmStructs-opt-fix.patch, so as to
+  optimize compilation of vmStructs.cpp (part of libjvm.so).
+- No longer filter -O flags from C flags coming from
+  redhat-rpm-config.
+
+* Mon Sep 10 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.28-4
+- link to jhsdb followed its file to ifarch jit_arches ifnarch s390x
+
+* Fri Sep 7 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.28-3
+- Enable ZGC on x86_64.
+
+* Tue Sep 4 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.28-2
+- jfr/*jfc files listed for all arches
+- lib/classlist do not exists s390, ifarch-ed via jit_arches out
+
+* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.28-1
+- Update to latest upstream build jdk11+28, the first release
+  candidate.
+
+* Wed Aug 29 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.22-8
+- Adjust system NSS patch, RHBZ-1565658-system-nss-SunEC.patch, so
+  as to filter -Wl,--as-needed from linker flags. Fixes FTBFS issue.
+
+* Thu Aug 23 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.22-6
+- dissabled accessibility, fixed provides for main package's debug variant
+
 * Mon Jul 30 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.22-5
 - now buildrequires javapackages-filesystem as the  issue with macros should be fixed
 

sources

@@ -1,2 +1,2 @@
 SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz) = 26b21be95d7302a4cf4afc63a0edc59ba3829303985654b5b6148a54f0bd6a36685463ccca86ed68f7498bfd8e7bec270e67210747e15b2d44105f4f00e48aa6
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz) = 4ca6a69cb1b67dd6749861de5f49e50a43c9c7a6100d4b55c722960fec90bb280dc995be7d76e9b2d4519ce0d8fef54c25be8e9b33b80d6c6ec9130ef166e4ee

update_package.sh

@@ -35,7 +35,7 @@ fi
 export PROJECT_NAME="shenandoah"
 export REPO_NAME="jdk11"
 # warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
-export VERSION="shenandoah-jdk-11+22"
+export VERSION="shenandoah-jdk-11+28"
 export COMPRESSION=xz
 # unset tapsets overrides
 export OPENJDK_URL=""