Libunwind is useless for non-MC builds.

Moreover its presence causes unwanted false-positives with Asan.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87a0e1e..935710a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -396,23 +396,13 @@ else()
   SET(SIMGRID_HAVE_MALLOCATOR 0)
 endif()
 
-if (minimal-bindings)
-  message(STATUS "Don't look for libunwind as we build minimal binding libraries.")
-  if(enable_model-checking)
-    message(FATAL_ERROR "You cannot enable model-checking and minimal-bindings at the same time.")
-  endif()
-else()
+if(enable_model-checking)
   include(FindLibunwind)
   if(HAVE_LIBUNWIND)
     SET(SIMGRID_DEP "${SIMGRID_DEP} ${LIBUNWIND_LIBRARIES}")
   else()
-    if(enable_model-checking)
-      message(FATAL_ERROR "Please install libunwind-dev libdw-dev libelf-dev libevent-dev if you want to compile the SimGrid model checker.")
-    endif()
+    message(FATAL_ERROR "Please install libunwind-dev libdw-dev libelf-dev libevent-dev if you want to compile the SimGrid model checker.")
   endif()
-endif()
-
-if(enable_model-checking)
   find_package(Libdw REQUIRED)
   find_package(Libelf REQUIRED)
   find_package(Libevent REQUIRED)

diff --git a/tools/address_sanitizer.supp b/tools/address_sanitizer.supp
index 4431358..19d706c 100644 (file)
--- a/tools/address_sanitizer.supp
+++ b/tools/address_sanitizer.supp
@@ -1,8 +1,5 @@
 # Address sanitizer suppressions for stuff that we cannot control
 
-# ignore libunwind cruft (seen with clang)
-interceptor_via_lib:libunwind.so
-
 # __gnu_cxx::__to_xstring
 #interceptor_via_fun:__to_xstring