diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2020-05-01 19:55:36 +0100 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2020-05-01 19:59:24 +0100 |
| commit | 13ec6724cd543fed0211aa60a7f963ad40a2b5b2 (patch) | |
| tree | 94ef18cc4b29926d6085dbed8bd97ba6a108a99f /gcc | |
| parent | 56017225eede47f94d0d81e3f1d0496d6b155963 (diff) | |
| download | gcc-13ec6724cd543fed0211aa60a7f963ad40a2b5b2.zip gcc-13ec6724cd543fed0211aa60a7f963ad40a2b5b2.tar.gz gcc-13ec6724cd543fed0211aa60a7f963ad40a2b5b2.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/i386/darwin.h | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5a0a821..e85a8e8 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 cff9a8c..fec934a 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) |