Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision fa35958abc0942e783f01f10de4587d2e962815b)
+++ benchmark/Makefile.in	(revision c8c0c7c5291339c09222f6f42efd7ecbcf3e63cb)
@@ -352,6 +352,5 @@
 LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS)
 
 AM_V_CFA = $(am__v_CFA_@AM_V@)
Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision fa35958abc0942e783f01f10de4587d2e962815b)
+++ driver/cfa.cc	(revision c8c0c7c5291339c09222f6f42efd7ecbcf3e63cb)
@@ -401,4 +401,6 @@
 		args[nargs++] = "-Xlinker";
 		args[nargs++] = "--undefined=__cfaabi_appready_startup";
+		args[nargs++] = "-z";
+		args[nargs++] = "execstack";
 
 		// include the cfa library in case it is needed
Index: libcfa/configure
===================================================================
--- libcfa/configure	(revision fa35958abc0942e783f01f10de4587d2e962815b)
+++ libcfa/configure	(revision c8c0c7c5291339c09222f6f42efd7ecbcf3e63cb)
@@ -3000,5 +3000,5 @@
 case $CONFIGURATION in
 	"debug"   )
-		CONFIG_CFLAGS="-Og -g"
+		CONFIG_CFLAGS="-O0 -g"
 		CONFIG_CFAFLAGS="-debug"
 		CONFIG_BUILDLIB="yes"
Index: libcfa/configure.ac
===================================================================
--- libcfa/configure.ac	(revision fa35958abc0942e783f01f10de4587d2e962815b)
+++ libcfa/configure.ac	(revision c8c0c7c5291339c09222f6f42efd7ecbcf3e63cb)
@@ -68,5 +68,5 @@
 case $CONFIGURATION in
 	"debug"   )
-		CONFIG_CFLAGS="-Og -g"
+		CONFIG_CFLAGS="-O0 -g"
 		CONFIG_CFAFLAGS="-debug"
 		CONFIG_BUILDLIB="yes"
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision fa35958abc0942e783f01f10de4587d2e962815b)
+++ libcfa/src/Makefile.in	(revision c8c0c7c5291339c09222f6f42efd7ecbcf3e63cb)
@@ -416,6 +416,5 @@
 LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS)
 
 AM_V_CFA = $(am__v_CFA_@AM_V@)
Index: libcfa/src/concurrency/coroutine.cfa
===================================================================
--- libcfa/src/concurrency/coroutine.cfa	(revision fa35958abc0942e783f01f10de4587d2e962815b)
+++ libcfa/src/concurrency/coroutine.cfa	(revision c8c0c7c5291339c09222f6f42efd7ecbcf3e63cb)
@@ -131,5 +131,5 @@
 
 [void *, size_t] __stack_alloc( size_t storageSize ) {
-	static const size_t stack_data_size = libCeiling( sizeof(__stack_t), 16 ); // minimum alignment
+	const size_t stack_data_size = libCeiling( sizeof(__stack_t), 16 ); // minimum alignment
 	assert(__page_size != 0l);
 	size_t size = libCeiling( storageSize, 16 ) + stack_data_size;
@@ -157,5 +157,5 @@
 
 void __stack_prepare( __stack_info_t * this, size_t create_size ) {
-	static const size_t stack_data_size = libCeiling( sizeof(__stack_t), 16 ); // minimum alignment
+	const size_t stack_data_size = libCeiling( sizeof(__stack_t), 16 ); // minimum alignment
 	bool userStack;
 	void * storage;
Index: longrun_tests/Makefile.in
===================================================================
--- longrun_tests/Makefile.in	(revision fa35958abc0942e783f01f10de4587d2e962815b)
+++ longrun_tests/Makefile.in	(revision c8c0c7c5291339c09222f6f42efd7ecbcf3e63cb)
@@ -486,6 +486,5 @@
 LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS)
 
 AM_V_CFA = $(am__v_CFA_@AM_V@)
Index: src/cfa.make
===================================================================
--- src/cfa.make	(revision fa35958abc0942e783f01f10de4587d2e962815b)
+++ src/cfa.make	(revision c8c0c7c5291339c09222f6f42efd7ecbcf3e63cb)
@@ -4,6 +4,5 @@
 LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS)
 
 AM_V_CFA = $(am__v_CFA_@AM_V@)
Index: tests/Makefile.in
===================================================================
--- tests/Makefile.in	(revision fa35958abc0942e783f01f10de4587d2e962815b)
+++ tests/Makefile.in	(revision c8c0c7c5291339c09222f6f42efd7ecbcf3e63cb)
@@ -358,6 +358,5 @@
 LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS)
 
 AM_V_CFA = $(am__v_CFA_@AM_V@)
