From e84f9ec8c32eb10bb5b2971586f2db042d3070a8 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Thu, 26 Apr 2012 20:43:30 +0000 Subject: [PATCH] don't define OPAL_HAVE_ATOMIC_SWAP_64/32 in amd/atomic.h unless we have inlined assembly. fixes pgi complilation on XE/XK-6 This commit was SVN r26343. --- opal/include/opal/sys/amd64/atomic.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opal/include/opal/sys/amd64/atomic.h b/opal/include/opal/sys/amd64/atomic.h index 343fb088ad..f8d35d06c0 100644 --- a/opal/include/opal/sys/amd64/atomic.h +++ b/opal/include/opal/sys/amd64/atomic.h @@ -44,10 +44,6 @@ #define OPAL_HAVE_ATOMIC_CMPSET_64 1 -#define OPAL_HAVE_ATOMIC_SWAP_32 1 - -#define OPAL_HAVE_ATOMIC_SWAP_64 1 - /********************************************************************** * * Memory Barriers @@ -125,6 +121,10 @@ static inline int opal_atomic_cmpset_64( volatile int64_t *addr, #if OMPI_GCC_INLINE_ASSEMBLY +#define OPAL_HAVE_ATOMIC_SWAP_32 1 + +#define OPAL_HAVE_ATOMIC_SWAP_64 1 + static inline int32_t opal_atomic_swap_32( volatile int32_t *addr, int32_t newval) {