From 7a59c1370839b6e30b72392791ea1bb262d088f07a9480faa8d3aaf842bd81cc Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 Apr 2015 15:49:59 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=81 --- 70d4f640f931.tar.bz2 | 3 +++ a747c1771e54.tar.bz2 | 3 --- java-1_8_0-openjdk.changes | 6 ++++++ java-1_8_0-openjdk.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 70d4f640f931.tar.bz2 delete mode 100644 a747c1771e54.tar.bz2 diff --git a/70d4f640f931.tar.bz2 b/70d4f640f931.tar.bz2 new file mode 100644 index 0000000..a44fc45 --- /dev/null +++ b/70d4f640f931.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd5ae53ff1c3a99804bb11441e545c1fac457b9d60b5d92a53ad33bf90b23f87 +size 8054853 diff --git a/a747c1771e54.tar.bz2 b/a747c1771e54.tar.bz2 deleted file mode 100644 index 1a7f4c6..0000000 --- a/a747c1771e54.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a52d50dcede642af7e2d65b8535a808b92b15c45c37d7cffb25ed8b1b0552bc8 -size 8055069 diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 9e86938..6b2a84e 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 16 15:47:54 UTC 2015 - fstrba@suse.com + +- Update the aarch64 tarball to the recent tip + * The revision has merged changes up to jdk8u45-b14 + ------------------------------------------------------------------- Wed Apr 15 08:27:37 UTC 2015 - fstrba@suse.com diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index b7fe21a..4cd29aa 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -43,7 +43,7 @@ %global nashorn_revision d5477c6d1678 %global aarch64_project aarch64-port %global aarch64_repository jdk8 -%global aarch64_hotspot_revision a747c1771e54 +%global aarch64_hotspot_revision 70d4f640f931 %global icedtea_sound_version 1.0.1 # priority must be 6 digits in total %global priority 180%{updatever} From 0484d1501d519773e4f44ed8935121093c1d079ca2941a47396c19c5bff61219 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 Apr 2015 22:03:15 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=82 --- cplusplus-interpreter.patch | 15 --------------- java-1_8_0-openjdk.changes | 2 ++ java-1_8_0-openjdk.spec | 4 ---- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 cplusplus-interpreter.patch diff --git a/cplusplus-interpreter.patch b/cplusplus-interpreter.patch deleted file mode 100644 index 4fba05f..0000000 --- a/cplusplus-interpreter.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Sat Dec 13 01:24:10 2014 +0300 -+++ jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Mon Dec 15 09:36:46 2014 +0100 -@@ -394,7 +394,11 @@ - // during deoptimization so the interpreter needs to skip it when - // the frame is popped. - thread->set_do_not_unlock_if_synchronized(true); -+#ifdef CC_INTERP -+ return (address) -1; -+#else - return Interpreter::remove_activation_entry(); -+#endif - } - - // Need to do this check first since when _do_not_unlock_if_synchronized - diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 6b2a84e..2dc00a3 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -3,6 +3,8 @@ Thu Apr 16 15:47:54 UTC 2015 - fstrba@suse.com - Update the aarch64 tarball to the recent tip * The revision has merged changes up to jdk8u45-b14 +- Remove upstreamed patch: + * cplusplus-interpreter.patch ------------------------------------------------------------------- Wed Apr 15 08:27:37 UTC 2015 - fstrba@suse.com diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index 4cd29aa..547b777 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -221,8 +221,6 @@ Patch12: adlc-parser.patch Patch13: implicit-pointer-decl.patch # Avoid triggering inactivity timeout while generating javadoc in zero VM Patch14: zero-javadoc-verbose.patch -# Fix to build the C++ interpreter that does not have Interpreter::remove_activation_entry -Patch15: cplusplus-interpreter.patch # # OpenJDK specific patches # @@ -514,8 +512,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2* %patch14 -p1 %endif -%patch15 -p1 - %patch99 -p1 # s390 build fixes From ff717f0bffe513a0b4ec4ffa83a807fb7697f8b862301d384ae09fbd5bfb6682 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 17 Apr 2015 05:38:19 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=83 --- cplusplus-interpreter.patch | 15 +++++++++++++++ java-1_8_0-openjdk.changes | 2 -- java-1_8_0-openjdk.spec | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 cplusplus-interpreter.patch diff --git a/cplusplus-interpreter.patch b/cplusplus-interpreter.patch new file mode 100644 index 0000000..4fba05f --- /dev/null +++ b/cplusplus-interpreter.patch @@ -0,0 +1,15 @@ +--- jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Sat Dec 13 01:24:10 2014 +0300 ++++ jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Mon Dec 15 09:36:46 2014 +0100 +@@ -394,7 +394,11 @@ + // during deoptimization so the interpreter needs to skip it when + // the frame is popped. + thread->set_do_not_unlock_if_synchronized(true); ++#ifdef CC_INTERP ++ return (address) -1; ++#else + return Interpreter::remove_activation_entry(); ++#endif + } + + // Need to do this check first since when _do_not_unlock_if_synchronized + diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 2dc00a3..6b2a84e 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -3,8 +3,6 @@ Thu Apr 16 15:47:54 UTC 2015 - fstrba@suse.com - Update the aarch64 tarball to the recent tip * The revision has merged changes up to jdk8u45-b14 -- Remove upstreamed patch: - * cplusplus-interpreter.patch ------------------------------------------------------------------- Wed Apr 15 08:27:37 UTC 2015 - fstrba@suse.com diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index 547b777..7e26984 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -221,6 +221,8 @@ Patch12: adlc-parser.patch Patch13: implicit-pointer-decl.patch # Avoid triggering inactivity timeout while generating javadoc in zero VM Patch14: zero-javadoc-verbose.patch +# Fix to build the C++ interpreter that does not have Interpreter::remove_activation_entry +Patch15: cplusplus-interpreter.patch # # OpenJDK specific patches # From 7968eb93ef73870f1560f13774275aa15fd1fbdbf03d4ebb7cff07a891ea351e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 17 Apr 2015 05:44:30 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=84 --- java-1_8_0-openjdk.changes | 2 ++ java-1_8_0-openjdk.spec | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 6b2a84e..a2f6211 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -3,6 +3,8 @@ Thu Apr 16 15:47:54 UTC 2015 - fstrba@suse.com - Update the aarch64 tarball to the recent tip * The revision has merged changes up to jdk8u45-b14 +- Apply cplusplus-interpreter.patch to the default hotspot tarball + only (aarch64 tarball has the patch integrated) ------------------------------------------------------------------- Wed Apr 15 08:27:37 UTC 2015 - fstrba@suse.com diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index 7e26984..7b96258 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -514,6 +514,10 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2* %patch14 -p1 %endif +%ifnarch %aarch64 +%patch15 -p1 +%endif + %patch99 -p1 # s390 build fixes