From 51123d8e4bf01f354aef77ffa4427d2388d9bb98 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 12 Mar 2018 08:36:36 +0100
Subject: [PATCH] Revert "disable dlopen when under sanitizers"

This reverts commit 4e2035d7b4730d535ebd7619c4e85878f71f8cb2.
---
 CMakeLists.txt                       | 4 ----
 src/smpi/internals/smpi_global.cpp   | 7 -------
 tools/cmake/src/internal_config.h.in | 2 --
 tools/tesh/tesh.py                   | 1 -
 4 files changed, 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b16aeab13a..51590bce4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -618,10 +618,6 @@ endif()
 file(REMOVE test_stackgrowth)
 #--------------------------------------------------------------------------------------------------
 
-if(enable_address_sanitizer OR enable_thread_sanitizer OR enable_undefined_sanitizer)
-  set(HAVE_SANITIZER 1)
-endif()
-
 ### check for addr2line
 find_path(ADDR2LINE NAMES addr2line	PATHS NO_DEFAULT_PATHS)
 if(ADDR2LINE)
diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 0c1a3b7f89..769c00900d 100644
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -388,13 +388,6 @@ static void smpi_init_options(){
     }
 #endif
 
-#if defined(HAVE_SANITIZER)
-    if (smpi_privatize_global_variables == SMPI_PRIVATIZE_DLOPEN) {
-      XBT_INFO("Sanitizers don't like dlopen, switching to mmap privatization instead.");
-      smpi_privatize_global_variables = SMPI_PRIVATIZE_MMAP;
-    }
-#endif
-
     if (smpi_cpu_threshold < 0)
       smpi_cpu_threshold = DBL_MAX;
 
diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index 90d8c70ba7..aac7ce0a3e 100644
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -109,5 +109,3 @@
 #cmakedefine01 HAVE_GRAPHVIZ
 /* The lib unwind library (for MC and backtrace display) */
 #cmakedefine01 HAVE_LIBUNWIND
-/* Whether we are built under a sanitizer (to disable dlopen privatization) */
-#cmakedefine01 HAVE_SANITIZER
diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index 2cd1dce335..a37449ee68 100755
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -467,7 +467,6 @@ if __name__ == '__main__':
            re.compile(r"cmake: /usr/local/lib/libcurl\.so\.4: no version information available \(required by cmake\)"), # Seen on CircleCI
            re.compile(r".*mmap broken on FreeBSD, but dlopen\+thread broken too. Switching to dlopen\+raw contexts\."),
            re.compile(r".*dlopen\+thread broken on Apple and BSD\. Switching to raw contexts\."),
-           re.compile(r"Sanitizers don.t like dlopen, switching to mmap privatization instead\."),
            ]
         TeshState().jenkins = True # This is a Jenkins build
 
-- 
2.20.1