@@ -7,7 +7,7 @@ echo "Creating grafts for llvm-upstream"

 REPONAME=llvm

 REFPFX=refs/tags/merge-$REPONAME-

-UPSTREAM=$REPONAME-upstream/release

+UPSTREAM=$REPONAME-upstream/release-2.8

 git for-each-ref $REFPFX*  --format='%(refname)' | while read tag_ref

 do

 	tag_svn_ref=`echo $tag_ref|sed -e s\|$REFPFX\|\|`

@@ -19,9 +19,9 @@ do

 	echo "$local_ref $local_parent_ref $upstream_ref" >>.git/info/grafts

 done

 echo "Merging llvm-upstream"

-MERGEREV=`git log $UPSTREAM -1 |grep /release_27@|sed -s 's/.*@\([0-9]*\).*/\1/'`

+MERGEREV=`git log $UPSTREAM -1 |grep /release_28@|sed -s 's/.*@\([0-9]*\).*/\1/'`

 echo "$MERGEREV"

-git merge -s subtree --squash llvm-upstream/release

+git merge -s subtree --squash llvm-upstream/release-2.8

 echo "Run strip-llvm.sh from libclamav/c++"

 echo "Then fix conflicts if needed: git mergetool"

@@ -4,28 +4,21 @@

 for i in llvm/bindings/ llvm/examples/ llvm/projects/ llvm/runtime/\

     llvm/website llvm/win32 llvm/Xcode llvm/lib/Archive\

     llvm/lib/CompilerDriver/ llvm/lib/Debugger/ llvm/lib/Linker/\

-    llvm/lib/Target/Alpha/ llvm/lib/Target/Blackfin/ llvm/lib/Target/CBackend/\

+    llvm/lib/AsmParser llvm/lib/Bitcode\

+    llvm/lib/CodeGen/AsmPrinter\

+    llvm/lib/ExecutionEngine/Interpreter\

+    llvm/lib/MC/MCDisassembler llvm/lib/MC/MCParser/\

+    llvm/lib/Target/PowerPC/AsmPrinter llvm/lib/Target/X86/AsmPrinter\

+    llvm/lib/Target/X86/Disassembler/ llvm/lib/Target/X86/AsmParser\

+    llvm/lib/Transforms/InstCombine/\

+    llvm/lib/Target/Alpha/ llvm/lib/Target/ARM/ llvm/lib/Target/Blackfin/ llvm/lib/Target/CBackend/\

     llvm/lib/Target/CellSPU/ llvm/lib/Target/CppBackend/ llvm/lib/Target/Mips\

     llvm/lib/Target/MSIL llvm/lib/Target/MSP430/ llvm/lib/Target/PIC16\

     llvm/lib/Target/Sparc/ llvm/lib/Target/SystemZ llvm/lib/Target/XCore\

     llvm/lib/Target/MBlaze/ llvm/lib/Target/PIC16/ llvm/lib/Target/MSP430\

-    llvm/test/Archive/ llvm/test/Bindings/ llvm/test/Bitcode/ llvm/test/DebugInfo/\

-    llvm/test/FrontendAda/ llvm/test/FrontendC llvm/test/FrontendC++/\

-    llvm/test/FrontendFortran/ llvm/test/FrontendObjC\

-    llvm/test/FrontendObjC++ llvm/test/Linker/ llvm/test/LLVMC\

-    llvm/test/MC llvm/test/Transforms llvm/test/Transforms/InstCombine\

-    llvm/test/BugPoint llvm/test/CodeGen/CPP llvm/test/CodeGen/Mips\

-    llvm/test/CodeGen/Alpha llvm/test/CodeGen/PIC16 llvm/test/CodeGen/SPARC\

-    llvm/test/CodeGen/XCore llvm/test/CodeGen/MSP430 llvm/test/CodeGen/MBlaze\

-    llvm/test/CodeGen/CellSPU llvm/test/CodeGen/CBackend\

-    llvm/test/CodeGen/SystemZ llvm/test/CodeGen/Blackfin llvm/test/TableGen\

-    llvm/test/Analysis llvm/test/Assembler llvm/test/Other\

-    llvm/tools/bugpoint llvm/tools/gold llvm/tools/llvm-ar\

-    llvm/tools/llvm-bcanalyzer llvm/tools/llvm-db\

-    llvm/tools/llvm-extract llvm/tools/llvm-ld llvm/tools/llvm-link llvm/tools/llvm-mc\

-    llvm/tools/llvm-nm llvm/tools/llvm-prof llvm/tools/llvm-ranlib\

-    llvm/tools/llvm-stub llvm/tools/lto llvm/tools/opt llvm/lib/MC/MCParser\

-    llvm/tools/llvm-dis/Makefile llvm/tools/edis/ llvm/tools/llvm-shlib\

+    llvm/test/  llvm/tools llvm/unittests llvm/utils/FileCheck\

+    llvm/utils/FileUpdate llvm/utils/fpcmp llvm/utils/not\

+    llvm/utils/PerfectShuffle llvm/utils/unittest\

     llvm/docs

     do

 	git rm -rf $i; git rm -f $i;