diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2013-02-13 17:06:43 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2013-02-13 17:06:43 +0100 |
| commit | 6422242b91c9568e93010d3d323ceb57a15aa751 (patch) | |
| tree | 20aa77714bbc247472b41653e7fed3ac015bb48c | |
| parent | 976a81ee63d8fa4c6d7b9a8fd6f9f215cd7048e9 (diff) | |
| download | gcc-6422242b91c9568e93010d3d323ceb57a15aa751.zip gcc-6422242b91c9568e93010d3d323ceb57a15aa751.tar.gz gcc-6422242b91c9568e93010d3d323ceb57a15aa751.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/config/i386/i386.c | 3 | ||||
| -rw-r--r-- | libsanitizer/ChangeLog | 4 | ||||
| -rw-r--r-- | libsanitizer/asan/asan_mapping.h | 6 |
4 files changed, 10 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 334f8fe..a3f2ca1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2013-02-13 Jakub Jelinek <jakub@redhat.com> + + * config/i386/i386.c (ix86_asan_shadow_offset): Revert last change. + 2013-02-13 Richard Biener <rguenther@suse.de> PR lto/56295 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index b8ef1c3..9a94c36 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 db1e6e1..861502f 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,7 @@ +2013-02-13 Jakub Jelinek <jakub@redhat.com> + + * asan/asan_mapping.h (SHADOW_OFFSET): Set to (1ULL << 44) on x86-64. + 2013-02-13 Kostya Serebryany <kcc@google.com> PR sanitizer/56128 diff --git a/libsanitizer/asan/asan_mapping.h b/libsanitizer/asan/asan_mapping.h index 3e7fc6b..48b2454 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 |