3 # FIXME: do we need a license (or whatever else) header here?
5 # This script merges libsanitizer sources from upstream.
10 svn co http
://llvm.org
/svn
/llvm-project
/compiler-rt
/trunk upstream
15 svn info |
grep Revision |
grep -o '[0-9]*'
19 (cd $1; ls *.
{cc
,h
,inc
,S
} 2> /dev
/null
)
23 change_comment_headers
() {
24 for f
in $
(list_files
$1); do
25 sed -n 3p
$1/$f |
grep -q 'The LLVM Compiler Infrastructure' ||
continue
26 changed
=$
(awk 'NR != 2 && NR != 3' < $1/$f)
27 echo "$changed" > $1/$f
31 # ARGUMENTS: upstream_path local_path
32 # This function merges changes from the directory upstream_path to
33 # the directory local_path.
35 upstream_path
=upstream
/$1
37 change_comment_headers
$upstream_path
38 echo MERGE
: $upstream_path
39 all
=$
( (list_files
$upstream_path; list_files
$local_path) |
sort |
uniq)
42 if [ -f $upstream_path/$f -a -f $local_path/$f ]; then
43 echo "FOUND IN BOTH :" $f
44 # diff -u $local_path/$f $upstream_path/$f
45 cp -v $upstream_path/$f $local_path
46 elif [ -f $upstream_path/$f ]; then
47 echo "FOUND IN UPSTREAM :" $f
48 cp -v $upstream_path/$f $local_path
49 svn add
$local_path/$f
50 elif [ -f $local_path/$f ]; then
51 echo "FOUND IN LOCAL :" $f
52 svn remove
$local_path/$f
63 pwd |
grep 'libsanitizer$' || \
64 fatal
"Run this script from libsanitizer dir"
66 CUR_REV
=$
(get_current_rev
)
67 echo Current upstream revision
: $CUR_REV
68 merge include
/sanitizer include
/sanitizer
71 merge lib
/tsan
/rtl tsan
72 merge lib
/sanitizer_common sanitizer_common
73 merge lib
/interception interception
76 # Need to merge lib/builtins/assembly.h file:
78 cp -v upstream
/lib
/builtins
/assembly.h
builtins
/assembly.h
82 # Update the MERGE file.
86 The first line of this file holds the svn revision number of the
87 last merge done from the master library sources.