build fix for jdk-zero-vm option

1 files changed, 21 insertions, 0 deletions

diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_interpreter_interpreterRuntime.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_interpreter_interpreterRuntime.cpp
new file mode 100644
index 00000000000..808096515e5
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_interpreter_interpreterRuntime.cpp
@@ -0,0 +1,21 @@
+$NetBSD: patch-hotspot_src_share_vm_interpreter_interpreterRuntime.cpp,v 1.1 2015/06/13 23:57:25 tnn Exp $
+
+Fix build with jdk-zero-vm option:
+
+interpreterRuntime.cpp:412:25: error: no member named 'remove_activation_entry' in 'Interpreter'
+    return Interpreter::remove_activation_entry();
+
+--- hotspot/src/share/vm/interpreter/interpreterRuntime.cpp.orig	2015-06-10 10:31:51.000000000 +0000
++++ hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
+@@ -407,7 +407,11 @@ IRT_ENTRY(address, InterpreterRuntime::e
+     // 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