aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorMax Ostapenko <m.ostapenko@partner.samsung.com>2015-11-23 11:07:18 +0200
committerMaxim Ostapenko <chefmax@gcc.gnu.org>2015-11-23 11:07:18 +0200
commit55aea9f56ccbdd0e225d4899024efd7b2b9f95b2 (patch)
treeb49fa5302e995c5559c7cb481c5eb8b9d3b42c08 /libsanitizer/MERGE
parent096b85f4b4ad0578059d4c3c6ac1c6c330abb3fb (diff)
downloadgcc-55aea9f56ccbdd0e225d4899024efd7b2b9f95b2.zip
gcc-55aea9f56ccbdd0e225d4899024efd7b2b9f95b2.tar.gz
gcc-55aea9f56ccbdd0e225d4899024efd7b2b9f95b2.tar.bz2
libsanitizer merge from upstream r253555.
libsanitizer/ 2015-11-23 Maxim Ostapenko <m.ostapenko@partner.samsung.com> * All source files: Merge from upstream r253555. * configure.tgt: Enable LSan on aarch64-*-linux* targets. Add new dependences for TSan for aarch64-*-linux* targets. * tsan/Makefile.am: Add new source files. * configure: Regenerate. * tsan/Makefile.in: Likewise. From-SVN: r230739
Diffstat (limited to 'libsanitizer/MERGE')
-rw-r--r--libsanitizer/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/libsanitizer/MERGE b/libsanitizer/MERGE
index 6ff9a9a..dfd606a 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-250806
+253555
The first line of this file holds the svn revision number of the
last merge done from the master library sources.