diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5a0a82128a8..e85a8e8813e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-01  Iain Sandoe  <iain@sandoe.co.uk>
+
+	* config/i386/darwin.h: Repair SUBTARGET_INIT_BUILTINS.
+	Override SUBTARGET_SHADOW_OFFSET macro.
+
 2020-05-01  Andreas Tobler  <andreast@gcc.gnu.org>
 
 	* config/i386/i386.h: Define a new macro: SUBTARGET_SHADOW_OFFSET.
diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h
index cff9a8c6b01..fec934aae69 100644
--- a/gcc/config/i386/darwin.h
+++ b/gcc/config/i386/darwin.h
@@ -347,12 +347,11 @@ along with GCC; see the file COPYING3.  If not see
 #define SUBTARGET_INIT_BUILTINS						\
   do {									\
     ix86_builtins[(int) IX86_BUILTIN_CFSTRING]				\
+      = darwin_init_cfstring_builtins ((unsigned) (IX86_BUILTIN_CFSTRING)); \
+    darwin_rename_builtins ();						\
+  } while(0)
 
 /* Define the shadow offset for asan.  */
 #undef SUBTARGET_SHADOW_OFFSET
 #define SUBTARGET_SHADOW_OFFSET	\
   (TARGET_LP64 ? HOST_WIDE_INT_1 << 44 : HOST_WIDE_INT_1 << 29)
-
-      = darwin_init_cfstring_builtins ((unsigned) (IX86_BUILTIN_CFSTRING)); \
-    darwin_rename_builtins ();						\
-  } while(0)