After switching to GIT, we should use it in libsanitizer
merge script. I'll do merge from master as soon as
PR95311 gets fixed.
I'm going to install the patch.
libsanitizer/ChangeLog:
* LOCAL_PATCHES: Use git hash instead of SVN id.
* merge.sh: Use git instead of VCS. Update paths
relative to upstream git repository.
+21bb1625bd4f183984223ce31bd03ba47ed62f27
# This script merges libsanitizer sources from upstream.
# This script merges libsanitizer sources from upstream.
get_upstream() {
rm -rf upstream
git clone https://github.com/llvm/llvm-project.git upstream
get_upstream() {
rm -rf upstream
git clone https://github.com/llvm/llvm-project.git upstream
# This function merges changes from the directory upstream_path to
# the directory local_path.
merge() {
# This function merges changes from the directory upstream_path to
# the directory local_path.
merge() {
- upstream_path=upstream/$1
+ upstream_path=upstream/compiler-rt/$1
local_path=$2
change_comment_headers $upstream_path
echo MERGE: $upstream_path
local_path=$2
change_comment_headers $upstream_path
echo MERGE: $upstream_path
elif [ -f $upstream_path/$f ]; then
echo "FOUND IN UPSTREAM :" $f
cp -v $upstream_path/$f $local_path
elif [ -f $upstream_path/$f ]; then
echo "FOUND IN UPSTREAM :" $f
cp -v $upstream_path/$f $local_path
- $VCS add $local_path/$f
elif [ -f $local_path/$f ]; then
echo "FOUND IN LOCAL :" $f
elif [ -f $local_path/$f ]; then
echo "FOUND IN LOCAL :" $f
# Need to merge lib/builtins/assembly.h file:
mkdir -p builtins
# Need to merge lib/builtins/assembly.h file:
mkdir -p builtins
-cp -v upstream/lib/builtins/assembly.h builtins/assembly.h
+cp -v upstream/compiler-rt/lib/builtins/assembly.h builtins/assembly.h