From 7dca9c2751fde19a12e22e9b0ed225d82cbeba62 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: May 04 2020 00:20:10 +0000 Subject: Update to aarch64-shenandoah-jdk8u252-b01. Switch to EA mode. Adjust JDK-8199936/PR3533 patch following JDK-8227397 configure change Make use of --with-extra-asflags introduced in jdk8u252-b01. Drop obsolete local patch, JDK-8219772, now that ASFLAGS are properly handled. --- diff --git a/.gitignore b/.gitignore index 21ee408..49432d6 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,5 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b07.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b08.tar.xz /tapsets-icedtea-3.15.0.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b01-4curve.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b01.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index ebeb3ca..7f91bf2 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -218,7 +218,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-jdk8u242-b08 +%global shenandoah_revision aarch64-shenandoah-jdk8u252-b01 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -234,12 +234,12 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 1 +%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, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 1 +%global is_ga 0 %if %{is_ga} %global milestone fcs %global milestone_version %{nil} @@ -1127,8 +1127,6 @@ Patch539: pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_jav Patch400: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch # PR3655: Allow use of system crypto policy to be disabled by the user Patch401: pr3655-toggle_system_crypto_policy.patch -# JDK-8219772: EXTRA_CFLAGS not being picked up for assembler files -Patch110: jdk8219772-extra_c_cxx_flags_not_picked_for_assembler_source.patch ############################################# # @@ -1548,7 +1546,6 @@ sh %{SOURCE12} %patch574 %patch575 %patch577 -%patch110 # RPM-only fixes %patch539 @@ -1630,14 +1627,13 @@ export CFLAGS="$CFLAGS -mieee" EXTRA_CFLAGS="%ourcppflags -Wno-error" EXTRA_CPP_FLAGS="%ourcppflags" # Fixes annocheck warnings in assembler files due to missing build notes -EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -Wa,--generate-missing-build-notes=yes" -EXTRA_CFLAGS="$EXTRA_CFLAGS -Wa,--generate-missing-build-notes=yes" +EXTRA_ASFLAGS="${EXTRA_CFLAGS} -Wa,--generate-missing-build-notes=yes" %ifarch %{power64} ppc # fix rpmlint warnings EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing" %endif -export EXTRA_CFLAGS +export EXTRA_CFLAGS EXTRA_ASFLAGS (cd %{top_level_dir_name}/common/autoconf bash ./autogen.sh @@ -1676,6 +1672,7 @@ bash ../../configure \ --with-stdc++lib=dynamic \ --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ --with-extra-cflags="$EXTRA_CFLAGS" \ + --with-extra-asflags="$EXTRA_ASFLAGS" \ --with-extra-ldflags="%{ourldflags}" \ --with-num-cores="$NUM_PROC" @@ -2191,6 +2188,13 @@ require "copy_jdk_configs.lua" %endif %changelog +* Sun May 03 2020 Andrew Hughes - 1:1.8.0.252.b01-0.1.ea +- Update to aarch64-shenandoah-jdk8u252-b01. +- Switch to EA mode. +- Adjust JDK-8199936/PR3533 patch following JDK-8227397 configure change +- Make use of --with-extra-asflags introduced in jdk8u252-b01. +- Drop obsolete local patch, JDK-8219772, now that ASFLAGS are properly handled. + * Fri Mar 13 2020 Andrew John Hughes - 1:1.8.0.242.b08-1 - Sync SystemTap & desktop files with upstream IcedTea release 3.15.0, removing previous workarounds diff --git a/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch index 533ea2d..ae48068 100644 --- a/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch +++ b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch @@ -10,7 +10,7 @@ Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4 --- openjdk.orig///common/autoconf/flags.m4 +++ openjdk///common/autoconf/flags.m4 -@@ -389,6 +389,21 @@ +@@ -402,6 +402,21 @@ AC_SUBST($2CXXSTD_CXXFLAG) fi @@ -44,11 +44,11 @@ diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in openjdk///common/a + $(REALIGN_CFLAG) EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@ EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@ - + EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@ diff --git openjdk.orig///common/autoconf/spec.gmk.in openjdk///common/autoconf/spec.gmk.in --- openjdk.orig///common/autoconf/spec.gmk.in +++ openjdk///common/autoconf/spec.gmk.in -@@ -334,6 +334,7 @@ +@@ -366,6 +366,7 @@ NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@ NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@ diff --git a/jdk8219772-extra_c_cxx_flags_not_picked_for_assembler_source.patch b/jdk8219772-extra_c_cxx_flags_not_picked_for_assembler_source.patch deleted file mode 100644 index 33ccea4..0000000 --- a/jdk8219772-extra_c_cxx_flags_not_picked_for_assembler_source.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk.orig/hotspot/make/linux/makefiles/vm.make ---- openjdk.orig/hotspot/make/linux/makefiles/vm.make -+++ openjdk/hotspot/make/linux/makefiles/vm.make -@@ -121,6 +121,7 @@ - CFLAGS += $(CFLAGS/NOEX) - - # Extra flags from gnumake's invocation or environment -+ASFLAGS += $(EXTRA_CFLAGS) - CFLAGS += $(EXTRA_CFLAGS) - LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) - diff --git a/sources b/sources index 55ce4fd..4fa9aea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (tapsets-icedtea-3.15.0.tar.xz) = a0376b936e28392e1d66abb1fc6a8f715cc2085319e5496627d65a9d65d5d5e32fc7b9d3edeefed64087f597503fb2b54f0de613be01049aaa61b598d63945aa -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b08.tar.xz) = 5102b72f47c53834942a2b970e0019f9de4fff32e4146bddfb8e0abcbf7805aa07456afb43fb9130cc3c1fd6d94bc0ab2e851d1d133fe2ec2a0fcffde3e288af +SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u252-b01.tar.xz) = 0cf78ddff5601964371ae754713d7e46e271dab183aa87bf9de760a45050a80e5183022404ec4b73215fb38b6baeecd1a29bc81139c59b773107ed350c6c7e81