From bc54c99e12cf33c5a6c70bf1c3952075b66a76ca Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Fri, 23 Jun 2017 08:27:48 -0600 Subject: [PATCH] configure: add builtin asm check for s390/s390x We accepted a change that enabled CMA on s390 and s390x. This change had the side-effect that we were no longer using the builtin atomics for these systems. This is a problem since we do not have ASM for s390 and s390x. This commit restores the atomics. Signed-off-by: Nathan Hjelm --- config/opal_config_asm.m4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/opal_config_asm.m4 b/config/opal_config_asm.m4 index 293a915e33..ecb5e7e968 100644 --- a/config/opal_config_asm.m4 +++ b/config/opal_config_asm.m4 @@ -13,7 +13,7 @@ dnl Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. dnl Copyright (c) 2015-2017 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. -dnl Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights +dnl Copyright (c) 2014-2017 Los Alamos National Security, LLC. All rights dnl reserved. dnl Copyright (c) 2017 Amazon.com, Inc. or its affiliates. All Rights dnl reserved. @@ -1088,9 +1088,13 @@ AC_DEFUN([OPAL_CONFIG_ASM],[ # as s390 is 31bits while s390x is 64bits s390-*) opal_cv_asm_arch="S390" + OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"], + [AC_MSG_ERROR([No atomic primitives available for $host])]) ;; s390x-*) opal_cv_asm_arch="S390X" + OPAL_CHECK_SYNC_BUILTINS([opal_cv_asm_builtin="BUILTIN_SYNC"], + [AC_MSG_ERROR([No atomic primitives available for $host])]) ;; sparc*-*) # SPARC v9 (and above) are the only ones with 64bit support