---
 tools/cmake/CompleteInFiles.cmake        |    2 +-
 tools/cmake/test_prog/prog_stackgrowth.c |   18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

Index: b/tools/cmake/CompleteInFiles.cmake
===================================================================
--- a/tools/cmake/CompleteInFiles.cmake
+++ b/tools/cmake/CompleteInFiles.cmake
@@ -616,7 +616,7 @@ else()
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
     set(PTH_STACKGROWTH "-1")
   else()
-    message(ERROR "Could not figure the stack direction.")
+    message(FATAL_ERROR "Could not figure out the stack direction. Test prog returned: ${stack}; CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}.")
   endif()
 endif()
 
Index: b/tools/cmake/test_prog/prog_stackgrowth.c
===================================================================
--- a/tools/cmake/test_prog/prog_stackgrowth.c
+++ b/tools/cmake/test_prog/prog_stackgrowth.c
@@ -10,12 +10,20 @@
 static int iterate = 10;
 static int growsdown(int *x)
 {
-  int y;
-  y = (x > &y);
+  int y = (x > &y);
+   
   if (--iterate > 0)
     y = growsdown(&y);
-  if (y != (x > &y))
+
+  /* The stack sometimes changes at the 0th level. 
+   * Original version did fail in this case, but I changed this around SimGrid 3.13 because of https://bugs.debian.org/814272
+   * Every arch failed on that day :(
+   */
+  if (iterate != 0 && y != (x > &y)) {
+    fprintf(stderr, "The stack changed its direction! (Iteration: %d. It was growing %s; &y=%p; &prevY=%p)\n",
+	    (10-iterate), y?"down":"up", &y, x);
     exit(1);
+  }
   return y;
 }
 
@@ -23,6 +31,6 @@ int main(int argc, char *argv[])
 {
   int x;
   printf("%s", growsdown(&x) ? "down" : "up");
-  exit(0);
-  return 1;
+
+  return 0;
 }
