Merge pull request #10721 from devreal/gcc_atomic_fixes

devreal · web-flow · commit 5571dbabec23 · 2022-08-26T17:18:43.000-04:00
Atomics: several fixes the GCC backend
diff --git a/opal/include/opal/sys/gcc_builtin/atomic.h b/opal/include/opal/sys/gcc_builtin/atomic.h
@@ -36,7 +36,7 @@
  *
  *********************************************************************/
 
-#if defined(PLATFORM_ARCH_X86_64) && defined (__GNUC__) && !defined(__llvm) && (__GNUC__ < 6)
+#if defined(PLATFORM_ARCH_X86_64) && defined(PLATFORM_COMPILER_GNU) && __GNUC__ < 8
     /* work around a bug in older gcc versions where ACQUIRE seems to get
      * treated as a no-op instead */
 #define OPAL_BUSTED_ATOMIC_MB 1
@@ -193,7 +193,7 @@ static inline intptr_t opal_atomic_swap_ptr(opal_atomic_intptr_t *addr, intptr_t
 
 static inline void opal_atomic_lock_init(opal_atomic_lock_t *lock, int32_t value)
 {
-    lock = value;
+    *lock = value;
 }
 
 static inline int opal_atomic_trylock(opal_atomic_lock_t *lock)

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`*`
`37`	`37`	`*********************************************************************/`
`38`	`38`
`39`		`-#if defined(PLATFORM_ARCH_X86_64) && defined (__GNUC__) && !defined(__llvm) && (__GNUC__ < 6)`
	`39`	`+#if defined(PLATFORM_ARCH_X86_64) && defined(PLATFORM_COMPILER_GNU) && __GNUC__ < 8`
`40`	`40`	`/* work around a bug in older gcc versions where ACQUIRE seems to get`
`41`	`41`	`* treated as a no-op instead */`
`42`	`42`	`#define OPAL_BUSTED_ATOMIC_MB 1`
`@@ -193,7 +193,7 @@ static inline intptr_t opal_atomic_swap_ptr(opal_atomic_intptr_t *addr, intptr_t`
`193`	`193`
`194`	`194`	`static inline void opal_atomic_lock_init(opal_atomic_lock_t *lock, int32_t value)`
`195`	`195`	`{`
`196`		`- lock = value;`
	`196`	`+ *lock = value;`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`static inline int opal_atomic_trylock(opal_atomic_lock_t *lock)`