From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 31 Jan 2017 13:50:20 +0000 (+0100)
Subject: s390.c (s390_asan_shadow_offset): New function.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4997a71dbb815a65be536ad1a5e70cf95a63c6ab;p=gcc.git

s390.c (s390_asan_shadow_offset): New function.

gcc/
	* config/s390/s390.c (s390_asan_shadow_offset): New function.
	(TARGET_ASAN_SHADOW_OFFSET): Redefine.
libsanitizer/
	* configure.tgt: Enable asan and ubsan on 64-bit s390*-*-linux*.

From-SVN: r245060
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 772a2f4bad3..604c9bd626a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/s390/s390.c (s390_asan_shadow_offset): New function.
+	(TARGET_ASAN_SHADOW_OFFSET): Redefine.
+
 2017-01-31  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	PR target/78597
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index fe65846a4f2..93377cdf7c8 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -15435,6 +15435,14 @@ s390_excess_precision (enum excess_precision_type type)
   return FLT_EVAL_METHOD_UNPREDICTABLE;
 }
 
+/* Implement the TARGET_ASAN_SHADOW_OFFSET hook.  */
+
+static unsigned HOST_WIDE_INT
+s390_asan_shadow_offset (void)
+{
+  return TARGET_64BIT ? HOST_WIDE_INT_1U << 52 : HOST_WIDE_INT_UC (0x20000000);
+}
+
 /* Initialize GCC target structure.  */
 
 #undef  TARGET_ASM_ALIGNED_HI_OP
@@ -15536,6 +15544,8 @@ s390_excess_precision (enum excess_precision_type type)
 #define TARGET_BUILD_BUILTIN_VA_LIST s390_build_builtin_va_list
 #undef TARGET_EXPAND_BUILTIN_VA_START
 #define TARGET_EXPAND_BUILTIN_VA_START s390_va_start
+#undef TARGET_ASAN_SHADOW_OFFSET
+#define TARGET_ASAN_SHADOW_OFFSET s390_asan_shadow_offset
 #undef TARGET_GIMPLIFY_VA_ARG_EXPR
 #define TARGET_GIMPLIFY_VA_ARG_EXPR s390_gimplify_va_arg
 
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index b0a4546f960..97728e766c6 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* configure.tgt: Enable asan and ubsan on 64-bit s390*-*-linux*.
+
 2017-01-24  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure.tgt: Enable tsan and lsan on powerpc64{,le}-*-linux*.
diff --git a/libsanitizer/configure.tgt b/libsanitizer/configure.tgt
index c59b2cd919b..e648051aab8 100644
--- a/libsanitizer/configure.tgt
+++ b/libsanitizer/configure.tgt
@@ -39,6 +39,11 @@ case "${target}" in
 	;;
   sparc*-*-linux*)
 	;;
+  s390*-*-linux*)
+	if test x$ac_cv_sizeof_void_p = x4; then
+		UNSUPPORTED=1
+	fi
+	;;
   arm*-*-linux*)
 	;;
   aarch64*-*-linux*)