diff options
| author | Kostya Serebryany <kcc@google.com> | 2013-02-21 10:57:10 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@gcc.gnu.org> | 2013-02-21 10:57:10 +0000 |
| commit | 7df59255e1accc8f95b4d90d1a17c60cd0e6e40e (patch) | |
| tree | 0ad34c195787ec507c5bcdbb710bf127eb3a2fb5 /gcc | |
| parent | 22deefcbb7c556a99fd72c1fb92a3a35b6dfd4b4 (diff) | |
| download | gcc-7df59255e1accc8f95b4d90d1a17c60cd0e6e40e.zip gcc-7df59255e1accc8f95b4d90d1a17c60cd0e6e40e.tar.gz gcc-7df59255e1accc8f95b4d90d1a17c60cd0e6e40e.tar.bz2 | |
libsanitizer merge from upstream r175733
From-SVN: r196201
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/i386/i386.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 067a61f..ca184f2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2013-02-23 Kostya Serebryany <kcc@google.com> + + * config/i386/i386.c (ix86_asan_shadow_offset): Use 0x7fff8000 as + asan_shadow_offset on x86_64 linux. + 2013-02-21 Richard Biener <rguenther@suse.de> PR tree-optimization/56415 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index f9f266a..b835c5d 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -5436,7 +5436,8 @@ ix86_legitimate_combined_insn (rtx insn) static unsigned HOST_WIDE_INT ix86_asan_shadow_offset (void) { - return TARGET_LP64 ? (HOST_WIDE_INT_1 << 44) + return TARGET_LP64 ? (TARGET_MACHO ? (HOST_WIDE_INT_1 << 44) + : HOST_WIDE_INT_C (0x7fff8000)) : (HOST_WIDE_INT_1 << 29); } |