diff --git a/.gitignore b/.gitignore index 5c6e85f..f382ea2 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 10d1507..0379480 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -217,7 +217,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global shenandoah_project aarch64-port %global shenandoah_repo jdk8u-shenandoah -%global shenandoah_revision aarch64-shenandoah-jdk8u222-b01 +%global shenandoah_revision aarch64-shenandoah-jdk8u222-b02 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -233,7 +233,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 2 +%global rpmrelease 0 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, @@ -1180,8 +1180,6 @@ Patch573: jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_h Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch # 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8 Patch575: jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch -# 8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning -Patch576: jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch # 8062808, PR3548: Turn on the -Wreturn-type warning Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch # s390: JDK-8203030, Type fixing for s390 @@ -1192,8 +1190,6 @@ Patch202: jdk8035341-allow_using_system_installed_libpng.patch Patch203: jdk8042159-allow_using_system_installed_lcms2.patch # 8210761: libjsig is being compiled without optimization Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch -# 8210416: [linux] Poor StrictMath performance due to non-optimized compilation -Patch622: jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch # 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization # Upstream 8u part. Patch623: jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch @@ -1608,10 +1604,8 @@ sh %{SOURCE12} %patch573 %patch574 %patch575 -%patch576 %patch577 %patch620 -%patch622 %patch623 %patch624 %patch625 @@ -2276,6 +2270,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Jul 08 2019 Andrew Hughes - 1:1.8.0.222.b02-0.0.ea +- Update to aarch64-shenandoah-jdk8u222-b02. +- Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in 8176100). + * Sun Jul 07 2019 Andrew Hughes - 1:1.8.0.222.b01-0.2.ea - Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment. diff --git a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch deleted file mode 100644 index 790ee0d..0000000 --- a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# User goetz -# Date 1415873641 -3600 -# Thu Nov 13 11:14:01 2014 +0100 -# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906 -# Parent 533473c67de6ff767710594639033c8e83523fe5 -8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning -Reviewed-by: stefank, tschatzl - -diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp openjdk/hotspot/src/share/vm/prims/jni.cpp ---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp -+++ openjdk/hotspot/src/share/vm/prims/jni.cpp -@@ -708,6 +708,7 @@ - - THROW_OOP_(JNIHandles::resolve(obj), JNI_OK); - ShouldNotReachHere(); -+ return 0; // Mute compiler. - JNI_END - - #ifndef USDT2 -@@ -734,6 +735,7 @@ - Handle protection_domain (THREAD, k->protection_domain()); - THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK); - ShouldNotReachHere(); -+ return 0; // Mute compiler. - JNI_END - - diff --git a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch deleted file mode 100644 index 98bbad0..0000000 --- a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git openjdk.orig/jdk/make/lib/CoreLibraries.gmk openjdk/jdk/make/lib/CoreLibraries.gmk ---- openjdk.orig/jdk/make/lib/CoreLibraries.gmk -+++ openjdk/jdk/make/lib/CoreLibraries.gmk -@@ -37,21 +37,32 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) - 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), aarch64) -- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -- endif --endif -- --ifneq ($(OPENJDK_TARGET_OS), macosx) -+ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH -+ LIBFDLIBM_CFLAGS_LINUX := -ffp-contract=off - # Unfortunately, '-ffp-contract' is only available since gcc 4.6. For ppc64le - # that's no problem since ppc64le support only appeared in gcc 4.8.3. But on - # ppc64 (big endian) we traditionally compiled with gcc 4.3 which only knows - # '-mno-fused-madd'. However, that's still not enough to get the float - # computations right - we additionally have to supply '-fno-strict-aliasing'. -+ # -+ # -+ ifeq ($(TOOLCHAIN_TYPE), gcc) -+ CC_VER_MAJOR := $(shell $(CC) -dumpversion | cut -d'.' -f1) -+ CC_VER_MINOR := $(shell $(CC) -dumpversion | cut -d'.' -f2) -+ endif -+ # Only GCC 4.6 and better have machine independent -ffp-contract=off. -+ # For other versions we need to explicitly set arch specific machine -+ # flags or keep optimization off. -+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 6 \) \))" "0" -+ ifeq ($(OPENJDK_TARGET_CPU), ppc64) -+ LIBFDLIBM_CFLAGS_LINUX := -mno-fused-madd -fno-strict-aliasing -+ else -+ BUILD_LIBFDLIBM_OPTIMIZATION := NONE -+ endif -+ endif -+endif -+ -+ifneq ($(OPENJDK_TARGET_OS), macosx) - $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \ - STATIC_LIBRARY := fdlibm, \ - OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \ -@@ -62,9 +73,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) - -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \ - CFLAGS_windows_debug := -DLOGGING, \ - CFLAGS_aix := -qfloat=nomaf, \ -- CFLAGS_linux_ppc64 := -mno-fused-madd -fno-strict-aliasing, \ -- CFLAGS_linux_ppc64le := -ffp-contract=off, \ -- CFLAGS_linux_aarch64 := -ffp-contract=off, \ -+ CFLAGS_linux := $(LIBFDLIBM_CFLAGS_LINUX), \ - ARFLAGS := $(ARFLAGS), \ - OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \ - DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) diff --git a/sources b/sources index 8c0edda..8e4f7c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz) = 1d120a52dc4a6ac77189fb8f8b27244aad2de7e1fa71c41e89280339fb5f0255761171159fb5b0ab0b4ba185d8462205574679219f9bd218843618f3dc575dd2 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz) = f30a5e1b7dd3fb3d7648d7871889f3f859946e4889649662aa7d051f02c101747e13d3b1311f14a68b5952f9745e577ef57cef44f7b73f9ccb0341c74d4068ac