aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/lsan/Makefile.am
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2014-01-09 19:13:39 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2014-01-09 19:13:39 +0100
commitc915a581459aa0d513e084cd95bd893164413d8e (patch)
tree4673c23f2c16e27a9aa1581586e99feaf4bedb55 /libsanitizer/lsan/Makefile.am
parent2fbec1f28b633989e983c39739957f60a0299422 (diff)
downloadgcc-c915a581459aa0d513e084cd95bd893164413d8e.zip
gcc-c915a581459aa0d513e084cd95bd893164413d8e.tar.gz
gcc-c915a581459aa0d513e084cd95bd893164413d8e.tar.bz2
re PR sanitizer/59136 (llvm-symbolizer shouldn't be started always)
PR sanitizer/59136 libsanitizer/ * sanitizer_common/Makefile.am (AM_CXXFLAGS): If LIBBACKTRACE_SUPPORTED add -DSANITIZER_LIBBACKTRACE and -I/-include flags. * lsan/Makefile.am (liblsan_la_LIBADD): Add libsanitizer_libbacktrace.la if LIBBACKTRACE_SUPPORTED. * tsan/Makefile.am (libtsan_la_LIBADD): Likewise. * ubsan/Makefile.am (libubsan_la_LIBADD): Likewise. * asan/Makefile.am (libasan_la_LIBADD): Likewise. * Makefile.am (SUBDIRS): If LIBBACKTRACE_SUPPORTED add libbacktrace. * README.gcc: Document that also lsan and ubsan are maintained in compiler-rt upstream. * libbacktrace/Makefile.am: New file. * libbacktrace/backtrace-rename.h: New file. * libbacktrace/backtrace-supported.h.in: New file. * libbacktrace/bridge.cc: New file. * configure.ac: Add tests needed for libbacktrace build within libsanitizer. * sanitizer_common/Makefile.in: Regenerated. * lsan/Makefile.in: Regenerated. * tsan/Makefile.in: Regenerated. * ubsan/Makefile.in: Regenerated. * libbacktrace/Makefile.in: Generated. * config.h.in: Regenerated. * configure: Regenerated. * Makefile.in: Regenerated. * interception/Makefile.in: Regenerated. * asan/Makefile.in: Regenerated. * aclocal.m4: Regenerated. testsuite/ * c-c++-common/asan/strip-path-prefix-1.c: Allow also the filename:line instead of (modulename+offset) form with stripped initial / from the filename. From-SVN: r206475
Diffstat (limited to 'libsanitizer/lsan/Makefile.am')
-rw-r--r--libsanitizer/lsan/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/libsanitizer/lsan/Makefile.am b/libsanitizer/lsan/Makefile.am
index 4784d7c..7a508c1 100644
--- a/libsanitizer/lsan/Makefile.am
+++ b/libsanitizer/lsan/Makefile.am
@@ -28,7 +28,11 @@ lsan_files = \
libsanitizer_lsan_la_SOURCES = $(sanitizer_lsan_files)
liblsan_la_SOURCES = $(lsan_files)
-liblsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la $(LIBSTDCXX_RAW_CXX_LDFLAGS)
+liblsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la $(top_builddir)/interception/libinterception.la
+if LIBBACKTRACE_SUPPORTED
+liblsan_la_LIBADD += $(top_builddir)/libbacktrace/libsanitizer_libbacktrace.la
+endif
+liblsan_la_LIBADD += $(LIBSTDCXX_RAW_CXX_LDFLAGS)
liblsan_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(link_liblsan)
# Work around what appears to be a GNU make bug handling MAKEFLAGS