AMPI: Check for RTLD_DEEPBIND at configure time

Author: evan-charmworks

cmake/detect-features-c.cmake

@@ -121,6 +121,7 @@ check_symbol_exists(pthread_setaffinity_np pthread.h HAVE_DECL_PTHREAD_SETAFFINI
 set(CMK_HAS_PTHREAD_SETAFFINITY ${HAVE_DECL_PTHREAD_SETAFFINITY_NP})
 check_symbol_exists(pthread_spin_lock pthread.h CMK_HAS_SPINLOCK)
 check_symbol_exists(pvalloc malloc.h CMK_HAS_PVALLOC)
+check_symbol_exists(RTLD_DEEPBIND dlfcn.h CMK_HAS_RTLD_DEEPBIND)
 check_symbol_exists(RTLD_DEFAULT dlfcn.h CMK_HAS_RTLD_DEFAULT)
 check_symbol_exists(RTLD_NEXT dlfcn.h CMK_HAS_RTLD_NEXT)
 check_function_exists(readlink CMK_HAS_READLINK)

src/libs/ck-libs/ampi/ampi_globals_pip.C

@@ -39,7 +39,10 @@ void AMPI_Node_Setup(int numranks)
   for (int myrank = 0; myrank < numranks; ++myrank)
   {
     const Lmid_t lmid = LM_ID_NEWLM;
-    const int flags = RTLD_NOW|RTLD_LOCAL|RTLD_DEEPBIND;
+    int flags = RTLD_NOW|RTLD_LOCAL;
+#if CMK_HAS_RTLD_DEEPBIND
+    flags |= RTLD_DEEPBIND;
+#endif
     SharedObject myexe = dlmopen(lmid, binary_path.c_str(), flags);
 
     if (myexe == nullptr)

src/scripts/configure.ac

@@ -2177,6 +2177,23 @@ then
 	AC_DEFINE_UNQUOTED(CMK_DLL_USE_DLOPEN, 1, [dlopen])
 fi
 
+cat > $tc <<EOT
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#ifndef __USE_GNU
+# define __USE_GNU
+#endif
+#include <dlfcn.h>
+#include <stddef.h>
+int main()
+{
+  return dlopen("", RTLD_DEEPBIND) == NULL;
+}
+EOT
+test_cc "whether has RTLD_DEEPBIND" "yes" "no" ""
+AC_DEFINE_UNQUOTED(CMK_HAS_RTLD_DEEPBIND, $pass, [whether has RTLD_DEEPBIND])
+
 cat > $tc <<EOT
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE