diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 524a9c9e170..0eabd3f19eb 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -1080,6 +1080,9 @@ extern void darwin_driver_init (unsigned int *,struct cl_decoded_option **);
 #undef SUPPORTS_INIT_PRIORITY
 #define SUPPORTS_INIT_PRIORITY 0
 
+#undef STACK_CHECK_STATIC_BUILTIN
+#define STACK_CHECK_STATIC_BUILTIN 1
+
 /* When building cross-compilers (and native crosses) we shall default to 
    providing an osx-version-min of this unless overridden by the User.
    10.5 is the only version that fully supports all our archs so that's the
diff --git a/gcc/config/darwin9.h b/gcc/config/darwin9.h
index 6576d386c12..125a35e7fc7 100644
--- a/gcc/config/darwin9.h
+++ b/gcc/config/darwin9.h
@@ -31,6 +31,3 @@ along with GCC; see the file COPYING3.  If not see
 
 #undef DEF_MIN_OSX_VERSION
 #define DEF_MIN_OSX_VERSION "10.5"
-
-#undef STACK_CHECK_STATIC_BUILTIN
-#define STACK_CHECK_STATIC_BUILTIN 1