From ff717f0bffe513a0b4ec4ffa83a807fb7697f8b862301d384ae09fbd5bfb6682 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 17 Apr 2015 05:38:19 +0000 Subject: [PATCH] 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 #