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
This commit is contained in:
Jakub Jelinek 2013-02-13 17:06:43 +01:00 committed by Jakub Jelinek
parent 976a81ee63
commit 6422242b91
4 changed files with 10 additions and 7 deletions

View File

@ -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> 2013-02-13 Richard Biener <rguenther@suse.de>
PR lto/56295 PR lto/56295

View File

@ -5436,8 +5436,7 @@ ix86_legitimate_combined_insn (rtx insn)
static unsigned HOST_WIDE_INT static unsigned HOST_WIDE_INT
ix86_asan_shadow_offset (void) ix86_asan_shadow_offset (void)
{ {
return TARGET_LP64 ? (TARGET_MACHO ? (HOST_WIDE_INT_1 << 44) return TARGET_LP64 ? (HOST_WIDE_INT_1 << 44)
: HOST_WIDE_INT_C (0x7fff8000))
: (HOST_WIDE_INT_1 << 29); : (HOST_WIDE_INT_1 << 29);
} }

View File

@ -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> 2013-02-13 Kostya Serebryany <kcc@google.com>
PR sanitizer/56128 PR sanitizer/56128

View File

@ -36,11 +36,7 @@ extern SANITIZER_INTERFACE_ATTRIBUTE uptr __asan_mapping_offset;
# if defined(__powerpc64__) # if defined(__powerpc64__)
# define SHADOW_OFFSET (1ULL << 41) # define SHADOW_OFFSET (1ULL << 41)
# else # else
# if ASAN_MAC # define SHADOW_OFFSET (1ULL << 44)
# define SHADOW_OFFSET (1ULL << 44)
# else
# define SHADOW_OFFSET 0x7fff8000ULL
# endif
# endif # endif
# endif # endif
# endif # endif