diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-07-05 11:47:05 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-07-05 11:47:05 +0200 |
| commit | bdfc619ed80b29b35aff74731f84915e033a5e84 (patch) | |
| tree | 29d65b5931984e80b81ce622d2a143c4e9f4f9e2 /gcc | |
| parent | c98446bc37da231419f6524d788dc6a4712458c8 (diff) | |
| download | gcc-bdfc619ed80b29b35aff74731f84915e033a5e84.zip gcc-bdfc619ed80b29b35aff74731f84915e033a5e84.tar.gz gcc-bdfc619ed80b29b35aff74731f84915e033a5e84.tar.bz2 | |
Revert
2018-07-04 Maxim Ostapenko <m.ostapenko@samsung.com>
PR sanitizer/84250
* config/gnu-user.h (LIBASAN_EARLY_SPEC): Pass -lstdc++ for static
libasan.
* gcc.c: Do not pass LIBUBSAN_SPEC if ASan is enabled with UBSan.
* Makefile.am: Reorder libs.
* Makefile.in: Regenerate.
* asan/Makefile.am: Define DCAN_SANITIZE_UB=1, add dependancy from
libsanitizer_ubsan.la.
* asan/Makefile.in: Regenerate.
* ubsan/Makefile.am: Define new libsanitizer_ubsan.la library.
* ubsan/Makefile.in: Regenerate.
From-SVN: r262433
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/config/gnu-user.h | 2 | ||||
| -rw-r--r-- | gcc/gcc.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2a609fe..1ecd226 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2018-07-05 Jakub Jelinek <jakub@redhat.com> + + Revert + 2018-07-04 Maxim Ostapenko <m.ostapenko@samsung.com> + + PR sanitizer/84250 + * config/gnu-user.h (LIBASAN_EARLY_SPEC): Pass -lstdc++ for static + libasan. + * gcc.c: Do not pass LIBUBSAN_SPEC if ASan is enabled with UBSan. + 2018-07-04 Maxim Ostapenko <m.ostapenko@samsung.com> PR sanitizer/84250 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h index ccae957..cba3c0b 100644 --- a/gcc/config/gnu-user.h +++ b/gcc/config/gnu-user.h @@ -161,7 +161,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \ "%{static-libasan:%{!shared:" \ LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \ - LD_DYNAMIC_OPTION " -lstdc++ }}%{!static-libasan:-lasan}" + LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}" #undef LIBTSAN_EARLY_SPEC #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \ "%{static-libtsan:%{!shared:" \ @@ -993,7 +993,7 @@ proper position among the other output files. */ %{static:%ecannot specify -static with -fsanitize=address}}\ %{%:sanitize(thread):" LIBTSAN_SPEC "\ %{static:%ecannot specify -static with -fsanitize=thread}}\ - %{!%:sanitize(address):%{%:sanitize(undefined):" LIBUBSAN_SPEC "}}\ + %{%:sanitize(undefined):" LIBUBSAN_SPEC "}\ %{%:sanitize(leak):" LIBLSAN_SPEC "}}}" #endif |