aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErkka Kääriä <erkka.kaaria@intel.com>2015-10-21 12:41:49 +0300
committerMaxin B. John <maxin.john@intel.com>2015-10-23 10:51:06 +0300
commitd7d4f64a32d26fc8a92e4c89b47c78956f20a14d (patch)
tree8bc220c18d8d91d28be2e4b1bdd783c8992dd21d
parent38f4c1365c11c0c369e297ec53591439be589fb0 (diff)
downloadmeta-java-d7d4f64a32d26fc8a92e4c89b47c78956f20a14d.tar.gz
meta-java-d7d4f64a32d26fc8a92e4c89b47c78956f20a14d.tar.bz2
meta-java-d7d4f64a32d26fc8a92e4c89b47c78956f20a14d.zip
cacao-initial-native: Fix undefined behaviour in gc
Upstream-Status: Backport Fixes undefined behaviour in boehm GC used by cacao-initial-native as suggested at https://github.com/ivmai/bdwgc/commit/16780405c899f01119bc45167122b4242f6b34fb. The undefined behaviour at very least causes a segmentation fault during classpath-native configure step with Fedora 22. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
-rw-r--r--recipes-core/cacao/cacao-initial-native_0.98.bb1
-rw-r--r--recipes-core/cacao/files/cacao-0.9.8-initial-fix-gc-undefined-behaviour.patch35
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-core/cacao/cacao-initial-native_0.98.bb b/recipes-core/cacao/cacao-initial-native_0.98.bb
index ec7fbdb..2a8ced5 100644
--- a/recipes-core/cacao/cacao-initial-native_0.98.bb
+++ b/recipes-core/cacao/cacao-initial-native_0.98.bb
@@ -14,6 +14,7 @@ SRC_URI = "\
http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2; \
file://cacao-0.98-initial.patch \
file://disable_hw_exceptions.patch \
+ file://cacao-0.9.8-initial-fix-gc-undefined-behaviour.patch \
"
# libjvm disabled - it would conflict with cacao-native installations
diff --git a/recipes-core/cacao/files/cacao-0.9.8-initial-fix-gc-undefined-behaviour.patch b/recipes-core/cacao/files/cacao-0.9.8-initial-fix-gc-undefined-behaviour.patch
new file mode 100644
index 0000000..ccc35cb
--- /dev/null
+++ b/recipes-core/cacao/files/cacao-0.9.8-initial-fix-gc-undefined-behaviour.patch
@@ -0,0 +1,35 @@
+Upstream-Status: Backport
+
+This fixes undefined behaviour in boehm GC as suggested at
+https://github.com/ivmai/bdwgc/commit/16780405c899f01119bc45167122b4242f6b34fb.
+
+The undefined behaviour at very least causes a segmentation fault during
+classpath-native configure step.
+
+Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com>
+
+--- cacao-0.98/src/mm/boehm-gc/mark_rts.c
++++ cacao-0.98/src/mm/boehm-gc/mark_rts.c
+@@ -371,18 +371,7 @@ ptr_t p;
+
+ ptr_t GC_approx_sp()
+ {
+- VOLATILE word dummy;
+-
+- dummy = 42; /* Force stack to grow if necessary. Otherwise the */
+- /* later accesses might cause the kernel to think we're */
+- /* doing something wrong. */
+-# ifdef _MSC_VER
+-# pragma warning(disable:4172)
+-# endif
+- return((ptr_t)(&dummy));
+-# ifdef _MSC_VER
+-# pragma warning(default:4172)
+-# endif
++ return __builtin_frame_address(0);
+ }
+
+ /*
+--
+2.1.4
+