Added the ability to xfail based on llvmgcc version

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@27635 91177308-0d34-0410-b5e6-96231b3b80d8

71 files changed, 76 insertions, 72 deletions

diff --git a/test/Analysis/Andersens/dg.exp b/test/Analysis/Andersens/dg.exp
index e326ea721c..ca40776a23 100644
--- a/test/Analysis/Andersens/dg.exp
+++ b/test/Analysis/Andersens/dg.exp
@@ -1,3 +1,4 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+
diff --git a/test/Analysis/BasicAA/dg.exp b/test/Analysis/BasicAA/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Analysis/BasicAA/dg.exp
+++ b/test/Analysis/BasicAA/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Analysis/DSGraph/dg.exp b/test/Analysis/DSGraph/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Analysis/DSGraph/dg.exp
+++ b/test/Analysis/DSGraph/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Analysis/Dominators/dg.exp b/test/Analysis/Dominators/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Analysis/Dominators/dg.exp
+++ b/test/Analysis/Dominators/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Analysis/GlobalsModRef/dg.exp b/test/Analysis/GlobalsModRef/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Analysis/GlobalsModRef/dg.exp
+++ b/test/Analysis/GlobalsModRef/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Analysis/LoadVN/dg.exp b/test/Analysis/LoadVN/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Analysis/LoadVN/dg.exp
+++ b/test/Analysis/LoadVN/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Analysis/LoopInfo/dg.exp b/test/Analysis/LoopInfo/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Analysis/LoopInfo/dg.exp
+++ b/test/Analysis/LoopInfo/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Archive/dg.exp b/test/Archive/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Archive/dg.exp
+++ b/test/Archive/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Assembler/dg.exp b/test/Assembler/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Assembler/dg.exp
+++ b/test/Assembler/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/BugPoint/dg.exp b/test/BugPoint/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/BugPoint/dg.exp
+++ b/test/BugPoint/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Bytecode/dg.exp b/test/Bytecode/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Bytecode/dg.exp
+++ b/test/Bytecode/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/C++Frontend/dg.exp b/test/C++Frontend/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/C++Frontend/dg.exp
+++ b/test/C++Frontend/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CFrontend/dg.exp b/test/CFrontend/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/CFrontend/dg.exp
+++ b/test/CFrontend/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CodeGen/Alpha/dg.exp b/test/CodeGen/Alpha/dg.exp
index cbdb4880dc..e109dadd00 100644
--- a/test/CodeGen/Alpha/dg.exp
+++ b/test/CodeGen/Alpha/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CodeGen/CBackend/dg.exp b/test/CodeGen/CBackend/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/CodeGen/CBackend/dg.exp
+++ b/test/CodeGen/CBackend/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CodeGen/Generic/GC/dg.exp b/test/CodeGen/Generic/GC/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/CodeGen/Generic/GC/dg.exp
+++ b/test/CodeGen/Generic/GC/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CodeGen/Generic/dg.exp b/test/CodeGen/Generic/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/CodeGen/Generic/dg.exp
+++ b/test/CodeGen/Generic/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CodeGen/IA64/dg.exp b/test/CodeGen/IA64/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/CodeGen/IA64/dg.exp
+++ b/test/CodeGen/IA64/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CodeGen/PowerPC/dg.exp b/test/CodeGen/PowerPC/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/CodeGen/PowerPC/dg.exp
+++ b/test/CodeGen/PowerPC/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CodeGen/SPARC/dg.exp b/test/CodeGen/SPARC/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/CodeGen/SPARC/dg.exp
+++ b/test/CodeGen/SPARC/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CodeGen/SparcV9/dg.exp b/test/CodeGen/SparcV9/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/CodeGen/SparcV9/dg.exp
+++ b/test/CodeGen/SparcV9/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/CodeGen/X86/dg.exp b/test/CodeGen/X86/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/CodeGen/X86/dg.exp
+++ b/test/CodeGen/X86/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Debugger/dg.exp b/test/Debugger/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Debugger/dg.exp
+++ b/test/Debugger/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/ExecutionEngine/dg.exp b/test/ExecutionEngine/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/ExecutionEngine/dg.exp
+++ b/test/ExecutionEngine/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Feature/dg.exp b/test/Feature/dg.exp
index 34d688e0ba..ca40776a23 100644
--- a/test/Feature/dg.exp
+++ b/test/Feature/dg.exp
@@ -1,4 +1,4 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
 
diff --git a/test/Linker/dg.exp b/test/Linker/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Linker/dg.exp
+++ b/test/Linker/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Other/dg.exp b/test/Other/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Other/dg.exp
+++ b/test/Other/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/TableGen/dg.exp b/test/TableGen/dg.exp
index 5ab1be9307..07d5faad40 100644
--- a/test/TableGen/dg.exp
+++ b/test/TableGen/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/ADCE/dg.exp b/test/Transforms/ADCE/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/ADCE/dg.exp
+++ b/test/Transforms/ADCE/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/ArgumentPromotion/dg.exp b/test/Transforms/ArgumentPromotion/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/ArgumentPromotion/dg.exp
+++ b/test/Transforms/ArgumentPromotion/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/BlockPlacement/dg.exp b/test/Transforms/BlockPlacement/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/BlockPlacement/dg.exp
+++ b/test/Transforms/BlockPlacement/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/CodeExtractor/dg.exp b/test/Transforms/CodeExtractor/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/CodeExtractor/dg.exp
+++ b/test/Transforms/CodeExtractor/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/CondProp/dg.exp b/test/Transforms/CondProp/dg.exp
index cbdb4880dc..e109dadd00 100644
--- a/test/Transforms/CondProp/dg.exp
+++ b/test/Transforms/CondProp/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/ConstProp/dg.exp b/test/Transforms/ConstProp/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/ConstProp/dg.exp
+++ b/test/Transforms/ConstProp/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/ConstantMerge/dg.exp b/test/Transforms/ConstantMerge/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/ConstantMerge/dg.exp
+++ b/test/Transforms/ConstantMerge/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/CorrelatedExprs/dg.exp b/test/Transforms/CorrelatedExprs/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/CorrelatedExprs/dg.exp
+++ b/test/Transforms/CorrelatedExprs/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/DSAnalysis/dg.exp b/test/Transforms/DSAnalysis/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/DSAnalysis/dg.exp
+++ b/test/Transforms/DSAnalysis/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/DeadArgElim/dg.exp b/test/Transforms/DeadArgElim/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/DeadArgElim/dg.exp
+++ b/test/Transforms/DeadArgElim/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/DeadStoreElimination/dg.exp b/test/Transforms/DeadStoreElimination/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/DeadStoreElimination/dg.exp
+++ b/test/Transforms/DeadStoreElimination/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/DecomposeMultiDimRefs/dg.exp b/test/Transforms/DecomposeMultiDimRefs/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/DecomposeMultiDimRefs/dg.exp
+++ b/test/Transforms/DecomposeMultiDimRefs/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/FunctionResolve/dg.exp b/test/Transforms/FunctionResolve/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/FunctionResolve/dg.exp
+++ b/test/Transforms/FunctionResolve/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/GCSE/dg.exp b/test/Transforms/GCSE/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/GCSE/dg.exp
+++ b/test/Transforms/GCSE/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/GlobalDCE/dg.exp b/test/Transforms/GlobalDCE/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/GlobalDCE/dg.exp
+++ b/test/Transforms/GlobalDCE/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/GlobalOpt/dg.exp b/test/Transforms/GlobalOpt/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/GlobalOpt/dg.exp
+++ b/test/Transforms/GlobalOpt/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/IPConstantProp/dg.exp b/test/Transforms/IPConstantProp/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/IPConstantProp/dg.exp
+++ b/test/Transforms/IPConstantProp/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/IndVarsSimplify/dg.exp b/test/Transforms/IndVarsSimplify/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/IndVarsSimplify/dg.exp
+++ b/test/Transforms/IndVarsSimplify/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/Inline/dg.exp b/test/Transforms/Inline/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/Inline/dg.exp
+++ b/test/Transforms/Inline/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/InstCombine/dg.exp b/test/Transforms/InstCombine/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/InstCombine/dg.exp
+++ b/test/Transforms/InstCombine/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/LICM/dg.exp b/test/Transforms/LICM/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/LICM/dg.exp
+++ b/test/Transforms/LICM/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/LevelRaise/dg.exp b/test/Transforms/LevelRaise/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/LevelRaise/dg.exp
+++ b/test/Transforms/LevelRaise/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/LoopSimplify/dg.exp b/test/Transforms/LoopSimplify/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/LoopSimplify/dg.exp
+++ b/test/Transforms/LoopSimplify/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/LoopStrengthReduce/dg.exp b/test/Transforms/LoopStrengthReduce/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/LoopStrengthReduce/dg.exp
+++ b/test/Transforms/LoopStrengthReduce/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/LoopUnroll/dg.exp b/test/Transforms/LoopUnroll/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/LoopUnroll/dg.exp
+++ b/test/Transforms/LoopUnroll/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/LoopUnswitch/dg.exp b/test/Transforms/LoopUnswitch/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/LoopUnswitch/dg.exp
+++ b/test/Transforms/LoopUnswitch/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/LowerInvoke/dg.exp b/test/Transforms/LowerInvoke/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/LowerInvoke/dg.exp
+++ b/test/Transforms/LowerInvoke/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/LowerSetJmp/dg.exp b/test/Transforms/LowerSetJmp/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/LowerSetJmp/dg.exp
+++ b/test/Transforms/LowerSetJmp/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/LowerSwitch/dg.exp b/test/Transforms/LowerSwitch/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/LowerSwitch/dg.exp
+++ b/test/Transforms/LowerSwitch/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/Mem2Reg/dg.exp b/test/Transforms/Mem2Reg/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/Mem2Reg/dg.exp
+++ b/test/Transforms/Mem2Reg/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/PruneEH/dg.exp b/test/Transforms/PruneEH/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/PruneEH/dg.exp
+++ b/test/Transforms/PruneEH/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/RaiseAllocations/dg.exp b/test/Transforms/RaiseAllocations/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/RaiseAllocations/dg.exp
+++ b/test/Transforms/RaiseAllocations/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/Reassociate/dg.exp b/test/Transforms/Reassociate/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/Reassociate/dg.exp
+++ b/test/Transforms/Reassociate/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/SCCP/dg.exp b/test/Transforms/SCCP/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/SCCP/dg.exp
+++ b/test/Transforms/SCCP/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/ScalarRepl/dg.exp b/test/Transforms/ScalarRepl/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/ScalarRepl/dg.exp
+++ b/test/Transforms/ScalarRepl/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/SimplifyCFG/dg.exp b/test/Transforms/SimplifyCFG/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/SimplifyCFG/dg.exp
+++ b/test/Transforms/SimplifyCFG/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/SimplifyLibCalls/dg.exp b/test/Transforms/SimplifyLibCalls/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/SimplifyLibCalls/dg.exp
+++ b/test/Transforms/SimplifyLibCalls/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/TailCallElim/dg.exp b/test/Transforms/TailCallElim/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/TailCallElim/dg.exp
+++ b/test/Transforms/TailCallElim/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Transforms/TailDup/dg.exp b/test/Transforms/TailDup/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Transforms/TailDup/dg.exp
+++ b/test/Transforms/TailDup/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/Verifier/2004-01-22-FloatNormalization.ll b/test/Verifier/2004-01-22-FloatNormalization.ll
index c5886c0c71..c86bf72eb3 100644
--- a/test/Verifier/2004-01-22-FloatNormalization.ll
+++ b/test/Verifier/2004-01-22-FloatNormalization.ll
@@ -1,5 +1,5 @@
 ; RUN: not llvm-as < %s -o /dev/null -f
-; XFAIL: *
+; XFAIL: 3.4 
 
 ; make sure that invalid 'float' values are caught.
 
diff --git a/test/Verifier/2005-03-21-UndefinedTypeReference.ll b/test/Verifier/2005-03-21-UndefinedTypeReference.ll
index 77fb765903..653eeec949 100644
--- a/test/Verifier/2005-03-21-UndefinedTypeReference.ll
+++ b/test/Verifier/2005-03-21-UndefinedTypeReference.ll
@@ -1,5 +1,4 @@
 ; RUN: not llvm-as -f %s -o /dev/null
-
 void %test() {
         malloc %InvalidType
         ret void
diff --git a/test/Verifier/dg.exp b/test/Verifier/dg.exp
index e326ea721c..142de8a6c8 100644
--- a/test/Verifier/dg.exp
+++ b/test/Verifier/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
diff --git a/test/lib/llvm-dg.exp b/test/lib/llvm-dg.exp
index 13df64ba40..918421b865 100644
--- a/test/lib/llvm-dg.exp
+++ b/test/lib/llvm-dg.exp
@@ -1,4 +1,5 @@
-proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx prcontext} {
+proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx prcontext llvmgcc_version} {
+
 
     set timeout 60
 
@@ -65,7 +66,6 @@ proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx
 		puts $scriptFileId $new_runline
 	    } elseif {[regexp {XFAIL:[ *](.+)} $line match targets]} {
 		set targets
-		
 
 		#split up target if more then 1 specified
 		foreach target [split $targets ,] {
@@ -73,6 +73,10 @@ proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx
 			set outcome XFAIL
 		    } elseif { [regexp $target $target_triplet match] } {
 			set outcome XFAIL
+		    } elseif { [regexp {llvmgcc(([0-9]+)|([0-9]+[.][0-9]+))} $target match submatch submatch2]  } {
+		if { [regexp ^($submatch)$|^(($submatch)(\.)) $llvmgcc_version match] } {
+			  set outcome XFAIL
+		    	}
 		    }
 		    
 		}