Merge pull request #3179 from hppritcha/topic/remove_osx_builtin_atomics

OSx: remove built-in atomics support

Author: hppritcha

config/opal_config_asm.m4

@@ -970,10 +970,6 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
       [AC_HELP_STRING([--enable-builtin-atomics],
          [Enable use of __sync builtin atomics (default: enabled)])],
          [], [enable_builtin_atomics="yes"])
-    AC_ARG_ENABLE([osx-builtin-atomics],
-      [AC_HELP_STRING([--enable-osx-builtin-atomics],
-         [Enable use of OSX builtin atomics (default: enabled)])],
-         [], [enable_osx_builtin_atomics="yes"])
 
     opal_cv_asm_builtin="BUILTIN_NO"
     if test "$opal_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes" ; then
@@ -982,10 +978,6 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
     if test "$opal_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes" ; then
        OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"], [])
     fi
-    if test "$opal_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_osx_builtin_atomics" = "yes" ; then
-       AC_CHECK_HEADER([libkern/OSAtomic.h],
-                       [opal_cv_asm_builtin="BUILTIN_OSX"])
-    fi
 
         OPAL_CHECK_ASM_PROC
         OPAL_CHECK_ASM_TEXT

opal/include/opal/sys/Makefile.am

@@ -37,7 +37,6 @@ include opal/sys/arm64/Makefile.am
 include opal/sys/ia32/Makefile.am
 include opal/sys/ia64/Makefile.am
 include opal/sys/mips/Makefile.am
-include opal/sys/osx/Makefile.am
 include opal/sys/powerpc/Makefile.am
 include opal/sys/sparcv9/Makefile.am
 include opal/sys/sync_builtin/Makefile.am

opal/include/opal/sys/architecture.h

@@ -43,7 +43,6 @@
 #define OPAL_ARM            0100
 #define OPAL_ARM64          0101
 #define OPAL_BUILTIN_SYNC   0200
-#define OPAL_BUILTIN_OSX    0201
 #define OPAL_BUILTIN_GCC    0202
 #define OPAL_BUILTIN_NO     0203
 

opal/include/opal/sys/atomic.h

@@ -153,8 +153,6 @@ enum {
 #include "opal/sys/sync_builtin/atomic.h"
 #elif OPAL_ASSEMBLY_BUILTIN == OPAL_BUILTIN_GCC
 #include "opal/sys/gcc_builtin/atomic.h"
-#elif OPAL_ASSEMBLY_BUILTIN == OPAL_BUILTIN_OSX
-#include "opal/sys/osx/atomic.h"
 #elif OPAL_ASSEMBLY_ARCH == OPAL_X86_64
 #include "opal/sys/x86_64/atomic.h"
 #elif OPAL_ASSEMBLY_ARCH == OPAL_ARM