summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-core/icedtea/icedtea7-native.inc2
-rw-r--r--recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch60
2 files changed, 62 insertions, 0 deletions
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index 55cb7e7..7d625eb 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -43,6 +43,7 @@ SRC_URI = " \
43 file://jaxws_fix_NullPointerException.patch;apply=no \ 43 file://jaxws_fix_NullPointerException.patch;apply=no \
44 file://timezoneszip.patch \ 44 file://timezoneszip.patch \
45 file://sigsegv.patch;apply=no \ 45 file://sigsegv.patch;apply=no \
46 file://vframeArray_Fix_sigsegv.patch;apply=no \
46 " 47 "
47 48
48S = "${WORKDIR}/${ICEDTEA}" 49S = "${WORKDIR}/${ICEDTEA}"
@@ -154,6 +155,7 @@ do_configure_append() {
154 155
155 patch -p1 < ${WORKDIR}/jaxws_fix_NullPointerException.patch 156 patch -p1 < ${WORKDIR}/jaxws_fix_NullPointerException.patch
156 patch -p1 < ${WORKDIR}/sigsegv.patch 157 patch -p1 < ${WORKDIR}/sigsegv.patch
158 patch -p1 < ${WORKDIR}/vframeArray_Fix_sigsegv.patch
157} 159}
158 160
159EXTRA_OEMAKE = ' \ 161EXTRA_OEMAKE = ' \
diff --git a/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch b/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
new file mode 100644
index 0000000..68653e4
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/vframeArray_Fix_sigsegv.patch
@@ -0,0 +1,60 @@
1Disable Optimization on vframeArray::unpack_to_stack
2
3GCC7 triggers a sigsegv while building:
4
5
6| JAVA_HOME=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0 ANT_OPTS=-Djava.io.tmpdir='/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk.build/langtools/build/ant-tmp' /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/recipe-sysroot-native/usr/bin/ant -Djdk.version=1.7.0_03 -Dfull.version='1.7.0_03-icedtea-b21' -Drelease=1.7.0_03 -Dbuild.number=b21 -Djavac.debug=true -Ddebug.classfiles=true -Djavac.target=7 -Djavac.source=7 -Dboot.java.home=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/bootstrap/jdk1.6.0 -Dimport.jdk=/home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/jdk ....
7| Buildfile: /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make/build.xml
8| #
9| # A fatal error has been detected by the Java Runtime Environment:
10| #
11| # SIGSEGV (0xb) at pc=0x00007fad7906e868, pid=9747, tid=140383055484672
12| #
13| # JRE version: 7.0_03-b21
14| # Java VM: OpenJDK 64-Bit Server VM (22.0-b10 mixed mode linux-amd64 compressed oops)
15| # Derivative: IcedTea7 2.1.3
16| # Distribution: Custom build (Thu Sep 7 09:36:21 CEST 2017)
17| # Problematic frame:
18| # V [libjvm.so+0x78b868] vframeArray::unpack_to_stack(frame&, int, int)+0x88
19| #
20| # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again
21| #
22| # An error report file with more information is saved as:
23| # /home/ricardo/curro/qt5022/build-qt5022-pyro/build/tmp/work/x86_64-linux/icedtea7-native/2.1.3-r1.0/icedtea-2.1.3/build/openjdk/langtools/make/hs_err_pid9747.log
24| #
25| # If you would like to submit a bug report, please include
26| # instructions on how to reproduce the bug and visit:
27| # http://icedtea.classpath.org/bugzilla
28| #
29| Aborted
30
31
32Upstream-Status: Inappropriate
33
34Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
35diff --git a/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp b/build/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
36index 52b080999224..81b6a09ea91a 100644
37--- a/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
38+++ b/openjdk-boot/hotspot/src/share/vm/runtime/vframeArray.cpp
39@@ -500,7 +500,7 @@ void vframeArray::fill_in(JavaThread* thread,
40 }
41 }
42
43-void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller_actual_parameters) {
44+void __attribute__((optimize("O0"))) vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller_actual_parameters) {
45 // stack picture
46 // unpack_frame
47 // [new interpreter frames ] (frames are skeletal but walkable)
48diff --git a/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp b/build/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
49index 52b080999224..81b6a09ea91a 100644
50--- a/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
51+++ b/openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
52@@ -500,7 +500,7 @@ void vframeArray::fill_in(JavaThread* thread,
53 }
54 }
55
56-void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller_actual_parameters) {
57+void __attribute__((optimize("O0"))) vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller_actual_parameters) {
58 // stack picture
59 // unpack_frame
60 // [new interpreter frames ] (frames are skeletal but walkable)