From 956d3b33b5a2a578be54ce8f41fd553e94bdaf2f Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 5 Feb 2013 09:08:09 +0000 Subject: [PATCH] re PR sanitizer/55374 ([asan] -static-libasan -static-libstdc++ doesn't work) PR sanitizer/55374 * config/gnu-user.h (LIBASAN_EARLY_SPEC): Add missing guard. From-SVN: r195749 --- gcc/ChangeLog | 9 +++++++-- gcc/config/gnu-user.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bfb857d..5af0cea 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ -2013-02-04 Alexander Potapenko - Jack Howarth +2013-02-05 Eric Botcazou + + PR sanitizer/55374 + * config/gnu-user.h (LIBASAN_EARLY_SPEC): Add missing guard. + +2013-02-04 Alexander Potapenko + Jack Howarth Jakub Jelinek PR sanitizer/55617 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h index 6e3bbb4..0024626 100644 --- a/gcc/config/gnu-user.h +++ b/gcc/config/gnu-user.h @@ -102,10 +102,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see it for -shared link, the executable should be compiled with -static-libasan in that case, and for executable link link with --{,no-}whole-archive around it to force everything into the executable. */ +#if defined(HAVE_LD_STATIC_DYNAMIC) #undef LIBASAN_EARLY_SPEC #define LIBASAN_EARLY_SPEC "%{static-libasan:%{!shared:" \ LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \ LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}" +#endif /* Additional libraries needed by -static-libasan. */ #undef STATIC_LIBASAN_LIBS -- 2.7.4