From 5cf3d024017b0cba685517682cc6a8a0106721e1 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 3 Sep 2020 14:04:04 +0000 Subject: [PATCH] Update to aarch64-shenandoah-jdk8u272-b05-shenandoah-merge-2020-08-28. Add additional s390 log2_intptr case in shenandoahUtils.cpp introduced by JDK-8245464 --- .gitignore | 1 + java-1.8.0-openjdk.spec | 8 ++++++-- ...0_31_bit_size_t_type_conflicts_in_shared_code.patch | 10 ++++++++++ sources | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2a94d3b..5ae92ea 100644 --- a/.gitignore +++ b/.gitignore @@ -201,3 +201,4 @@ /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b03-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b04-4curve.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b05-4curve.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b05-shenandoah-merge-2020-08-28-4curve.tar.xz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index efcc646..15512c8 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -244,7 +244,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-jdk8u272-b05 +%global shenandoah_revision aarch64-shenandoah-jdk8u272-b05-shenandoah-merge-2020-08-28 # Define old aarch64/jdk8u tree variables for compatibility %global project %{shenandoah_project} %global repo %{shenandoah_repo} @@ -260,7 +260,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 0 +%global rpmrelease 1 # 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, @@ -2403,6 +2403,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Sep 02 2020 Andrew Hughes - 1:1.8.0.272.b05-0.1.ea +- Update to aarch64-shenandoah-jdk8u272-b05-shenandoah-merge-2020-08-28. +- Add additional s390 log2_intptr case in shenandoahUtils.cpp introduced by JDK-8245464 + * Thu Aug 27 2020 Andrew Hughes - 1:1.8.0.272.b05-0.0.ea - Update to aarch64-shenandoah-jdk8u272-b05. - Add additional s390 size_t case in g1ConcurrentMarkObjArrayProcessor.cpp introduced by JDK-8057003 diff --git a/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch b/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch index 7bdce3a..53bceec 100644 --- a/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch +++ b/jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch @@ -331,3 +331,13 @@ diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1ConcurrentMa if (remaining > ObjArrayMarkingStride) { push_array_slice(start_from + ObjArrayMarkingStride); +diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp ++++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahUtils.cpp +@@ -150,5 +150,5 @@ + return value; + } + +- return (size_t)1 << (log2_intptr(value) + 1); ++ return (size_t)1 << (log2_intptr((uintptr_t) value) + 1); + } diff --git a/sources b/sources index 7789d61..f48e4f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b05-4curve.tar.xz) = 59c31185d067d0384561dc3451265e4dbb36331a8734975a29e5ce5b0c100f713dcb070fb5b8aa53e2e4e8f44ca7caf4935d6061488cea4f4bd5f95fd3145e93 +SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u272-b05-shenandoah-merge-2020-08-28-4curve.tar.xz) = 0b97e71fda79399179439aa850edd7228e8ea318be09e80e1a1c380a145cdb968e3a22a27d4b388d9cc28ec52de2815aa67e0931e998c79ff47f122e26f31b2d