Cope with non-const SIGSTKSZ.

See https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53.

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index dbd49f7..10056c7 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -11,7 +11,7 @@
 #include "src/simix/smx_private.hpp"
 #include "src/surf/surf_interface.hpp"
 
-#include <array>
+#include <vector>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
@@ -29,7 +29,9 @@ thread_local Context* Context::current_context_ = nullptr;
 /* Install or disable alternate signal stack, for SIGSEGV handler. */
 int Context::install_sigsegv_stack(stack_t* old_stack, bool enable)
 {
-  static std::array<unsigned char, SIGSTKSZ> sigsegv_stack;
+  static std::vector<unsigned char> sigsegv_stack;
+  if (sigsegv_stack.size() == 0)
+    sigsegv_stack.resize(SIGSTKSZ);
   stack_t stack;
   stack.ss_sp    = sigsegv_stack.data();
   stack.ss_size  = sigsegv_stack.size();

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index fe14085..b8a4412 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -88,8 +88,6 @@ static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
   std::raise(signum);
 }
 
-std::array<unsigned char, SIGSTKSZ> sigsegv_stack; /* alternate stack for SIGSEGV handler */
-
 /**
  * Install signal handler for SIGSEGV.  Check that nobody has already installed
  * its own handler.  For example, the Java VM does this.