gcov.c (print_usage): Handle new option.

[gcc.git] / libsanitizer / merge.sh

diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh
index 6918ee2475fb690df68f21e15da0b53ea3395fbc..9c29b319829f5ef34e3c1b321a809187534a92f7 100755 (executable)
--- a/libsanitizer/merge.sh
+++ b/libsanitizer/merge.sh
@@ -16,7 +16,7 @@ get_current_rev() {
 }
 
 list_files() {
-  (cd $1; ls *.{cc,h} 2> /dev/null)
+  (cd $1; ls *.{cc,h,inc} 2> /dev/null)
 
 }
 
@@ -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