1*4882a593SmuzhiyunFrom d5c628a6179b99705fa05ab87437321b132c81bc Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Brendan Heading <brendanheading@gmail.com> 3*4882a593SmuzhiyunDate: Wed, 21 Jun 2017 16:36:15 -0400 4*4882a593SmuzhiyunSubject: [PATCH] Fix compile time atomic detection 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunImproved compile-time detection of atomic support in the compiler. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunUpstream-Status: 'Needs information' 9*4882a593SmuzhiyunSee : https://gitlab.gnome.org/GNOME/glib/issues/1063 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Brendan Heading <brendanheading@gmail.com> 12*4882a593SmuzhiyunSigned-off-by: Adam Duskett <aduskett@gmail.com> 13*4882a593SmuzhiyunRefresh for 2.68.1 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun glib/gthread-posix.c | 3 +-- 16*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 2 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/glib/gthread-posix.c b/glib/gthread-posix.c 19*4882a593Smuzhiyunindex 71a6b7b..d09d029 100644 20*4882a593Smuzhiyun--- a/glib/gthread-posix.c 21*4882a593Smuzhiyun+++ b/glib/gthread-posix.c 22*4882a593Smuzhiyun@@ -72,8 +72,7 @@ 23*4882a593Smuzhiyun #include <sys/syscall.h> 24*4882a593Smuzhiyun #endif 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun-#if defined(HAVE_FUTEX) && \ 27*4882a593Smuzhiyun- (defined(HAVE_STDATOMIC_H) || defined(__ATOMIC_SEQ_CST)) 28*4882a593Smuzhiyun+#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__clang__) 29*4882a593Smuzhiyun #define USE_NATIVE_MUTEX 30*4882a593Smuzhiyun #endif 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun-- 33*4882a593Smuzhiyun2.9.4 34*4882a593Smuzhiyun 35