From 5a8347e23ab13912b6edec2c6c6e3a101b017c79 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Fri, 21 Aug 2020 07:03:42 +0000 Subject: [PATCH 18/35] DP: Use --push-state/--pop-state for gold as well when linking libtsan. --- gcc/gcc.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/gcc.cc b/gcc/gcc.cc index 6cbb726599b..59390fd39d6 100644 --- a/gcc/gcc.cc +++ b/gcc/gcc.cc @@ -755,10 +755,10 @@ proper position among the other output files. */ #define LIBASAN_SPEC STATIC_LIBASAN_LIBS #elif defined(HAVE_LD_STATIC_DYNAMIC) #define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \ - " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \ + " %{!static-libasan:--push-state --no-as-needed}" \ " -lasan " \ " %{static-libasan:" LD_DYNAMIC_OPTION "}" \ - " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \ + " %{!static-libasan:--pop-state}" \ STATIC_LIBASAN_LIBS #else #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS @@ -794,10 +794,10 @@ proper position among the other output files. */ #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS #elif defined(HAVE_LD_STATIC_DYNAMIC) #define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \ - " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \ + " %{!static-libtsan:--push-state --no-as-needed}" \ " -ltsan " \ " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \ - " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \ + " %{!static-libtsan:--pop-state}" \ STATIC_LIBTSAN_LIBS #else #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS @@ -815,10 +815,10 @@ proper position among the other output files. */ #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS #elif defined(HAVE_LD_STATIC_DYNAMIC) #define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \ - " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \ + " %{!static-liblsan:--push-state --no-as-needed}" \ " -llsan " \ " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \ - " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \ + " %{!static-liblsan:--pop-state}" \ STATIC_LIBLSAN_LIBS #else #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS @@ -834,10 +834,10 @@ proper position among the other output files. */ " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}" #ifdef HAVE_LD_STATIC_DYNAMIC #define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \ - " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \ + " %{!static-libubsan:--push-state --no-as-needed}" \ " -lubsan " \ " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \ - " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \ + " %{!static-libubsan:--pop-state}" \ STATIC_LIBUBSAN_LIBS #else #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS -- 2.41.0