diff --git a/.gitignore b/.gitignore index 9b8b2ec..ca99e1d 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b04.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b05.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b06.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b07.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 70e8ff8..74def62 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-b06 +%global shenandoah_revision aarch64-shenandoah-jdk8u242-b07 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -1001,7 +1001,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1 +Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?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 @@ -1199,8 +1199,6 @@ Patch201: jdk8043805-allow_using_system_installed_libjpeg.patch # and should be upstreamed to the appropriate # trees. ############################################# -# JDK-8236829: JDK-8232102 backport breaks s390 -Patch301: jdk8236829-s390_shenandoah.patch ############################################# # @@ -1553,7 +1551,6 @@ sh %{SOURCE12} %endif # Shenandoah patches -%patch301 # Extract systemtap tapsets %if %{with_systemtap} @@ -2185,6 +2182,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Jan 29 2020 Andrew Hughes - 1:1.8.0.242.b07-0 +- Update to aarch64-shenandoah-jdk8u242-b07. +- Remove Shenandoah S390 patch which is now included upstream as JDK-8236829. + * Wed Jan 29 2020 Fedora Release Engineering - 1:1.8.0.242.b06-0.0.ea.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/jdk8236829-s390_shenandoah.patch b/jdk8236829-s390_shenandoah.patch deleted file mode 100644 index ec1e619..0000000 --- a/jdk8236829-s390_shenandoah.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp ---- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahHeapRegion.cpp -@@ -479,31 +479,37 @@ - "of regions (" SIZE_FORMAT ") of minimum region size (" SIZE_FORMAT "%s).", - byte_size_in_proper_unit(max_heap_size), proper_unit_for_byte_size(max_heap_size), - MIN_NUM_REGIONS, -- byte_size_in_proper_unit(ShenandoahMinRegionSize), proper_unit_for_byte_size(ShenandoahMinRegionSize)); -+ byte_size_in_proper_unit(ShenandoahMinRegionSize), -+ proper_unit_for_byte_size(ShenandoahMinRegionSize)); - vm_exit_during_initialization("Invalid -XX:ShenandoahMinRegionSize option", message); - } - if (ShenandoahMinRegionSize < MIN_REGION_SIZE) { - err_msg message("" SIZE_FORMAT "%s should not be lower than minimum region size (" SIZE_FORMAT "%s).", -- byte_size_in_proper_unit(ShenandoahMinRegionSize), proper_unit_for_byte_size(ShenandoahMinRegionSize), -- byte_size_in_proper_unit(MIN_REGION_SIZE), proper_unit_for_byte_size(MIN_REGION_SIZE)); -+ byte_size_in_proper_unit(ShenandoahMinRegionSize), -+ proper_unit_for_byte_size(ShenandoahMinRegionSize), -+ byte_size_in_proper_unit(MIN_REGION_SIZE), proper_unit_for_byte_size(MIN_REGION_SIZE)); - vm_exit_during_initialization("Invalid -XX:ShenandoahMinRegionSize option", message); - } - if (ShenandoahMinRegionSize < MinTLABSize) { - err_msg message("" SIZE_FORMAT "%s should not be lower than TLAB size size (" SIZE_FORMAT "%s).", -- byte_size_in_proper_unit(ShenandoahMinRegionSize), proper_unit_for_byte_size(ShenandoahMinRegionSize), -- byte_size_in_proper_unit(MinTLABSize), proper_unit_for_byte_size(MinTLABSize)); -+ byte_size_in_proper_unit(ShenandoahMinRegionSize), -+ proper_unit_for_byte_size(ShenandoahMinRegionSize), -+ byte_size_in_proper_unit(MinTLABSize), proper_unit_for_byte_size(MinTLABSize)); - vm_exit_during_initialization("Invalid -XX:ShenandoahMinRegionSize option", message); - } - if (ShenandoahMaxRegionSize < MIN_REGION_SIZE) { - err_msg message("" SIZE_FORMAT "%s should not be lower than min region size (" SIZE_FORMAT "%s).", -- byte_size_in_proper_unit(ShenandoahMaxRegionSize), proper_unit_for_byte_size(ShenandoahMaxRegionSize), -- byte_size_in_proper_unit(MIN_REGION_SIZE), proper_unit_for_byte_size(MIN_REGION_SIZE)); -+ byte_size_in_proper_unit(ShenandoahMaxRegionSize), -+ proper_unit_for_byte_size(ShenandoahMaxRegionSize), -+ byte_size_in_proper_unit(MIN_REGION_SIZE), proper_unit_for_byte_size(MIN_REGION_SIZE)); - vm_exit_during_initialization("Invalid -XX:ShenandoahMaxRegionSize option", message); - } - if (ShenandoahMinRegionSize > ShenandoahMaxRegionSize) { - err_msg message("Minimum (" SIZE_FORMAT "%s) should be larger than maximum (" SIZE_FORMAT "%s).", -- byte_size_in_proper_unit(ShenandoahMinRegionSize), proper_unit_for_byte_size(ShenandoahMinRegionSize), -- byte_size_in_proper_unit(ShenandoahMaxRegionSize), proper_unit_for_byte_size(ShenandoahMaxRegionSize)); -+ byte_size_in_proper_unit(ShenandoahMinRegionSize), -+ proper_unit_for_byte_size(ShenandoahMinRegionSize), -+ byte_size_in_proper_unit(ShenandoahMaxRegionSize), -+ proper_unit_for_byte_size(ShenandoahMaxRegionSize)); - vm_exit_during_initialization("Invalid -XX:ShenandoahMinRegionSize or -XX:ShenandoahMaxRegionSize", message); - } - -@@ -521,19 +527,24 @@ - "of regions (" SIZE_FORMAT ") of requested size (" SIZE_FORMAT "%s).", - byte_size_in_proper_unit(max_heap_size), proper_unit_for_byte_size(max_heap_size), - MIN_NUM_REGIONS, -- byte_size_in_proper_unit(ShenandoahHeapRegionSize), proper_unit_for_byte_size(ShenandoahHeapRegionSize)); -+ byte_size_in_proper_unit(ShenandoahHeapRegionSize), -+ proper_unit_for_byte_size(ShenandoahHeapRegionSize)); - vm_exit_during_initialization("Invalid -XX:ShenandoahHeapRegionSize option", message); - } - if (ShenandoahHeapRegionSize < ShenandoahMinRegionSize) { - err_msg message("Heap region size (" SIZE_FORMAT "%s) should be larger than min region size (" SIZE_FORMAT "%s).", -- byte_size_in_proper_unit(ShenandoahHeapRegionSize), proper_unit_for_byte_size(ShenandoahHeapRegionSize), -- byte_size_in_proper_unit(ShenandoahMinRegionSize), proper_unit_for_byte_size(ShenandoahMinRegionSize)); -+ byte_size_in_proper_unit(ShenandoahHeapRegionSize), -+ proper_unit_for_byte_size(ShenandoahHeapRegionSize), -+ byte_size_in_proper_unit(ShenandoahMinRegionSize), -+ proper_unit_for_byte_size(ShenandoahMinRegionSize)); - vm_exit_during_initialization("Invalid -XX:ShenandoahHeapRegionSize option", message); - } - if (ShenandoahHeapRegionSize > ShenandoahMaxRegionSize) { - err_msg message("Heap region size (" SIZE_FORMAT "%s) should be lower than max region size (" SIZE_FORMAT "%s).", -- byte_size_in_proper_unit(ShenandoahHeapRegionSize), proper_unit_for_byte_size(ShenandoahHeapRegionSize), -- byte_size_in_proper_unit(ShenandoahMaxRegionSize), proper_unit_for_byte_size(ShenandoahMaxRegionSize)); -+ byte_size_in_proper_unit(ShenandoahHeapRegionSize), -+ proper_unit_for_byte_size(ShenandoahHeapRegionSize), -+ byte_size_in_proper_unit(ShenandoahMaxRegionSize), -+ proper_unit_for_byte_size(ShenandoahMaxRegionSize)); - vm_exit_during_initialization("Invalid -XX:ShenandoahHeapRegionSize option", message); - } - region_size = ShenandoahHeapRegionSize; diff --git a/sources b/sources index 7037e9a..bd0a6a5 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-jdk8u242-b06.tar.xz) = 38901aafdda65f4fc4d152f31c1d8b694a0bb6c73ed5d3c6fa66634f4b2ffad3eccc23be1b2c16a5c1c07d63279d91403f45d66dca3d7f4a04e3142cd3960938 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u242-b07.tar.xz) = a394689d9402f2a268f60c15c6f13eb7ca2d5b68d929b631d48848590d0a2e0e94d4c202290d98dcb1a7d2d804288512f3a784e0d4a4dc24a2245dc2a571cec2