projects
/
gcc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
gcov.c (print_usage): Handle new option.
[gcc.git]
/
libsanitizer
/
merge.sh
diff --git
a/libsanitizer/merge.sh
b/libsanitizer/merge.sh
index d2e622aeb1a808c16156f7e6b2aa63dd7edd99e1..9c29b319829f5ef34e3c1b321a809187534a92f7 100755
(executable)
--- 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