extra/java8-openjdk: zero fix

extra/java8-openjdk/PKGBUILD

@@ -11,6 +11,7 @@
 #  - add arm to _JARCH and _DOC_ARCH
 #  - configure with --with-jvm-variants=zero
 #  - adjust doc package to use linux-${_DOC_ARCH}-normal-zero-release instead of normal-server-release
+#  - patch for zero
 
 pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc')
 pkgbase=java8-openjdk
@@ -34,7 +35,8 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
         jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
         jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
         langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
-        nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
+        nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
+        zero-interpreter-fix.patch)
 
 sha256sums=('1fc7ca0e760af9bab0620049d2e21cde557961101949e54ea74736872295bdde'
             '1363462eff9fa2550c803e823695a3f4086380b106dfcff78c456f10c42beb3e'
@@ -43,7 +45,8 @@ sha256sums=('1fc7ca0e760af9bab0620049d2e21cde557961101949e54ea74736872295bdde'
             '6de0d99d6685761c064814855d1e3401e48aadb830a7c68d03b13f0a41e0e950'
             'ad83699c97dec550c532eaf98a8bc049c8fbf80d7211057e76a3c86e5fcc3c0f'
             '2fb4444e00ef3d4fe2b9f8f5c4a8618e1fb0f58704c6c07246bafd43f39b41d1'
-            '39113708d318c070326b5d4543f1bd499bf7e77012f08b67ba0d0313730935ff')
+            '39113708d318c070326b5d4543f1bd499bf7e77012f08b67ba0d0313730935ff'
+            'ed2968406c6b05e7438a0ed7cb2b6041ddce369cbcedff11fd7563c8350e0e67')
 
 case "${CARCH}" in
   'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -67,6 +70,9 @@ prepare() {
   do
     ln -s ../${subrepo}-${_repo_ver} ${subrepo}
   done
+
+  cd ../hotspot-${_repo_ver}
+  patch -p2 -i ../zero-interpreter-fix.patch
 }
 
 build() {

extra/java8-openjdk/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@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
+