mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 10:54:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update merge.sh to reflect usage of git.

Browse Source 
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.
This commit is contained in:
Martin Liska 2020-05-25 20:55:29 +02:00
parent 757dbb59c1
commit b3d566f570
No known key found for this signature in database
GPG Key ID: 4DC182DC0FA73785
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsanitizer/LOCAL_PATCHES
View File

@ -1 +1 @@
r277910
21bb1625bd4f183984223ce31bd03ba47ed62f27

10
libsanitizer/merge.sh
View File

@ -4,8 +4,6 @@
# This script merges libsanitizer sources from upstream.
VCS=${1:-svn}
get_upstream() {
rm -rf upstream
git clone https://github.com/llvm/llvm-project.git upstream
@ -33,7 +31,7 @@ change_comment_headers() {
# 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
@ -47,10 +45,10 @@ merge() {
elif [ -f $upstream_path/$f ]; then
echo "FOUND IN UPSTREAM :" $f
cp -v $upstream_path/$f $local_path
$VCS add $local_path/$f
git add $local_path/$f
elif [ -f $local_path/$f ]; then
echo "FOUND IN LOCAL :" $f
$VCS rm $local_path/$f
git rm $local_path/$f
fi
done
@ -76,7 +74,7 @@ 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
cp -v upstream/compiler-rt/lib/builtins/assembly.h builtins/assembly.h
rm -rf upstream