summaryrefslogtreecommitdiff
path: root/libsanitizer/merge.sh
diff options
context:
space:
mode:
authorJack Howarth <howarth@bromo.med.uc.edu>2013-02-21 19:12:43 +0000
committerJakub Jelinek <jakub@gcc.gnu.org>2013-02-21 20:12:43 +0100
commit304886c59c0521ff1c6bfc798181a6b0a17e9368 (patch)
treefedeedc14164345e1cec408a130979b64276ee87 /libsanitizer/merge.sh
parent68aab0e225dbafdaa8115092b0ed829ab5c9d161 (diff)
downloadgcc-304886c59c0521ff1c6bfc798181a6b0a17e9368.tar.gz
Makefile.am (libasan_la_SOURCES): Remove deprecated dynamic/asan_interceptors_dynamic.cc.
* asan/Makefile.am (libasan_la_SOURCES): Remove deprecated dynamic/asan_interceptors_dynamic.cc. * asan/Makefile.in: Regenerated. * merge.sh: Remove merge of deprecated lib/asan/dynamic. From-SVN: r196211
Diffstat (limited to 'libsanitizer/merge.sh')
-rwxr-xr-xlibsanitizer/merge.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh
index d2e622aeb1a..9c29b319829 100755
--- a/libsanitizer/merge.sh
+++ b/libsanitizer/merge.sh
@@ -66,7 +66,6 @@ CUR_REV=$(get_current_rev)
echo Current upstream revision: $CUR_REV
merge include/sanitizer include/sanitizer
merge lib/asan asan
-merge lib/asan/dynamic asan/dynamic
merge lib/tsan/rtl tsan
merge lib/sanitizer_common sanitizer_common
merge lib/interception interception