aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/ubsan/Makefile.am
diff options
context:
space:
mode:
authorMaxim Ostapenko <m.ostapenko@samsung.com>2018-07-04 19:49:06 +0000
committerMaxim Ostapenko <chefmax@gcc.gnu.org>2018-07-04 22:49:06 +0300
commitca8dd9f2745d6931f70b7a5f7e46f8e2032d5912 (patch)
tree05ab9d3e7c12ed003b81a038bb975000b4a57d80 /libsanitizer/ubsan/Makefile.am
parenta617812f148c71209a94f33879b13fa603c6103c (diff)
downloadgcc-ca8dd9f2745d6931f70b7a5f7e46f8e2032d5912.zip
gcc-ca8dd9f2745d6931f70b7a5f7e46f8e2032d5912.tar.gz
gcc-ca8dd9f2745d6931f70b7a5f7e46f8e2032d5912.tar.bz2
re PR sanitizer/84250 (Symbol collision when using both Address and Undefined Behavior sanitizers (-fsanitize=address,undefined))
gcc/ 2018-07-04 Maxim Ostapenko <m.ostapenko@samsung.com> PR sanitizer/84250 * config/gnu-user.h (LIBASAN_EARLY_SPEC): Pass -lstdc++ for static libasan. * gcc.c: Do not pass LIBUBSAN_SPEC if ASan is enabled with UBSan. libsanitizer/ 2018-07-04 Maxim Ostapenko <m.ostapenko@samsung.com> PR sanitizer/84250 * Makefile.am: Reorder libs. * Makefile.in: Regenerate. * asan/Makefile.am: Define DCAN_SANITIZE_UB=1, add dependancy from libsanitizer_ubsan.la. * asan/Makefile.in: Regenerate. * ubsan/Makefile.am: Define new libsanitizer_ubsan.la library. * ubsan/Makefile.in: Regenerate. From-SVN: r262421
Diffstat (limited to 'libsanitizer/ubsan/Makefile.am')
-rw-r--r--libsanitizer/ubsan/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/libsanitizer/ubsan/Makefile.am b/libsanitizer/ubsan/Makefile.am
index 2bff6be..1bb40bd 100644
--- a/libsanitizer/ubsan/Makefile.am
+++ b/libsanitizer/ubsan/Makefile.am
@@ -11,6 +11,7 @@ AM_CXXFLAGS += $(EXTRA_CXXFLAGS)
ACLOCAL_AMFLAGS = -I m4
toolexeclib_LTLIBRARIES = libubsan.la
+noinst_LTLIBRARIES = libsanitizer_ubsan.la
ubsan_plugin_files = \
ubsan_diag.cc \
@@ -25,7 +26,10 @@ ubsan_plugin_files = \
ubsan_files = $(ubsan_plugin_files)
-libubsan_la_SOURCES = $(ubsan_files)
+libsanitizer_ubsan_la_SOURCES = $(ubsan_plugin_files)
+libsanitizer_ubsan_la_LIBADD = $(LIBSTDCXX_RAW_CXX_LDFLAGS)
+
+libubsan_la_SOURCES = $(ubsan_files)
libubsan_la_LIBADD = $(top_builddir)/sanitizer_common/libsanitizer_common.la
if !USING_MAC_INTERPOSE
libubsan_la_LIBADD += $(top_builddir)/interception/libinterception.la