The package rpms/java-11-openjdk.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-11-openjdk.git/commit/?id=92....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit 29e7fe052b84478a4aa17d2fd0e75ccd42c55471
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Wed Apr 22 23:05:34 2020 +0100
Update to shenandoah-jdk-11.0.7+10 (GA)
Switch to GA mode for final release.
Remove JDK-8237879 backport as this was integrated upstream in jdk-11.0.7+10.
diff --git a/.gitignore b/.gitignore
index 02efc92..b787053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,5 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.7+8.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+9.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+10-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+10.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 7121da9..f006ca1 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -225,7 +225,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 9
+%global buildver 10
%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
@@ -243,7 +243,7 @@
# 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 0
+%global is_ga 1
%if %{is_ga}
%global ea_designator ""
%global ea_designator_zip ""
@@ -1066,18 +1066,6 @@ Patch8: s390-8214206_fix.patch
#############################################
#
-# Patches appearing in 11.0.7
-#
-# This section includes patches which are present
-# in the listed OpenJDK 11u release and should be
-# able to be removed once that release is out
-# and used by this RPM.
-#############################################
-# JDK-8237879: make 4.3 breaks build
-Patch9: jdk8237879-make_4_3_build_fixes.patch
-
-#############################################
-#
# Patches appearing in 11.0.8
#
# This section includes patches which are present
@@ -1324,7 +1312,6 @@ pushd %{top_level_dir_name}
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%patch11 -p1
%patch12 -p1
popd # openjdk
@@ -1872,6 +1859,11 @@ require "copy_jdk_configs.lua"
%changelog
+* Wed Apr 22 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.10-0
+- Update to shenandoah-jdk-11.0.7+10 (GA)
+- Switch to GA mode for final release.
+- Remove JDK-8237879 backport as this was integrated upstream in jdk-11.0.7+10.
+
* Tue Apr 21 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.9-0.0.ea
- Update to shenandoah-jdk-11.0.7+9 (EA)
- Remove JDK-8241296 backport as this was integrated upstream in jdk-11.0.7+9.
diff --git a/jdk8237879-make_4_3_build_fixes.patch
b/jdk8237879-make_4_3_build_fixes.patch
deleted file mode 100644
index 76da003..0000000
--- a/jdk8237879-make_4_3_build_fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# HG changeset patch
-# User ihse
-# Date 1580378910 -3600
-# Node ID 0743e1d49930a95d045bfdaa8f8607a00289e677
-# Parent 24b4c763cb2276db073bec263246879eb312daeb
-8237879: make 4.3 breaks build
-Reviewed-by: erikj, tbell
-
-diff -r 24b4c763cb22 -r 0743e1d49930 make/common/MakeBase.gmk
---- a/make/common/MakeBase.gmk Thu Jan 30 10:10:48 2020 +0100
-+++ b/make/common/MakeBase.gmk Thu Jan 30 11:08:30 2020 +0100
-@@ -525,15 +525,16 @@
- # Param 2 - (optional) name of file to store value in
- DependOnVariableHelper = \
- $(strip \
-- $(eval -include $(call DependOnVariableFileName, $1, $2)) \
-+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
-+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
- $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
-- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
-+ $(call MakeDir, $(dir $($1_filename))) \
- $(if $(findstring $(LOG_LEVEL), trace), \
- $(info NewVariable $1: >$(strip $($1))<) \
- $(info OldVariable $1: >$(strip $($1_old))<)) \
- $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
-- $(call DependOnVariableFileName, $1, $2))) \
-- $(call DependOnVariableFileName, $1, $2) \
-+ $($1_filename))) \
-+ $($1_filename) \
- )
-
- # Main macro
-
diff --git a/sources b/sources
index 04072ba..9522fbb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz) =
7da1a4d8d906b7c1bfaf133d430cedde9670838d4d24606cedff6d8ab8f430cef9f83bb5ef438a38fc9ed294c1b4d724f6bd9a704a4f178340d92401db2450d1
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+10-4curve.tar.xz) =
469e7f43c131ba8970791fc9f7e84a13296943e8f68e80f27673b29e1837948f64ec3746a57b2aab9d508f8a038e7c3e4ae2d979b4d25e987093deeded0ebb70
commit 6f26736c1a820ef3aec5842882123b892c392c90
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Tue Apr 21 16:30:40 2020 +0100
Update to shenandoah-jdk-11.0.7+9 (EA)
Remove JDK-8241296 backport as this was integrated upstream in jdk-11.0.7+9.
diff --git a/.gitignore b/.gitignore
index 23cd395..02efc92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,5 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.7+7.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+8-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+8.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+9.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index dfa620c..7121da9 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -225,7 +225,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 8
+%global buildver 9
%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
@@ -1075,8 +1075,6 @@ Patch8: s390-8214206_fix.patch
#############################################
# JDK-8237879: make 4.3 breaks build
Patch9: jdk8237879-make_4_3_build_fixes.patch
-# JDK-8241296: Segfault in JNIHandleBlock::oops_do()
-Patch10: jdk8241296-jnihandleblock_segfault.patch
#############################################
#
@@ -1327,7 +1325,6 @@ pushd %{top_level_dir_name}
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
%patch11 -p1
%patch12 -p1
popd # openjdk
@@ -1875,6 +1872,10 @@ require "copy_jdk_configs.lua"
%changelog
+* Tue Apr 21 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.9-0.0.ea
+- Update to shenandoah-jdk-11.0.7+9 (EA)
+- Remove JDK-8241296 backport as this was integrated upstream in jdk-11.0.7+9.
+
* Tue Apr 21 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.8-0.0.ea
- Update to shenandoah-jdk-11.0.7+8 (EA)
diff --git a/jdk8241296-jnihandleblock_segfault.patch
b/jdk8241296-jnihandleblock_segfault.patch
deleted file mode 100644
index d0920a8..0000000
--- a/jdk8241296-jnihandleblock_segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1584629637 0
-# Thu Mar 19 14:53:57 2020 +0000
-# Node ID e96597ea4d672793ab205fd67009efed809fae11
-# Parent 0daa6b52ba568246e8f930138fb36f8f04d9fadd
-8241296: Segfault in JNIHandleBlock::oops_do()
-Reviewed-by: duke
-
-diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
---- a/src/hotspot/share/runtime/thread.cpp
-+++ b/src/hotspot/share/runtime/thread.cpp
-@@ -867,7 +867,9 @@
- }
-
- void Thread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
-- active_handles()->oops_do(f);
-+ if (active_handles() != NULL) {
-+ active_handles()->oops_do(f);
-+ }
- // Do oop for ThreadShadow
- f->do_oop((oop*)&_pending_exception);
- handle_area()->oops_do(f);
diff --git a/sources b/sources
index 61143b4..04072ba 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+8-4curve.tar.xz) =
a613befe275dc21d3feec469ecebb06144e3565b3ab060cd53a82da0f4d5356ad005bb3d10c45c44f67bda3db0f694333a5595b5f990c65602764949471e8c2f
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz) =
7da1a4d8d906b7c1bfaf133d430cedde9670838d4d24606cedff6d8ab8f430cef9f83bb5ef438a38fc9ed294c1b4d724f6bd9a704a4f178340d92401db2450d1
commit 383f0f9eee91794b2fad27c20ed0e8e38ac7325c
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Tue Apr 21 14:14:40 2020 +0100
Update to shenandoah-jdk-11.0.7+8 (EA)
diff --git a/.gitignore b/.gitignore
index 38c93e7..23cd395 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.7+6.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+7-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+7.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+8-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+8.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 9d6f4df..dfa620c 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -225,7 +225,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 7
+%global buildver 8
%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
@@ -1875,6 +1875,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Tue Apr 21 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.8-0.0.ea
+- Update to shenandoah-jdk-11.0.7+8 (EA)
+
* Mon Apr 20 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.7-0.0.ea
- Update to shenandoah-jdk-11.0.7+7 (EA)
diff --git a/sources b/sources
index 659807d..61143b4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+7-4curve.tar.xz) =
152ffb69ecae083c1bc10caf074ca99233db96b2bb3173e7df086922ef809db76ed5161ddfd830241292666d3031fd161256d2cd4db2083999feca6844140d74
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+8-4curve.tar.xz) =
a613befe275dc21d3feec469ecebb06144e3565b3ab060cd53a82da0f4d5356ad005bb3d10c45c44f67bda3db0f694333a5595b5f990c65602764949471e8c2f
commit fcbd0df0dfd9a52d54e0ab2a0dc0e8c507d88dd9
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Mon Apr 20 21:33:25 2020 +0100
Update to shenandoah-jdk-11.0.7+7 (EA)
diff --git a/.gitignore b/.gitignore
index 3505020..38c93e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,5 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.7+5.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+6-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+6.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+7-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+7.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 1a33cbf..9d6f4df 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -225,7 +225,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 6
+%global buildver 7
%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
@@ -1875,6 +1875,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Mon Apr 20 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.7-0.0.ea
+- Update to shenandoah-jdk-11.0.7+7 (EA)
+
* Mon Apr 20 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.6-0.0.ea
- Update to shenandoah-jdk-11.0.7+6 (EA)
diff --git a/sources b/sources
index af49229..659807d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+6-4curve.tar.xz) =
289cf01e71b22ac184fb5ad6f1300ad3d2a3e864cd510f7466ef8782fa1bdd9937b9377e98701ff9cb6b38ba44cda526c33895e3b0c8f3c54672bd4e2fa597b2
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+7-4curve.tar.xz) =
152ffb69ecae083c1bc10caf074ca99233db96b2bb3173e7df086922ef809db76ed5161ddfd830241292666d3031fd161256d2cd4db2083999feca6844140d74
commit 1544c552b9f7bf8462a53010f79976235885f635
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Mon Apr 20 18:20:37 2020 +0100
Update to shenandoah-jdk-11.0.7+6 (EA)
diff --git a/.gitignore b/.gitignore
index 93be14c..3505020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,5 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.7+4.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+5-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+5.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+6-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+6.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 1ae1cf1..1a33cbf 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -225,7 +225,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 5
+%global buildver 6
%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
@@ -1875,6 +1875,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Mon Apr 20 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.6-0.0.ea
+- Update to shenandoah-jdk-11.0.7+6 (EA)
+
* Sun Apr 19 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.5-0.0.ea
- Update to shenandoah-jdk-11.0.7+5 (EA)
diff --git a/sources b/sources
index ad59d44..af49229 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+5-4curve.tar.xz) =
980117b7cd9fce5db07ecaaa17cb1db7e5df4d88c2d92e0e3e7ac7130d0d2900aa9cf8d01d4f08c2cae5aec130766f156276936ab0657e2a379138be5fd61d92
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+6-4curve.tar.xz) =
289cf01e71b22ac184fb5ad6f1300ad3d2a3e864cd510f7466ef8782fa1bdd9937b9377e98701ff9cb6b38ba44cda526c33895e3b0c8f3c54672bd4e2fa597b2
commit 147ad68448504a3e570e492777e8eb03f31afefe
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Mon Apr 20 09:41:38 2020 +0100
Update to shenandoah-jdk-11.0.7+5 (EA)
diff --git a/.gitignore b/.gitignore
index acc56d6..93be14c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,10 +29,13 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.6+2-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.6+9-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.6+10-4curve.tar.xz
+/tapsets-icedtea-3.11.0.tar.xz
+/tapsets-icedtea-3.15.0.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+1-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+2-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+3-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+3.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+4-4curve.tar.xz
-/tapsets-icedtea-3.11.0.tar.xz
-/tapsets-icedtea-3.15.0.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+4.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+5-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+5.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 349205a..1ae1cf1 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -225,7 +225,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 4
+%global buildver 5
%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
@@ -1875,6 +1875,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Sun Apr 19 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.5-0.0.ea
+- Update to shenandoah-jdk-11.0.7+5 (EA)
+
* Sun Apr 19 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.4-0.0.ea
- Update to shenandoah-jdk-11.0.7+4 (EA)
diff --git a/sources b/sources
index e5db5e9..ad59d44 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+4-4curve.tar.xz) =
01b9a84c8287110d49f5e2dd58a7a2ebf308e3b20aaab5d449ebf104d275050b9ea99f8e7d8f711a3a3d11369b6d68867dd56ededa0bbb4a24a0a44123fac68e
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+5-4curve.tar.xz) =
980117b7cd9fce5db07ecaaa17cb1db7e5df4d88c2d92e0e3e7ac7130d0d2900aa9cf8d01d4f08c2cae5aec130766f156276936ab0657e2a379138be5fd61d92
commit 92a0d58b726fce34c7473590a864e11849611a90
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Sun Apr 19 20:33:08 2020 +0100
Update to shenandoah-jdk-11.0.7+4 (EA)
diff --git a/.gitignore b/.gitignore
index 7a2515f..acc56d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,5 +33,6 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.7+2-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+3-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+3.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+4-4curve.tar.xz
/tapsets-icedtea-3.11.0.tar.xz
/tapsets-icedtea-3.15.0.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 06ce94d..349205a 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -225,7 +225,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 3
+%global buildver 4
%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
@@ -1875,6 +1875,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Sun Apr 19 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.4-0.0.ea
+- Update to shenandoah-jdk-11.0.7+4 (EA)
+
* Thu Apr 16 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.3-0.0.ea
- Add JDK-8228407 backport to resolve crashes during verification.
diff --git a/sources b/sources
index 1a9a9c1..e5db5e9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+3-4curve.tar.xz) =
22c0603a2e2dd000b02d84d589e0622ee285fa32f1082dc84c7d5cce5771ba14780384daeb5e603ff4bc8d6dd926331822d8c4d0894a319df5dc00c6887b3854
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+4-4curve.tar.xz) =
01b9a84c8287110d49f5e2dd58a7a2ebf308e3b20aaab5d449ebf104d275050b9ea99f8e7d8f711a3a3d11369b6d68867dd56ededa0bbb4a24a0a44123fac68e
commit 31ee240549b6ea50ac587ea93309cfe961a72680
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Fri Apr 17 02:52:39 2020 -0400
Add JDK-8228407 backport to resolve crashes during verification.
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 01827c6..06ce94d 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -1073,6 +1073,8 @@ Patch8: s390-8214206_fix.patch
# able to be removed once that release is out
# and used by this RPM.
#############################################
+# JDK-8237879: make 4.3 breaks build
+Patch9: jdk8237879-make_4_3_build_fixes.patch
# JDK-8241296: Segfault in JNIHandleBlock::oops_do()
Patch10: jdk8241296-jnihandleblock_segfault.patch
@@ -1085,10 +1087,10 @@ Patch10: jdk8241296-jnihandleblock_segfault.patch
# able to be removed once that release is out
# and used by this RPM.
#############################################
-# JDK-8237879: make 4.3 breaks build
-Patch9: jdk8237879-make_4_3_build_fixes.patch
# JDK-8237396: JvmtiTagMap::weak_oops_do() should not trigger barriers
Patch11: jdk8237396-avoid_triggering_barriers.patch
+# JDK-8228407: JVM crashes with shared archive file mismatch
+Patch12: jdk8228407-shared_archive_crash.patch
#############################################
#
@@ -1327,6 +1329,7 @@ pushd %{top_level_dir_name}
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
popd # openjdk
%patch1000
@@ -1873,6 +1876,9 @@ require "copy_jdk_configs.lua"
%changelog
* Thu Apr 16 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.3-0.0.ea
+- Add JDK-8228407 backport to resolve crashes during verification.
+
+* Thu Apr 16 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.3-0.0.ea
- Update to shenandoah-jdk-11.0.7+3 (EA)
* Mon Apr 06 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.5.ea
diff --git a/jdk8228407-shared_archive_crash.patch
b/jdk8228407-shared_archive_crash.patch
new file mode 100644
index 0000000..f3c8086
--- /dev/null
+++ b/jdk8228407-shared_archive_crash.patch
@@ -0,0 +1,54 @@
+# HG changeset patch
+# User ccheung
+# Date 1564075552 25200
+# Thu Jul 25 10:25:52 2019 -0700
+# Node ID 1edf6cc224fbf975eadf2a1810f67816a8607d30
+# Parent 73dbc713d4ddbdbeae71375db1603d85cef47f99
+8228407: JVM crashes with shared archive file mismatch
+Summary: Stop processing other header fields if initial header check has failed.
+Reviewed-by: dholmes, jiangli
+
+diff --git a/src/hotspot/share/memory/filemap.cpp b/src/hotspot/share/memory/filemap.cpp
+--- a/src/hotspot/share/memory/filemap.cpp
++++ b/src/hotspot/share/memory/filemap.cpp
+@@ -1287,7 +1287,9 @@
+ }
+
+ init_from_file(_fd);
+- if (!validate_header()) {
++ // UseSharedSpaces could be disabled if the checking of some of the header fields in
++ // init_from_file has failed.
++ if (!UseSharedSpaces || !validate_header()) {
+ return false;
+ }
+ return true;
+diff --git a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
+--- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
++++ b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
+@@ -385,8 +385,16 @@
+ output.shouldNotContain("Checksum verification failed");
+
+ copyFile(orgJsaFile, jsa);
++ // modify _jvm_ident and run with -Xshare:auto
++ System.out.println("\n2b. Corrupt _jvm_ident run with
-Xshare:auto\n");
++ modifyJvmIdent();
++ output = TestCommon.execAuto(execArgs);
++ output.shouldContain("The shared archive file was created by a different
version or build of HotSpot");
++ output.shouldContain("Hello World");
++
++ copyFile(orgJsaFile, jsa);
+ // modify _magic and _paths_misc_info_size, test should fail
+- System.out.println("\n2b. Corrupt _magic and _paths_misc_info_size, should
fail\n");
++ System.out.println("\n2c. Corrupt _magic and _paths_misc_info_size, should
fail\n");
+ modifyHeaderIntField(offset_magic, 0x00000000);
+ modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
+ output = TestCommon.execCommon(execArgs);
+@@ -395,7 +403,7 @@
+
+ copyFile(orgJsaFile, jsa);
+ // modify _version and _paths_misc_info_size, test should fail
+- System.out.println("\n2c. Corrupt _version and _paths_misc_info_size,
should fail\n");
++ System.out.println("\n2d. Corrupt _version and _paths_misc_info_size,
should fail\n");
+ modifyHeaderIntField(offset_version, 0x00000000);
+ modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
+ output = TestCommon.execCommon(execArgs);
commit ce190439da62f7ccc5975a80a9b51514c77edbdb
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Thu Apr 16 16:32:07 2020 -0400
Update to shenandoah-jdk-11.0.7+3 (EA)
diff --git a/.gitignore b/.gitignore
index 8ce892a..7a2515f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,5 +31,7 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.6+10-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+1-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+2-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+3-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+3.tar.xz
/tapsets-icedtea-3.11.0.tar.xz
/tapsets-icedtea-3.15.0.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 4aca87a..01827c6 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -225,8 +225,8 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 2
-%global rpmrelease 5
+%global buildver 3
+%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
%if %is_system_jdk
@@ -1872,6 +1872,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Thu Apr 16 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.3-0.0.ea
+- Update to shenandoah-jdk-11.0.7+3 (EA)
+
* Mon Apr 06 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.5.ea
- Sync SystemTap & desktop files with upstream IcedTea release 3.15.0 using new
script
diff --git a/sources b/sources
index fa7ab9e..1a9a9c1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+2-4curve.tar.xz) =
ff5d39689e66dcb0bd620ad0633faf2f2cb537fc67e6869a3b4692831e64c1815de510f450118fe61d9d48617ad741ab5c6c261d2cd2c2a8f8a686a1b94ef302
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+3-4curve.tar.xz) =
22c0603a2e2dd000b02d84d589e0622ee285fa32f1082dc84c7d5cce5771ba14780384daeb5e603ff4bc8d6dd926331822d8c4d0894a319df5dc00c6887b3854
commit 3c67a27eb96052a6c0962c3d610ba6911c7abf87
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Mon Apr 6 22:03:22 2020 +0100
Sync SystemTap & desktop files with upstream IcedTea release 3.15.0 using new
script
diff --git a/.gitignore b/.gitignore
index caa8493..8ce892a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.6+10-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+1-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+2-4curve.tar.xz
+/tapsets-icedtea-3.11.0.tar.xz
+/tapsets-icedtea-3.15.0.tar.xz
diff --git a/icedtea_sync.sh b/icedtea_sync.sh
new file mode 100755
index 0000000..c3fd5e6
--- /dev/null
+++ b/icedtea_sync.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Copyright (C) 2019 Red Hat, Inc.
+# Written by Andrew John Hughes <gnu.andrew(a)redhat.com>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <
http://www.gnu.org/licenses/>.
+
+ICEDTEA_VERSION=3.15.0
+ICEDTEA_URL=https://icedtea.classpath.org/download/source
+ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
+
+set -e
+
+if test "x${WGET}" = "x"; then
+ WGET=$(which wget);
+ if test "x${WGET}" = "x"; then
+ echo "wget not found";
+ exit 1;
+ fi
+fi
+
+if test "x${CHECKSUM}" = "x"; then
+ CHECKSUM=$(which sha256sum)
+ if test "x${CHECKSUM}" = "x"; then
+ echo "sha256sum not found";
+ exit 2;
+ fi
+fi
+
+if test "x${PGP}" = "x"; then
+ PGP=$(which gpg)
+ if test "x${PGP}" = "x"; then
+ echo "gpg not found";
+ exit 3;
+ fi
+fi
+
+if test "x${TAR}" = "x"; then
+ TAR=$(which tar)
+ if test "x${TAR}" = "x"; then
+ echo "tar not found";
+ exit 4;
+ fi
+fi
+
+echo "Dependencies:";
+echo -e "\tWGET: ${WGET}";
+echo -e "\tCHECKSUM: ${CHECKSUM}";
+echo -e "\tPGP: ${PGP}\n";
+echo -e "\tTAR: ${TAR}\n";
+
+echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
+if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
+ echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
+ exit 5;
+fi
+
+echo "Downloading IcedTea release tarball...";
+${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
+echo "Downloading IcedTea tarball signature...";
+${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
+echo "Downloading IcedTea tarball checksums...";
+${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
+
+echo "Verifying checksums...";
+${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
+
+echo "Checking signature...";
+${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
+
+echo "Extracting files...";
+${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
+ icedtea-${ICEDTEA_VERSION}/tapset \
+ icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
+
+echo "Replacing desktop files...";
+mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in .
+
+echo "Creating new tapset tarball...";
+mv -v icedtea-${ICEDTEA_VERSION} openjdk
+${TAR} cJf tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
+
+rm -rvf openjdk
+rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
+rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
+rm -vf icedtea-${ICEDTEA_VERSION}.sha256
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 96f8b51..4aca87a 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -217,13 +217,16 @@
%global lts_designator_zip ""
%endif
+# Define IcedTea version used for SystemTap tapsets and desktop file
+%global icedteaver 3.15.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 2
-%global rpmrelease 4
+%global rpmrelease 5
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
%if %is_system_jdk
@@ -995,10 +998,14 @@ License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and
GPL+ and GPLv
URL:
http://openjdk.java.net/
-# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
+# to regenerate source0 (jdk) run update_package.sh
# update_package.sh contains hard-coded repos, revisions, tags, and projects to
regenerate the source archives
Source0:
shenandoah-jdk%{majorver}-shenandoah-jdk-%{newjavaver}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve.tar.xz
-Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
+
+# Use 'icedtea_sync.sh' to update the following
+# They are based on code contained in the IcedTea project (3.x).
+# Systemtap tapsets. Zipped up to keep it small.
+Source8: tapsets-icedtea-%{icedteaver}.tar.xz
# Desktop files. Adapted from IcedTea
Source9: jconsole.desktop.in
@@ -1334,7 +1341,7 @@ cp -r tapset tapset%{debug_suffix}
for suffix in %{build_loop} ; do
for file in "tapset"$suffix/*.in; do
- OUTPUT_FILE=`echo $file | sed -e
"s:\.stp\.in$:%{version}-%{release}.%{_arch}.stp:g"`
+ OUTPUT_FILE=`echo $file | sed -e
"s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir --
$suffix}/lib/server/libjvm.so:g" $file > $file.1
# TODO find out which architectures other than i686 have a client vm
%ifarch %{ix86}
@@ -1351,16 +1358,18 @@ done
%endif
# Prepare desktop files
+# The _X_ syntax indicates variables that are replaced by make upstream
+# The @X@ syntax indicates variables that are replaced by configure upstream
for suffix in %{build_loop} ; do
for file in %{SOURCE9}; do
FILE=`basename $file | sed -e s:\.in$::g`
EXT="${FILE##*.}"
NAME="${FILE%.*}"
OUTPUT_FILE=$NAME$suffix.$EXT
- sed -e "s:@JAVA_HOME@:%{sdkbindir -- $suffix}:g" $file >
$OUTPUT_FILE
- sed -i -e "s:@JRE_HOME@:%{jrebindir -- $suffix}:g" $OUTPUT_FILE
- sed -i -e "s:@ARCH@:%{version}-%{release}.%{_arch}$suffix:g" $OUTPUT_FILE
- sed -i -e "s:@JAVA_MAJOR_VERSION@:%{majorver}:g" $OUTPUT_FILE
+ sed -e "s:_SDKBINDIR_:%{sdkbindir -- $suffix}:g" $file >
$OUTPUT_FILE
+ sed -i -e "s:@target_cpu@:%{_arch}:g" $OUTPUT_FILE
+ sed -i -e "s:@OPENJDK_VER@:%{version}-%{release}.%{_arch}$suffix:g"
$OUTPUT_FILE
+ sed -i -e "s:@JAVA_VER@:%{javaver}:g" $OUTPUT_FILE
sed -i -e "s:@JAVA_VENDOR@:%{origin}:g" $OUTPUT_FILE
done
done
@@ -1863,6 +1872,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Mon Apr 06 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.5.ea
+- Sync SystemTap & desktop files with upstream IcedTea release 3.15.0 using new
script
+
* Sat Mar 28 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.4.ea
- Add JDK-8237396 backport to resolve Shenandoah TCK breakage in traversal mode.
diff --git a/jconsole.desktop.in b/jconsole.desktop.in
index a8917c1..8a3b04d 100644
--- a/jconsole.desktop.in
+++ b/jconsole.desktop.in
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=OpenJDK @JAVA_MAJOR_VERSION@ Monitoring & Management Console @ARCH@
-Comment=Monitor and manage OpenJDK @JAVA_MAJOR_VERSION@ applications for @ARCH@
-Exec=@JAVA_HOME@/jconsole
-Icon=java-@JAVA_MAJOR_VERSION@-@JAVA_VENDOR@
+Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console
(@OPENJDK_VER@)
+Comment=Monitor and manage OpenJDK applications
+Exec=_SDKBINDIR_/jconsole
+Icon=java-@JAVA_VER@-@JAVA_VENDOR@
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
diff --git a/sources b/sources
index 1a08051..fa7ab9e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) =
cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
+SHA512 (tapsets-icedtea-3.15.0.tar.xz) =
c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+2-4curve.tar.xz) =
ff5d39689e66dcb0bd620ad0633faf2f2cb537fc67e6869a3b4692831e64c1815de510f450118fe61d9d48617ad741ab5c6c261d2cd2c2a8f8a686a1b94ef302
diff --git a/update_package.sh b/update_package.sh
index 3d5935c..9831993 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -3,34 +3,6 @@
set -e
-# TAPSET
-export PROJECT_NAME="hg"
-export REPO_NAME="icedtea8"
-export VERSION="9d464368e06d"
-export COMPRESSION=xz
-export
OPENJDK_URL=http://icedtea.classpath.org
-export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
-export TO_COMPRESS="*/tapset"
-# warning, filename and filenameroot creation is duplicated here from
generate_source_tarball.sh
-CLONED_FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
-TAPSET_VERSION=3.2
-TAPSET=systemtap_"$TAPSET_VERSION"_tapsets_$CLONED_FILENAME
-if [ ! -f ${TAPSET} ] ; then
- if [ ! -f ${CLONED_FILENAME} ] ; then
- echo "Generating ${CLONED_FILENAME}"
- sh ./generate_source_tarball.sh
- else
- echo "exists exists exists exists exists exists exists "
- echo "reusing reusing reusing reusing reusing reusing "
- echo ${CLONED_FILENAME}
- fi
- mv -v $CLONED_FILENAME $TAPSET
-else
- echo "exists exists exists exists exists exists exists "
- echo "reusing reusing reusing reusing reusing reusing "
- echo ${TAPSET}
-fi
-
# OpenJDK from Shenandoah project
export PROJECT_NAME="shenandoah"
export REPO_NAME="jdk11"
commit 1f54afa8e6bc8bff5e4957f4b84b8dbcb3c42ca3
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Sat Mar 28 20:11:34 2020 +0000
Add JDK-8237396 backport to resolve Shenandoah TCK breakage in traversal mode.
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 26609d4..96f8b51 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -223,7 +223,7 @@
%global top_level_dir_name %{origin}
%global minorver 0
%global buildver 2
-%global rpmrelease 3
+%global rpmrelease 4
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
%if %is_system_jdk
@@ -1056,6 +1056,16 @@ Patch6: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
Patch7: pr3695-toggle_system_crypto_policy.patch
# S390 ambiguous log2_intptr call
Patch8: s390-8214206_fix.patch
+
+#############################################
+#
+# Patches appearing in 11.0.7
+#
+# This section includes patches which are present
+# in the listed OpenJDK 11u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
+#############################################
# JDK-8241296: Segfault in JNIHandleBlock::oops_do()
Patch10: jdk8241296-jnihandleblock_segfault.patch
@@ -1070,6 +1080,8 @@ Patch10: jdk8241296-jnihandleblock_segfault.patch
#############################################
# JDK-8237879: make 4.3 breaks build
Patch9: jdk8237879-make_4_3_build_fixes.patch
+# JDK-8237396: JvmtiTagMap::weak_oops_do() should not trigger barriers
+Patch11: jdk8237396-avoid_triggering_barriers.patch
#############################################
#
@@ -1307,6 +1319,7 @@ pushd %{top_level_dir_name}
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
popd # openjdk
%patch1000
@@ -1850,6 +1863,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Sat Mar 28 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.4.ea
+- Add JDK-8237396 backport to resolve Shenandoah TCK breakage in traversal mode.
+
* Tue Mar 24 2020 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.7.2-0.3.ea
- Revert GCC 10 workaround for s390x.
- Resolves RHBZ#1799087.
diff --git a/jdk8237396-avoid_triggering_barriers.patch
b/jdk8237396-avoid_triggering_barriers.patch
new file mode 100644
index 0000000..90d7c65
--- /dev/null
+++ b/jdk8237396-avoid_triggering_barriers.patch
@@ -0,0 +1,58 @@
+# HG changeset patch
+# User zgu
+# Date 1579696811 18000
+# Wed Jan 22 07:40:11 2020 -0500
+# Node ID 91ea567eeabeade6b3f8d6cf10c02ba53f700eca
+# Parent 082f1d3eb1649ff776cda165ed78d65bc7361ebc
+8237396: JvmtiTagMap::weak_oops_do() should not trigger barriers
+Reviewed-by: stefank, rkennke
+
+diff --git a/src/hotspot/share/prims/jvmtiTagMap.cpp
b/src/hotspot/share/prims/jvmtiTagMap.cpp
+--- a/src/hotspot/share/prims/jvmtiTagMap.cpp
++++ b/src/hotspot/share/prims/jvmtiTagMap.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -96,6 +96,11 @@
+ inline oop object_peek() {
+ return NativeAccess<ON_PHANTOM_OOP_REF |
AS_NO_KEEPALIVE>::oop_load(object_addr());
+ }
++
++ inline oop object_raw() {
++ return RawAccess<>::oop_load(object_addr());
++ }
++
+ inline jlong tag() const { return _tag; }
+
+ inline void set_tag(jlong tag) {
+@@ -3357,7 +3362,7 @@
+ JvmtiTagHashmapEntry* next = entry->next();
+
+ // has object been GC'ed
+- if (!is_alive->do_object_b(entry->object_peek())) {
++ if (!is_alive->do_object_b(entry->object_raw())) {
+ // grab the tag
+ jlong tag = entry->tag();
+ guarantee(tag != 0, "checking");
+@@ -3375,7 +3380,7 @@
+ ++freed;
+ } else {
+ f->do_oop(entry->object_addr());
+- oop new_oop = entry->object_peek();
++ oop new_oop = entry->object_raw();
+
+ // if the object has moved then re-hash it and move its
+ // entry to its new location.
+@@ -3409,7 +3414,7 @@
+ // Re-add all the entries which were kept aside
+ while (delayed_add != NULL) {
+ JvmtiTagHashmapEntry* next = delayed_add->next();
+- unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object_peek(), size);
++ unsigned int pos = JvmtiTagHashmap::hash(delayed_add->object_raw(), size);
+ delayed_add->set_next(table[pos]);
+ table[pos] = delayed_add;
+ delayed_add = next;
commit 929a17acefd1462fbb3814c2a96cb936ee4c79c1
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Tue Mar 24 13:21:53 2020 +0100
Revert GCC 10 workaround on s390x
Resolves: RHBZ#1799087
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 67497c0..26609d4 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -223,7 +223,7 @@
%global top_level_dir_name %{origin}
%global minorver 0
%global buildver 2
-%global rpmrelease 2
+%global rpmrelease 3
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
%if %is_system_jdk
@@ -1372,16 +1372,11 @@ export ARCH_DATA_MODEL=64
export CFLAGS="$CFLAGS -mieee"
%endif
-GCC_10_WORKAROUND_S390x="-fno-tree-coalesce-vars -fno-tree-copy-prop -fno-tree-dce
-fno-tree-dominator-opts -fno-tree-dse -fno-tree-forwprop -fno-tree-fre
-fno-tree-loop-distribute-patterns -fno-tree-loop-distribution -fno-tree-loop-vectorize
-fno-tree-partial-pre -fno-tree-phiprop -fno-tree-pre -fno-tree-pta -fno-tree-scev-cprop
-fno-tree-sink -fno-tree-slp-vectorize -fno-tree-slsr -fno-tree-sra
-fno-tree-switch-conversion -fno-tree-tail-merge -fno-tree-ter -fno-tree-vrp
-fno-unit-at-a-time -fno-unswitch-loops -fno-vect-cost-model
-fno-version-loops-for-strides"
# We use ourcppflags because the OpenJDK build seems to
# pass EXTRA_CFLAGS to the HotSpot C++ compiler...
# Explicitly set the C++ standard as the default has changed on GCC >= 6
EXTRA_CFLAGS="%ourcppflags -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks
-fno-lifetime-dse -fcommon"
EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks
-fno-lifetime-dse -fcommon"
-%ifarch s390x
-EXTRA_CFLAGS="$EXTRA_CFLAGS $GCC_10_WORKAROUND_S390x"
-EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS $GCC_10_WORKAROUND_S390x"
-%endif
%ifarch %{power64} ppc
# fix rpmlint warnings
@@ -1855,6 +1850,10 @@ require "copy_jdk_configs.lua"
%changelog
+* Tue Mar 24 2020 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.7.2-0.3.ea
+- Revert GCC 10 workaround for s390x.
+- Resolves RHBZ#1799087.
+
* Fri Mar 20 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.2.ea
- Backport JDK-8241296 to fix segfaults when active_handles is NULL (RH1813550)
commit e59ec9b5d6f1919e34b59ecae9f22fb874aaa498
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Fri Mar 20 12:11:01 2020 +0000
Backport JDK-8241296 to fix segfaults when active_handles is NULL (RH1813550)
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index bd19d05..67497c0 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -223,7 +223,7 @@
%global top_level_dir_name %{origin}
%global minorver 0
%global buildver 2
-%global rpmrelease 1
+%global rpmrelease 2
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
%if %is_system_jdk
@@ -1056,6 +1056,18 @@ Patch6: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
Patch7: pr3695-toggle_system_crypto_policy.patch
# S390 ambiguous log2_intptr call
Patch8: s390-8214206_fix.patch
+# JDK-8241296: Segfault in JNIHandleBlock::oops_do()
+Patch10: jdk8241296-jnihandleblock_segfault.patch
+
+#############################################
+#
+# Patches appearing in 11.0.8
+#
+# This section includes patches which are present
+# in the listed OpenJDK 11u release and should be
+# able to be removed once that release is out
+# and used by this RPM.
+#############################################
# JDK-8237879: make 4.3 breaks build
Patch9: jdk8237879-make_4_3_build_fixes.patch
@@ -1294,6 +1306,7 @@ pushd %{top_level_dir_name}
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
popd # openjdk
%patch1000
@@ -1842,6 +1855,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Fri Mar 20 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.2.ea
+- Backport JDK-8241296 to fix segfaults when active_handles is NULL (RH1813550)
+
* Fri Mar 13 2020 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.7.2-0.1.ea
- Add patch for make 4.3 (JDK-8237879)
diff --git a/jdk8241296-jnihandleblock_segfault.patch
b/jdk8241296-jnihandleblock_segfault.patch
new file mode 100644
index 0000000..d0920a8
--- /dev/null
+++ b/jdk8241296-jnihandleblock_segfault.patch
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User aph
+# Date 1584629637 0
+# Thu Mar 19 14:53:57 2020 +0000
+# Node ID e96597ea4d672793ab205fd67009efed809fae11
+# Parent 0daa6b52ba568246e8f930138fb36f8f04d9fadd
+8241296: Segfault in JNIHandleBlock::oops_do()
+Reviewed-by: duke
+
+diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
+--- a/src/hotspot/share/runtime/thread.cpp
++++ b/src/hotspot/share/runtime/thread.cpp
+@@ -867,7 +867,9 @@
+ }
+
+ void Thread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
+- active_handles()->oops_do(f);
++ if (active_handles() != NULL) {
++ active_handles()->oops_do(f);
++ }
+ // Do oop for ThreadShadow
+ f->do_oop((oop*)&_pending_exception);
+ handle_area()->oops_do(f);
commit 77671d891236c26691052009347dd7aa1bad51d7
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Fri Mar 13 17:54:50 2020 +0100
Add JDK-8237879 so as to be able to build with make 4.3
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index ecdfd82..bd19d05 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -223,7 +223,7 @@
%global top_level_dir_name %{origin}
%global minorver 0
%global buildver 2
-%global rpmrelease 0
+%global rpmrelease 1
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
%if %is_system_jdk
@@ -1056,6 +1056,8 @@ Patch6: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
Patch7: pr3695-toggle_system_crypto_policy.patch
# S390 ambiguous log2_intptr call
Patch8: s390-8214206_fix.patch
+# JDK-8237879: make 4.3 breaks build
+Patch9: jdk8237879-make_4_3_build_fixes.patch
#############################################
#
@@ -1291,6 +1293,7 @@ pushd %{top_level_dir_name}
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
popd # openjdk
%patch1000
@@ -1839,6 +1842,9 @@ require "copy_jdk_configs.lua"
%changelog
+* Fri Mar 13 2020 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.7.2-0.1.ea
+- Add patch for make 4.3 (JDK-8237879)
+
* Wed Mar 04 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.0.ea
- Update to shenandoah-jdk-11.0.7+2 (EA)
- Drop JDK-8224851 backport now included upstream.
diff --git a/jdk8237879-make_4_3_build_fixes.patch
b/jdk8237879-make_4_3_build_fixes.patch
new file mode 100644
index 0000000..76da003
--- /dev/null
+++ b/jdk8237879-make_4_3_build_fixes.patch
@@ -0,0 +1,34 @@
+
+# HG changeset patch
+# User ihse
+# Date 1580378910 -3600
+# Node ID 0743e1d49930a95d045bfdaa8f8607a00289e677
+# Parent 24b4c763cb2276db073bec263246879eb312daeb
+8237879: make 4.3 breaks build
+Reviewed-by: erikj, tbell
+
+diff -r 24b4c763cb22 -r 0743e1d49930 make/common/MakeBase.gmk
+--- a/make/common/MakeBase.gmk Thu Jan 30 10:10:48 2020 +0100
++++ b/make/common/MakeBase.gmk Thu Jan 30 11:08:30 2020 +0100
+@@ -525,15 +525,16 @@
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+ $(strip \
+- $(eval -include $(call DependOnVariableFileName, $1, $2)) \
++ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
++ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
+ $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
++ $(call MakeDir, $(dir $($1_filename))) \
+ $(if $(findstring $(LOG_LEVEL), trace), \
+ $(info NewVariable $1: >$(strip $($1))<) \
+ $(info OldVariable $1: >$(strip $($1_old))<)) \
+ $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+- $(call DependOnVariableFileName, $1, $2))) \
+- $(call DependOnVariableFileName, $1, $2) \
++ $($1_filename))) \
++ $($1_filename) \
+ )
+
+ # Main macro
+
commit 2013b9c501407f1899ad900454dc8024ae3ce1c7
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Wed Mar 4 20:29:44 2020 +0000
Update to shenandoah-jdk-11.0.7+2 (EA)
Drop JDK-8224851 backport now included upstream.
diff --git a/.gitignore b/.gitignore
index 435d19f..caa8493 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.6+9-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.6+10-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.7+1-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+2-4curve.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 980ac49..ecdfd82 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -222,7 +222,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 1
+%global buildver 2
%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
@@ -1056,8 +1056,6 @@ Patch6: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
Patch7: pr3695-toggle_system_crypto_policy.patch
# S390 ambiguous log2_intptr call
Patch8: s390-8214206_fix.patch
-# JDK-8224851: AArch64: fix warnings and errors with Clang and GCC 8.3
-Patch10: jdk8224851-aarch64_compiler_fixes.patch
#############################################
#
@@ -1293,7 +1291,6 @@ pushd %{top_level_dir_name}
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch10 -p1
popd # openjdk
%patch1000
@@ -1842,6 +1839,10 @@ require "copy_jdk_configs.lua"
%changelog
+* Wed Mar 04 2020 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.2-0.0.ea
+- Update to shenandoah-jdk-11.0.7+2 (EA)
+- Drop JDK-8224851 backport now included upstream.
+
* Thu Feb 27 2020 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.1-0.0.ea
- Update to shenandoah-jdk-11.0.7+1 (EA)
- Switch to EA mode for 11.0.7 pre-release builds.
diff --git a/jdk8224851-aarch64_compiler_fixes.patch
b/jdk8224851-aarch64_compiler_fixes.patch
deleted file mode 100644
index eabdaef..0000000
--- a/jdk8224851-aarch64_compiler_fixes.patch
+++ /dev/null
@@ -1,506 +0,0 @@
-# HG changeset patch
-# User ngasson
-# Date 1560756709 -28800
-# Mon Jun 17 15:31:49 2019 +0800
-# Node ID e53ec3b362f42ca94b120141b6da6dcfeba346f2
-# Parent 5eeee2cc94f5937ca847f635d9e0510b355bb2af
-8224851: AArch64: fix warnings and errors with Clang and GCC 8.3
-Reviewed-by: aph, kbarrett
-
-diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
---- a/src/hotspot/cpu/aarch64/aarch64.ad
-+++ b/src/hotspot/cpu/aarch64/aarch64.ad
-@@ -13748,7 +13748,7 @@
- format %{ "fcmps $src1, 0.0" %}
-
- ins_encode %{
-- __ fcmps(as_FloatRegister($src1$$reg), 0.0D);
-+ __ fcmps(as_FloatRegister($src1$$reg), 0.0);
- %}
-
- ins_pipe(pipe_class_compare);
-@@ -13777,7 +13777,7 @@
- format %{ "fcmpd $src1, 0.0" %}
-
- ins_encode %{
-- __ fcmpd(as_FloatRegister($src1$$reg), 0.0D);
-+ __ fcmpd(as_FloatRegister($src1$$reg), 0.0);
- %}
-
- ins_pipe(pipe_class_compare);
-@@ -13853,7 +13853,7 @@
- Label done;
- FloatRegister s1 = as_FloatRegister($src1$$reg);
- Register d = as_Register($dst$$reg);
-- __ fcmps(s1, 0.0D);
-+ __ fcmps(s1, 0.0);
- // installs 0 if EQ else -1
- __ csinvw(d, zr, zr, Assembler::EQ);
- // keeps -1 if less or unordered else installs 1
-@@ -13880,7 +13880,7 @@
- Label done;
- FloatRegister s1 = as_FloatRegister($src1$$reg);
- Register d = as_Register($dst$$reg);
-- __ fcmpd(s1, 0.0D);
-+ __ fcmpd(s1, 0.0);
- // installs 0 if EQ else -1
- __ csinvw(d, zr, zr, Assembler::EQ);
- // keeps -1 if less or unordered else installs 1
-diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
---- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
-+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
-@@ -276,7 +276,7 @@
- unsigned get(int msb = 31, int lsb = 0) {
- int nbits = msb - lsb + 1;
- unsigned mask = ((1U << nbits) - 1) << lsb;
-- assert_cond(bits & mask == mask);
-+ assert_cond((bits & mask) == mask);
- return (insn & mask) >> lsb;
- }
-
-@@ -2580,7 +2580,7 @@
- // RBIT only allows T8B and T16B but encodes them oddly. Argh...
- void rbit(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {
- assert((ASSERTION), MSG);
-- _rbit(Vd, SIMD_Arrangement(T & 1 | 0b010), Vn);
-+ _rbit(Vd, SIMD_Arrangement((T & 1) | 0b010), Vn);
- }
- #undef ASSERTION
-
-diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
---- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
-+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-@@ -1091,8 +1091,8 @@
- // Assembler::EQ does not permit unordered branches, so we add
- // another branch here. Likewise, Assembler::NE does not permit
- // ordered branches.
-- if (is_unordered && op->cond() == lir_cond_equal
-- || !is_unordered && op->cond() == lir_cond_notEqual)
-+ if ((is_unordered && op->cond() == lir_cond_equal)
-+ || (!is_unordered && op->cond() == lir_cond_notEqual))
- __ br(Assembler::VS, *(op->ublock()->label()));
- switch(op->cond()) {
- case lir_cond_equal: acond = Assembler::EQ; break;
-@@ -1775,18 +1775,22 @@
- switch (code) {
- case lir_add: __ fadds (dest->as_float_reg(), left->as_float_reg(),
right->as_float_reg()); break;
- case lir_sub: __ fsubs (dest->as_float_reg(), left->as_float_reg(),
right->as_float_reg()); break;
-+ case lir_mul_strictfp: // fall through
- case lir_mul: __ fmuls (dest->as_float_reg(), left->as_float_reg(),
right->as_float_reg()); break;
-+ case lir_div_strictfp: // fall through
- case lir_div: __ fdivs (dest->as_float_reg(), left->as_float_reg(),
right->as_float_reg()); break;
- default:
- ShouldNotReachHere();
- }
- } else if (left->is_double_fpu()) {
- if (right->is_double_fpu()) {
-- // cpu register - cpu register
-+ // fpu register - fpu register
- switch (code) {
- case lir_add: __ faddd (dest->as_double_reg(), left->as_double_reg(),
right->as_double_reg()); break;
- case lir_sub: __ fsubd (dest->as_double_reg(), left->as_double_reg(),
right->as_double_reg()); break;
-+ case lir_mul_strictfp: // fall through
- case lir_mul: __ fmuld (dest->as_double_reg(), left->as_double_reg(),
right->as_double_reg()); break;
-+ case lir_div_strictfp: // fall through
- case lir_div: __ fdivd (dest->as_double_reg(), left->as_double_reg(),
right->as_double_reg()); break;
- default:
- ShouldNotReachHere();
-diff --git a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
---- a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
-+++ b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-@@ -426,7 +426,7 @@
- tmp = new_register(T_DOUBLE);
- }
-
-- arithmetic_op_fpu(x->op(), reg, left.result(), right.result(), NULL);
-+ arithmetic_op_fpu(x->op(), reg, left.result(), right.result(),
x->is_strictfp());
-
- set_result(x, round_item(reg));
- }
-diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.cpp
b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
---- a/src/hotspot/cpu/aarch64/frame_aarch64.cpp
-+++ b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-@@ -767,11 +767,13 @@
-
- extern "C" void pf(unsigned long sp, unsigned long fp, unsigned long pc,
- unsigned long bcx, unsigned long thread) {
-- RegisterMap map((JavaThread*)thread, false);
- if (!reg_map) {
-- reg_map = (RegisterMap*)os::malloc(sizeof map, mtNone);
-+ reg_map = NEW_C_HEAP_OBJ(RegisterMap, mtNone);
-+ ::new (reg_map) RegisterMap((JavaThread*)thread, false);
-+ } else {
-+ *reg_map = RegisterMap((JavaThread*)thread, false);
- }
-- memcpy(reg_map, &map, sizeof map);
-+
- {
- CodeBlob *cb = CodeCache::find_blob((address)pc);
- if (cb && cb->frame_size())
-diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
---- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
-+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
-@@ -38,8 +38,6 @@
- protected:
-
- protected:
-- using MacroAssembler::call_VM_leaf_base;
--
- // Interpreter specific version of call_VM_base
- using MacroAssembler::call_VM_leaf_base;
-
-diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
-+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
-@@ -2608,7 +2608,7 @@
- if ((offset & (size-1)) && offset >= (1<<8)) {
- add(tmp, base, offset & ((1<<12)-1));
- base = tmp;
-- offset &= -1<<12;
-+ offset &= -1u<<12;
- }
-
- if (offset >= (1<<12) * size) {
-diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp
b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp
---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp
-+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp
-@@ -286,7 +286,7 @@
- frecpe(vtmp5, vtmp5, S); // vtmp5 ~= 1/vtmp5
- lsr(tmp2, rscratch1, 48);
- movz(tmp4, 0x77f0, 48);
-- fmovd(vtmp4, 1.0d);
-+ fmovd(vtmp4, 1.0);
- movz(tmp1, INF_OR_NAN_PREFIX, 48);
- bfm(tmp4, rscratch1, 0, 51); // tmp4 = 0x77F0 << 48 |
mantissa(X)
- // vtmp1 = AS_DOUBLE_BITS(0x77F0 << 48 | mantissa(X)) == mx
-@@ -358,7 +358,7 @@
- br(GE, DONE);
- cmp(rscratch1, tmp2);
- br(NE, CHECKED_CORNER_CASES);
-- fmovd(v0, 0.0d);
-+ fmovd(v0, 0.0);
- }
- bind(DONE);
- ret(lr);
-diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_trig.cpp
b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_trig.cpp
---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_trig.cpp
-+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_trig.cpp
-@@ -381,11 +381,11 @@
- }
-
- block_comment("nx calculation with unrolled while(tx[nx-1]==zeroA)
nx--;"); {
-- fcmpd(v26, 0.0d); // if NE then jx == 2. else it's
1 or 0
-+ fcmpd(v26, 0.0); // if NE then jx == 2. else it's
1 or 0
- add(iqBase, sp, 480); // base of iq[]
- fmuld(v3, v26, v10);
- br(NE, NX_SET);
-- fcmpd(v7, 0.0d); // v7 == 0 => jx = 0. Else jx = 1
-+ fcmpd(v7, 0.0); // v7 == 0 => jx = 0. Else jx = 1
- csetw(jx, NE);
- }
- bind(NX_SET);
-@@ -696,7 +696,7 @@
- cmpw(jv, zr);
- addw(tmp4, jx, 4); // tmp4 = m = jx + jk = jx + 4. jx is in {0,1,2} so m is in
[4,5,6]
- cselw(jv, jv, zr, GE);
-- fmovd(v26, 0.0d);
-+ fmovd(v26, 0.0);
- addw(tmp5, jv, 1); // jv+1
- subsw(j, jv, jx);
- add(qBase, sp, 320); // base of q[]
-@@ -819,8 +819,8 @@
- movw(jz, 4);
- fmovd(v17, i); // v17 = twon24
- fmovd(v30, tmp5); // 2^q0
-- fmovd(v21, 0.125d);
-- fmovd(v20, 8.0d);
-+ fmovd(v21, 0.125);
-+ fmovd(v20, 8.0);
- fmovd(v22, tmp4); // 2^-q0
-
- block_comment("recompute loop"); {
-@@ -877,7 +877,7 @@
- lsr(ih, tmp2, 23); // ih = iq[z-1] >> 23
- b(Q0_ZERO_CMP_DONE);
- bind(Q0_ZERO_CMP_LT);
-- fmovd(v4, 0.5d);
-+ fmovd(v4, 0.5);
- fcmpd(v18, v4);
- cselw(ih, zr, ih, LT); // if (z<0.5) ih = 0
- }
-@@ -924,7 +924,7 @@
- br(NE, IH_HANDLED);
-
- block_comment("if(ih==2) {"); {
-- fmovd(v25, 1.0d);
-+ fmovd(v25, 1.0);
- fsubd(v18, v25, v18); // z = one - z;
- cbzw(rscratch2, IH_HANDLED);
- fsubd(v18, v18, v30); // z -= scalbnA(one,q0);
-@@ -932,7 +932,7 @@
- }
- bind(IH_HANDLED);
- // check if recomputation is needed
-- fcmpd(v18, 0.0d);
-+ fcmpd(v18, 0.0);
- br(NE, RECOMP_CHECK_DONE_NOT_ZERO);
-
- block_comment("if(z==zeroB) {"); {
-@@ -994,7 +994,7 @@
- }
- bind(RECOMP_CHECK_DONE);
- // chop off zero terms
-- fcmpd(v18, 0.0d);
-+ fcmpd(v18, 0.0);
- br(EQ, Z_IS_ZERO);
-
- block_comment("else block of if(z==0.0) {"); {
-@@ -1053,7 +1053,7 @@
- movw(tmp2, zr); // tmp2 will keep jz - i == 0 at start
- bind(COMP_FOR);
- // for(fw=0.0,k=0;k<=jp&&k<=jz-i;k++) fw += PIo2[k]*q[i+k];
-- fmovd(v30, 0.0d);
-+ fmovd(v30, 0.0);
- add(tmp5, qBase, i, LSL, 3); // address of q[i+k] for k==0
- movw(tmp3, 4);
- movw(tmp4, zr); // used as k
-@@ -1081,7 +1081,7 @@
- // remember prec == 2
-
- block_comment("for (i=jz;i>=0;i--) fw += fq[i];"); {
-- fmovd(v4, 0.0d);
-+ fmovd(v4, 0.0);
- mov(i, jz);
- bind(FW_FOR1);
- ldrd(v1, Address(rscratch2, i, Address::lsl(3)));
-@@ -1319,7 +1319,7 @@
- ld1(C1, C2, C3, C4, T1D, Address(rscratch2)); // load C1..C3\4
- block_comment("calculate r = z*(C1+z*(C2+z*(C3+z*(C4+z*(C5+z*C6)))))"); {
- fmaddd(r, z, C6, C5);
-- fmovd(half, 0.5d);
-+ fmovd(half, 0.5);
- fmaddd(r, z, r, C4);
- fmuld(y, x, y);
- fmaddd(r, z, r, C3);
-@@ -1329,7 +1329,7 @@
- fmaddd(r, z, r, C1); // r = C1+z(C2+z(C4+z(C5+z*C6)))
- }
- // need to multiply r by z to have "final" r value
-- fmovd(one, 1.0d);
-+ fmovd(one, 1.0);
- cmp(ix, rscratch1);
- br(GT, IX_IS_LARGE);
- block_comment("if(ix < 0x3FD33333) return one - (0.5*z - (z*r -
x*y))"); {
-@@ -1352,7 +1352,7 @@
- b(QX_SET);
- bind(SET_QX_CONST);
- block_comment("if(ix > 0x3fe90000) qx = 0.28125;"); {
-- fmovd(qx, 0.28125d);
-+ fmovd(qx, 0.28125);
- }
- bind(QX_SET);
- fnmsub(C6, x, r, y); // z*r - xy
-@@ -1443,7 +1443,7 @@
- block_comment("kernel_sin/kernel_cos: if(ix<0x3e400000) {<fast
return>}"); {
- bind(TINY_X);
- if (isCos) {
-- fmovd(v0, 1.0d);
-+ fmovd(v0, 1.0);
- }
- ret(lr);
- }
-diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
---- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
-+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
-@@ -169,7 +169,7 @@
- if (FILE *f = fopen("/proc/cpuinfo", "r")) {
- char buf[128], *p;
- while (fgets(buf, sizeof (buf), f) != NULL) {
-- if (p = strchr(buf, ':')) {
-+ if ((p = strchr(buf, ':')) != NULL) {
- long v = strtol(p+1, NULL, 0);
- if (strncmp(buf, "CPU implementer", sizeof "CPU implementer"
- 1) == 0) {
- _cpu = v;
-diff --git a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp
b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp
---- a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp
-+++ b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp
-@@ -40,7 +40,9 @@
- {
- template<typename I, typename D>
- D add_and_fetch(I add_value, D volatile* dest, atomic_memory_order order) const {
-- return __sync_add_and_fetch(dest, add_value);
-+ D res = __atomic_add_fetch(dest, add_value, __ATOMIC_RELEASE);
-+ FULL_MEM_BARRIER;
-+ return res;
- }
- };
-
-diff --git a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.s
b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.s
---- a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.s
-+++ b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.s
-@@ -159,7 +159,7 @@
- blo bwd_copy_drain
-
- bwd_copy_again:
-- prfm pldl1keep, [s, #-256]
-+ prfum pldl1keep, [s, #-256]
- stp t0, t1, [d, #-16]
- ldp t0, t1, [s, #-16]
- stp t2, t3, [d, #-32]
-diff --git a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
---- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
-+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
-@@ -79,12 +79,8 @@
- #define REG_FP 29
- #define REG_LR 30
-
--#define SPELL_REG_SP "sp"
--#define SPELL_REG_FP "x29"
--
--address os::current_stack_pointer() {
-- register void *esp __asm__ (SPELL_REG_SP);
-- return (address) esp;
-+NOINLINE address os::current_stack_pointer() {
-+ return (address)__builtin_frame_address(0);
- }
-
- char* os::non_memory_address_word() {
-@@ -199,23 +195,8 @@
- return frame(fr->link(), fr->link(), fr->sender_pc());
- }
-
--intptr_t* _get_previous_fp() {
-- register intptr_t **fp __asm__ (SPELL_REG_FP);
--
-- // fp is for this frame (_get_previous_fp). We want the fp for the
-- // caller of os::current_frame*(), so go up two frames. However, for
-- // optimized builds, _get_previous_fp() will be inlined, so only go
-- // up 1 frame in that case.
-- #ifdef _NMT_NOINLINE_
-- return **(intptr_t***)fp;
-- #else
-- return *fp;
-- #endif
--}
--
--
--frame os::current_frame() {
-- intptr_t* fp = _get_previous_fp();
-+NOINLINE frame os::current_frame() {
-+ intptr_t *fp = *(intptr_t **)__builtin_frame_address(0);
- frame myframe((intptr_t*)os::current_stack_pointer(),
- (intptr_t*)fp,
- CAST_FROM_FN_PTR(address, os::current_frame));
-@@ -228,12 +209,6 @@
- }
-
- // Utility functions
--
--// From IA32 System Programming Guide
--enum {
-- trap_page_fault = 0xE
--};
--
- extern "C" JNIEXPORT int
- JVM_handle_linux_signal(int sig,
- siginfo_t* info,
-@@ -575,42 +550,42 @@
- return 0;
- }
-
-- void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
-+ void _Copy_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) {
- if (from > to) {
-- jshort *end = from + count;
-+ const jshort *end = from + count;
- while (from < end)
- *(to++) = *(from++);
- }
- else if (from < to) {
-- jshort *end = from;
-+ const jshort *end = from;
- from += count - 1;
- to += count - 1;
- while (from >= end)
- *(to--) = *(from--);
- }
- }
-- void _Copy_conjoint_jints_atomic(jint* from, jint* to, size_t count) {
-+ void _Copy_conjoint_jints_atomic(const jint* from, jint* to, size_t count) {
- if (from > to) {
-- jint *end = from + count;
-+ const jint *end = from + count;
- while (from < end)
- *(to++) = *(from++);
- }
- else if (from < to) {
-- jint *end = from;
-+ const jint *end = from;
- from += count - 1;
- to += count - 1;
- while (from >= end)
- *(to--) = *(from--);
- }
- }
-- void _Copy_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) {
-+ void _Copy_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) {
- if (from > to) {
-- jlong *end = from + count;
-+ const jlong *end = from + count;
- while (from < end)
- os::atomic_copy64(from++, to++);
- }
- else if (from < to) {
-- jlong *end = from;
-+ const jlong *end = from;
- from += count - 1;
- to += count - 1;
- while (from >= end)
-@@ -618,22 +593,22 @@
- }
- }
-
-- void _Copy_arrayof_conjoint_bytes(HeapWord* from,
-+ void _Copy_arrayof_conjoint_bytes(const HeapWord* from,
- HeapWord* to,
- size_t count) {
- memmove(to, from, count);
- }
-- void _Copy_arrayof_conjoint_jshorts(HeapWord* from,
-+ void _Copy_arrayof_conjoint_jshorts(const HeapWord* from,
- HeapWord* to,
- size_t count) {
- memmove(to, from, count * 2);
- }
-- void _Copy_arrayof_conjoint_jints(HeapWord* from,
-+ void _Copy_arrayof_conjoint_jints(const HeapWord* from,
- HeapWord* to,
- size_t count) {
- memmove(to, from, count * 4);
- }
-- void _Copy_arrayof_conjoint_jlongs(HeapWord* from,
-+ void _Copy_arrayof_conjoint_jlongs(const HeapWord* from,
- HeapWord* to,
- size_t count) {
- memmove(to, from, count * 8);
diff --git a/sources b/sources
index b1adbff..1a08051 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) =
cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+1-4curve.tar.xz) =
044a51ecb04cbf6ad065f55b9beea4bc585af72a197352db17d059bf763051fd1820868873a05d7f6d3cb779376e3d872ae7e24caf6405b7cad281353efc5483
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+2-4curve.tar.xz) =
ff5d39689e66dcb0bd620ad0633faf2f2cb537fc67e6869a3b4692831e64c1815de510f450118fe61d9d48617ad741ab5c6c261d2cd2c2a8f8a686a1b94ef302
commit 9a97397ba55f4e419856d28b6eff53ff65938611
Author: Andrew John Hughes <gnu.andrew(a)redhat.com>
Date: Fri Feb 14 14:58:25 2020 +0000
Update to shenandoah-jdk-11.0.7+1 (EA)
Switch to EA mode for 11.0.7 pre-release builds.
Drop JDK-8236039 backport now applied upstream.
diff --git a/.gitignore b/.gitignore
index a291e75..435d19f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
/shenandoah-jdk11-shenandoah-jdk-11.0.6+2-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.6+9-4curve.tar.xz
/shenandoah-jdk11-shenandoah-jdk-11.0.6+10-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.7+1-4curve.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 376340a..980ac49 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -200,7 +200,7 @@
# New Version-String scheme-style defines
%global majorver 11
-%global securityver 6
+%global securityver 7
# buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place
@@ -222,7 +222,7 @@
%global origin_nice OpenJDK
%global top_level_dir_name %{origin}
%global minorver 0
-%global buildver 10
+%global buildver 1
%global rpmrelease 0
#%%global tagsuffix ""
# priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when
moving to 11 we had to add another digit
@@ -240,7 +240,7 @@
# 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 ea_designator ""
%global ea_designator_zip ""
@@ -1056,8 +1056,6 @@ Patch6: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
Patch7: pr3695-toggle_system_crypto_policy.patch
# S390 ambiguous log2_intptr call
Patch8: s390-8214206_fix.patch
-# JDK-8236039: JSSE Client does not accept status_request extension in CertificateRequest
messages for TLS 1.3
-Patch9: jdk8236039-status_request_extension.patch
# JDK-8224851: AArch64: fix warnings and errors with Clang and GCC 8.3
Patch10: jdk8224851-aarch64_compiler_fixes.patch
@@ -1295,7 +1293,6 @@ pushd %{top_level_dir_name}
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%patch10 -p1
popd # openjdk
@@ -1845,6 +1842,11 @@ require "copy_jdk_configs.lua"
%changelog
+* Thu Feb 27 2020 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:11.0.7.1-0.0.ea
+- Update to shenandoah-jdk-11.0.7+1 (EA)
+- Switch to EA mode for 11.0.7 pre-release builds.
+- Drop JDK-8236039 backport now applied upstream.
+
* Thu Feb 27 2020 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.6.10-0
- Add workaround for building with GCC 10 on s390x. See RHBZ#1799087
diff --git a/jdk8236039-status_request_extension.patch
b/jdk8236039-status_request_extension.patch
deleted file mode 100644
index be7008c..0000000
--- a/jdk8236039-status_request_extension.patch
+++ /dev/null
@@ -1,310 +0,0 @@
-# HG changeset patch
-# User jnimeh
-# Date 1578287079 28800
-# Sun Jan 05 21:04:39 2020 -0800
-# Node ID b9d1ce20dd4b2ce34e74c8fa2d784335231abcd1
-# Parent 3782f295811625b65d57f1aef15daa10d82a58a7
-8236039: JSSE Client does not accept status_request extension in CertificateRequest
messages for TLS 1.3
-Reviewed-by: xuelei
-
-diff --git a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
---- a/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
-+++ b/src/java.base/share/classes/sun/security/ssl/CertStatusExtension.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -39,11 +39,7 @@
- import javax.net.ssl.SSLProtocolException;
- import sun.security.provider.certpath.OCSPResponse;
- import sun.security.provider.certpath.ResponderId;
--import static sun.security.ssl.SSLExtension.CH_STATUS_REQUEST;
--import static sun.security.ssl.SSLExtension.CH_STATUS_REQUEST_V2;
- import sun.security.ssl.SSLExtension.ExtensionConsumer;
--import static sun.security.ssl.SSLExtension.SH_STATUS_REQUEST;
--import static sun.security.ssl.SSLExtension.SH_STATUS_REQUEST_V2;
- import sun.security.ssl.SSLExtension.SSLExtensionSpec;
- import sun.security.ssl.SSLHandshake.HandshakeMessage;
- import sun.security.util.DerInputStream;
-@@ -434,8 +430,9 @@
- } else {
- extBuilder.append(",\n");
- }
-- extBuilder.append(
-- "{\n" + Utilities.indent(ext.toString()) +
"}");
-+ extBuilder.append("{\n").
-+ append(Utilities.indent(ext.toString())).
-+ append("}");
- }
-
- extsStr = extBuilder.toString();
-@@ -552,11 +549,11 @@
- return null;
- }
-
-- if (!chc.sslConfig.isAvailable(CH_STATUS_REQUEST)) {
-+ if (!chc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST)) {
- if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake"))
{
- SSLLogger.fine(
- "Ignore unavailable extension: " +
-- CH_STATUS_REQUEST.name);
-+ SSLExtension.CH_STATUS_REQUEST.name);
- }
- return null;
- }
-@@ -568,8 +565,8 @@
- byte[] extData = new byte[] {0x01, 0x00, 0x00, 0x00, 0x00};
-
- // Update the context.
-- chc.handshakeExtensions.put(
-- CH_STATUS_REQUEST, CertStatusRequestSpec.DEFAULT);
-+ chc.handshakeExtensions.put(SSLExtension.CH_STATUS_REQUEST,
-+ CertStatusRequestSpec.DEFAULT);
-
- return extData;
- }
-@@ -593,10 +590,10 @@
- // The consuming happens in server side only.
- ServerHandshakeContext shc = (ServerHandshakeContext)context;
-
-- if (!shc.sslConfig.isAvailable(CH_STATUS_REQUEST)) {
-+ if (!shc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST)) {
- if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake"))
{
- SSLLogger.fine("Ignore unavailable extension: " +
-- CH_STATUS_REQUEST.name);
-+ SSLExtension.CH_STATUS_REQUEST.name);
- }
- return; // ignore the extension
- }
-@@ -610,7 +607,7 @@
- }
-
- // Update the context.
-- shc.handshakeExtensions.put(CH_STATUS_REQUEST, spec);
-+ shc.handshakeExtensions.put(SSLExtension.CH_STATUS_REQUEST, spec);
- if (!shc.isResumption &&
- !shc.negotiatedProtocol.useTLS13PlusSpec()) {
- shc.handshakeProducers.put(SSLHandshake.CERTIFICATE_STATUS.id,
-@@ -654,13 +651,12 @@
-
- // In response to "status_request" extension request only.
- CertStatusRequestSpec spec = (CertStatusRequestSpec)
-- shc.handshakeExtensions.get(CH_STATUS_REQUEST);
-+ shc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST);
- if (spec == null) {
- // Ignore, no status_request extension requested.
- if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake"))
{
-- SSLLogger.finest(
-- "Ignore unavailable extension: " +
-- CH_STATUS_REQUEST.name);
-+ SSLLogger.finest("Ignore unavailable extension: " +
-+ SSLExtension.CH_STATUS_REQUEST.name);
- }
-
- return null; // ignore the extension
-@@ -681,8 +677,8 @@
- byte[] extData = new byte[0];
-
- // Update the context.
-- shc.handshakeExtensions.put(
-- SH_STATUS_REQUEST, CertStatusRequestSpec.DEFAULT);
-+ shc.handshakeExtensions.put(SSLExtension.SH_STATUS_REQUEST,
-+ CertStatusRequestSpec.DEFAULT);
-
- return extData;
- }
-@@ -708,7 +704,7 @@
-
- // In response to "status_request" extension request only.
- CertStatusRequestSpec requestedCsr = (CertStatusRequestSpec)
-- chc.handshakeExtensions.get(CH_STATUS_REQUEST);
-+ chc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST);
- if (requestedCsr == null) {
- throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
- "Unexpected status_request extension in ServerHello");
-@@ -722,8 +718,8 @@
- }
-
- // Update the context.
-- chc.handshakeExtensions.put(
-- SH_STATUS_REQUEST, CertStatusRequestSpec.DEFAULT);
-+ chc.handshakeExtensions.put(SSLExtension.SH_STATUS_REQUEST,
-+ CertStatusRequestSpec.DEFAULT);
-
- // Since we've received a legitimate status_request in the
- // ServerHello, stapling is active if it's been enabled.
-@@ -909,7 +905,7 @@
- return null;
- }
-
-- if (!chc.sslConfig.isAvailable(CH_STATUS_REQUEST_V2)) {
-+ if (!chc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST_V2)) {
- if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake"))
{
- SSLLogger.finest(
- "Ignore unavailable status_request_v2 extension");
-@@ -926,8 +922,8 @@
- 0x00, 0x07, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00};
-
- // Update the context.
-- chc.handshakeExtensions.put(
-- CH_STATUS_REQUEST_V2, CertStatusRequestV2Spec.DEFAULT);
-+ chc.handshakeExtensions.put(SSLExtension.CH_STATUS_REQUEST_V2,
-+ CertStatusRequestV2Spec.DEFAULT);
-
- return extData;
- }
-@@ -951,7 +947,7 @@
- // The consuming happens in server side only.
- ServerHandshakeContext shc = (ServerHandshakeContext)context;
-
-- if (!shc.sslConfig.isAvailable(CH_STATUS_REQUEST_V2)) {
-+ if (!shc.sslConfig.isAvailable(SSLExtension.CH_STATUS_REQUEST_V2)) {
- if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake"))
{
- SSLLogger.finest(
- "Ignore unavailable status_request_v2 extension");
-@@ -969,7 +965,8 @@
- }
-
- // Update the context.
-- shc.handshakeExtensions.put(CH_STATUS_REQUEST_V2, spec);
-+ shc.handshakeExtensions.put(SSLExtension.CH_STATUS_REQUEST_V2,
-+ spec);
- if (!shc.isResumption) {
- shc.handshakeProducers.putIfAbsent(
- SSLHandshake.CERTIFICATE_STATUS.id,
-@@ -1013,7 +1010,7 @@
-
- // In response to "status_request_v2" extension request only
- CertStatusRequestV2Spec spec = (CertStatusRequestV2Spec)
-- shc.handshakeExtensions.get(CH_STATUS_REQUEST_V2);
-+ shc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST_V2);
- if (spec == null) {
- // Ignore, no status_request_v2 extension requested.
- if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake"))
{
-@@ -1038,8 +1035,8 @@
- byte[] extData = new byte[0];
-
- // Update the context.
-- shc.handshakeExtensions.put(
-- SH_STATUS_REQUEST_V2, CertStatusRequestV2Spec.DEFAULT);
-+ shc.handshakeExtensions.put(SSLExtension.SH_STATUS_REQUEST_V2,
-+ CertStatusRequestV2Spec.DEFAULT);
-
- return extData;
- }
-@@ -1065,7 +1062,7 @@
-
- // In response to "status_request" extension request only
- CertStatusRequestV2Spec requestedCsr = (CertStatusRequestV2Spec)
-- chc.handshakeExtensions.get(CH_STATUS_REQUEST_V2);
-+ chc.handshakeExtensions.get(SSLExtension.CH_STATUS_REQUEST_V2);
- if (requestedCsr == null) {
- throw chc.conContext.fatal(Alert.UNEXPECTED_MESSAGE,
- "Unexpected status_request_v2 extension in ServerHello");
-@@ -1079,8 +1076,8 @@
- }
-
- // Update the context.
-- chc.handshakeExtensions.put(
-- SH_STATUS_REQUEST_V2, CertStatusRequestV2Spec.DEFAULT);
-+ chc.handshakeExtensions.put(SSLExtension.SH_STATUS_REQUEST_V2,
-+ CertStatusRequestV2Spec.DEFAULT);
-
- // Since we've received a legitimate status_request in the
- // ServerHello, stapling is active if it's been enabled. If it
-diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
---- a/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
-+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtension.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -113,7 +113,6 @@
- null,
- null,
- CertStatusExtension.certStatusReqStringizer),
--
- CR_STATUS_REQUEST (0x0005, "status_request"),
- CT_STATUS_REQUEST (0x0005, "status_request",
- SSLHandshake.CERTIFICATE,
-@@ -124,6 +123,7 @@
- null,
- null,
- CertStatusExtension.certStatusRespStringizer),
-+
- // extensions defined in RFC 4681
- USER_MAPPING (0x0006, "user_mapping"),
-
-@@ -515,6 +515,16 @@
- return null;
- }
-
-+ static String nameOf(int extensionType) {
-+ for (SSLExtension ext : SSLExtension.values()) {
-+ if (ext.id == extensionType) {
-+ return ext.name;
-+ }
-+ }
-+
-+ return "unknown extension";
-+ }
-+
- static boolean isConsumable(int extensionType) {
- for (SSLExtension ext : SSLExtension.values()) {
- if (ext.id == extensionType &&
-diff --git a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
---- a/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
-+++ b/src/java.base/share/classes/sun/security/ssl/SSLExtensions.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -86,11 +86,14 @@
- "Received buggy supported_groups extension "
+
- "in the ServerHello handshake message");
- }
-- } else {
-+ } else if (handshakeType == SSLHandshake.SERVER_HELLO) {
- throw hm.handshakeContext.conContext.fatal(
-- Alert.UNSUPPORTED_EXTENSION,
-- "extension (" + extId +
-- ") should not be presented in " +
handshakeType.name);
-+ Alert.UNSUPPORTED_EXTENSION, "extension (" +
-+ extId + ") should not be presented in " +
-+ handshakeType.name);
-+ } else {
-+ isSupported = false;
-+ // debug log to ignore unknown extension for handshakeType
- }
- }
-
-@@ -365,9 +368,10 @@
- }
-
- private static String toString(int extId, byte[] extData) {
-+ String extName = SSLExtension.nameOf(extId);
- MessageFormat messageFormat = new MessageFormat(
-- "\"unknown extension ({0})\": '{'\n" +
-- "{1}\n" +
-+ "\"{0} ({1})\": '{'\n" +
-+ "{2}\n" +
- "'}'",
- Locale.ENGLISH);
-
-@@ -375,6 +379,7 @@
- String encoded = hexEncoder.encodeBuffer(extData);
-
- Object[] messageFields = {
-+ extName,
- extId,
- Utilities.indent(encoded)
- };
diff --git a/sources b/sources
index b56c25d..b1adbff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) =
cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.6+10-4curve.tar.xz) =
02fc8c49c9db1e14f01df38cd144aeb6baad0f3e95701965120e5ce069e860ab88825764fcf213c6001a112fd6262dbe96af5bbe592a2c1400ff229ae2309e00
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.7+1-4curve.tar.xz) =
044a51ecb04cbf6ad065f55b9beea4bc585af72a197352db17d059bf763051fd1820868873a05d7f6d3cb779376e3d872ae7e24caf6405b7cad281353efc5483