From 9de1e8b27263fa9edaf6578b78547fc393f1d4fe Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Wed, 7 Jan 2009 20:10:21 +0000 Subject: [PATCH] 2009-01-07 Zoltan Varga Backport of 122702. * mini-arm.c (mono_arch_flush_icache): Use __GNUC_PREREQ instead of checking __GNUC_MINOR__ which can break when the major version changes. svn path=/branches/mono-2-2/mono/; revision=122704 --- mono/mini/ChangeLog | 7 +++++++ mono/mini/mini-arm.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 9e7d697ac55..a1a16d54908 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,10 @@ +2009-01-07 Zoltan Varga + + Backport of 122702. + + * mini-arm.c (mono_arch_flush_icache): Use __GNUC_PREREQ instead of checking + __GNUC_MINOR__ which can break when the major version changes. + 2009-01-05 Zoltan Varga * branch-opts.c (mono_if_conversion): Fix another assert introduced by diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c index 0b5ad201375..daaf5d75a93 100644 --- a/mono/mini/mini-arm.c +++ b/mono/mini/mini-arm.c @@ -578,12 +578,16 @@ mono_arch_regalloc_cost (MonoCompile *cfg, MonoMethodVar *vmv) return 2; } +#ifndef __GNUC_PREREQ +#define __GNUC_PREREQ(maj, min) (0) +#endif + void mono_arch_flush_icache (guint8 *code, gint size) { #if __APPLE__ sys_icache_invalidate (code, size); -#elif ((__GNUC__ >= 4) && (__GNUC_MINOR__ >= 1)) +#elif __GNUC_PREREQ(4, 1) __clear_cache (code, code + size); #else __asm __volatile ("mov r0, %0\n" -- 2.25.1