Unbreak arm.

- Remove armv6hf because it is default now.
- Merge a HotSpot fix from src/os_cpu/linux_zero/vm/os_linux_zero.cpp.
http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c6ef40024aa2
- Add an upstream patch to unbreak Zero.
http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/8f58998958ca
- Extend PR209599 to cover arm platforms.

3 files changed, 56 insertions, 3 deletions

diff --git a/java/openjdk8/files/patch-hotspot_src_cpu_zero_vm_cppInterpreter__zero.cpp b/java/openjdk8/files/patch-hotspot_src_cpu_zero_vm_cppInterpreter__zero.cpp
new file mode 100644
index 000000000000..90749da16631
--- /dev/null
+++ b/java/openjdk8/files/patch-hotspot_src_cpu_zero_vm_cppInterpreter__zero.cpp
@@ -0,0 +1,21 @@
+--- hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Mon Apr 25 21:03:53 2016 +0000
++++ hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Tue Apr 26 02:49:59 2016 +0100
+@@ -220,9 +220,16 @@
+   // Push our result
+   for (int i = 0; i < result_slots; i++) {
+     // Adjust result to smaller
+-    intptr_t res = result[-i];
++    union {
++      intptr_t res;
++      jint res_jint;
++    };
++    res = result[-i];
+     if (result_slots == 1) {
+-      res = narrow(method->result_type(), res);
++      BasicType t = method->result_type();
++      if (is_subword_type(t)) {
++        res_jint = (jint)narrow(t, res_jint);
++      }
+     }
+     stack->push(res);
+   }
diff --git a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp
index 7c5a24426637..713d5c13c630 100644
--- a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp
+++ b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp
@@ -1,7 +1,25 @@
-clang objects to redefining builtins.
-
---- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig	2015-06-03 15:48:43 UTC
+--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig	2014-03-04 02:52:15 UTC
 +++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+@@ -60,8 +60,8 @@
+ #include "utilities/vmError.hpp"
+ 
+ address os::current_stack_pointer() {
+-  address dummy = (address) &dummy;
+-  return dummy;
++  // return the address of the current function
++  return (address)__builtin_frame_address(0);
+ }
+ 
+ frame os::get_sender_for_C_frame(frame* fr) {
+@@ -189,7 +189,7 @@
+       ShouldNotCallThis();
+     }
+     else*/ if (thread->thread_state() == _thread_in_vm &&
+-               sig == SIGBUS && thread->doing_unsafe_access()) {
++               (sig == SIGSEGV || sig == SIGBUS) && thread->doing_unsafe_access()) {
+       ShouldNotCallThis();
+     }
+ 
 @@ -446,21 +446,6 @@ extern "C" {
    }
  };
diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp
new file mode 100644
index 000000000000..db6cd4de4eaa
--- /dev/null
+++ b/java/openjdk8/files/patch-hotspot_src_share_vm_interpreter_bytecodeInterpreter.cpp
@@ -0,0 +1,14 @@
+--- hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Mon Apr 25 21:03:53 2016 +0000
++++ hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Tue Apr 26 02:49:59 2016 +0100
+@@ -593,8 +593,9 @@
+ /* 0xDC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ 
+ /* 0xE0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+-/* 0xE4 */ &&opc_default,     &&opc_fast_aldc,      &&opc_fast_aldc_w,  &&opc_return_register_finalizer,
+-/* 0xE8 */ &&opc_invokehandle,&&opc_default,        &&opc_default,      &&opc_default,
++/* 0xE4 */ &&opc_default,     &&opc_default,        &&opc_fast_aldc,    &&opc_fast_aldc_w,
++/* 0xE8 */ &&opc_return_register_finalizer,
++                              &&opc_invokehandle,   &&opc_default,      &&opc_default,
+ /* 0xEC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
+ 
+ /* 0xF0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,