From 0bc8ba92832d263ce3927362463e9b1e86534294 Mon Sep 17 00:00:00 2001 From: Vlad Brezae Date: Tue, 14 Jan 2020 16:09:33 +0200 Subject: [PATCH] [utils] Include missing define of MONO_GNUC_VERSION We were adding the WRAP_ATOMIC_INTRINSIC all the time on arm64, due to missing MONO_GNUC_VERSION. Commit migrated from https://github.com/mono/mono/commit/7fb011aa5a5475b59d3b2f16256fc745ed1bda15 --- src/mono/mono/utils/atomic.c | 1 - src/mono/mono/utils/atomic.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/mono/utils/atomic.c b/src/mono/mono/utils/atomic.c index 58c46e2..519448b 100644 --- a/src/mono/mono/utils/atomic.c +++ b/src/mono/mono/utils/atomic.c @@ -13,7 +13,6 @@ #include #include -#include #if defined (WAPI_NO_ATOMIC_ASM) || defined (BROKEN_64BIT_ATOMICS_INTRINSIC) #define NEED_64BIT_CMPXCHG_FALLBACK diff --git a/src/mono/mono/utils/atomic.h b/src/mono/mono/utils/atomic.h index 40574c1..4b46122 100755 --- a/src/mono/mono/utils/atomic.h +++ b/src/mono/mono/utils/atomic.h @@ -16,6 +16,7 @@ #include "config.h" #include #include +#include /* The current Nexus 7 arm-v7a fails with: -- 2.7.4