From 4e8ff00fbd8978601a38533b07580f30ab0f6c03 Mon Sep 17 00:00:00 2001
From: Augustin Degomme <adegomme@users.noreply.github.com>
Date: Sun, 24 Jan 2021 22:34:14 +0100
Subject: [PATCH] add more libs (from ubuntu 21.04) to exclusion list

---
 src/mc/remote/RemoteSimulation.cpp | 9 +++++++++
 tools/cmake/Flags.cmake            | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/mc/remote/RemoteSimulation.cpp b/src/mc/remote/RemoteSimulation.cpp
index 762cd2d42b..4024675cb0 100644
--- a/src/mc/remote/RemoteSimulation.cpp
+++ b/src/mc/remote/RemoteSimulation.cpp
@@ -43,6 +43,7 @@ static const std::vector<std::string> filtered_libraries = {
 #endif
     "libargp", /* workarounds for glibc-less systems */
     "libasan", /* gcc sanitizers */
+    "libasn1",
     "libboost_chrono",
     "libboost_context",
     "libboost_context-mt",
@@ -79,7 +80,12 @@ static const std::vector<std::string> filtered_libraries = {
     "libgcrypt",
     "libgfortran",
     "libgpg-error",
+    "libgssapi",
     "libgssapi_krb5",
+    "libhcrypto",
+    "libheimbase",
+    "libheimntlm",
+    "libhx509",
     "libhogweed",
     "libidn2",
     "libimf",
@@ -109,10 +115,12 @@ static const std::vector<std::string> filtered_libraries = {
     "libpthread",
     "libquadmath",
     "libresolv",
+    "libroken",
     "librt",
     "librtmp",
     "libsasl2",
     "libselinux",
+    "libsqlite3",
     "libssh",
     "libssh2",
     "libssl",
@@ -126,6 +134,7 @@ static const std::vector<std::string> filtered_libraries = {
     "libunwind-ptrace",
     "libunwind-x86",
     "libunwind-x86_64",
+    "libwind",
     "libz",
     "libzstd"};
 
diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake
index 484f48789a..72dcbf1721 100644
--- a/tools/cmake/Flags.cmake
+++ b/tools/cmake/Flags.cmake
@@ -174,15 +174,15 @@ endif()
 
 if(enable_model-checking AND enable_compile_optimizations)
   # Forget it, do not optimize the code (because it confuses the MC):
-  set(optCFLAGS "-O0 ")
+  set(optCFLAGS "-O0 -gdwarf-4")
   # But you can still optimize this:
   foreach(s
       src/simix/popping.cpp src/simix/popping_generated.cpp src/simix/smx_global.cpp
       ${SURF_SRC} ${TRACING_SRC} ${XBT_SRC}
       ${MC_SRC_BASE} ${MC_SRC})
-      set (mcCFLAGS "-O3  -funroll-loops -fno-strict-aliasing")
-       if(CMAKE_COMPILER_IS_GNUCC)
-         set (mcCFLAGS "${mcCFLAGS} -finline-functions")
+      set (mcCFLAGS "-O3 -gdwarf-4 -funroll-loops -fno-strict-aliasing")
+      if(CMAKE_COMPILER_IS_GNUCC)
+        set (mcCFLAGS "${mcCFLAGS} -finline-functions")
       endif()
       set_source_files_properties(${s} PROPERTIES COMPILE_FLAGS ${mcCFLAGS})
   endforeach()
-- 
2.20.1