summaryrefslogtreecommitdiff
path: root/libsanitizer/merge.sh
diff options
context:
space:
mode:
authorkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-12-04 07:00:35 +0000
committerkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-12-04 07:00:35 +0000
commit524c4bbb71bd6634e6305c0b6a153b9700fcd6db (patch)
treeffc5f7302fa16d7a7c53d7de59d3edaae370fbd3 /libsanitizer/merge.sh
parent907c5ecdf6b298b6cb78e090d8451b36d5e241e9 (diff)
[libsanitizer] Fix PR55521 by switching libsanitizer from mach_override to mac interpose functions on darwin
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194120 138bc75d-0d04-0410-961f-82ee72b054a4
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 297af56e790d..0f75431cf685 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