Signed-off-by: Jens Rehsack <s...@netbsd.org> --- ..._than_returning_address_of_local_variable.patch | 23 ++++++++++++++++++++++ recipes-core/openjdk/openjdk-8_72b00.bb | 14 ++++++------- recipes-core/openjdk/openjre-8_72b00.bb | 14 ++++++------- 3 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-8-72b00/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch
diff --git a/recipes-core/openjdk/openjdk-8-72b00/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch b/recipes-core/openjdk/openjdk-8-72b00/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch new file mode 100644 index 0000000..9e1d204 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-72b00/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch @@ -0,0 +1,23 @@ +# HG changeset patch +# User sgehwolf +# Date 1434121785 -3600 +# Node ID 6217fd2c767b467641bf7b41a9c37273e8fa0cbd +# Parent ff0929a59ced0e144201aa05819ae2e47d6f2c61 +8087120: [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 ff0929a59ced -r 6217fd2c767b src/os_cpu/linux_zero/vm/os_linux_zero.cpp +--- hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.orig Thu Jun 11 20:19:26 2015 -0700 ++++ hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Fri Jun 12 16:09:45 2015 +0100 +@@ -59,8 +59,8 @@ + extern sigjmp_buf* get_jmp_buf_for_continuation(); + + 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) { diff --git a/recipes-core/openjdk/openjdk-8_72b00.bb b/recipes-core/openjdk/openjdk-8_72b00.bb index c6d17df..62e3190 100644 --- a/recipes-core/openjdk/openjdk-8_72b00.bb +++ b/recipes-core/openjdk/openjdk-8_72b00.bb @@ -1,18 +1,16 @@ require openjdk-8-release-72b00.inc require openjdk-8-cross.inc +# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch +# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html +# by Roman Kennke (rkennke at redhat.com) PATCHES_URI_append = "\ file://openjdk8-restrict-to-staging-dir.patch;apply=no \ + file://openjdk8-fix-shark-build.patch;apply=no \ + file://openjdk8-fix-shark-stdc++11.patch;apply=no \ + file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \ " -# patch extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch -# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html -# by Roman Kennke (rkennke at redhat.com) -PATCHES_URI_append_arm = " file://openjdk8-fix-shark-build.patch;apply=no " -PATCHES_URI_append_arm = " file://openjdk8-fix-shark-stdc++11.patch;apply=no " -PATCHES_URI_append_mips = " file://openjdk8-fix-shark-build.patch;apply=no " -PATCHES_URI_append_mips = " file://openjdk8-fix-shark-stdc++11.patch;apply=no " - do_install() { do_install_jdk } diff --git a/recipes-core/openjdk/openjre-8_72b00.bb b/recipes-core/openjdk/openjre-8_72b00.bb index 3decc0c..78e9a0d 100644 --- a/recipes-core/openjdk/openjre-8_72b00.bb +++ b/recipes-core/openjdk/openjre-8_72b00.bb @@ -1,18 +1,16 @@ require openjdk-8-release-72b00.inc require openjdk-8-cross.inc +# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch +# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html +# by Roman Kennke (rkennke at redhat.com) PATCHES_URI_append = "\ file://openjdk8-restrict-to-staging-dir.patch;apply=no \ + file://openjdk8-fix-shark-build.patch;apply=no \ + file://openjdk8-fix-shark-stdc++11.patch;apply=no \ + file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \ " -# patch extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch -# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html -# by Roman Kennke (rkennke at redhat.com) -PATCHES_URI_append_arm = " file://openjdk8-fix-shark-build.patch;apply=no " -PATCHES_URI_append_arm = " file://openjdk8-fix-shark-stdc++11.patch;apply=no " -PATCHES_URI_append_mips = " file://openjdk8-fix-shark-build.patch;apply=no " -PATCHES_URI_append_mips = " file://openjdk8-fix-shark-stdc++11.patch;apply=no " - do_install() { do_install_jre } -- 1.9.1 -- Jens Rehsack - rehs...@gmail.com -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto