diff --git a/lib/Target/Sparc/SparcV8InstrInfo_F3.td b/lib/Target/Sparc/SparcInstrFormats.td
similarity index 58%
rename from lib/Target/Sparc/SparcV8InstrInfo_F3.td
rename to lib/Target/Sparc/SparcInstrFormats.td
index 4906b9de04d..cef4ecb033d 100644
--- a/lib/Target/Sparc/SparcV8InstrInfo_F3.td
+++ b/lib/Target/Sparc/SparcInstrFormats.td
@@ -1,14 +1,50 @@
-//===- SparcV8Instrs_F3.td - Format 3 Instructions: SparcV8 Target --------===//
-//
+//===- SparcV8InstrFormats.td - SparcV8 Instr Formats ------*- tablegen -*-===//
+// 
 //                     The LLVM Compiler Infrastructure
 //
 // This file was developed by the LLVM research group and is distributed under
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
 // 
 //===----------------------------------------------------------------------===//
+
+//===----------------------------------------------------------------------===//
+// Format #2 instruction classes in the SparcV8
+//===----------------------------------------------------------------------===//
+
+class F2 : InstV8 {                   // Format 2 instructions
+  bits<3>  op2;
+  bits<22> imm22;
+  let op          = 0;    // op = 0
+  let Inst{24-22} = op2;
+  let Inst{21-0}  = imm22;
+}
+
+// Specific F2 classes: SparcV8 manual, page 44
 //
+class F2_1<bits<3> op2Val, string name> : F2 {
+  bits<5>  rd;
+  bits<22> imm;
+
+  let op2         = op2Val;
+  let Name        = name;
+
+  let Inst{29-25} = rd;
+}
+
+class F2_2<bits<4> condVal, bits<3> op2Val, string name> : F2 {
+  bits<4>   cond;
+  bit       annul = 0;     // currently unused
+
+  let cond        = condVal;
+  let op2         = op2Val;
+  let Name        = name;
+
+  let Inst{29}    = annul;
+  let Inst{28-25} = cond;
+}
+
+//===----------------------------------------------------------------------===//
 // Format #3 instruction classes in the SparcV8
-//
 //===----------------------------------------------------------------------===//
 
 class F3 : InstV8 {
diff --git a/lib/Target/Sparc/SparcInstrInfo.td b/lib/Target/Sparc/SparcInstrInfo.td
index 07491eb1c10..110ac8b0f82 100644
--- a/lib/Target/Sparc/SparcInstrInfo.td
+++ b/lib/Target/Sparc/SparcInstrInfo.td
@@ -28,8 +28,7 @@ class InstV8 : Instruction {          // SparcV8 instruction baseline
   bit isPrivileged = 0; // Is this a privileged instruction?
 }
 
-include "SparcV8InstrInfo_F2.td"
-include "SparcV8InstrInfo_F3.td"
+include "SparcV8InstrFormats.td"
 
 //===----------------------------------------------------------------------===//
 // Instructions
diff --git a/lib/Target/Sparc/SparcV8InstrInfo_F2.td b/lib/Target/Sparc/SparcV8InstrInfo_F2.td
deleted file mode 100644
index 7b550bd7ddf..00000000000
--- a/lib/Target/Sparc/SparcV8InstrInfo_F2.td
+++ /dev/null
@@ -1,44 +0,0 @@
-//===- SparcV8Instrs_F2.td - Format 2 instructions: SparcV8 Target --------===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// Format #2 instruction classes in the SparcV8
-//
-//===----------------------------------------------------------------------===//
-
-class F2 : InstV8 {                   // Format 2 instructions
-  bits<3>  op2;
-  bits<22> imm22;
-  let op          = 0;    // op = 0
-  let Inst{24-22} = op2;
-  let Inst{21-0}  = imm22;
-}
-
-// Specific F2 classes: SparcV8 manual, page 44
-//
-class F2_1<bits<3> op2Val, string name> : F2 {
-  bits<5>  rd;
-  bits<22> imm;
-
-  let op2         = op2Val;
-  let Name        = name;
-
-  let Inst{29-25} = rd;
-}
-
-class F2_2<bits<4> condVal, bits<3> op2Val, string name> : F2 {
-  bits<4>   cond;
-  bit       annul = 0;     // currently unused
-
-  let cond        = condVal;
-  let op2         = op2Val;
-  let Name        = name;
-
-  let Inst{29}    = annul;
-  let Inst{28-25} = cond;
-}
diff --git a/lib/Target/SparcV8/SparcV8InstrInfo_F3.td b/lib/Target/SparcV8/SparcV8InstrFormats.td
similarity index 58%
rename from lib/Target/SparcV8/SparcV8InstrInfo_F3.td
rename to lib/Target/SparcV8/SparcV8InstrFormats.td
index 4906b9de04d..cef4ecb033d 100644
--- a/lib/Target/SparcV8/SparcV8InstrInfo_F3.td
+++ b/lib/Target/SparcV8/SparcV8InstrFormats.td
@@ -1,14 +1,50 @@
-//===- SparcV8Instrs_F3.td - Format 3 Instructions: SparcV8 Target --------===//
-//
+//===- SparcV8InstrFormats.td - SparcV8 Instr Formats ------*- tablegen -*-===//
+// 
 //                     The LLVM Compiler Infrastructure
 //
 // This file was developed by the LLVM research group and is distributed under
 // the University of Illinois Open Source License. See LICENSE.TXT for details.
 // 
 //===----------------------------------------------------------------------===//
+
+//===----------------------------------------------------------------------===//
+// Format #2 instruction classes in the SparcV8
+//===----------------------------------------------------------------------===//
+
+class F2 : InstV8 {                   // Format 2 instructions
+  bits<3>  op2;
+  bits<22> imm22;
+  let op          = 0;    // op = 0
+  let Inst{24-22} = op2;
+  let Inst{21-0}  = imm22;
+}
+
+// Specific F2 classes: SparcV8 manual, page 44
 //
+class F2_1<bits<3> op2Val, string name> : F2 {
+  bits<5>  rd;
+  bits<22> imm;
+
+  let op2         = op2Val;
+  let Name        = name;
+
+  let Inst{29-25} = rd;
+}
+
+class F2_2<bits<4> condVal, bits<3> op2Val, string name> : F2 {
+  bits<4>   cond;
+  bit       annul = 0;     // currently unused
+
+  let cond        = condVal;
+  let op2         = op2Val;
+  let Name        = name;
+
+  let Inst{29}    = annul;
+  let Inst{28-25} = cond;
+}
+
+//===----------------------------------------------------------------------===//
 // Format #3 instruction classes in the SparcV8
-//
 //===----------------------------------------------------------------------===//
 
 class F3 : InstV8 {
diff --git a/lib/Target/SparcV8/SparcV8InstrInfo.td b/lib/Target/SparcV8/SparcV8InstrInfo.td
index 07491eb1c10..110ac8b0f82 100644
--- a/lib/Target/SparcV8/SparcV8InstrInfo.td
+++ b/lib/Target/SparcV8/SparcV8InstrInfo.td
@@ -28,8 +28,7 @@ class InstV8 : Instruction {          // SparcV8 instruction baseline
   bit isPrivileged = 0; // Is this a privileged instruction?
 }
 
-include "SparcV8InstrInfo_F2.td"
-include "SparcV8InstrInfo_F3.td"
+include "SparcV8InstrFormats.td"
 
 //===----------------------------------------------------------------------===//
 // Instructions
diff --git a/lib/Target/SparcV8/SparcV8InstrInfo_F2.td b/lib/Target/SparcV8/SparcV8InstrInfo_F2.td
deleted file mode 100644
index 7b550bd7ddf..00000000000
--- a/lib/Target/SparcV8/SparcV8InstrInfo_F2.td
+++ /dev/null
@@ -1,44 +0,0 @@
-//===- SparcV8Instrs_F2.td - Format 2 instructions: SparcV8 Target --------===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// Format #2 instruction classes in the SparcV8
-//
-//===----------------------------------------------------------------------===//
-
-class F2 : InstV8 {                   // Format 2 instructions
-  bits<3>  op2;
-  bits<22> imm22;
-  let op          = 0;    // op = 0
-  let Inst{24-22} = op2;
-  let Inst{21-0}  = imm22;
-}
-
-// Specific F2 classes: SparcV8 manual, page 44
-//
-class F2_1<bits<3> op2Val, string name> : F2 {
-  bits<5>  rd;
-  bits<22> imm;
-
-  let op2         = op2Val;
-  let Name        = name;
-
-  let Inst{29-25} = rd;
-}
-
-class F2_2<bits<4> condVal, bits<3> op2Val, string name> : F2 {
-  bits<4>   cond;
-  bit       annul = 0;     // currently unused
-
-  let cond        = condVal;
-  let op2         = op2Val;
-  let Name        = name;
-
-  let Inst{29}    = annul;
-  let Inst{28-25} = cond;
-}