| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283 |
- diff --git a/gcc/gcc.c b/gcc/gcc.c
- index 0af888c7d78..70c9b3f7e18 100644
- --- a/gcc/gcc.c
- +++ b/gcc/gcc.c
- @@ -733,12 +733,12 @@ proper position among the other output files. */
-
- #ifndef LIBASAN_SPEC
- #define STATIC_LIBASAN_LIBS \
- - " %{static-libasan|static:%:include(libsanitizer.spec)%(link_libasan)}"
- + " %:include(libsanitizer.spec)%(link_libasan)"
- #ifdef LIBASAN_EARLY_SPEC
- #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- -#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
- - "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
- +#define LIBASAN_SPEC LD_STATIC_OPTION \
- + " -lasan " LD_DYNAMIC_OPTION \
- STATIC_LIBASAN_LIBS
- #else
- #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
- @@ -751,12 +751,12 @@ proper position among the other output files. */
-
- #ifndef LIBHWASAN_SPEC
- #define STATIC_LIBHWASAN_LIBS \
- - " %{static-libhwasan|static:%:include(libsanitizer.spec)%(link_libhwasan)}"
- + " %:include(libsanitizer.spec)%(link_libhwasan)"
- #ifdef LIBHWASAN_EARLY_SPEC
- #define LIBHWASAN_SPEC STATIC_LIBHWASAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- -#define LIBHWASAN_SPEC "%{static-libhwasan:" LD_STATIC_OPTION \
- - "} -lhwasan %{static-libhwasan:" LD_DYNAMIC_OPTION "}" \
- +#define LIBHWASAN_SPEC LD_STATIC_OPTION \
- + " -lhwasan " LD_DYNAMIC_OPTION \
- STATIC_LIBHWASAN_LIBS
- #else
- #define LIBHWASAN_SPEC "-lhwasan" STATIC_LIBHWASAN_LIBS
- @@ -769,12 +769,12 @@ proper position among the other output files. */
-
- #ifndef LIBTSAN_SPEC
- #define STATIC_LIBTSAN_LIBS \
- - " %{static-libtsan|static:%:include(libsanitizer.spec)%(link_libtsan)}"
- + " %:include(libsanitizer.spec)%(link_libtsan)"
- #ifdef LIBTSAN_EARLY_SPEC
- #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- -#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
- - "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
- +#define LIBTSAN_SPEC LD_STATIC_OPTION \
- + " -ltsan " LD_DYNAMIC_OPTION \
- STATIC_LIBTSAN_LIBS
- #else
- #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
- @@ -787,12 +787,12 @@ proper position among the other output files. */
-
- #ifndef LIBLSAN_SPEC
- #define STATIC_LIBLSAN_LIBS \
- - " %{static-liblsan|static:%:include(libsanitizer.spec)%(link_liblsan)}"
- + " %:include(libsanitizer.spec)%(link_liblsan)"
- #ifdef LIBLSAN_EARLY_SPEC
- #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
- #elif defined(HAVE_LD_STATIC_DYNAMIC)
- -#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
- - "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
- +#define LIBLSAN_SPEC LD_STATIC_OPTION \
- + " -llsan " LD_DYNAMIC_OPTION \
- STATIC_LIBLSAN_LIBS
- #else
- #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
- @@ -805,10 +805,10 @@ proper position among the other output files. */
-
- #ifndef LIBUBSAN_SPEC
- #define STATIC_LIBUBSAN_LIBS \
- - " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
- + " %:include(libsanitizer.spec)%(link_libubsan)"
- #ifdef HAVE_LD_STATIC_DYNAMIC
- -#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
- - "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
- +#define LIBUBSAN_SPEC LD_STATIC_OPTION \
- + " -lubsan " LD_DYNAMIC_OPTION \
- STATIC_LIBUBSAN_LIBS
- #else
- #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
|
