/hg/release/icedtea7-forest-2.6/hotspot: 2 new changesets

[andrew at icedtea.classpath.org]

changeset b19bc5aeaa09 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=b19bc5aeaa09
author: sgehwolf
date: Fri Jun 12 16:09:45 2015 +0100

	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


changeset 34fb456c0018 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=34fb456c0018
author: andrew
date: Tue Jul 21 11:22:58 2015 +0100

	Added tag icedtea-2.6.1 for changeset b19bc5aeaa09


diffstat:

 .hgtags                                    |  1 +
 src/os_cpu/linux_zero/vm/os_linux_zero.cpp |  4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r 4ce44f68d86d -r 34fb456c0018 .hgtags
--- a/.hgtags	Sun Jul 19 18:19:32 2015 +0100
+++ b/.hgtags	Tue Jul 21 11:22:58 2015 +0100
@@ -875,3 +875,4 @@
 501fc984fa3b3d51e1a7f1220f2de635a2b370b9 jdk7u85-b00
 3f1b4a1fe4a274cd1f89d9ec83d8018f7f4b7d01 jdk7u85-b01
 94f15794d5e7847a60540eacbe3e276dbe127a1a icedtea-2.6-branchpoint
+b19bc5aeaa099ac73ee8341e337a007180409593 icedtea-2.6.1
diff -r 4ce44f68d86d -r 34fb456c0018 src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Sun Jul 19 18:19:32 2015 +0100
+++ b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Tue Jul 21 11:22:58 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) {