summaryrefslogtreecommitdiff
path: root/libsanitizer/merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 'libsanitizer/merge.sh')
-rwxr-xr-xlibsanitizer/merge.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/libsanitizer/merge.sh b/libsanitizer/merge.sh
index 29e444248f1..b3321027733 100755
--- a/libsanitizer/merge.sh
+++ b/libsanitizer/merge.sh
@@ -72,6 +72,10 @@ merge lib/sanitizer_common sanitizer_common
merge lib/interception interception
merge lib/ubsan ubsan
+# Need to merge lib/builtins/assembly.h file:
+mkdir -p builtins
+cp -v upstream/lib/builtins/assembly.h builtins/assembly.h
+
rm -rf upstream
# Update the MERGE file.