projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 21244a1)
[utils] Include missing define of MONO_GNUC_VERSION
authorVlad Brezae <brezaevlad@gmail.com>
Tue, 14 Jan 2020 14:09:33 +0000 (16:09 +0200)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Tue, 14 Jan 2020 21:03:48 +0000 (22:03 +0100)
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 patch | blob | history
src/mono/mono/utils/atomic.h patch | blob | history

diff --git a/src/mono/mono/utils/atomic.c b/src/mono/mono/utils/atomic.c
index 58c46e2..519448b 100644 (file)
--- a/src/mono/mono/utils/atomic.c
+++ b/src/mono/mono/utils/atomic.c
@@ -13,7 +13,6 @@
 #include <glib.h>
 
 #include <mono/utils/atomic.h>
-#include <mono/utils/mono-compiler.h>
 
 #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 (executable)
--- a/src/mono/mono/utils/atomic.h
+++ b/src/mono/mono/utils/atomic.h
@@ -16,6 +16,7 @@
 #include "config.h"
 #include <glib.h>
 #include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-compiler.h>
 
 /*
 The current Nexus 7 arm-v7a fails with:
Domain: Dotnet / Core;