43021dfb77
Patch '0001-fix-compile-time-atomic-detection.patch' claims to be Merged but this is not true. The linked issue is closed with 'Needs information', and the code itself is effectively not merged. Clarify the 'Upstream-status' line to make this more clear. Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
33 lines
1 KiB
Diff
33 lines
1 KiB
Diff
From d5c628a6179b99705fa05ab87437321b132c81bc Mon Sep 17 00:00:00 2001
|
|
From: Brendan Heading <brendanheading@gmail.com>
|
|
Date: Wed, 21 Jun 2017 16:36:15 -0400
|
|
Subject: [PATCH] Fix compile time atomic detection
|
|
|
|
Improved compile-time detection of atomic support in the compiler.
|
|
|
|
Upstream-Status: 'Needs information'
|
|
See : https://gitlab.gnome.org/GNOME/glib/issues/1063
|
|
|
|
Signed-off-by: Brendan Heading <brendanheading@gmail.com>
|
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
|
---
|
|
glib/gthread-posix.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
|
|
index 71a6b7b..d09d029 100644
|
|
--- a/glib/gthread-posix.c
|
|
+++ b/glib/gthread-posix.c
|
|
@@ -73,7 +73,7 @@
|
|
#endif
|
|
|
|
/* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */
|
|
-#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && !defined(__clang__)
|
|
+#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__clang__)
|
|
#define USE_NATIVE_MUTEX
|
|
#endif
|
|
|
|
--
|
|
2.9.4
|
|
|