Merge branch 'v3_9_x'

[simgrid.git] / src / mc / mc_memory.c

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index 1950729..f104773 100644 (file)
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -8,9 +8,6 @@
 #include "mc/mc.h"
 #include "mc_private.h"
 #include "xbt/log.h"
-#define _GNU_SOURCE
-
-
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc,
                                 "Logging specific to MC (memory)");
@@ -27,9 +24,14 @@ void MC_memory_init()
   std_heap = mmalloc_get_default_md();
   xbt_assert(std_heap != NULL);
 
+#if defined HAVE_GNU_LD && !defined MMALLOC_WANT_OVERRIDE_LEGACY 
+  /* use the system malloc for the model-checker data */
+  raw_heap = NULL;
+#else
   /* Create the second region a page after the first one ends + safety gap */
   raw_heap = xbt_mheap_new(-1, (char*)(std_heap) + STD_HEAP_SIZE + getpagesize());
   xbt_assert(raw_heap != NULL);
+#endif
 }
 
 /* Finalize the memory subsystem */