aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@gcc.gnu.org>2013-02-05 09:08:09 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2013-02-05 09:08:09 +0000
commit956d3b33b5a2a578be54ce8f41fd553e94bdaf2f (patch)
tree410fe55e15ac0faad6962b715fb03364c2294b96 /gcc
parentcf35e2b1e6e24e73f727deda55d6f4042a8ef23d (diff)
downloadgcc-956d3b33b5a2a578be54ce8f41fd553e94bdaf2f.zip
gcc-956d3b33b5a2a578be54ce8f41fd553e94bdaf2f.tar.gz
gcc-956d3b33b5a2a578be54ce8f41fd553e94bdaf2f.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/config/gnu-user.h2
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 <glider@google.com>
- Jack Howarth <howarth@bromo.med.uc.edu>
+2013-02-05 Eric Botcazou <ebotcazou@adacore.com>
+
+ PR sanitizer/55374
+ * config/gnu-user.h (LIBASAN_EARLY_SPEC): Add missing guard.
+
+2013-02-04 Alexander Potapenko <glider@google.com>
+ Jack Howarth <howarth@bromo.med.uc.edu>
Jakub Jelinek <jakub@redhat.com>
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