Skip to content

Commit 6f64744

Browse files
authored
Merge pull request #9801 from jsquyres/pr/fix-trivial-configure-label
config/opal_config_asm.m4: Trivial output label fix
2 parents 89c09f1 + 33e1056 commit 6f64744

File tree

1 file changed

+66
-66
lines changed

1 file changed

+66
-66
lines changed

config/opal_config_asm.m4

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -343,34 +343,34 @@ __atomic_compare_exchange_n(&tmp, &old, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED
343343
__atomic_add_fetch(&tmp, 1, __ATOMIC_RELAXED);
344344
__atomic_compare_exchange_n(&tmp64, &old64, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
345345
__atomic_add_fetch(&tmp64, 1, __ATOMIC_RELAXED);])],
346-
[opal_cv_have___atomic=yes],
347-
[opal_cv_have___atomic=no])
346+
[opal_cv_have___atomic=yes],
347+
[opal_cv_have___atomic=no])
348348
349349
AC_MSG_RESULT([$opal_cv_have___atomic])
350350
351351
if test $opal_cv_have___atomic = "yes" ; then
352-
AC_MSG_CHECKING([for 64-bit GCC built-in atomics])
352+
AC_MSG_CHECKING([for 64-bit GCC built-in atomics])
353353
354-
AC_LINK_IFELSE([AC_LANG_PROGRAM([
354+
AC_LINK_IFELSE([AC_LANG_PROGRAM([
355355
#include <stdint.h>
356356
uint64_t tmp64, old64 = 0;], [
357357
__atomic_compare_exchange_n(&tmp64, &old64, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
358358
__atomic_add_fetch(&tmp64, 1, __ATOMIC_RELAXED);])],
359-
[opal_cv_have___atomic_64=yes],
360-
[opal_cv_have___atomic_64=no])
361-
362-
AC_MSG_RESULT([$opal_cv_have___atomic_64])
363-
364-
if test $opal_cv_have___atomic_64 = "yes" ; then
365-
AC_MSG_CHECKING([if 64-bit GCC built-in atomics are lock-free])
366-
AC_RUN_IFELSE([AC_LANG_PROGRAM([], [if (!__atomic_is_lock_free (8, 0)) { return 1; }])],
367-
[AC_MSG_RESULT([yes])],
368-
[AC_MSG_RESULT([no])
369-
opal_cv_have___atomic_64=no],
370-
[AC_MSG_RESULT([cannot test -- assume yes (cross compiling)])])
371-
fi
359+
[opal_cv_have___atomic_64=yes],
360+
[opal_cv_have___atomic_64=no])
361+
362+
AC_MSG_RESULT([$opal_cv_have___atomic_64])
363+
364+
if test $opal_cv_have___atomic_64 = "yes" ; then
365+
AC_MSG_CHECKING([if 64-bit GCC built-in atomics are lock-free])
366+
AC_RUN_IFELSE([AC_LANG_PROGRAM([], [if (!__atomic_is_lock_free (8, 0)) { return 1; }])],
367+
[AC_MSG_RESULT([yes])],
368+
[AC_MSG_RESULT([no])
369+
opal_cv_have___atomic_64=no],
370+
[AC_MSG_RESULT([cannot test -- assume yes (cross compiling)])])
371+
fi
372372
else
373-
opal_cv_have___atomic_64=no
373+
opal_cv_have___atomic_64=no
374374
fi
375375
376376
# Check for 128-bit support
@@ -1060,40 +1060,40 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
10601060
AC_MSG_WARN([C11 atomics were requested but are not supported])
10611061
AC_MSG_ERROR([Cannot continue])
10621062
elif test "$enable_builtin_atomics" = "yes" ; then
1063-
if test $opal_cv_have___atomic = "yes" ; then
1064-
opal_cv_asm_builtin="BUILTIN_GCC"
1065-
else
1066-
AC_MSG_WARN([GCC built-in atomics requested but not found.])
1067-
AC_MSG_ERROR([Cannot continue])
1068-
fi
1063+
if test $opal_cv_have___atomic = "yes" ; then
1064+
opal_cv_asm_builtin="BUILTIN_GCC"
1065+
else
1066+
AC_MSG_WARN([GCC built-in atomics requested but not found.])
1067+
AC_MSG_ERROR([Cannot continue])
1068+
fi
10691069
fi
10701070
1071-
OPAL_CHECK_ASM_PROC
1072-
OPAL_CHECK_ASM_TEXT
1073-
OPAL_CHECK_ASM_GLOBAL
1074-
OPAL_CHECK_ASM_GNU_STACKEXEC
1075-
OPAL_CHECK_ASM_LABEL_SUFFIX
1076-
OPAL_CHECK_ASM_GSYM
1077-
OPAL_CHECK_ASM_LSYM
1078-
OPAL_CHECK_ASM_TYPE
1079-
OPAL_CHECK_ASM_SIZE
1080-
OPAL_CHECK_ASM_ALIGN_LOG
1081-
1082-
# find our architecture for purposes of assembly stuff
1083-
opal_cv_asm_arch="UNSUPPORTED"
1084-
OPAL_GCC_INLINE_ASSIGN=""
1085-
1086-
case "${host}" in
1071+
OPAL_CHECK_ASM_PROC
1072+
OPAL_CHECK_ASM_TEXT
1073+
OPAL_CHECK_ASM_GLOBAL
1074+
OPAL_CHECK_ASM_GNU_STACKEXEC
1075+
OPAL_CHECK_ASM_LABEL_SUFFIX
1076+
OPAL_CHECK_ASM_GSYM
1077+
OPAL_CHECK_ASM_LSYM
1078+
OPAL_CHECK_ASM_TYPE
1079+
OPAL_CHECK_ASM_SIZE
1080+
OPAL_CHECK_ASM_ALIGN_LOG
1081+
1082+
# find our architecture for purposes of assembly stuff
1083+
opal_cv_asm_arch="UNSUPPORTED"
1084+
OPAL_GCC_INLINE_ASSIGN=""
1085+
1086+
case "${host}" in
10871087
x86_64-*x32|i?86-*|x86_64*|amd64*)
10881088
if test "$ac_cv_sizeof_long" = "4" ; then
1089-
if test $opal_cv_asm_builtin = BUILTIN_NO ; then
1090-
AC_MSG_ERROR([IA32 atomics are no longer supported. Use a C11 compiler])
1091-
fi
1092-
opal_cv_asm_arch="IA32"
1093-
else
1094-
opal_cv_asm_arch="X86_64"
1095-
OPAL_CHECK_CMPXCHG16B
1096-
fi
1089+
if test $opal_cv_asm_builtin = BUILTIN_NO ; then
1090+
AC_MSG_ERROR([IA32 atomics are no longer supported. Use a C11 compiler])
1091+
fi
1092+
opal_cv_asm_arch="IA32"
1093+
else
1094+
opal_cv_asm_arch="X86_64"
1095+
OPAL_CHECK_CMPXCHG16B
1096+
fi
10971097
OPAL_GCC_INLINE_ASSIGN='"xaddl %1,%0" : "=m"(ret), "+r"(negone) : "m"(ret)'
10981098
;;
10991099
@@ -1104,8 +1104,8 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
11041104
11051105
armv7*|arm-*-linux-gnueabihf|armv6*)
11061106
if test $opal_cv_asm_builtin = BUILTIN_NO ; then
1107-
AC_MSG_ERROR([32-bit ARM atomics are no longer supported. Use a C11 compiler])
1108-
fi
1107+
AC_MSG_ERROR([32-bit ARM atomics are no longer supported. Use a C11 compiler])
1108+
fi
11091109
11101110
opal_cv_asm_arch="ARM"
11111111
OPAL_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
@@ -1114,11 +1114,11 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
11141114
powerpc-*|powerpc64-*|powerpcle-*|powerpc64le-*|rs6000-*|ppc-*)
11151115
OPAL_CHECK_POWERPC_REG
11161116
if test "$ac_cv_sizeof_long" = "4" ; then
1117-
if test $opal_cv_asm_builtin = BUILTIN_NO ; then
1118-
AC_MSG_ERROR([PowerPC 32-bit atomics are no longer supported. Use a C11 compiler])
1119-
fi
1120-
opal_cv_asm_arch="POWERPC32"
1121-
elif test "$ac_cv_sizeof_long" = "8" ; then
1117+
if test $opal_cv_asm_builtin = BUILTIN_NO ; then
1118+
AC_MSG_ERROR([PowerPC 32-bit atomics are no longer supported. Use a C11 compiler])
1119+
fi
1120+
opal_cv_asm_arch="POWERPC32"
1121+
elif test "$ac_cv_sizeof_long" = "8" ; then
11221122
opal_cv_asm_arch="POWERPC64"
11231123
else
11241124
AC_MSG_ERROR([Could not determine PowerPC word size: $ac_cv_sizeof_long])
@@ -1138,18 +1138,18 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
11381138
11391139
;;
11401140
*)
1141-
if test $opal_cv_have___atomic = "yes" ; then
1142-
opal_cv_asm_builtin="BUILTIN_GCC"
1143-
else
1144-
AC_MSG_ERROR([No atomic primitives available for $host])
1145-
fi
1146-
;;
1147-
esac
1141+
if test $opal_cv_have___atomic = "yes" ; then
1142+
opal_cv_asm_builtin="BUILTIN_GCC"
1143+
else
1144+
AC_MSG_ERROR([No atomic primitives available for $host])
1145+
fi
1146+
;;
1147+
esac
11481148
1149-
if test "$opal_cv_asm_builtin" = "BUILTIN_GCC" ; then
1149+
if test "$opal_cv_asm_builtin" = "BUILTIN_GCC" ; then
11501150
AC_DEFINE([OPAL_C_GCC_INLINE_ASSEMBLY], [1],
1151-
[Whether C compiler supports GCC style inline assembly])
1152-
else
1151+
[Whether C compiler supports GCC style inline assembly])
1152+
else
11531153
opal_cv_asm_inline_supported="no"
11541154
# now that we know our architecture, try to inline assemble
11551155
OPAL_CHECK_INLINE_C_GCC([$OPAL_GCC_INLINE_ASSIGN])
@@ -1219,7 +1219,7 @@ int main(int argc, char* argv[])
12191219
[Whether to use builtin atomics])
12201220
AC_SUBST([OPAL_ASSEMBLY_BUILTIN])
12211221
1222-
OPAL_SUMMARY_ADD([[Atomics]],[[OMPI]],[],[$opal_cv_asm_builtin])
1222+
OPAL_SUMMARY_ADD([[Miscellaneous]],[[Atomics]],[],[$opal_cv_asm_builtin])
12231223
12241224
OPAL_ASM_FIND_FILE
12251225

0 commit comments

Comments
 (0)