opal: disable code patcher if --disable-dlopen

Signed-off-by: Nathan Hjelm <[email protected]>
open-mpi · Mar 28, 2016 · 5000b45 · 5000b45
1 parent df6a4a3
commit 5000b45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/config/opal_configure_options.m4 b/config/opal_configure_options.m4
@@ -283,7 +283,8 @@ else
     OPAL_ENABLE_DLOPEN_SUPPORT=1
     AC_MSG_RESULT([yes])
 fi
-
+AC_DEFINE_UNQUOTED(OPAL_ENABLE_DLOPEN_SUPPORT, $OPAL_ENABLE_DLOPEN_SUPPORT,
+    [Whether we want to enable dlopen support])
 
 #
 # Heterogeneous support

diff --git a/opal/util/opal_patcher.c b/opal/util/opal_patcher.c
@@ -25,7 +25,7 @@
 #include <dlfcn.h>
 #include <assert.h>
 
-#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__)
+#if OPAL_ENABLE_DLOPEN_SUPPORT && (defined(__i386__) || defined(__x86_64__) || defined(__ia64__))
 
 static void flush_and_invalidate_cache (unsigned long  a)
 {
@@ -202,7 +202,7 @@ bool opal_patch_supported (void)
 
 /* end of #if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) */
 // ------------------------------------------------- PPC equivalent:
-#elif defined(__PPC__)
+#elif OPAL_ENABLE_DLOPEN_SUPPORT && defined(__PPC__)
 
 static inline uintptr_t addr_text (uintptr_t addr) {
 #if (defined(__PPC64__) || defined(__powerpc64__) || defined(__PPC__)) && _CALL_ELF != 2