diff options
| author | Ben Cheng <bccheng@google.com> | 2013-08-05 15:18:29 -0700 |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2013-08-05 16:03:48 -0700 |
| commit | 32fce3edda831e36ee484406c39dffbe0230f257 (patch) | |
| tree | 733b1b5398304b260a4ee3d5d9b17da5038c5486 /gcc-4.8/gcc/gcc.c | |
| parent | e85b9ca2afe8edbb9fa99c6ce2cc4e52dce18c21 (diff) | |
| download | toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.tar.gz toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.tar.bz2 toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.zip | |
[4.8] Merge GCC 4.8.1
Change-Id: Ic8a60b7563f5172440fd40788605163a0cca6e30
Diffstat (limited to 'gcc-4.8/gcc/gcc.c')
| -rw-r--r-- | gcc-4.8/gcc/gcc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc-4.8/gcc/gcc.c b/gcc-4.8/gcc/gcc.c index f0b946e5e..e16f72ec5 100644 --- a/gcc-4.8/gcc/gcc.c +++ b/gcc-4.8/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 |