[src/trunk]: src/external/gpl3/gcc/dist/gcc Don't add a dynamic dependency to...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f20a97d9d42b
branches:  trunk
changeset: 323146:f20a97d9d42b
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 02 01:40:02 2018 +0000

description:
Don't add a dynamic dependency to the sanitizer shared libaries in other
shared libraries.

diffstat:

 external/gpl3/gcc/dist/gcc/config/netbsd-elf.h |  4 ++--
 external/gpl3/gcc/dist/gcc/gcc.c               |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r d60146f5d14d -r f20a97d9d42b external/gpl3/gcc/dist/gcc/config/netbsd-elf.h
--- a/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h    Sat Jun 02 01:38:41 2018 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/netbsd-elf.h    Sat Jun 02 01:40:02 2018 +0000
@@ -90,9 +90,9 @@
        %(netbsd_link_ld_elf_so)} \
      %{static:-static \
        %{pie: %(netbsd_link_ld_elf_so)}}} \
-   %{!nostdlib:%{!nodefaultlibs:\
+   %{!shared:%{!nostdlib:%{!nodefaultlibs:\
      %{%:sanitize(address): -lasan } \
-     %{%:sanitize(undefined): -lubsan}}}"
+     %{%:sanitize(undefined): -lubsan}}}}"
 
 /* Provide the standard list of subtarget extra specs for NetBSD targets.  */
 #define NETBSD_SUBTARGET_EXTRA_SPECS \
diff -r d60146f5d14d -r f20a97d9d42b external/gpl3/gcc/dist/gcc/gcc.c
--- a/external/gpl3/gcc/dist/gcc/gcc.c  Sat Jun 02 01:38:41 2018 +0000
+++ b/external/gpl3/gcc/dist/gcc/gcc.c  Sat Jun 02 01:40:02 2018 +0000
@@ -964,20 +964,20 @@
 /* Linker command line options for -fsanitize= early on the command line.  */
 #ifndef SANITIZER_EARLY_SPEC
 #define SANITIZER_EARLY_SPEC "\
-%{!nostdlib:%{!nodefaultlibs:%{%:sanitize(address):" LIBASAN_EARLY_SPEC "} \
+%{!shared:%{!nostdlib:%{!nodefaultlibs:%{%:sanitize(address):" LIBASAN_EARLY_SPEC "} \
     %{%:sanitize(thread):" LIBTSAN_EARLY_SPEC "} \
-    %{%:sanitize(leak):" LIBLSAN_EARLY_SPEC "}}}"
+    %{%:sanitize(leak):" LIBLSAN_EARLY_SPEC "}}}}"
 #endif
 
 /* Linker command line options for -fsanitize= late on the command line.  */
 #ifndef SANITIZER_SPEC
 #define SANITIZER_SPEC "\
-%{!nostdlib:%{!nodefaultlibs:%{%:sanitize(address):" LIBASAN_SPEC "\
+%{!shared:%{!nostdlib:%{!nodefaultlibs:%{%:sanitize(address):" LIBASAN_SPEC "\
     %{static:%ecannot specify -static with -fsanitize=address}}\
     %{%:sanitize(thread):" LIBTSAN_SPEC "\
     %{static:%ecannot specify -static with -fsanitize=thread}}\
     %{%:sanitize(undefined):" LIBUBSAN_SPEC "}\
-    %{%:sanitize(leak):" LIBLSAN_SPEC "}}}"
+    %{%:sanitize(leak):" LIBLSAN_SPEC "}}}}"
 #endif
 
 #ifndef POST_LINK_SPEC