[java-1.8.0-openjdk] Fix zero interpreter
Omair Majid
omajid at fedoraproject.org
Fri Feb 20 20:35:14 UTC 2015
commit 076fbbddc576dc3286a1e0c1aa336b3afe4f35c5
Author: Omair Majid <omajid at redhat.com>
Date: Fri Feb 20 15:34:10 2015 -0500
Fix zero interpreter
java-1.8.0-openjdk.spec | 7 +++++++
zero-interpreter-fix.patch | 25 +++++++++++++++++++++++++
2 files changed, 32 insertions(+)
---
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index a017c7f..1aa3aec 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -719,6 +719,7 @@ Patch102: %{name}-size_t.patch
Patch201: system-libjpeg.patch
Patch202: system-libpng.patch
Patch203: system-lcms.patch
+Patch204: zero-interpreter-fix.patch
Patch300: jstack-pr1845.patch
@@ -986,6 +987,9 @@ sh %{SOURCE12}
%patch201
%patch202
%patch203
+%ifnarch %{aarch64}
+%patch204
+%endif
%patch1
%patch3
@@ -1689,6 +1693,9 @@ end
%changelog
+* Fri Feb 20 2015 Omair Majid <omajid at redhat.com> - 1:1.8.0.40-21.b25
+- Fix zero interpreter build.
+
* Thu Feb 12 2015 Omair Majid <omajid at redhat.com> - 1:1.8.0.40-21.b25
- Fix building with gcc 5 by ignoring return-local-addr warning
- Include additional debugging info for java class files and test that they are
diff --git a/zero-interpreter-fix.patch b/zero-interpreter-fix.patch
new file mode 100644
index 0000000..8fdbd90
--- /dev/null
+++ b/zero-interpreter-fix.patch
@@ -0,0 +1,25 @@
+# HG changeset patch
+# User roland
+# Date 1418632606 -3600
+# Node ID a733dad6fc1e2572ed227e898da35e0053cbb7c5
+# Parent db035d4ba1bd25ac8803bb2d177cb35681eb6907
+8067231: Zero builds fails after JDK-6898462
+Summary: Interpreter::remove_activation_entry() is not defined for the C++ interpreter
+Reviewed-by: roland, coleenp
+Contributed-by: Severin Gehwolf <sgehwolf at redhat.com>
+
+--- 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
+
More information about the scm-commits
mailing list