diff options
| author | Kostya Serebryany <kcc@google.com> | 2012-11-23 14:46:25 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@gcc.gnu.org> | 2012-11-23 14:46:25 +0000 |
| commit | e297eb600dd52acd73fb64ca45905b68f4e9b99b (patch) | |
| tree | a354102cd1c27b09eefe0b04f517d4ecac5bc566 /libsanitizer/merge.sh | |
| parent | 8ddf5c28ea6be09213739c94f9765019be476bb0 (diff) | |
| download | gcc-e297eb600dd52acd73fb64ca45905b68f4e9b99b.tar.gz | |
[libsanitizer] merge from upstream r168514
From-SVN: r193756
Diffstat (limited to 'libsanitizer/merge.sh')
| -rwxr-xr-x | libsanitizer/merge.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh index 6918ee2475f..297af56e790 100755 --- a/libsanitizer/merge.sh +++ b/libsanitizer/merge.sh @@ -44,10 +44,11 @@ merge() { cp -v $upstream_path/$f $local_path elif [ -f $upstream_path/$f ]; then echo "FOUND IN UPSTREAM :" $f - echo "UNSUPPORTED YET" && exit 1 + cp -v $upstream_path/$f $local_path + svn add $local_path/$f elif [ -f $local_path/$f ]; then echo "FOUND IN LOCAL :" $f - echo "UNSUPPORTED YET" && exit 1 + svn remove $local_path/$f fi done @@ -65,6 +66,7 @@ CUR_REV=$(get_current_rev) echo Current upstream revision: $CUR_REV merge include/sanitizer include/sanitizer merge lib/asan asan +merge lib/tsan/rtl tsan merge lib/sanitizer_common sanitizer_common merge lib/interception interception |