--- a/ChangeLog	Tue Jul 21 21:15:30 2015 +0100
+++ b/ChangeLog	Tue Jul 21 22:15:21 2015 +0100
@@ -1,3 +1,15 @@
+2015-07-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	S8087120, RH1206656, PR2553: [GCC5]
+	java.lang.StackOverflowError on Zero
+	JVM initialization on non x86 platforms.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add PR2553.
+	* NEWS: Updated.
+	* patches/pr2553.patch:
+	Patch for PR2553 for the default
+	HotSpot build.
+
 2015-07-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* NEWS: Updated.

--- a/Makefile.am	Tue Jul 21 21:15:30 2015 +0100
+++ b/Makefile.am	Tue Jul 21 22:15:21 2015 +0100
@@ -293,6 +293,10 @@
 ICEDTEA_PATCHES += patches/rh1022017.patch
 endif
 
+if !WITH_ALT_HSBUILD
+ICEDTEA_PATCHES += patches/pr2553.patch
+endif
+
 ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
 
 # Bootstrapping patches

--- a/NEWS	Tue Jul 21 21:15:30 2015 +0100
+++ b/NEWS	Tue Jul 21 22:15:21 2015 +0100
@@ -92,6 +92,7 @@
   - S8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies
   - S8081475, PR2494: SystemTap does not work when JDK is compiled with GCC 5
   - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12
+  - S8087120, RH1206656, PR2553: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
   - OJ03: Only apply PaX-marking when needed by a running PaX kernel
   - OJ04: Revert introduction of lambda expression in sun.lwawt.macosx.LWCToolkit
   - OJ05: Fix mistake in 8075374 backport
@@ -132,7 +133,6 @@
   - S8079203: AARCH64: Need to cater for different partner implementations
   - S8080586: aarch64: hotspot test compiler/codegen/7184394/TestAESMain.java fails
   - S8081622: Increment the build value to b03 for hs24.85 in 8u51
-  - S8087120, RH1206656, PR2553: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
 * PPC & AIX port
   - S8069590: AIX port of "8050807: Better performing performance data handling"
   - S8078482, PR2307: ppc: pass thread to throw_AbstractMethodError

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr2553.patch	Tue Jul 21 22:15:21 2015 +0100
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1434121785 -3600
+#      Fri Jun 12 16:09:45 2015 +0100
+# Node ID b19bc5aeaa099ac73ee8341e337a007180409593
+# Parent  4ce44f68d86dcf88b27142e5ec031dec29d47d6f
+8087120, RH1206656, PR2553: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
+Summary: Use __builtin_frame_address(0) rather than returning address of local variable.
+Reviewed-by: dholmes
+
+diff -r 4ce44f68d86d -r b19bc5aeaa09 src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Sun Jul 19 18:19:32 2015 +0100
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Fri Jun 12 16:09:45 2015 +0100
+@@ -61,8 +61,8 @@
+ #endif
+ 
+ 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) {