summaryrefslogtreecommitdiff
path: root/libsanitizer/merge.sh
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2012-12-04 07:00:35 +0000
committerKostya Serebryany <kcc@gcc.gnu.org>2012-12-04 07:00:35 +0000
commit8c4d267c6e834ccc20632d2c9077d7622b8145cf (patch)
treeffc5f7302fa16d7a7c53d7de59d3edaae370fbd3 /libsanitizer/merge.sh
parent3fa057a43770dbb23a0fb21a94cab1789df3277c (diff)
downloadgcc-8c4d267c6e834ccc20632d2c9077d7622b8145cf.tar.gz
[libsanitizer] Fix PR55521 by switching libsanitizer from mach_override to mac interpose functions on darwin
From-SVN: r194120
Diffstat (limited to 'libsanitizer/merge.sh')
-rwxr-xr-xlibsanitizer/merge.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh
index 297af56e790..0f75431cf68 100755
--- a/libsanitizer/merge.sh
+++ b/libsanitizer/merge.sh
@@ -66,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/asan/dynamic asan/dynamic
merge lib/tsan/rtl tsan
merge lib/sanitizer_common sanitizer_common
merge lib/interception interception