From: Jakub Jelinek Date: Fri, 17 May 2013 12:17:14 +0000 (+0200) Subject: gcc.c (SANITIZER_SPEC): Reject -fsanitize=address -fsanitize=thread linking. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=17042d2b387c22ee6cd5b3ab5fa8772511493c44;p=gcc.git gcc.c (SANITIZER_SPEC): Reject -fsanitize=address -fsanitize=thread linking. * gcc.c (SANITIZER_SPEC): Reject -fsanitize=address -fsanitize=thread linking. From-SVN: r199009 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7bb4e280518..810fa4aa388 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,12 +1,14 @@ +2013-05-17 Jakub Jelinek + + * gcc.c (SANITIZER_SPEC): Reject -fsanitize=address -fsanitize=thread + linking. + 2013-05-17 Marek Polacek * 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 * tree-vect-patterns.c (vect_recog_rotate_pattern): For diff --git a/gcc/gcc.c b/gcc/gcc.c index 7aaf07dbe2c..6ef4e8a1b77 100644 --- a/gcc/gcc.c +++ b/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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8635b0b72e2..dfe29773ca9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-05-17 Marek Polacek + + * gcc.dg/strlenopt-25.c: New test. + * gcc.dg/strlenopt-26.c: Likewise. + 2013-05-17 Jakub Jelinek * gcc.target/i386/rotate-4.c: Compile only with -mavx