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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 334f8fedccfe580d6c5557f74d3551915877a27b..a3f2ca1d074b8c7c4aebdc59535705a317f4f5cf 100644 (file)
--- 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 b8ef1c33efc95b76f30913f65ec87149845b2159..9a94c36bea984ceadd304598ed9ce36ff9eba3d1 100644 (file)
--- 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);
 }
 \f

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index db1e6e119de4115bfea7ac2fbfa9e726daefa6dd..861502f85aabb853ea444693843797d0a20fb6cf 100644 (file)
--- 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 3e7fc6bd43b40a3f26247240f960c99bcdf82631..48b24545b99fd73fbcb453e65afb29fdba3008cd 100644 (file)
--- 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