From 6422242b91c9568e93010d3d323ceb57a15aa751 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 13 Feb 2013 17:06:43 +0100 Subject: [PATCH] i386.c (ix86_asan_shadow_offset): Revert last change. * config/i386/i386.c (ix86_asan_shadow_offset): Revert last change. * asan/asan_mapping.h (SHADOW_OFFSET): Set to (1ULL << 44) on x86-64. From-SVN: r196017 --- gcc/ChangeLog | 4 ++++ gcc/config/i386/i386.c | 3 +-- libsanitizer/ChangeLog | 4 ++++ libsanitizer/asan/asan_mapping.h | 6 +----- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 334f8fedccf..a3f2ca1d074 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2013-02-13 Jakub Jelinek + + * config/i386/i386.c (ix86_asan_shadow_offset): Revert last change. + 2013-02-13 Richard Biener PR lto/56295 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index b8ef1c33efc..9a94c36bea9 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -5436,8 +5436,7 @@ ix86_legitimate_combined_insn (rtx insn) static unsigned HOST_WIDE_INT ix86_asan_shadow_offset (void) { - return TARGET_LP64 ? (TARGET_MACHO ? (HOST_WIDE_INT_1 << 44) - : HOST_WIDE_INT_C (0x7fff8000)) + return TARGET_LP64 ? (HOST_WIDE_INT_1 << 44) : (HOST_WIDE_INT_1 << 29); } diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index db1e6e119de..861502f85aa 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,7 @@ +2013-02-13 Jakub Jelinek + + * asan/asan_mapping.h (SHADOW_OFFSET): Set to (1ULL << 44) on x86-64. + 2013-02-13 Kostya Serebryany PR sanitizer/56128 diff --git a/libsanitizer/asan/asan_mapping.h b/libsanitizer/asan/asan_mapping.h index 3e7fc6bd43b..48b24545b99 100644 --- a/libsanitizer/asan/asan_mapping.h +++ b/libsanitizer/asan/asan_mapping.h @@ -36,11 +36,7 @@ extern SANITIZER_INTERFACE_ATTRIBUTE uptr __asan_mapping_offset; # if defined(__powerpc64__) # define SHADOW_OFFSET (1ULL << 41) # else -# if ASAN_MAC -# define SHADOW_OFFSET (1ULL << 44) -# else -# define SHADOW_OFFSET 0x7fff8000ULL -# endif +# define SHADOW_OFFSET (1ULL << 44) # endif # endif # endif -- 2.30.2