Darwin: Fix bootstrap break from libsanitizer changes.

The recent libsanitizer change seems to have had a corrupt
chunk, that caused it to apply a change part way through the
SUBTARGET_INIT_BUILTINS macro, leading to a bootstrap fail
in stage1.

gcc/ChangeLog:

2020-05-01  Iain Sandoe  <iain@sandoe.co.uk>

	* config/i386/darwin.h: Repair SUBTARGET_INIT_BUILTINS.
	Override SUBTARGET_SHADOW_OFFSET macro.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5a0a82128a8be6802449ee6b842fe94ad1f90e08..e85a8e8813e1621a3ece8ad2d9c8e021535b862e 100644 (file)
--- 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 cff9a8c6b01e6105773df8b7afbee580b2e9cdea..fec934aae69a2c2dc07e77f261dc1567e12e1b9e 100644 (file)
--- 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)