From b23579f4a004fc9a734efe1cf151505a7c0d30ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sun, 28 Aug 2016 14:50:09 +0200 Subject: [PATCH] [utils] Add a MONO_GNUC_VERSION macro. --- mono/sgen/sgen-marksweep.c | 5 +---- mono/utils/mono-compiler.h | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mono/sgen/sgen-marksweep.c b/mono/sgen/sgen-marksweep.c index aa5ef1a44a9..a215c44502c 100644 --- a/mono/sgen/sgen-marksweep.c +++ b/mono/sgen/sgen-marksweep.c @@ -1138,10 +1138,7 @@ major_get_and_reset_num_major_objects_marked (void) /* gcc 4.2.1 from xcode4 crashes on sgen_card_table_get_card_address () when this is enabled */ #if defined(PLATFORM_MACOSX) -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) -#if GCC_VERSION <= 40300 +#if MONO_GNUC_VERSION <= 40300 #undef PREFETCH_CARDS #endif #endif diff --git a/mono/utils/mono-compiler.h b/mono/utils/mono-compiler.h index 2b3b86e2ef2..d03ba8051aa 100644 --- a/mono/utils/mono-compiler.h +++ b/mono/utils/mono-compiler.h @@ -303,5 +303,9 @@ typedef SSIZE_T ssize_t; #define MONO_COLD #endif +#if defined (__GNUC__) && defined (__GNUC_MINOR__) && defined (__GNUC_PATCHLEVEL__) +#define MONO_GNUC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) +#endif + #endif /* __UTILS_MONO_COMPILER_H__*/ -- 2.25.1