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)
 {