summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_v...
diff options
context:
space:
mode:
authorErkka Kääriä <erkka.kaaria@intel.com>2016-08-09 10:32:17 +0300
committerMaxin B. John <maxin.john@intel.com>2016-08-24 13:49:01 +0300
commit0eeeb059751c00042bd0341d17f5cceddef3c502 (patch)
treed3e337cca462ec96e6ee3730b611565c755db983 /recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch
parent0d58a4fb4236edeeeb3f23a66c0c14279066c8bb (diff)
downloadmeta-java-0eeeb059751c00042bd0341d17f5cceddef3c502.tar.gz
openjdk-8: Upgrade from u72 to u102
Openjdk is upgraded from u72 to u102. Two patches are dropped, as these were backports and the fixes are present in the current version. One patch was refreshed. One patch was backported from the upcoming u112 to fix a zero mode crash. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch
deleted file mode 100644
index f3dc864..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1# HG changeset patch
2# User sgehwolf
3# Date 1434121785 -3600
4# Node ID 6217fd2c767b467641bf7b41a9c37273e8fa0cbd
5# Parent ff0929a59ced0e144201aa05819ae2e47d6f2c61
68087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
7Summary: Use __builtin_frame_address(0) rather than returning address of local variable.
8Reviewed-by: dholmes
9
10diff -r ff0929a59ced -r 6217fd2c767b src/os_cpu/linux_zero/vm/os_linux_zero.cpp
11--- hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.orig Thu Jun 11 20:19:26 2015 -0700
12+++ hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Fri Jun 12 16:09:45 2015 +0100
13@@ -59,8 +59,8 @@
14 extern sigjmp_buf* get_jmp_buf_for_continuation();
15
16 address os::current_stack_pointer() {
17- address dummy = (address) &dummy;
18- return dummy;
19+ // return the address of the current function
20+ return (address)__builtin_frame_address(0);
21 }
22
23 frame os::get_sender_for_C_frame(frame* fr) {