From 696d846a56cc12549f080c6c87e6a0272bdb29f1 Mon Sep 17 00:00:00 2001 From: Max Ostapenko Date: Wed, 21 Oct 2015 10:32:45 +0300 Subject: libsanitizer merge from upstream r250806. libsanitizer/ 2015-10-20 Maxim Ostapenko * All source files: Merge from upstream r250806. * configure.ac (link_sanitizer_common): Add -lrt flag. * configure.tgt: Enable TSAN and LSAN for aarch64-linux targets. Set CXX_ABI_NEEDED=true for darwin. * asan/Makefile.am (asan_files): Add new files. (DEFS): Add DCAN_SANITIZE_UB=0 and remove unused and legacy DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0. * asan/Makefile.in: Regenerate. * ubsan/Makefile.am (ubsan_files): Add new files. (DEFS): Add DCAN_SANITIZE_UB=1. (libubsan_la_LIBADD): Add -lc++abi if CXX_ABI_NEEDED is true. * ubsan/Makefile.in: Regenerate. * tsan/Makefile.am (tsan_files): Add new files. (DEFS): Add DCAN_SANITIZE_UB=0. * tsan/Makefile.in: Regenerate. * sanitizer_common/Makefile.am (sanitizer_common_files): Add new files. * sanitizer_common/Makefile.in: Regenerate. * asan/libtool-version: Bump the libasan SONAME. From-SVN: r229111 --- libsanitizer/MERGE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libsanitizer/MERGE') diff --git a/libsanitizer/MERGE b/libsanitizer/MERGE index ef893cb..6ff9a9a 100644 --- a/libsanitizer/MERGE +++ b/libsanitizer/MERGE @@ -1,4 +1,4 @@ -221802 +250806 The first line of this file holds the svn revision number of the last merge done from the master library sources. -- cgit v1.1