Skip to content

Commit 0414c0c

Browse files
authored
Merge pull request #3757 from ggouaillardet/topic/enable_builtin_atomics
configury: abort when builtin atomics cannot be built and configure'd…
2 parents 0118e32 + 409a3bf commit 0414c0c

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

config/opal_config_asm.m4

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -913,16 +913,15 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
913913
914914
AC_ARG_ENABLE([builtin-atomics],
915915
[AC_HELP_STRING([--enable-builtin-atomics],
916-
[Enable use of __sync builtin atomics (default: enabled)])],
917-
[], [enable_builtin_atomics="yes"])
916+
[Enable use of __sync builtin atomics (default: enabled)])])
918917
919918
opal_cv_asm_builtin="BUILTIN_NO"
920-
if test "$opal_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes" ; then
921-
OPAL_CHECK_GCC_ATOMIC_BUILTINS([opal_cv_asm_builtin="BUILTIN_GCC"], [])
922-
fi
923-
if test "$opal_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes" ; then
924-
OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"], [])
925-
fi
919+
AS_IF([test "$opal_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" != "no"],
920+
[OPAL_CHECK_GCC_ATOMIC_BUILTINS([opal_cv_asm_builtin="BUILTIN_GCC"], [])])
921+
AS_IF([test "$opal_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" != "no"],
922+
[OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"], [])])
923+
AS_IF([test "$opal_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes"],
924+
[AC_MSG_ERROR([__sync builtin atomics requested but not found.])])
926925
927926
OPAL_CHECK_ASM_PROC
928927
OPAL_CHECK_ASM_TEXT

0 commit comments

Comments
 (0)