Accepting request 312522 from Java:Factory

- Use priority matching to ibm-java, always 5 bigger than it

- Added patch:
  * zero-dummy.patch
    - Fix crash of ZERO VM built with gcc5

OBS-URL: https://build.opensuse.org/request/show/312522
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openjdk?expand=0&rev=31

java-1_8_0-openjdk.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jun 18 13:38:54 UTC 2015 - tchvatal@suse.com
+
+- Use priority matching to ibm-java, always 5 bigger than it
+
+-------------------------------------------------------------------
+Wed Jun 10 08:10:23 UTC 2015 - fstrba@suse.com
+
+- Added patch:
+  * zero-dummy.patch
+    - Fix crash of ZERO VM built with gcc5
+
 -------------------------------------------------------------------
 Fri Jun  5 12:58:27 UTC 2015 - fstrba@suse.com
 

java-1_8_0-openjdk.spec

@@ -46,7 +46,7 @@
 %global aarch64_hotspot_revision 70d4f640f931
 %global icedtea_sound_version 1.0.1
 # priority must be 6 digits in total
-%global priority        180%{updatever}
+%global priority        1805
 %global javaver         1.8.0
 # Standard JPackage directories and symbolic links.
 %global sdklnk          java-%{javaver}-openjdk
@@ -225,6 +225,8 @@ Patch13:        implicit-pointer-decl.patch
 Patch14:        zero-javadoc-verbose.patch
 # Fix to build the C++ interpreter that does not have Interpreter::remove_activation_entry
 Patch15:        cplusplus-interpreter.patch
+# Fix crash on zero virtual machine built with gcc5
+Patch16:        zero-dummy.patch
 #
 # OpenJDK specific patches
 #
@@ -519,6 +521,7 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 
 %if %{with zero}
 %patch14 -p1
+%patch16 -p1
 %endif
 
 %ifnarch %aarch64

zero-dummy.patch

@@ -0,0 +1,13 @@
+--- jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2015-06-10 10:06:49.485230587 +0200
++++ jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2015-06-10 10:07:33.645229254 +0200
+@@ -55,8 +55,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) {