diff --git a/test/CodeGen/Generic/2007-04-13-SwitchLowerBadPhi.ll b/test/CodeGen/Generic/2007-04-13-SwitchLowerBadPhi.ll
index a0b1403cf8d..9c3c804aa75 100644
--- a/test/CodeGen/Generic/2007-04-13-SwitchLowerBadPhi.ll
+++ b/test/CodeGen/Generic/2007-04-13-SwitchLowerBadPhi.ll
@@ -1,9 +1,6 @@
 ; RUN: llc < %s -O0
 ; PR 1323
 
-; ModuleID = 'test.bc'
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
-target triple = "i686-apple-darwin8"
 	%struct.comp = type { i8*, i32, i8*, [3 x i8], i32 }
 
 define void @regbranch() {
diff --git a/test/CodeGen/Generic/2007-11-21-UndeadIllegalNode.ll b/test/CodeGen/Generic/2007-11-21-UndeadIllegalNode.ll
index e220be6389d..3090857d964 100644
--- a/test/CodeGen/Generic/2007-11-21-UndeadIllegalNode.ll
+++ b/test/CodeGen/Generic/2007-11-21-UndeadIllegalNode.ll
@@ -1,7 +1,5 @@
 ; RUN: llc < %s -o -
 
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
-target triple = "i686-pc-linux-gnu"
 	%struct.RETURN = type { i32, i32 }
 	%struct.ada__finalization__controlled = type { %struct.system__finalization_root__root_controlled }
 	%struct.ada__streams__root_stream_type = type { %struct.ada__tags__dispatch_table* }
diff --git a/test/CodeGen/Generic/2007-12-17-InvokeAsm.ll b/test/CodeGen/Generic/2007-12-17-InvokeAsm.ll
index bd26481bd30..4cc1e7c181e 100644
--- a/test/CodeGen/Generic/2007-12-17-InvokeAsm.ll
+++ b/test/CodeGen/Generic/2007-12-17-InvokeAsm.ll
@@ -1,7 +1,5 @@
 ; RUN: llc < %s -enable-eh
 
-target triple = "i686-pc-linux-gnu"
-
 define fastcc void @bc__support__high_resolution_time__initialize_clock_rate() {
 entry:
 	invoke void asm "rdtsc\0A\09movl %eax, $0\0A\09movl %edx, $1", "=*imr,=*imr,~{dirflag},~{fpsr},~{flags},~{dx},~{ax}"( i32* null, i32* null )
diff --git a/test/CodeGen/Generic/2007-12-31-UnusedSelector.ll b/test/CodeGen/Generic/2007-12-31-UnusedSelector.ll
index fc9164f7c4a..d2e97a477b4 100644
--- a/test/CodeGen/Generic/2007-12-31-UnusedSelector.ll
+++ b/test/CodeGen/Generic/2007-12-31-UnusedSelector.ll
@@ -1,8 +1,6 @@
 ; RUN: llc < %s -enable-eh
 ; PR1833
 
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
-target triple = "i686-pc-linux-gnu"
 	%struct.__class_type_info_pseudo = type { %struct.__type_info_pseudo }
 	%struct.__type_info_pseudo = type { i8*, i8* }
 @_ZTI2e1 = external constant %struct.__class_type_info_pseudo		; <%struct.__class_type_info_pseudo*> [#uses=1]
diff --git a/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll b/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll
index 4f95dfe8a73..00ca8c756b4 100644
--- a/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll
+++ b/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll
@@ -1,7 +1,5 @@
 ; RUN: llc < %s
 ; PR2603
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
-target triple = "i386-pc-linux-gnu"
         %struct.A = type { i8 }
         %struct.B = type { i8, [1 x i8] }
 @Foo = constant %struct.A { i8 ptrtoint (i8* getelementptr ([1 x i8]* inttoptr (i32 17 to [1 x i8]*), i32 0, i32 -16) to i8) }          ; <%struct.A*> [#uses=0]
diff --git a/test/CodeGen/Generic/2009-11-16-BadKillsCrash.ll b/test/CodeGen/Generic/2009-11-16-BadKillsCrash.ll
index a51c75d6222..22bd4d7e6a4 100644
--- a/test/CodeGen/Generic/2009-11-16-BadKillsCrash.ll
+++ b/test/CodeGen/Generic/2009-11-16-BadKillsCrash.ll
@@ -1,7 +1,5 @@
 ; RUN: llc < %s
 ; PR5495
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32"
-target triple = "i386-pc-linux-gnu"
 
 %"struct.std::__ctype_abstract_base<wchar_t>" = type { %"struct.std::locale::facet" }
 %"struct.std::basic_ios<char,std::char_traits<char> >" = type { %"struct.std::ios_base", %"struct.std::basic_ostream<char,std::char_traits<char> >"*, i8, i8, %"struct.std::basic_streambuf<char,std::char_traits<char> >"*, %"struct.std::ctype<char>"*, %"struct.std::__ctype_abstract_base<wchar_t>"*, %"struct.std::__ctype_abstract_base<wchar_t>"* }
diff --git a/test/CodeGen/Generic/GC/redundant_init.ll b/test/CodeGen/Generic/GC/redundant_init.ll
deleted file mode 100644
index 10c70e73105..00000000000
--- a/test/CodeGen/Generic/GC/redundant_init.ll
+++ /dev/null
@@ -1,17 +0,0 @@
-; RUN: llc < %s -march=x86 | \
-; RUN:   ignore grep {movl..0} | count 0
-
-%struct.obj = type { i8*, %struct.obj* }
-
-declare void @g() gc "shadow-stack"
-
-define void @f(i8* %o) gc "shadow-stack" {
-entry:
-	%root = alloca i8*
-	call void @llvm.gcroot(i8** %root, i8* null)
-	store i8* %o, i8** %root
-	call void @g()
-	ret void
-}
-
-declare void @llvm.gcroot(i8**, i8*)
diff --git a/test/CodeGen/Generic/2007-02-16-BranchFold.ll b/test/CodeGen/X86/2007-02-16-BranchFold.ll
similarity index 100%
rename from test/CodeGen/Generic/2007-02-16-BranchFold.ll
rename to test/CodeGen/X86/2007-02-16-BranchFold.ll
diff --git a/test/CodeGen/Generic/2007-05-05-Personality.ll b/test/CodeGen/X86/2007-05-05-Personality.ll
similarity index 100%
rename from test/CodeGen/Generic/2007-05-05-Personality.ll
rename to test/CodeGen/X86/2007-05-05-Personality.ll
diff --git a/test/CodeGen/Generic/GC/alloc_loop.ll b/test/CodeGen/X86/GC/alloc_loop.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/alloc_loop.ll
rename to test/CodeGen/X86/GC/alloc_loop.ll
diff --git a/test/CodeGen/Generic/GC/argpromotion.ll b/test/CodeGen/X86/GC/argpromotion.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/argpromotion.ll
rename to test/CodeGen/X86/GC/argpromotion.ll
diff --git a/test/CodeGen/Generic/GC/badreadproto.ll b/test/CodeGen/X86/GC/badreadproto.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/badreadproto.ll
rename to test/CodeGen/X86/GC/badreadproto.ll
diff --git a/test/CodeGen/Generic/GC/badrootproto.ll b/test/CodeGen/X86/GC/badrootproto.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/badrootproto.ll
rename to test/CodeGen/X86/GC/badrootproto.ll
diff --git a/test/CodeGen/Generic/GC/badwriteproto.ll b/test/CodeGen/X86/GC/badwriteproto.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/badwriteproto.ll
rename to test/CodeGen/X86/GC/badwriteproto.ll
diff --git a/test/CodeGen/Generic/GC/deadargelim.ll b/test/CodeGen/X86/GC/deadargelim.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/deadargelim.ll
rename to test/CodeGen/X86/GC/deadargelim.ll
diff --git a/test/CodeGen/Generic/GC/dg.exp b/test/CodeGen/X86/GC/dg.exp
similarity index 100%
rename from test/CodeGen/Generic/GC/dg.exp
rename to test/CodeGen/X86/GC/dg.exp
diff --git a/test/CodeGen/Generic/GC/fat.ll b/test/CodeGen/X86/GC/fat.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/fat.ll
rename to test/CodeGen/X86/GC/fat.ll
diff --git a/test/CodeGen/Generic/GC/inline.ll b/test/CodeGen/X86/GC/inline.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/inline.ll
rename to test/CodeGen/X86/GC/inline.ll
diff --git a/test/CodeGen/Generic/GC/inline2.ll b/test/CodeGen/X86/GC/inline2.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/inline2.ll
rename to test/CodeGen/X86/GC/inline2.ll
diff --git a/test/CodeGen/Generic/GC/lower_gcroot.ll b/test/CodeGen/X86/GC/lower_gcroot.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/lower_gcroot.ll
rename to test/CodeGen/X86/GC/lower_gcroot.ll
diff --git a/test/CodeGen/Generic/GC/outside.ll b/test/CodeGen/X86/GC/outside.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/outside.ll
rename to test/CodeGen/X86/GC/outside.ll
diff --git a/test/CodeGen/Generic/GC/simple_ocaml.ll b/test/CodeGen/X86/GC/simple_ocaml.ll
similarity index 100%
rename from test/CodeGen/Generic/GC/simple_ocaml.ll
rename to test/CodeGen/X86/GC/simple_ocaml.ll