Merge ubsan into trunk.

[thirdparty/gcc.git] / gcc / tsan.c

diff --git a/gcc/tsan.c b/gcc/tsan.c
index b9171c803aa1d8cbbb4b5264ffddf00ba08829fc..fb91129eb674368adc74b9ad746efdc75fe40d6d 100644 (file)
--- a/gcc/tsan.c
+++ b/gcc/tsan.c
@@ -713,7 +713,7 @@ tsan_pass (void)
 static bool
 tsan_gate (void)
 {
-  return flag_tsan != 0;
+  return (flag_sanitize & SANITIZE_THREAD) != 0;
 }
 
 /* Inserts __tsan_init () into the list of CTORs.  */
@@ -775,7 +775,7 @@ make_pass_tsan (gcc::context *ctxt)
 static bool
 tsan_gate_O0 (void)
 {
-  return flag_tsan != 0 && !optimize;
+  return (flag_sanitize & SANITIZE_THREAD) != 0 && !optimize;
 }
 
 namespace {