gcc.c (SANITIZER_SPEC): Reject -fsanitize=address -fsanitize=thread linking.

	* gcc.c (SANITIZER_SPEC): Reject -fsanitize=address -fsanitize=thread
	linking.

From-SVN: r199009

gcc/ChangeLog

+2013-05-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc.c (SANITIZER_SPEC): Reject -fsanitize=address -fsanitize=thread
+	linking.
+
 2013-05-17  Marek Polacek  <polacek@redhat.com>
 
 	* tree-ssa-strlen.c (handle_char_store): Don't invalidate
 	cached length when doing non-zero store of storing '\0' to
 	'\0'.
 
-	* gcc.dg/strlenopt-25.c: New test.
-	* gcc.dg/strlenopt-26.c: Likewise.
-
 2013-05-17  Jakub Jelinek  <jakub@redhat.com>
 
 	* tree-vect-patterns.c (vect_recog_rotate_pattern): For

gcc/gcc.c

@@ -716,7 +716,8 @@ proper position among the other output files.  */
 #ifndef SANITIZER_SPEC
 #define SANITIZER_SPEC "\
 %{!nostdlib:%{!nodefaultlibs:%{fsanitize=address:" LIBASAN_SPEC "\
-    %{static:%ecannot specify -static with -fsanitize=address}}\
+    %{static:%ecannot specify -static with -fsanitize=address}\
+    %{fsanitize=thread:%e-fsanitize=address is incompatible with -fsanitize=thread}}\
     %{fsanitize=thread:" LIBTSAN_SPEC "\
     %{!pie:%{!shared:%e-fsanitize=thread linking must be done with -pie or -shared}}}}}"
 #endif

gcc/testsuite/ChangeLog

+2013-05-17  Marek Polacek  <polacek@redhat.com>
+
+	* gcc.dg/strlenopt-25.c: New test.
+	* gcc.dg/strlenopt-26.c: Likewise.
+
 2013-05-17  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.target/i386/rotate-4.c: Compile only with -mavx