Merge pull request open-mpi#6055 from ggouaillardet/topic/c11_atomics

Misc C11 atomics related fixes

Author: ggouaillardet

config/opal_config_asm.m4

@@ -11,8 +11,8 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2008-2018 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) 2015-2018 Research Organization for Information Science
+dnl                         and Technology (RIST).  All rights reserved.
 dnl Copyright (c) 2014-2018 Los Alamos National Security, LLC. All rights
 dnl                         reserved.
 dnl Copyright (c) 2017      Amazon.com, Inc. or its affiliates.  All Rights
@@ -1148,6 +1148,9 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
     if test "x$enable_c11_atomics" != "xno" && test "$opal_cv_c11_supported" = "yes" ; then
         opal_cv_asm_builtin="BUILTIN_C11"
         OPAL_CHECK_C11_CSWAP_INT128
+    elif test "x$enable_c11_atomics" = "xyes"; then
+        AC_MSG_WARN([C11 atomics were requested but are not supported])
+        AC_MSG_ERROR([Cannot continue])
     else
         opal_cv_asm_builtin="BUILTIN_NO"
         AS_IF([test "$opal_cv_asm_builtin" = "BUILTIN_NO" && test "$enable_builtin_atomics" = "yes"],

opal/include/opal/sys/atomic_stdc.h

@@ -2,6 +2,8 @@
 /*
  * Copyright (c) 2018      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -23,7 +25,7 @@
 
 #include <stdatomic.h>
 #include <stdint.h>
-#include "opal/include/opal_stdint.h"
+#include "opal_stdint.h"
 
 #define OPAL_HAVE_ATOMIC_MEM_BARRIER 1
 

orte/test/mpi/Makefile

@@ -4,7 +4,7 @@ PROGS = mpi_no_op mpi_barrier hello hello_nodename abort multi_abort simple_spaw
 		crisscross read_write ziatest slave reduce-hang ziaprobe ziatest bcast_loop \
 		parallel_w8 parallel_w64 parallel_r8 parallel_r64 sio sendrecv_blaster early_abort \
 		debugger singleton_client_server intercomm_create spawn_tree init-exit77 mpi_info \
-		info_spawn server client paccept pconnect ring hello.sapp binding badcoll attach xlib \
+		info_spawn server client ring binding badcoll attach xlib \
 		no-disconnect nonzero interlib pinterlib add_host
 
 all: $(PROGS)