summaryrefslogtreecommitdiff
path: root/libsanitizer/Makefile.in
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2018-07-05 11:47:05 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2018-07-05 11:47:05 +0200
commitbdfc619ed80b29b35aff74731f84915e033a5e84 (patch)
tree29d65b5931984e80b81ce622d2a143c4e9f4f9e2 /libsanitizer/Makefile.in
parentc98446bc37da231419f6524d788dc6a4712458c8 (diff)
Revert
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. * 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: r262433
Diffstat (limited to 'libsanitizer/Makefile.in')
-rw-r--r--libsanitizer/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/libsanitizer/Makefile.in b/libsanitizer/Makefile.in
index 9074292764b..a9fea21eaf8 100644
--- a/libsanitizer/Makefile.in
+++ b/libsanitizer/Makefile.in
@@ -140,8 +140,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = sanitizer_common interception libbacktrace lsan ubsan \
- asan tsan
+DIST_SUBDIRS = sanitizer_common interception libbacktrace lsan asan \
+ ubsan tsan
ACLOCAL = @ACLOCAL@
ALLOC_FILE = @ALLOC_FILE@
AMTAR = @AMTAR@
@@ -294,7 +294,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
sanincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/sanitizer
nodist_saninclude_HEADERS = $(am__append_1)
@SANITIZER_SUPPORTED_TRUE@SUBDIRS = sanitizer_common $(am__append_2) \
-@SANITIZER_SUPPORTED_TRUE@ $(am__append_3) lsan ubsan asan \
+@SANITIZER_SUPPORTED_TRUE@ $(am__append_3) lsan asan ubsan \
@SANITIZER_SUPPORTED_TRUE@ $(am__append_4)
gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)