diff mbox

Backport to GCC7

Message ID 39098fd6-4854-dead-93ce-e790e3523c1e@suse.cz
State New
Headers show

Commit Message

Martin Liška July 27, 2017, 8:34 a.m. UTC 
Adding one more that I've just tested.

Thanks,
Martin
diff mbox

Patch

From 96cea83ca9362a5598ab54ed83132cc0ab30a7e7 Mon Sep 17 00:00:00 2001
From: marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 17 Jul 2017 11:44:54 +0000
Subject: Backport r250271

gcc/ChangeLog:

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.

---
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
--
2.13.3