Attempting to fix upstream bug from: https://bugzilla.xamarin.com/show_bug.cgi?id=44918
Signed-off-by: Barry Grussling <ba...@grussling.com> --- .../ARM-Disable-fast-tls-on-embedded-mono.patch | 30 ++++++++++++++++++++++ recipes-mono/mono/mono_4.6.1.5.bb | 3 +++ 2 files changed, 33 insertions(+) create mode 100644 recipes-mono/mono/mono-4.6.1.5/ARM-Disable-fast-tls-on-embedded-mono.patch diff --git a/recipes-mono/mono/mono-4.6.1.5/ARM-Disable-fast-tls-on-embedded-mono.patch b/recipes-mono/mono/mono-4.6.1.5/ARM-Disable-fast-tls-on-embedded-mono.patch new file mode 100644 index 0000000..416abad --- /dev/null +++ b/recipes-mono/mono/mono-4.6.1.5/ARM-Disable-fast-tls-on-embedded-mono.patch @@ -0,0 +1,30 @@ +Temporary patch from https://github.com/BrzVlad/mono/commit/831e66655e7465023109333fca31d036c7b9a514 +for https://bugzilla.xamarin.com/show_bug.cgi?id=44918. Should make it +into upstream soon: + +From 831e66655e7465023109333fca31d036c7b9a514 Mon Sep 17 00:00:00 2001 +From: Vlad Brezae <brezaev...@gmail.com> +Date: Thu, 13 Oct 2016 00:18:46 +0300 +Subject: [PATCH] [arm] Disable fast tls on embedded mono with __thread + +We don't have MONO_THREAD_VAR_OFFSET on embedded mono. +--- + mono/mini/mini-arm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c +index 2eac369..86757ac 100644 +--- a/mono/mini/mini-arm.c ++++ b/mono/mini/mini-arm.c +@@ -31,7 +31,7 @@ + #include "mini-gc.h" + #include "mono/arch/arm/arm-vfp-codegen.h" + +-#if (defined(HAVE_KW_THREAD) && defined(__linux__) && defined(__ARM_EABI__)) \ ++#if (defined(HAVE_KW_THREAD) && defined(__linux__) && defined(__ARM_EABI__) && !defined(__PIC__)) \ + || defined(TARGET_ANDROID) \ + || (defined(TARGET_IOS) && !defined(TARGET_WATCHOS)) + #define HAVE_FAST_TLS +-- +2.10.2 + diff --git a/recipes-mono/mono/mono_4.6.1.5.bb b/recipes-mono/mono/mono_4.6.1.5.bb index ae8a7eb..7abe82c 100644 --- a/recipes-mono/mono/mono_4.6.1.5.bb +++ b/recipes-mono/mono/mono_4.6.1.5.bb @@ -6,3 +6,6 @@ require mono-${PV}.inc PACKAGES += "${PN}-profiler " FILES_${PN}-profiler += " ${datadir}/mono-2.0/mono/profiler/*" +SRC_URI += "file://ARM-Disable-fast-tls-on-embedded-mono.patch \ +" + -- 2.10.2 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto