From 7df59255e1accc8f95b4d90d1a17c60cd0e6e40e Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Thu, 21 Feb 2013 10:57:10 +0000 Subject: libsanitizer merge from upstream r175733 From-SVN: r196201 --- gcc/ChangeLog | 5 +++++ gcc/config/i386/i386.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'gcc') 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 + + * config/i386/i386.c (ix86_asan_shadow_offset): Use 0x7fff8000 as + asan_shadow_offset on x86_64 linux. + 2013-02-21 Richard Biener 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); } -- cgit v1.1