From: Martin Liska <mliska@suse.cz>
Date: Mon, 17 Jul 2017 11:44:54 +0000 (+0200)
Subject: Do not allow -fgnu-tm w/ -fsanitize={kernel-,}address (PR sanitizer/81302).
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=26c5b549cf954899e4c383e4f23e0b1c305449b2;p=gcc.git

Do not allow -fgnu-tm w/ -fsanitize={kernel-,}address (PR sanitizer/81302).

2017-07-17  Martin Liska  <mliska@suse.cz>

	PR sanitizer/81302
	* opts.c (finish_options): Do not allow -fgnu-tm
	w/ -fsanitize={kernel-,}address.  Say sorry.

From-SVN: r250271
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce0b6cc4ebf..f241a89ad2c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-07-17  Martin Liska  <mliska@suse.cz>
+
+	PR sanitizer/81302
+	* opts.c (finish_options): Do not allow -fgnu-tm
+	w/ -fsanitize={kernel-,}address.  Say sorry.
+
 2017-07-17  Bin Cheng  <bin.cheng@arm.com>
 
 	PR target/81369
diff --git a/gcc/opts.c b/gcc/opts.c
index 0343d6a5e86..3182bc99d65 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1005,6 +1005,13 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
 
       opts->x_flag_stack_reuse = SR_NONE;
     }
+
+  if ((opts->x_flag_sanitize & SANITIZE_USER_ADDRESS) && opts->x_flag_tm)
+    sorry ("transactional memory is not supported with %<-fsanitize=address%>");
+
+  if ((opts->x_flag_sanitize & SANITIZE_KERNEL_ADDRESS) && opts->x_flag_tm)
+    sorry ("transactional memory is not supported with "
+	   "%<-fsanitize=kernel-address%>");
 }
 
 #define LEFT_COLUMN	27