OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Darwin: Fix bootstrap break from libsanitizer changes.

Browse Source 
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.
This commit is contained in:
Iain Sandoe 2020-05-01 19:55:36 +01:00
parent 56017225ee
commit 13ec6724cd
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -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> 2020-05-01 Andreas Tobler <andreast@gcc.gnu.org>
* config/i386/i386.h: Define a new macro: SUBTARGET_SHADOW_OFFSET. * config/i386/i386.h: Define a new macro: SUBTARGET_SHADOW_OFFSET.

7
gcc/config/i386/darwin.h
View File

@ -347,12 +347,11 @@ along with GCC; see the file COPYING3. If not see
#define SUBTARGET_INIT_BUILTINS \ #define SUBTARGET_INIT_BUILTINS \
do { \ do { \
ix86_builtins[(int) IX86_BUILTIN_CFSTRING] \ 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. */ /* Define the shadow offset for asan. */
#undef SUBTARGET_SHADOW_OFFSET #undef SUBTARGET_SHADOW_OFFSET
#define SUBTARGET_SHADOW_OFFSET \ #define SUBTARGET_SHADOW_OFFSET \
(TARGET_LP64 ? HOST_WIDE_INT_1 << 44 : HOST_WIDE_INT_1 << 29) (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)