diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-21 19:12:43 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-21 19:12:43 +0000 |
| commit | c9880cbad7dca3a5ed67f708e4283d079cf74925 (patch) | |
| tree | fedeedc14164345e1cec408a130979b64276ee87 /libsanitizer/merge.sh | |
| parent | 6dfa90cc960b6d4d50faeb3fbb8c4ee6134e4e16 (diff) | |
| download | gcc-c9880cbad7dca3a5ed67f708e4283d079cf74925.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196211 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/merge.sh')
| -rwxr-xr-x | libsanitizer/merge.sh | 1 |
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 |