diff --git a/src/mono/mono/mini/mini-amd64.h b/src/mono/mono/mini/mini-amd64.h
index 8872ece7ee97e4..51ffbcdcda57a2 100644
--- a/src/mono/mono/mini/mini-amd64.h
+++ b/src/mono/mono/mini/mini-amd64.h
@@ -382,7 +382,7 @@ typedef struct {
 
 #define MONO_ARCH_USE_SIGACTION 1
 
-#ifdef HAVE_WORKING_SIGALTSTACK
+#ifdef ENABLE_SIGALTSTACK
 
 #define MONO_ARCH_SIGSEGV_ON_ALTSTACK
 
diff --git a/src/mono/mono/mini/mini-ppc.h b/src/mono/mono/mini/mini-ppc.h
index 88a5415c5a925a..7c706ad7214dfa 100644
--- a/src/mono/mono/mini/mini-ppc.h
+++ b/src/mono/mono/mini/mini-ppc.h
@@ -232,10 +232,10 @@ typedef struct MonoCompileArch {
 
 #define PPC_CALL_REG ppc_r12
 
-#if defined(HAVE_WORKING_SIGALTSTACK) && !defined(__APPLE__)
+#if defined(ENABLE_SIGALTSTACK) && !defined(__APPLE__)
 #define MONO_ARCH_SIGSEGV_ON_ALTSTACK 1
 #define MONO_ARCH_SIGNAL_STACK_SIZE (12 * 1024)
-#endif /* HAVE_WORKING_SIGALTSTACK */
+#endif /* ENABLE_SIGALTSTACK */
 
 #define MONO_ARCH_IMT_REG ppc_r11
 
diff --git a/src/mono/mono/mini/mini-sparc.h b/src/mono/mono/mini/mini-sparc.h
index 1d96c2f0360ce4..aabbac47538098 100644
--- a/src/mono/mono/mini/mini-sparc.h
+++ b/src/mono/mono/mini/mini-sparc.h
@@ -91,7 +91,7 @@ typedef struct MonoCompileArch {
 
 #define MONO_ARCH_USE_SIGACTION 1
 
-#ifdef HAVE_WORKING_SIGALTSTACK
+#ifdef ENABLE_SIGALTSTACK
 /*#define MONO_ARCH_SIGSEGV_ON_ALTSTACK*/
 #endif
 
diff --git a/src/mono/mono/mini/mini-x86.h b/src/mono/mono/mini/mini-x86.h
index 7e5f7a25a95831..6ccdd27f778742 100644
--- a/src/mono/mono/mini/mini-x86.h
+++ b/src/mono/mono/mini/mini-x86.h
@@ -46,7 +46,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep);
 
 #ifndef HOST_WIN32
 
-#ifdef HAVE_WORKING_SIGALTSTACK
+#ifdef ENABLE_SIGALTSTACK
 /*
  * solaris doesn't have pthread_getattr_np () needed by the sigaltstack setup
  * code.
@@ -59,7 +59,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep);
 #define MONO_ARCH_USE_SIGACTION
 #endif /* __HAIKU__ */
 
-#endif /* HAVE_WORKING_SIGALTSTACK */
+#endif /* ENABLE_SIGALTSTACK */
 #endif /* !HOST_WIN32 */
 
 #define MONO_ARCH_SUPPORT_TASKLETS 1