summaryrefslogtreecommitdiff
path: root/lang/mono/patches/patch-mono_mini_mini-arm.c
diff options
context:
space:
mode:
Diffstat (limited to 'lang/mono/patches/patch-mono_mini_mini-arm.c')
-rw-r--r--lang/mono/patches/patch-mono_mini_mini-arm.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/lang/mono/patches/patch-mono_mini_mini-arm.c b/lang/mono/patches/patch-mono_mini_mini-arm.c
index cabc3e38f8e..acc850323bc 100644
--- a/lang/mono/patches/patch-mono_mini_mini-arm.c
+++ b/lang/mono/patches/patch-mono_mini_mini-arm.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-mono_mini_mini-arm.c,v 1.4 2014/11/30 08:40:51 spz Exp $
+$NetBSD: patch-mono_mini_mini-arm.c,v 1.5 2015/05/21 14:38:08 kefren Exp $
---- mono/mini/mini-arm.c.orig 2014-10-04 09:27:43.000000000 +0000
-+++ mono/mini/mini-arm.c
-@@ -54,6 +54,11 @@
+--- mono/mini/mini-arm.c.orig 2015-04-30 13:27:46.000000000 +0300
++++ mono/mini/mini-arm.c 2015-05-11 15:55:15.000000000 +0300
+@@ -56,6 +56,11 @@
#define IS_VFP (TRUE)
#endif
@@ -14,7 +14,7 @@ $NetBSD: patch-mono_mini_mini-arm.c,v 1.4 2014/11/30 08:40:51 spz Exp $
#if defined(__ARM_EABI__) && defined(__linux__) && !defined(PLATFORM_ANDROID) && !defined(__native_client__)
#define HAVE_AEABI_READ_TP 1
#endif
-@@ -897,6 +902,10 @@ void
+@@ -922,6 +927,10 @@ void
mono_arch_init (void)
{
const char *cpu_arch;
@@ -25,7 +25,7 @@ $NetBSD: patch-mono_mini_mini-arm.c,v 1.4 2014/11/30 08:40:51 spz Exp $
mono_mutex_init_recursive (&mini_arch_mutex);
#ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED
-@@ -948,6 +957,32 @@ mono_arch_init (void)
+@@ -986,6 +995,32 @@ mono_arch_init (void)
have a way to properly detect CPU features on it. */
thumb_supported = TRUE;
iphone_abi = TRUE;
@@ -58,7 +58,7 @@ $NetBSD: patch-mono_mini_mini-arm.c,v 1.4 2014/11/30 08:40:51 spz Exp $
#else
thumb_supported = mono_hwcap_arm_has_thumb;
thumb2_supported = mono_hwcap_arm_has_thumb2;
-@@ -1160,6 +1195,11 @@ mono_arch_flush_icache (guint8 *code, gi
+@@ -1196,6 +1231,11 @@ mono_arch_flush_icache (guint8 *code, gi
#ifdef MONO_CROSS_COMPILE
#elif __APPLE__
sys_icache_invalidate (code, size);
@@ -67,6 +67,6 @@ $NetBSD: patch-mono_mini_mini-arm.c,v 1.4 2014/11/30 08:40:51 spz Exp $
+ args.addr = (uintptr_t)code;
+ args.len = (size_t)size;
+ sysarch(ARM_SYNC_ICACHE, &args);
+ #elif __GNUC_PREREQ(4, 3)
+ __builtin___clear_cache (code, code + size);
#elif __GNUC_PREREQ(4, 1)
- __clear_cache (code, code + size);
- #elif defined(PLATFORM_ANDROID)