The package rpms/java-1.8.0-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-1.8.0-openjdk.git/commit/?id...
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id....
Change:
-%ifarch %{ix86}
-%ifarch x86_64 %{aarch64}
Thanks.
Full change:
============
commit d304a2f11060a21a89434944caf758329118b105
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Wed Jul 31 16:34:14 2019 +0100
Update to aarch64-shenandoah-jdk8u222-b10.
Adjust PR3083/RH134640 to apply after JDK-8182999
Switch to GA mode for final release.
diff --git a/.gitignore b/.gitignore
index 0eb9e5a..4db088b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,3 +145,6 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b05.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b06.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b08.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b09.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 919aaa6..0831345 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -217,7 +217,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u222-b07
+%global shenandoah_revision aarch64-shenandoah-jdk8u222-b10
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@@ -238,7 +238,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 milestone fcs
%global milestone_version %{nil}
@@ -2284,6 +2284,11 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Thu Jul 11 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b10-0
+- Update to aarch64-shenandoah-jdk8u222-b10.
+- Adjust PR3083/RH134640 to apply after JDK-8182999
+- Switch to GA mode for final release.
+
* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b07-0.0.ea
- Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13.
- Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream.
diff --git
a/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
index d44ed1d..b52c087 100644
---
a/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
+++
b/pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
@@ -7,9 +7,21 @@
PR3083, RH1346460: Regression in SSL debug output without an ECC provider
Summary: Return null rather than throwing an exception when there's no ECC provider.
-diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java
---- openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 17:08:12 2016
+0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016
+0100
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
++++ openjdk/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
+@@ -121,7 +121,7 @@
+ private static void ensureCurveIsSupported(ECParameterSpec ecSpec)
+ throws InvalidAlgorithmParameterException {
+
+- AlgorithmParameters ecParams = ECUtil.getECParameters(null);
++ AlgorithmParameters ecParams = ECUtil.getECParameters(null, true);
+ byte[] encodedParams;
+ try {
+ ecParams.init(ecSpec);
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java
openjdk/jdk/src/share/classes/sun/security/util/Debug.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/util/Debug.java
++++ openjdk/jdk/src/share/classes/sun/security/util/Debug.java
@@ -73,6 +73,7 @@
System.err.println("certpath PKIX CertPathBuilder and");
System.err.println(" CertPathValidator debugging");
@@ -18,9 +30,9 @@ diff -r bc6eab2038c6 -r a4541d1d8609
src/share/classes/sun/security/util/Debug.j
System.err.println("gssloginconfig");
System.err.println(" GSS LoginConfigImpl debugging");
System.err.println("configfile JAAS ConfigFile loading");
-diff -r bc6eab2038c6 -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java
---- openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 17:08:12 2016
+0100
-+++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016
+0100
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/util/ECUtil.java
openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/util/ECUtil.java
++++ openjdk/jdk/src/share/classes/sun/security/util/ECUtil.java
@@ -41,6 +41,9 @@
public class ECUtil {
@@ -34,11 +46,11 @@ diff -r bc6eab2038c6 -r a4541d1d8609
src/share/classes/sun/security/util/ECUtil.
@@ -90,6 +93,10 @@
}
- private static AlgorithmParameters getECParameters(Provider p) {
+ public static AlgorithmParameters getECParameters(Provider p) {
+ return getECParameters(p, false);
+ }
+
-+ private static AlgorithmParameters getECParameters(Provider p, boolean
throwException) {
++ public static AlgorithmParameters getECParameters(Provider p, boolean
throwException) {
try {
if (p != null) {
return AlgorithmParameters.getInstance("EC", p);
diff --git a/sources b/sources
index 5671c4a..eaffa07 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.11.0.tar.xz) =
f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz) =
f58e5ac864cd66a39f4e479982ff236c8fa560c4108a1e13e11f3dcee1d1c3cbcb8383c8f144bea0c7059eb77f80f0628eb91e93b77a86f75bd84a28382be66c
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz) =
8e8379260a0f896c41b79e41e51609f3363f734b47cd412d20a4fe18079f73cdeefefdfa62b22f83743d289f8f622201f6650343ee6741163c57d1c5797dcc58
commit 584e2215c0afad8756c5a59b0f2afa351adc9400
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Wed Jul 31 15:54:20 2019 +0100
Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13.
Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream.
diff --git a/.gitignore b/.gitignore
index d8def8d..0eb9e5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,3 +141,7 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b04.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b05.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b06.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index ade741c..919aaa6 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -217,7 +217,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u222-b03
+%global shenandoah_revision aarch64-shenandoah-jdk8u222-b07
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@@ -1203,9 +1203,6 @@ Patch202: jdk8035341-allow_using_system_installed_libpng.patch
Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
# 8210761: libjsig is being compiled without optimization
Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
-# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
-# Aarch64-port 8u local part
-Patch624:
jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
# JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector
flags,
# overriding --with-extra-cflags
Patch626: jdk8223219-fstack-protector-root.patch
@@ -1626,7 +1623,6 @@ sh %{SOURCE12}
%patch575
%patch577
%patch620
-%patch624
%patch626
%patch627
%patch110
@@ -2288,6 +2284,10 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b07-0.0.ea
+- Update to aarch64-shenandoah-jdk8u222-b07 and Shenandoah merge 2019-06-13.
+- Drop remaining JDK-8210425/RH1632174 patch now AArch64 part is upstream.
+
* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b03-0.0.ea
- Update to aarch64-shenandoah-jdk8u222-b03.
- Drop 8210425 patches applied upstream. Still need to add AArch64 version in
aarch64/shenandoah-jdk8u.
diff --git
a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
b/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
deleted file mode 100644
index cf1b40b..0000000
---
a/jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/aarch64.make
openjdk/hotspot/make/linux/makefiles/aarch64.make
-index 3d17326..7cdb498 100644
---- openjdk.orig/hotspot/make/linux/makefiles/aarch64.make
-+++ openjdk/hotspot/make/linux/makefiles/aarch64.make
-@@ -22,10 +22,13 @@
- #
- #
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
-
diff --git a/sources b/sources
index 9e15789..5671c4a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.11.0.tar.xz) =
f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz) =
d7ca2c2b92ca21384c1a4f2f1f9a0335a941de4c24c6a54ce8a323ae0b61eb1ef9cb9d399cd9299841a1e9a2484375acb26db29fbd8b9b982b45d21442b88026
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b07.tar.xz) =
f58e5ac864cd66a39f4e479982ff236c8fa560c4108a1e13e11f3dcee1d1c3cbcb8383c8f144bea0c7059eb77f80f0628eb91e93b77a86f75bd84a28382be66c
commit a9aae2a8745bc7b48a68721ba556c35bbaed1b57
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Wed Jul 31 13:58:09 2019 +0100
Update to aarch64-shenandoah-jdk8u222-b03.
Drop 8210425 patches applied upstream. Still need to add AArch64 version in
aarch64/shenandoah-jdk8u.
Re-generate JDK-8141570 & JDK-8143245 patches due to 8210425 zeroshark.make
changes.
diff --git a/.gitignore b/.gitignore
index f382ea2..d8def8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,3 +140,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index ef56e23..ade741c 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -217,7 +217,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u222-b02
+%global shenandoah_revision aarch64-shenandoah-jdk8u222-b03
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@@ -1204,14 +1204,8 @@ Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
# 8210761: libjsig is being compiled without optimization
Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
-# Upstream 8u part.
-Patch623:
jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
-# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Aarch64-port 8u local part
Patch624:
jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_aarch64.patch
-# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
-# Zero part of the fix for (arm/s390 arches)
-Patch625:
jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
# JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector
flags,
# overriding --with-extra-cflags
Patch626: jdk8223219-fstack-protector-root.patch
@@ -1632,9 +1626,7 @@ sh %{SOURCE12}
%patch575
%patch577
%patch620
-%patch623
%patch624
-%patch625
%patch626
%patch627
%patch110
@@ -2296,6 +2288,11 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b03-0.0.ea
+- Update to aarch64-shenandoah-jdk8u222-b03.
+- Drop 8210425 patches applied upstream. Still need to add AArch64 version in
aarch64/shenandoah-jdk8u.
+- Re-generate JDK-8141570 & JDK-8143245 patches due to 8210425 zeroshark.make
changes.
+
* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b02-0.0.ea
- Update to aarch64-shenandoah-jdk8u222-b02.
- Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in
8176100).
diff --git
a/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
index f1e3215..c9ef36b 100644
--- a/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
+++ b/jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_headers.patch
@@ -34,9 +34,9 @@ diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
openjdk/hots
+ -Wno-format-nonliteral -Wno-format-security \
+ -Wno-maybe-uninitialized
- # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
- OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-@@ -42,5 +49,3 @@
+ # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to
+ # the compiler so as to be able to produce optimized objects
+@@ -48,5 +55,3 @@
ifeq ($(ARCH_DATA_MODEL), 64)
CFLAGS += -D_LP64=1
endif
diff --git a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
index b0a88ea..792b04a 100644
--- a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
+++ b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
@@ -8,6 +8,7 @@
Reviewed-by: dholmes, coleenp
diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
openjdk/hotspot/make/linux/makefiles/zeroshark.make
+diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
openjdk/hotspot/make/linux/makefiles/zeroshark.make
--- openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
@@ -1,5 +1,5 @@
@@ -27,8 +28,8 @@ diff --git openjdk.orig/hotspot/make/linux/makefiles/zeroshark.make
openjdk/hots
- -Wno-format-nonliteral -Wno-format-security \
- -Wno-maybe-uninitialized
- # The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
- OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+ # If FDLIBM_CFLAGS is non-empty it holds CFLAGS needed to be passed to
+ # the compiler so as to be able to produce optimized objects
diff --git openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
@@ -60,7 +61,7 @@ diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
openjdk/h
switch (type) {
case T_VOID:
ftype = &ffi_type_void;
-diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -1,6 +1,6 @@
diff --git
a/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
b/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
deleted file mode 100644
index 0b05ba6..0000000
--- a/jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git openjdk.orig/hotspot/make/linux/makefiles/amd64.make
openjdk/hotspot/make/linux/makefiles/amd64.make
---- openjdk.orig/hotspot/make/linux/makefiles/amd64.make
-+++ openjdk/hotspot/make/linux/makefiles/amd64.make
-@@ -22,10 +22,13 @@
- #
- #
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make
openjdk/hotspot/make/linux/makefiles/gcc.make
---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make
-@@ -225,6 +225,16 @@
- OPT_CFLAGS/SIZE=-Os
- OPT_CFLAGS/SPEED=-O3
-
-+ifeq ($(USE_CLANG),)
-+ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
-+ # For other versions we need to explicitly set arch specific machine
-+ # flags or keep optimization off for them.
-+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \)
\& \( $(CC_VER_MINOR) \>= 6 \) \))" "1"
-+ OPT_CFLAGS_NO_FMA = -ffp-contract=off
-+ endif
-+endif
-+
-+
- # Hotspot uses very unstrict aliasing turn this optimization off
- # This option is added to CFLAGS rather than OPT_CFLAGS
- # so that OPT_CFLAGS overrides get this option too.
-diff --git openjdk.orig/hotspot/make/linux/makefiles/i486.make
openjdk/hotspot/make/linux/makefiles/i486.make
---- openjdk.orig/hotspot/make/linux/makefiles/i486.make
-+++ openjdk/hotspot/make/linux/makefiles/i486.make
-@@ -24,10 +24,13 @@
-
- # TLS helper, assembled from .s file
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
- # Must also specify if CPU is little endian
- CFLAGS += -DVM_LITTLE_ENDIAN
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/ppc64.make
openjdk/hotspot/make/linux/makefiles/ppc64.make
---- openjdk.orig/hotspot/make/linux/makefiles/ppc64.make
-+++ openjdk/hotspot/make/linux/makefiles/ppc64.make
-@@ -49,3 +49,17 @@
- # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
- CFLAGS += -mcpu=power7 -mtune=power8 -minsert-sched-nops=regroup_exact -mno-multiple
-mno-string
- endif
-+
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ ifeq ($(OPENJDK_TARGET_CPU_ENDIAN),big)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd
-fno-strict-aliasing
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) -mno-fused-madd
-fno-strict-aliasing
-+ else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ endif
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
-+
diff --git
a/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
b/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
deleted file mode 100644
index 6c1ebad..0000000
---
a/jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/zeroshark.make
-+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make
-@@ -30,10 +30,13 @@ ifeq ($(USE_CLANG), true)
- WARNING_FLAGS += -Wno-undef
- endif
-
--# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
--OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+ifeq ($(OPT_CFLAGS_NO_FMA),)
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
-+else
-+ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+ OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/SPEED) $(OPT_CFLAGS_NO_FMA)
-+endif
-
- # Specify that the CPU is little endian, if necessary
- ifeq ($(ZERO_ENDIANNESS), little)
diff --git a/sources b/sources
index 8e4f7c0..9e15789 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.11.0.tar.xz) =
f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz) =
f30a5e1b7dd3fb3d7648d7871889f3f859946e4889649662aa7d051f02c101747e13d3b1311f14a68b5952f9745e577ef57cef44f7b73f9ccb0341c74d4068ac
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b03.tar.xz) =
d7ca2c2b92ca21384c1a4f2f1f9a0335a941de4c24c6a54ce8a323ae0b61eb1ef9cb9d399cd9299841a1e9a2484375acb26db29fbd8b9b982b45d21442b88026
commit cc57cbccebc52e230e1d332bba65ea07c0a0b331
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Wed Jul 31 04:19:52 2019 +0100
Update to aarch64-shenandoah-jdk8u222-b02.
Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in
8176100).
diff --git a/.gitignore b/.gitignore
index 5c6e85f..f382ea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,3 +139,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 3752b5a..ef56e23 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -217,7 +217,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u222-b01
+%global shenandoah_revision aarch64-shenandoah-jdk8u222-b02
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@@ -233,7 +233,7 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease 2
+%global rpmrelease 0
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
# Release will be (where N is usually a number starting at 1):
# - 0.N%%{?extraver}%%{?dist} for EA releases,
@@ -1193,8 +1193,6 @@ Patch573:
jdk8141570-pr3548-fix_zero_interpreter_build_for_disable_precompiled_h
Patch574: jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
# 8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
Patch575:
jdk8197981-pr3548-missing_return_statement_in_sync_val_compare_and_swap_8.patch
-# 8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
-Patch576:
jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
# 8062808, PR3548: Turn on the -Wreturn-type warning
Patch577: jdk8062808-pr3548-turn_on_the_wreturn_type_warning.patch
# s390: JDK-8203030, Type fixing for s390
@@ -1205,8 +1203,6 @@ Patch202: jdk8035341-allow_using_system_installed_libpng.patch
Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
# 8210761: libjsig is being compiled without optimization
Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
-# 8210416: [linux] Poor StrictMath performance due to non-optimized compilation
-Patch622:
jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Upstream 8u part.
Patch623:
jdk8210425-rh1632174-01-compile_with_o2_and_ffp_contract_off_as_for_fdlibm.patch
@@ -1634,10 +1630,8 @@ sh %{SOURCE12}
%patch573
%patch574
%patch575
-%patch576
%patch577
%patch620
-%patch622
%patch623
%patch624
%patch625
@@ -2302,6 +2296,10 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Mon Jul 08 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b02-0.0.ea
+- Update to aarch64-shenandoah-jdk8u222-b02.
+- Drop 8064786/PR3599 & 8210416/RH1632174 as applied upstream (8064786 silently in
8176100).
+
* Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.2.ea
- Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment.
diff --git
a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
b/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
deleted file mode 100644
index 790ee0d..0000000
---
a/jdk8064786-pr3599-fix_debug_build_after_8062808_Turn_on_the_wreturn_type_warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User goetz
-# Date 1415873641 -3600
-# Thu Nov 13 11:14:01 2014 +0100
-# Node ID 1878c4c1d04e1f3c6f67a19d36c35863d6b5f906
-# Parent 533473c67de6ff767710594639033c8e83523fe5
-8064786, PR3599: Fix debug build after 8062808: Turn on the -Wreturn-type warning
-Reviewed-by: stefank, tschatzl
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
openjdk/hotspot/src/share/vm/prims/jni.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jni.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jni.cpp
-@@ -708,6 +708,7 @@
-
- THROW_OOP_(JNIHandles::resolve(obj), JNI_OK);
- ShouldNotReachHere();
-+ return 0; // Mute compiler.
- JNI_END
-
- #ifndef USDT2
-@@ -734,6 +735,7 @@
- Handle protection_domain (THREAD, k->protection_domain());
- THROW_MSG_LOADER_(name, (char *)message, class_loader, protection_domain, JNI_OK);
- ShouldNotReachHere();
-+ return 0; // Mute compiler.
- JNI_END
-
-
diff --git
a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
b/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
deleted file mode 100644
index 98bbad0..0000000
---
a/jdk8210416-rh1632174-compile_fdlibm_with_o2_ffp_contract_off_on_gcc_clang_arches.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git openjdk.orig/jdk/make/lib/CoreLibraries.gmk
openjdk/jdk/make/lib/CoreLibraries.gmk
---- openjdk.orig/jdk/make/lib/CoreLibraries.gmk
-+++ openjdk/jdk/make/lib/CoreLibraries.gmk
-@@ -37,21 +37,32 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
- endif
-
- ifeq ($(OPENJDK_TARGET_OS), linux)
-- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
-- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
-- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
-- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
-- else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
-- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
-- endif
--endif
--
--ifneq ($(OPENJDK_TARGET_OS), macosx)
-+ BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
-+ LIBFDLIBM_CFLAGS_LINUX := -ffp-contract=off
- # Unfortunately, '-ffp-contract' is only available since gcc 4.6. For ppc64le
- # that's no problem since ppc64le support only appeared in gcc 4.8.3. But on
- # ppc64 (big endian) we traditionally compiled with gcc 4.3 which only knows
- # '-mno-fused-madd'. However, that's still not enough to get the float
- # computations right - we additionally have to supply '-fno-strict-aliasing'.
-+ #
-+ #
-+ ifeq ($(TOOLCHAIN_TYPE), gcc)
-+ CC_VER_MAJOR := $(shell $(CC) -dumpversion | cut -d'.' -f1)
-+ CC_VER_MINOR := $(shell $(CC) -dumpversion | cut -d'.' -f2)
-+ endif
-+ # Only GCC 4.6 and better have machine independent -ffp-contract=off.
-+ # For other versions we need to explicitly set arch specific machine
-+ # flags or keep optimization off.
-+ ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \)
\& \( $(CC_VER_MINOR) \>= 6 \) \))" "0"
-+ ifeq ($(OPENJDK_TARGET_CPU), ppc64)
-+ LIBFDLIBM_CFLAGS_LINUX := -mno-fused-madd -fno-strict-aliasing
-+ else
-+ BUILD_LIBFDLIBM_OPTIMIZATION := NONE
-+ endif
-+ endif
-+endif
-+
-+ifneq ($(OPENJDK_TARGET_OS), macosx)
- $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
- STATIC_LIBRARY := fdlibm, \
- OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
-@@ -62,9 +73,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx)
- -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
- CFLAGS_windows_debug := -DLOGGING, \
- CFLAGS_aix := -qfloat=nomaf, \
-- CFLAGS_linux_ppc64 := -mno-fused-madd -fno-strict-aliasing, \
-- CFLAGS_linux_ppc64le := -ffp-contract=off, \
-- CFLAGS_linux_aarch64 := -ffp-contract=off, \
-+ CFLAGS_linux := $(LIBFDLIBM_CFLAGS_LINUX), \
- ARFLAGS := $(ARFLAGS), \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
diff --git a/sources b/sources
index 8c0edda..8e4f7c0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (tapsets-icedtea-3.11.0.tar.xz) =
f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz) =
1d120a52dc4a6ac77189fb8f8b27244aad2de7e1fa71c41e89280339fb5f0255761171159fb5b0ab0b4ba185d8462205574679219f9bd218843618f3dc575dd2
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b02.tar.xz) =
f30a5e1b7dd3fb3d7648d7871889f3f859946e4889649662aa7d051f02c101747e13d3b1311f14a68b5952f9745e577ef57cef44f7b73f9ccb0341c74d4068ac
commit 85a907b56c9fdf23545f2cabebc3b613298623f8
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Wed Jul 24 17:58:37 2019 +0100
Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment.
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 145aa18..3752b5a 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -233,7 +233,7 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease 1
+%global rpmrelease 2
# 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,
@@ -871,7 +871,9 @@ Requires: libXcomposite%{?_isa}
Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
# for java-X-openjdk package's desktop binding
+%if 0%{?fedora} || 0%{?rhel} >= 8
Recommends: gtk2%{?_isa}
+%endif
Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
@@ -913,7 +915,9 @@ Requires(postun): %{_sbindir}/alternatives
# in version 1.7 and higher for --family switch
Requires(postun): chkconfig >= 1.7
# for optional support of kernel stream control, card reader and printing bindings
+%if 0%{?fedora} || 0%{?rhel} >= 8
Suggests: lksctp-tools%{?_isa}, pcsc-lite-devel%{?_isa}
+%endif
# Standard JPackage base provides
Provides: jre-headless%{?1} = %{epoch}:%{javaver}
@@ -2298,6 +2302,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.2.ea
+- Make use of Recommends and Suggests dependent on Fedora or RHEL 8+ environment.
+
* Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.1.ea
- Update to aarch64-shenandoah-jdk8u222-b01.
- Refactor PR2888 after inclusion of 8129988 upstream. Now includes PR3575.
commit 260536c34db4cfa5e09df5e3a5c4c2ff08d678fd
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Wed Jul 24 05:07:05 2019 +0100
Update to aarch64-shenandoah-jdk8u222-b01.
Refactor PR2888 after inclusion of 8129988 upstream. Now includes PR3575.
Drop 8171000 & 8197546 as applied upstream.
diff --git a/.gitignore b/.gitignore
index faa17a0..5c6e85f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b03.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index e187680..145aa18 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -217,7 +217,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision
aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30
+%global shenandoah_revision aarch64-shenandoah-jdk8u222-b01
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@@ -226,19 +226,19 @@
%global icedteaver 3.11.0
# e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 ->
aarch64-shenandoah-jdk8u212-b04
-%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah*})
+%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah-merge*})
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont
forget spec escape % by %%)
%global whole_update %(VERSION=%{version_tag}; echo ${VERSION%%-*})
# eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease 6
+%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,
# - N%%{?extraver}{?dist} for GA releases
-%global is_ga 1
+%global is_ga 0
%if %{is_ga}
%global milestone fcs
%global milestone_version %{nil}
@@ -1138,9 +1138,8 @@ Patch517:
pr2899-dont_use_withseed_versions_of_nss_functions_as_they_dont_fully_
Patch518:
pr2934-sunec_provider_throwing_keyexception_withine.separator_current_nss_thus_initialise_the_random_number_generator_and_feed_the_seed_to_it.patch
Patch519:
pr3479-rh1486025-sunec_provider_can_have_multiple_instances_leading_to_premature_nss_shutdown.patch
# PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
-Patch539:
pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
# PR3575, RH1567204: System cacerts database handling should not affect jssecacerts
-Patch540:
pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
+Patch539:
pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
# PR3183, RH1340845: Support Fedora/RHEL8 system crypto policy
Patch300: pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
# PR3655: Allow use of system crypto policy to be disabled by the user
@@ -1182,10 +1181,6 @@ Patch107: s390-8214206_fix.patch
Patch502: pr2462-resolve_disabled_warnings_for_libunpack_and_the_unpack200_binary.patch
# S8154313: Generated javadoc scattered all over the place
Patch400: jdk8154313-generated_javadoc_scattered_all_over_the_place.patch
-# 8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
-Patch563:
jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
-# 8197546, PR3542, RH1402819: Fix for 8171000 breaks Solaris + Linux builds
-Patch564: jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
# PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
Patch571:
jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
# 8141570, PR3548: Fix Zero interpreter build for --disable-precompiled-headers
@@ -1631,8 +1626,6 @@ sh %{SOURCE12}
%patch529
%patch531
%patch530
-%patch563
-%patch564
%patch571
%patch573
%patch574
@@ -1651,7 +1644,7 @@ sh %{SOURCE12}
# RPM-only fixes
%patch525
%patch539
-%patch540
+%patch1000
# RHEL-only patches
%if ! 0%{?fedora} && 0%{?rhel} <= 7
@@ -1660,8 +1653,6 @@ sh %{SOURCE12}
# Shenandoah patches
-%patch1000
-
# Extract systemtap tapsets
%if %{with_systemtap}
tar --strip-components=1 -x -I xz -f %{SOURCE8}
@@ -2307,6 +2298,11 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Sun Jul 07 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.222.b01-0.1.ea
+- Update to aarch64-shenandoah-jdk8u222-b01.
+- Refactor PR2888 after inclusion of 8129988 upstream. Now includes PR3575.
+- Drop 8171000 & 8197546 as applied upstream.
+
* Wed Jul 03 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-6
- Include 'ea' designator in Release when appropriate.
diff --git
a/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
b/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
deleted file mode 100644
index d831aa9..0000000
--- a/jdk8171000-pr3542-rh1402819-robot_createScreenCapture_crashes_in_wayland_mode.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-# HG changeset patch
-# User kaddepalli
-# Date 1517818481 -19800
-# Mon Feb 05 13:44:41 2018 +0530
-# Node ID b77308735540644d4710244e3c88865067f2905a
-# Parent 39bfc94b1f4265b645c2970a58389acc779dafe9
-8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
-Reviewed-by: serb, mhalder
-
-diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
-@@ -394,77 +394,48 @@
- XRectangle bbox; /* bounding box of grabbed area */
- list_ptr regions;/* list of regions to read from */
- {
-- image_region_type *reg;
-- int32_t dst_x, dst_y; /* where in pixmap to write (UL) */
-- int32_t diff;
--
-- XImage *reg_image,*ximage ;
-- int32_t srcRect_x,srcRect_y,srcRect_width,srcRect_height ;
-- int32_t rem ;
-- int32_t bytes_per_line;
-- int32_t bitmap_unit;
--
-- bitmap_unit = sizeof (long);
-- if (format == ZPixmap)
-- bytes_per_line = width*depth/8;
-- else
-- bytes_per_line = width/8;
--
--
-- /* Find out how many more bytes are required for padding so that
-- ** bytes per scan line will be multiples of bitmap_unit bits */
-- if (format == ZPixmap) {
-- rem = (bytes_per_line*8)%bitmap_unit;
-- if (rem)
-- bytes_per_line += (rem/8 + 1);
-- }
-+ XImage *ximage ;
-
- ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
- (uint32_t)width,(uint32_t)height,8,0);
-
-- bytes_per_line = ximage->bytes_per_line;
--
-- if (format == ZPixmap)
-- ximage->data = malloc(height*bytes_per_line);
-- else
-- ximage->data = malloc(height*bytes_per_line*depth);
--
-+ ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 :
depth), sizeof(char));
- ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
-
-- for (reg = (image_region_type *) first_in_list( regions); reg;
-+ for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
- reg = (image_region_type *) next_in_list( regions))
- {
-- int32_t rect;
-- struct my_XRegion *vis_reg;
-- vis_reg = (struct my_XRegion *)(reg->visible_region);
-- for (rect = 0;
-- rect < vis_reg->numRects;
-- rect++)
-+ struct my_XRegion *vis_reg = (struct my_XRegion
*)(reg->visible_region);
-+ for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
- {
-- /**
------------------------------------------------------------------------
-- Intersect bbox with visible part of region giving src rect &
output
-- location. Width is the min right side minus the max left side.
-- Similar for height. Offset src rect so x,y are relative to
-- origin of win, not the root-relative visible rect of win.
--
------------------------------------------------------------------------ **/
-- srcRect_width = MIN( vis_reg->rects[rect].x2, bbox.width +
bbox.x)
-- - MAX( vis_reg->rects[rect].x1, bbox.x);
-+ /**
------------------------------------------------------------------------
-+ Intersect bbox with visible part of region giving src rect
& output
-+ location. Width is the min right side minus the max left
side.
-+ Similar for height. Offset src rect so x,y are relative to
-+ origin of win, not the root-relative visible rect of win.
-+
------------------------------------------------------------------------ **/
-+ int32_t srcRect_width = MIN( vis_reg->rects[rect].x2,
bbox.width + bbox.x)
-+ - MAX( vis_reg->rects[rect].x1, bbox.x);
-+
-+ int32_t srcRect_height = MIN( vis_reg->rects[rect].y2,
bbox.height + bbox.y)
-+ - MAX( vis_reg->rects[rect].y1, bbox.y);
-
-- srcRect_height = MIN( vis_reg->rects[rect].y2, bbox.height +
bbox.y)
-- - MAX( vis_reg->rects[rect].y1, bbox.y);
-+ int32_t diff = bbox.x - vis_reg->rects[rect].x1;
-+ int32_t srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1
- reg->x_rootrel - reg->border);
-+ int32_t dst_x = MAX( 0, -diff) ;
-
-- diff = bbox.x - vis_reg->rects[rect].x1;
-- srcRect_x = MAX( 0, diff) + (vis_reg->rects[rect].x1 -
reg->x_rootrel - reg->border);
-- dst_x = MAX( 0, -diff) ;
-- diff = bbox.y - vis_reg->rects[rect].y1;
-- srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1 -
reg->y_rootrel - reg->border);
-- dst_y = MAX( 0, -diff) ;
-- reg_image = XGetImage(disp,reg->win,srcRect_x,srcRect_y,
-- (uint32_t) srcRect_width, (uint32_t) srcRect_height,AllPlanes,format) ;
-- TransferImage(disp,reg_image,srcRect_width,
-- srcRect_height,reg,ximage,dst_x,dst_y) ;
-- XDestroyImage(reg_image);
-- }
-+ diff = bbox.y - vis_reg->rects[rect].y1;
-+ int32_t srcRect_y = MAX( 0, diff) + (vis_reg->rects[rect].y1
- reg->y_rootrel - reg->border);
-+ int32_t dst_y = MAX( 0, -diff) ;
-+ XImage* reg_image =
XGetImage(disp,reg->win,srcRect_x,srcRect_y,
-+ (uint32_t) srcRect_width, (uint32_t)
srcRect_height,AllPlanes,format) ;
-+
-+ if (reg_image) {
-+ TransferImage(disp,reg_image,srcRect_width,
-+ srcRect_height,reg,ximage,dst_x,dst_y) ;
-+ XDestroyImage(reg_image);
-+ }
-+ }
- }
- return ximage ;
- }
diff --git a/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
b/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
deleted file mode 100644
index ba712ad..0000000
--- a/jdk8197546-pr3542-rh1402819-fix_for_8171000_breaks_solaris_linux_builds.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1518454604 28800
-# Mon Feb 12 08:56:44 2018 -0800
-# Node ID 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
-# Parent b77308735540644d4710244e3c88865067f2905a
-8197546: Fix for 8171000 breaks Solaris + Linux builds
-Reviewed-by: serb, jdv
-
-diff --git openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
---- openjdk.orig/jdk/src/solaris/native/sun/awt/multiVis.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/multiVis.c
-@@ -395,6 +395,8 @@
- list_ptr regions;/* list of regions to read from */
- {
- XImage *ximage ;
-+ image_region_type* reg;
-+ int32_t rect;
-
- ximage = XCreateImage(disp,fakeVis,(uint32_t) depth,format,0,NULL,
- (uint32_t)width,(uint32_t)height,8,0);
-@@ -402,11 +404,11 @@
- ximage->data = calloc(ximage->bytes_per_line*height*((format==ZPixmap)? 1 :
depth), sizeof(char));
- ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
-
-- for (image_region_type* reg = (image_region_type *) first_in_list( regions); reg;
-+ for (reg = (image_region_type *) first_in_list( regions); reg;
- reg = (image_region_type *) next_in_list( regions))
- {
- struct my_XRegion *vis_reg = (struct my_XRegion
*)(reg->visible_region);
-- for (int32_t rect = 0; rect < vis_reg->numRects; rect++)
-+ for (rect = 0; rect < vis_reg->numRects; rect++)
- {
- /**
------------------------------------------------------------------------
- Intersect bbox with visible part of region giving src rect
& output
diff --git
a/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
index fc8f981..a42688d 100644
---
a/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
+++
b/pr2888-openjdk_should_check_for_system_cacerts_database_eg_etc_pki_java_cacerts.patch
@@ -5,42 +5,45 @@
# Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b
# Parent 6b81fd2227d14226f2121f2d51b464536925686e
PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+PR3575: System cacerts database handling should not affect jssecacerts
-diff --git a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@@ -174,15 +174,20 @@
- storeFile = new File(storeFileName);
- fis = getFileInputStream(storeFile);
- } else {
-- String javaHome = props.get("javaHome");
-- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "jssecacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ storeFile = new File(sep + "etc" + sep + "pki" +
sep
-+ + "java" + sep +
"cacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
-+ String javaHome = props.get("javaHome");
- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "cacerts");
-- fis = getFileInputStream(storeFile);
-+ + "security" + sep +
-+ "jssecacerts");
-+ if ((fis = getFileInputStream(storeFile)) == null) {
-+ storeFile = new File(javaHome + sep + "lib" + sep
-+ + "security" + sep +
-+ "cacerts");
-+ fis = getFileInputStream(storeFile);
-+ }
- }
- }
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
+@@ -72,7 +72,7 @@
+ * The preference of the default trusted KeyStore is:
+ * javax.net.ssl.trustStore
+ * jssecacerts
+- * cacerts
++ * cacerts (system and local)
+ */
+ private static final class TrustStoreDescriptor {
+ private static final String fileSep = File.separator;
+@@ -83,6 +83,10 @@
+ defaultStorePath + fileSep + "cacerts";
+ private static final String jsseDefaultStore =
+ defaultStorePath + fileSep + "jssecacerts";
++ /* Check system cacerts DB: /etc/pki/java/cacerts */
++ private static final String systemStore =
++ fileSep + "etc" + fileSep + "pki" +
++ fileSep + "java" + fileSep + "cacerts";
-diff --git a/src/share/classes/sun/security/tools/KeyStoreUtil.java
b/src/share/classes/sun/security/tools/KeyStoreUtil.java
---- openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
+ // the trust store name
+ private final String storeName;
+@@ -146,7 +150,8 @@
+ long temporaryTime = 0L;
+ if (!"NONE".equals(storePropName)) {
+ String[] fileNames =
+- new String[] {storePropName, defaultStore};
++ new String[] {storePropName,
++ systemStore, defaultStore};
+ for (String fileName : fileNames) {
+ File f = new File(fileName);
+ if (f.isFile() && f.canRead()) {
+diff --git openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
+--- openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
+++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
-@@ -87,9 +87,14 @@
+@@ -108,9 +108,14 @@
throws Exception
{
String sep = File.separator;
diff --git
a/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
b/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
deleted file mode 100644
index ce24c59..0000000
---
a/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1525111445 -3600
-# Mon Apr 30 19:04:05 2018 +0100
-# Node ID 388fc8da23044317c160678ffa8ff541c216a255
-# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
-PR3575: System cacerts database handling should not affect jssecacerts
-
-diff --git
openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
-@@ -162,7 +162,7 @@
- * Try:
- * javax.net.ssl.trustStore (if this variable exists, stop)
- * jssecacerts
-- * cacerts
-+ * cacerts (system and local)
- *
- * If none exists, we use an empty keystore.
- */
-@@ -174,14 +174,14 @@
- storeFile = new File(storeFileName);
- fis = getFileInputStream(storeFile);
- } else {
-- /* Check system cacerts DB first; /etc/pki/java/cacerts */
-- storeFile = new File(sep + "etc" + sep + "pki" +
sep
-- + "java" + sep +
"cacerts");
-+ String javaHome = props.get("javaHome");
-+ storeFile = new File(javaHome + sep + "lib" + sep
-+ + "security" + sep +
-+ "jssecacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
-- String javaHome = props.get("javaHome");
-- storeFile = new File(javaHome + sep + "lib" + sep
-- + "security" + sep +
-- "jssecacerts");
-+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
-+ storeFile = new File(sep + "etc" + sep +
"pki" + sep
-+ + "java" + sep +
"cacerts");
- if ((fis = getFileInputStream(storeFile)) == null) {
- storeFile = new File(javaHome + sep + "lib" + sep
- + "security" + sep +
diff --git a/sources b/sources
index 2064a52..8c0edda 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-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz)
=
8ef6029cfa053fce7e0f73aab72b287a4505b06d6e2f1153e5c903a48ba89147fc187987f58d6eb737ede9d5c76a8925f22c34a4f5c3d757674c06fccf77c21b
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b01.tar.xz) =
1d120a52dc4a6ac77189fb8f8b27244aad2de7e1fa71c41e89280339fb5f0255761171159fb5b0ab0b4ba185d8462205574679219f9bd218843618f3dc575dd2
commit a7f82eacb0bc57c5c30c564ac689788ec509e46b
Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org>
Date: Tue Jul 23 11:24:34 2019 +0100
Handle milestone as variables so we can alter it easily and set the docs zip filename
appropriately.
Drop unused use_shenandoah_hotspot variable.
Include 'ea' designator in Release when appropriate.
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 2ce7fd1..e187680 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -76,13 +76,6 @@
%global include_debug_build 0
%endif
-# Shenandoah HotSpot used everywhere, but built only on x86_64 and AArch64
-%ifarch x86_64 %{aarch64}
-%global use_shenandoah_hotspot 1
-%else
-%global use_shenandoah_hotspot 0
-%endif
-
%if %{include_debug_build}
%global build_loop2 %{debug_suffix}
%else
@@ -188,8 +181,6 @@
%global archinstall %{_arch}
%endif
-
-
%ifarch %{jit_arches}
%global with_systemtap 1
%else
@@ -242,6 +233,23 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
+%global rpmrelease 6
+# Define milestone (EA for pre-releases, GA ("fcs") for releases)
+# Release will be (where N is usually a number starting at 1):
+# - 0.N%%{?extraver}%%{?dist} for EA releases,
+# - N%%{?extraver}{?dist} for GA releases
+%global is_ga 1
+%if %{is_ga}
+%global milestone fcs
+%global milestone_version %{nil}
+%global extraver %{nil}
+%global eaprefix %{nil}
+%else
+%global milestone ea
+%global milestone_version "-ea"
+%global extraver .%{milestone}
+%global eaprefix 0.
+%endif
# priority must be 7 digits in total. The expression is workarounding tip
%global priority %(TIP=1800%{updatever}; echo ${TIP/tip/999})
@@ -1000,7 +1008,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 5%{?dist}
+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
@@ -1554,6 +1562,10 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0
] ; then
echo "You have disabled both include_debug_build and include_normal_build. That is
a no go."
exit 13
fi
+
+echo "Update version: %{updatever}"
+echo "Build number: %{buildver}"
+echo "Milestone: %{milestone}"
%setup -q -c -n %{uniquesuffix ""} -T -a 0
#
https://bugzilla.redhat.com/show_bug.cgi?id=1189084
prioritylength=`expr length %{priority}`
@@ -1753,7 +1765,7 @@ bash ../../configure \
--with-jvm-variants=zero \
%endif
--with-native-debug-symbols=internal \
- --with-milestone="fcs" \
+ --with-milestone=%{milestone} \
--with-update-version=%{updatever} \
--with-build-number=%{buildver} \
--with-boot-jdk=/usr/lib/jvm/java-openjdk \
@@ -1984,7 +1996,7 @@ popd
# Install Javadoc documentation
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir -- $suffix}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir
-- $suffix}
-built_doc_archive=`echo
"jdk-%{javaver}_%{updatever}$suffix-%{buildver}-docs.zip" | sed
s/slowdebug/debug/`
+built_doc_archive=`echo
"jdk-%{javaver}_%{updatever}%{milestone_version}$suffix-%{buildver}-docs.zip" |
sed s/slowdebug/debug/`
cp -a %{buildoutputdir -- $suffix}/bundles/$built_doc_archive
$RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
# Install icons and menu entries
@@ -2295,6 +2307,13 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Wed Jul 03 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-6
+- Include 'ea' designator in Release when appropriate.
+
+* Wed Jul 03 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-6
+- Handle milestone as variables so we can alter it easily and set the docs zip filename
appropriately.
+- Drop unused use_shenandoah_hotspot variable.
+
* Fri Jun 14 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-5
- Update to aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.
- Update version logic to handle -shenandoah* tag suffix.
commit 574dfb4ddb15b98eb1047d45e0fdc2553b3e4581
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Mon Jun 24 15:23:59 2019 +0100
Update to aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.
Update version logic to handle -shenandoah* tag suffix.
Drop PR3634 as applied upstream.
Adjust 8214206 fix for S390 as BinaryMagnitudeSeq moved to shenandoahNumberSeq.cpp
Update 8214206 to use log2_long rather than casting to intptr_t, which may be smaller
than size_t.
diff --git a/.gitignore b/.gitignore
index d1072b7..faa17a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,3 +137,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b02.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b03.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 528602a..2ce7fd1 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -226,7 +226,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-jdk8u212-b04
+%global shenandoah_revision
aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@@ -234,12 +234,14 @@
# Define IcedTea version used for SystemTap tapsets and desktop files
%global icedteaver 3.11.0
+# e.g. aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30 ->
aarch64-shenandoah-jdk8u212-b04
+%global version_tag %(VERSION=%{revision}; echo ${VERSION%%-shenandoah*})
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont
forget spec escape % by %%)
-%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*})
+%global whole_update %(VERSION=%{version_tag}; echo ${VERSION%%-*})
# eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27
-%global buildver %(VERSION=%{revision}; echo ${VERSION##*-})
+%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
# priority must be 7 digits in total. The expression is workarounding tip
%global priority %(TIP=1800%{updatever}; echo ${TIP/tip/999})
@@ -998,7 +1000,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 4%{?dist}
+Release: 5%{?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
@@ -1241,8 +1243,6 @@ Patch201: jdk8043805-allow_using_system_installed_libjpeg.patch
# and should be upstreamed to the appropriate
# trees.
#############################################
-# PR3634: Shenandoah still broken on s390 with aarch64-shenandoah-jdk8u181-b16
-Patch582: pr3634-fix_shenandoah_for_size_t_on_s390.patch
#############################################
#
@@ -1647,7 +1647,6 @@ sh %{SOURCE12}
%endif
# Shenandoah patches
-%patch582
%patch1000
@@ -2296,6 +2295,13 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Fri Jun 14 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-5
+- Update to aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.
+- Update version logic to handle -shenandoah* tag suffix.
+- Drop PR3634 as applied upstream.
+- Adjust 8214206 fix for S390 as BinaryMagnitudeSeq moved to shenandoahNumberSeq.cpp
+- Update 8214206 to use log2_long rather than casting to intptr_t, which may be smaller
than size_t.
+
* Wed May 22 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-4
- Remove additions to EXTRA_CFLAGS and EXTRA_CPP_FLAGS which are now made by upstream.
- Remove -mstackrealign addition which is handled by PR3533 & PR3591 patches.
diff --git a/pr3634-fix_shenandoah_for_size_t_on_s390.patch
b/pr3634-fix_shenandoah_for_size_t_on_s390.patch
deleted file mode 100644
index 20a4625..0000000
--- a/pr3634-fix_shenandoah_for_size_t_on_s390.patch
+++ /dev/null
@@ -1,14 +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
-@@ -524,8 +524,8 @@
- region_size = max_heap_size / ShenandoahTargetNumRegions;
-
- // Now make sure that we don't go over or under our limits.
-- region_size = MAX2(ShenandoahMinRegionSize, region_size);
-- region_size = MIN2(ShenandoahMaxRegionSize, region_size);
-+ region_size = MAX2<size_t>(ShenandoahMinRegionSize, region_size);
-+ region_size = MIN2<size_t>(ShenandoahMaxRegionSize, region_size);
-
- } else {
- if (ShenandoahHeapRegionSize > initial_heap_size / MIN_NUM_REGIONS) {
diff --git a/s390-8214206_fix.patch b/s390-8214206_fix.patch
index 93f12de..42902cf 100644
--- a/s390-8214206_fix.patch
+++ b/s390-8214206_fix.patch
@@ -7,10 +7,22 @@ diff --git
openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1BiasedArray.
address base = create_new_base_array(num_target_elems, target_elem_size_in_bytes);
- initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes,
log2_intptr(mapping_granularity_in_bytes));
+ initialize_base(base, num_target_elems, bias, target_elem_size_in_bytes,
-+ log2_intptr((uintptr_t) mapping_granularity_in_bytes));
++ log2_long(mapping_granularity_in_bytes));
}
size_t bias() const { return _bias; }
+diff --git
openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp
openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp
+---
openjdk.orig/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/shenandoah/shenandoahNumberSeq.cpp
+@@ -135,7 +135,7 @@
+ void BinaryMagnitudeSeq::add(size_t val) {
+ Atomic::add(val, &_sum);
+
+- int mag = log2_intptr(val) + 1;
++ int mag = log2_long(val) + 1;
+
+ // Defensively saturate for product bits:
+ if (mag < 0) {
diff --git openjdk.orig/hotspot/src/share/vm/runtime/os.cpp
openjdk/hotspot/src/share/vm/runtime/os.cpp
--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp
+++ openjdk/hotspot/src/share/vm/runtime/os.cpp
@@ -19,19 +31,7 @@ diff --git openjdk.orig/hotspot/src/share/vm/runtime/os.cpp
openjdk/hotspot/src/
void os::set_memory_serialize_page(address page) {
- int count = log2_intptr(sizeof(class JavaThread)) - log2_int(64);
-+ int count = log2_intptr((uintptr_t) sizeof(class JavaThread)) - log2_int(64);
++ int count = log2_long(sizeof(class JavaThread)) - log2_int(64);
_mem_serialize_page = (volatile int32_t *)page;
// We initialize the serialization page shift count here
// We assume a cache line size of 64 bytes
-diff --git openjdk.orig/hotspot/src/share/vm/utilities/numberSeq.cpp
openjdk/hotspot/src/share/vm/utilities/numberSeq.cpp
---- openjdk.orig/hotspot/src/share/vm/utilities/numberSeq.cpp
-+++ openjdk/hotspot/src/share/vm/utilities/numberSeq.cpp
-@@ -369,7 +369,7 @@
- void BinaryMagnitudeSeq::add(size_t val) {
- Atomic::add(val, &_sum);
-
-- int mag = log2_intptr(val) + 1;
-+ int mag = log2_intptr((uintptr_t) val) + 1;
-
- // Defensively saturate for product bits:
- if (mag < 0) {
diff --git a/sources b/sources
index bc68672..2064a52 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-jdk8u212-b04.tar.xz) =
ebcb028fdbcd414bc13d8dc5e331b4a6be2026e19eed5c903eecc02929fde8829fca8aa430220319df7f772f5c4d9689739d5f41ce35c4e542641ab2bfcd6c51
+SHA512
(aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u212-b04-shenandoah-merge-2019-04-30.tar.xz)
=
8ef6029cfa053fce7e0f73aab72b287a4505b06d6e2f1153e5c903a48ba89147fc187987f58d6eb737ede9d5c76a8925f22c34a4f5c3d757674c06fccf77c21b
commit 7ab68b2b83f6bfb0a387cdc729b2d06f30006edb
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Wed May 22 20:00:06 2019 +0100
Remove additions to EXTRA_CFLAGS and EXTRA_CPP_FLAGS which are now made by upstream.
Remove -mstackrealign addition which is handled by PR3533 & PR3591 patches.
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index cf39ca8..528602a 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -998,7 +998,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 3%{?dist}
+Release: 4%{?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
@@ -1717,9 +1717,8 @@ export CFLAGS="$CFLAGS -mieee"
# 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"
-EXTRA_CPP_FLAGS="%ourcppflags -std=gnu++98 -fno-delete-null-pointer-checks
-fno-lifetime-dse"
+EXTRA_CFLAGS="%ourcppflags -Wno-error"
+EXTRA_CPP_FLAGS="%ourcppflags"
# Fixes annocheck warnings in assembler files due to missing build notes
EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -Wa,--generate-missing-build-notes=yes"
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wa,--generate-missing-build-notes=yes"
@@ -1768,13 +1767,8 @@ bash ../../configure \
--with-libpng=system \
--with-lcms=system \
--with-stdc++lib=dynamic \
-%ifarch %{ix86}
- --with-extra-cxxflags="-mstackrealign $EXTRA_CPP_FLAGS" \
- --with-extra-cflags="-mstackrealign $EXTRA_CFLAGS" \
-%else
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
--with-extra-cflags="$EXTRA_CFLAGS" \
-%endif
--with-extra-ldflags="%{ourldflags}" \
--with-num-cores="$NUM_PROC"
@@ -2302,6 +2296,10 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Wed May 22 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-4
+- Remove additions to EXTRA_CFLAGS and EXTRA_CPP_FLAGS which are now made by upstream.
+- Remove -mstackrealign addition which is handled by PR3533 & PR3591 patches.
+
* Wed May 22 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-3
- Add JDK-8223219 to avoid -fstack-protector overriding -fstack-protector-strong
commit 2c52e1ff0ebb6438dce25522e611840a9ac35205
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Mon May 13 16:02:54 2019 +0100
Add JDK-8223219 to avoid -fstack-protector overriding -fstack-protector-strong
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 618a058..cf39ca8 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -998,7 +998,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 2%{?dist}
+Release: 3%{?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
@@ -1207,6 +1207,10 @@ Patch624:
jdk8210425-rh1632174-02-compile_with_o2_and_ffp_contract_off_as_for_fd
# 8210425: [x86] sharedRuntimeTrig/sharedRuntimeTrans compiled without optimization
# Zero part of the fix for (arm/s390 arches)
Patch625:
jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fdlibm_zero.patch
+# JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector
flags,
+# overriding --with-extra-cflags
+Patch626: jdk8223219-fstack-protector-root.patch
+Patch627: jdk8223219-fstack-protector-hotspot.patch
#############################################
#
@@ -1628,6 +1632,8 @@ sh %{SOURCE12}
%patch623
%patch624
%patch625
+%patch626
+%patch627
%patch110
# RPM-only fixes
@@ -2296,6 +2302,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Wed May 22 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-3
+- Add JDK-8223219 to avoid -fstack-protector overriding -fstack-protector-strong
+
* Wed May 15 2019 James Cassell <cyberpear(a)fedoraproject.org> - 1:1.8.0.212.b04-2
- mark net.properties as a config file
diff --git a/jdk8223219-fstack-protector-hotspot.patch
b/jdk8223219-fstack-protector-hotspot.patch
new file mode 100644
index 0000000..ec69944
--- /dev/null
+++ b/jdk8223219-fstack-protector-hotspot.patch
@@ -0,0 +1,35 @@
+diff --git openjdk.orig/hotspot/make/bsd/makefiles/gcc.make
openjdk/hotspot/make/bsd/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/bsd/makefiles/gcc.make
++++ openjdk/hotspot/make/bsd/makefiles/gcc.make
+@@ -190,7 +190,7 @@
+ CFLAGS += -fno-exceptions
+ ifeq ($(USE_CLANG),)
+ CFLAGS += -pthread
+- CFLAGS += -fcheck-new -fstack-protector
++ CFLAGS += -fcheck-new
+ # version 4 and above support fvisibility=hidden (matches jni_x86.h file)
+ # except 4.1.2 gives pointless warnings that can't be disabled (afaik)
+ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \)
\& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
+diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make
openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
++++ openjdk/hotspot/make/linux/makefiles/gcc.make
+@@ -150,7 +150,7 @@
+ CFLAGS += -fno-exceptions
+ CFLAGS += -D_REENTRANT
+ ifeq ($(USE_CLANG),)
+- CFLAGS += -fcheck-new -fstack-protector
++ CFLAGS += -fcheck-new
+ # version 4 and above support fvisibility=hidden (matches jni_x86.h file)
+ # except 4.1.2 gives pointless warnings that can't be disabled (afaik)
+ ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \)
\& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
+diff --git openjdk.orig/hotspot/make/solaris/makefiles/gcc.make
openjdk/hotspot/make/solaris/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make
++++ openjdk/hotspot/make/solaris/makefiles/gcc.make
+@@ -75,7 +75,6 @@
+ CFLAGS += -fno-exceptions
+ CFLAGS += -D_REENTRANT
+ CFLAGS += -fcheck-new
+-CFLAGS += -fstack-protector
+
+ ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
+
diff --git a/jdk8223219-fstack-protector-root.patch
b/jdk8223219-fstack-protector-root.patch
new file mode 100644
index 0000000..a73761c
--- /dev/null
+++ b/jdk8223219-fstack-protector-root.patch
@@ -0,0 +1,33 @@
+diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4
+--- openjdk.orig/common/autoconf/flags.m4
++++ openjdk/common/autoconf/flags.m4
+@@ -388,16 +388,8 @@
+ CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
+ CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
+ elif test "x$TOOLCHAIN_TYPE" = xgcc; then
+- case $OPENJDK_TARGET_CPU_ARCH in
+- x86 )
+- LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
+- LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
+- ;;
+- x86_64 )
+- LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
+- LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
+- ;;
+- esac
++ LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
++ LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
+ if test "x$OPENJDK_TARGET_OS" != xmacosx; then
+ LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
+ LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
+@@ -464,10 +456,6 @@
+ ppc )
+ # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
+ ;;
+- x86 )
+- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer
-fstack-protector"
+- CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector"
+- ;;
+ * )
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
+ CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
commit 3ea4f13b20c9d1d8f4e2e6c18020bc8334d5b929
Author: James Cassell <code(a)james.cassell.me>
Date: Tue May 14 15:31:54 2019 -0400
mark net.properties as a config file
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index f7e9162..618a058 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -689,6 +689,7 @@ exit 0
%{_jvmdir}/%{jredir -- %{?1}}/lib/jvm.hprof.txt
%{_jvmdir}/%{jredir -- %{?1}}/lib/meta-index
%{_jvmdir}/%{jredir -- %{?1}}/lib/net.properties
+%config(noreplace) %{etcjavadir -- %{?1}}/lib/net.properties
%{_jvmdir}/%{jredir -- %{?1}}/lib/psfont.properties.ja
%{_jvmdir}/%{jredir -- %{?1}}/lib/psfontj2d.properties
%{_jvmdir}/%{jredir -- %{?1}}/lib/resources.jar
@@ -997,7 +998,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 1%{?dist}
+Release: 2%{?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
@@ -2084,7 +2085,7 @@ touch -t 201401010000 $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir --
$suffix}/lib/securi
# moving config files to /etc
mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib/security/policy/unlimited/
mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/lib/security/policy/limited/
-for file in lib/security/cacerts lib/security/policy/unlimited/US_export_policy.jar
lib/security/policy/unlimited/local_policy.jar
lib/security/policy/limited/US_export_policy.jar
lib/security/policy/limited/local_policy.jar lib/security/java.policy
lib/security/java.security lib/security/blacklisted.certs lib/logging.properties
lib/calendars.properties lib/security/nss.cfg ; do
+for file in lib/security/cacerts lib/security/policy/unlimited/US_export_policy.jar
lib/security/policy/unlimited/local_policy.jar
lib/security/policy/limited/US_export_policy.jar
lib/security/policy/limited/local_policy.jar lib/security/java.policy
lib/security/java.security lib/security/blacklisted.certs lib/logging.properties
lib/calendars.properties lib/security/nss.cfg lib/net.properties ; do
mv $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/$file
$RPM_BUILD_ROOT/%{etcjavadir -- $suffix}/$file
ln -sf %{etcjavadir -- $suffix}/$file
$RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/$file
done
@@ -2295,6 +2296,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Wed May 15 2019 James Cassell <cyberpear(a)fedoraproject.org> - 1:1.8.0.212.b04-2
+- mark net.properties as a config file
+
* Mon May 13 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-1
- Update patch for RH1566890.
- Renamed
rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639
to
commit ff8c15a8aa2350bf2a3c1933952c30c2d5bf0286
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Mon May 13 04:59:45 2019 +0100
Update patch for RH1566890.
Renamed
rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639
to
rh1566890-CVE_2018_3639-speculative_store_bypass.patch
Added dependent patch,
rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index dc42966..f7e9162 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -997,7 +997,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 0%{?dist}
+Release: 1%{?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
@@ -1108,7 +1108,8 @@ Patch523:
pr2974-rh1337583-add_systemlineendings_option_to_keytool_and_use_line_
# PR3083, RH1346460: Regression in SSL debug output without an ECC provider
Patch528:
pr3083-rh1346460-for_ssl_debug_return_null_instead_of_exception_when_theres_no_ecc_provider.patch
# RH1566890: CVE-2018-3639
-Patch529:
rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
+Patch529: rh1566890-CVE_2018_3639-speculative_store_bypass.patch
+Patch531: rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
# PR3601: Fix additional -Wreturn-type issues introduced by 8061651
Patch530:
pr3601-fix_additional_Wreturn_type_issues_introduced_by_8061651_for_prims_jvm_cpp.patch
# Support for building the SunEC provider with the system NSS installation
@@ -1611,6 +1612,7 @@ sh %{SOURCE12}
%patch523
%patch528
%patch529
+%patch531
%patch530
%patch563
%patch564
@@ -2293,6 +2295,13 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Mon May 13 2019 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:1.8.0.212.b04-1
+- Update patch for RH1566890.
+ - Renamed
rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639
to
+ rh1566890-CVE_2018_3639-speculative_store_bypass.patch
+ - Added dependent patch,
+ rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
+
* Thu Apr 11 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.212.b04-0
- Update to aarch64-shenandoah-jdk8u212-b04.
diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass.patch
b/rh1566890-CVE_2018_3639-speculative_store_bypass.patch
new file mode 100644
index 0000000..d8f3a5a
--- /dev/null
+++ b/rh1566890-CVE_2018_3639-speculative_store_bypass.patch
@@ -0,0 +1,44 @@
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -103,6 +103,8 @@
+ # include <inttypes.h>
+ # include <sys/ioctl.h>
+
++#include <sys/prctl.h>
++
+ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
+
+ #ifndef _GNU_SOURCE
+@@ -4997,6 +4999,31 @@
+ }
+ }
+
++/* Per task speculation control */
++#ifndef PR_GET_SPECULATION_CTRL
++#define PR_GET_SPECULATION_CTRL 52
++#endif
++#ifndef PR_SET_SPECULATION_CTRL
++#define PR_SET_SPECULATION_CTRL 53
++#endif
++/* Speculation control variants */
++# undef PR_SPEC_STORE_BYPASS
++# define PR_SPEC_STORE_BYPASS 0
++/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
++# undef PR_SPEC_NOT_AFFECTED
++# undef PR_SPEC_PRCTL
++# undef PR_SPEC_ENABLE
++# undef PR_SPEC_DISABLE
++# define PR_SPEC_NOT_AFFECTED 0
++# define PR_SPEC_PRCTL (1UL << 0)
++# define PR_SPEC_ENABLE (1UL << 1)
++# define PR_SPEC_DISABLE (1UL << 2)
++
++static void set_speculation() __attribute__((constructor));
++static void set_speculation() {
++ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
++}
++
+ // this is called _before_ most of the global arguments have been parsed
+ void os::init(void) {
+ char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
b/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
new file mode 100644
index 0000000..94ef9d4
--- /dev/null
+++ b/rh1566890-CVE_2018_3639-speculative_store_bypass_toggle.patch
@@ -0,0 +1,54 @@
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -5001,26 +5001,43 @@
+
+ /* Per task speculation control */
+ #ifndef PR_GET_SPECULATION_CTRL
+-#define PR_GET_SPECULATION_CTRL 52
++# define PR_GET_SPECULATION_CTRL 52
+ #endif
+ #ifndef PR_SET_SPECULATION_CTRL
+-#define PR_SET_SPECULATION_CTRL 53
++# define PR_SET_SPECULATION_CTRL 53
+ #endif
+ /* Speculation control variants */
+-# undef PR_SPEC_STORE_BYPASS
++#ifndef PR_SPEC_STORE_BYPASS
+ # define PR_SPEC_STORE_BYPASS 0
++#endif
+ /* Return and control values for PR_SET/GET_SPECULATION_CTRL */
+-# undef PR_SPEC_NOT_AFFECTED
+-# undef PR_SPEC_PRCTL
+-# undef PR_SPEC_ENABLE
+-# undef PR_SPEC_DISABLE
++
++#ifndef PR_SPEC_NOT_AFFECTED
+ # define PR_SPEC_NOT_AFFECTED 0
++#endif
++#ifndef PR_SPEC_PRCTL
+ # define PR_SPEC_PRCTL (1UL << 0)
++#endif
++#ifndef PR_SPEC_ENABLE
+ # define PR_SPEC_ENABLE (1UL << 1)
++#endif
++#ifndef PR_SPEC_DISABLE
+ # define PR_SPEC_DISABLE (1UL << 2)
++#endif
++#ifndef PR_SPEC_FORCE_DISABLE
++# define PR_SPEC_FORCE_DISABLE (1UL << 3)
++#endif
++#ifndef PR_SPEC_DISABLE_NOEXEC
++# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
++#endif
+
+ static void set_speculation() __attribute__((constructor));
+ static void set_speculation() {
++ if ( prctl(PR_SET_SPECULATION_CTRL,
++ PR_SPEC_STORE_BYPASS,
++ PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
++ return;
++ }
+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
+ }
+
diff --git
a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
deleted file mode 100644
index d8f3a5a..0000000
---
a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -103,6 +103,8 @@
- # include <inttypes.h>
- # include <sys/ioctl.h>
-
-+#include <sys/prctl.h>
-+
- PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
-
- #ifndef _GNU_SOURCE
-@@ -4997,6 +4999,31 @@
- }
- }
-
-+/* Per task speculation control */
-+#ifndef PR_GET_SPECULATION_CTRL
-+#define PR_GET_SPECULATION_CTRL 52
-+#endif
-+#ifndef PR_SET_SPECULATION_CTRL
-+#define PR_SET_SPECULATION_CTRL 53
-+#endif
-+/* Speculation control variants */
-+# undef PR_SPEC_STORE_BYPASS
-+# define PR_SPEC_STORE_BYPASS 0
-+/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
-+# undef PR_SPEC_NOT_AFFECTED
-+# undef PR_SPEC_PRCTL
-+# undef PR_SPEC_ENABLE
-+# undef PR_SPEC_DISABLE
-+# define PR_SPEC_NOT_AFFECTED 0
-+# define PR_SPEC_PRCTL (1UL << 0)
-+# define PR_SPEC_ENABLE (1UL << 1)
-+# define PR_SPEC_DISABLE (1UL << 2)
-+
-+static void set_speculation() __attribute__((constructor));
-+static void set_speculation() {
-+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
-+}
-+
- // this is called _before_ most of the global arguments have been parsed
- void os::init(void) {
- char dummy; /* used to get a guess on initial stack address */