b3d566f570
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.
88 lines
2.1 KiB
Bash
Executable File
88 lines
2.1 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# FIXME: do we need a license (or whatever else) header here?
|
|
|
|
# This script merges libsanitizer sources from upstream.
|
|
|
|
get_upstream() {
|
|
rm -rf upstream
|
|
git clone https://github.com/llvm/llvm-project.git upstream
|
|
}
|
|
|
|
get_current_rev() {
|
|
cd upstream
|
|
git rev-parse HEAD
|
|
}
|
|
|
|
list_files() {
|
|
(cd $1; ls *.{cc,cpp,h,inc,S} 2> /dev/null)
|
|
|
|
}
|
|
|
|
change_comment_headers() {
|
|
for f in $(list_files $1); do
|
|
sed -n 3p $1/$f | grep -q 'The LLVM Compiler Infrastructure' || continue
|
|
changed=$(awk 'NR != 2 && NR != 3' < $1/$f)
|
|
echo "$changed" > $1/$f
|
|
done
|
|
}
|
|
|
|
# ARGUMENTS: upstream_path local_path
|
|
# This function merges changes from the directory upstream_path to
|
|
# the directory local_path.
|
|
merge() {
|
|
upstream_path=upstream/compiler-rt/$1
|
|
local_path=$2
|
|
change_comment_headers $upstream_path
|
|
echo MERGE: $upstream_path
|
|
all=$( (list_files $upstream_path; list_files $local_path) | sort | uniq)
|
|
#echo $all
|
|
for f in $all; do
|
|
if [ -f $upstream_path/$f -a -f $local_path/$f ]; then
|
|
echo "FOUND IN BOTH :" $f
|
|
# diff -u $local_path/$f $upstream_path/$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
|
|
git add $local_path/$f
|
|
elif [ -f $local_path/$f ]; then
|
|
echo "FOUND IN LOCAL :" $f
|
|
git rm $local_path/$f
|
|
fi
|
|
done
|
|
|
|
}
|
|
|
|
fatal() {
|
|
echo "$1"
|
|
exit 1;
|
|
}
|
|
|
|
pwd | grep 'libsanitizer$' || \
|
|
fatal "Run this script from libsanitizer dir"
|
|
get_upstream
|
|
CUR_REV=$(get_current_rev)
|
|
echo Current upstream revision: $CUR_REV
|
|
merge include/sanitizer include/sanitizer
|
|
merge lib/asan asan
|
|
merge lib/lsan lsan
|
|
merge lib/tsan/rtl tsan
|
|
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/compiler-rt/lib/builtins/assembly.h builtins/assembly.h
|
|
|
|
rm -rf upstream
|
|
|
|
# Update the MERGE file.
|
|
cat << EOF > MERGE
|
|
$CUR_REV
|
|
|
|
The first line of this file holds the git revision number of the
|
|
last merge done from the master library sources.
|
|
EOF
|