6 files changed, 32 insertions, 27 deletions
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h
index 43dc78dfc5..9903f09c01 100644
--- a/include/llvm/CodeGen/MachineInstr.h
+++ b/include/llvm/CodeGen/MachineInstr.h
@@ -19,7 +19,7 @@
 #include "llvm/CodeGen/InstrForest.h"
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/NonCopyable.h"
-#include "llvm/CodeGen/TargetMachine.h"
+#include "llvm/Target/Machine.h"
 
 template<class _MI, class _V> class ValOpIterator;
 
diff --git a/include/llvm/CodeGen/RegClass.h b/include/llvm/CodeGen/RegClass.h
index 1d08502445..efe174617c 100644
--- a/include/llvm/CodeGen/RegClass.h
+++ b/include/llvm/CodeGen/RegClass.h
@@ -16,19 +16,14 @@
 
 */
 
-
-
 #ifndef REG_CLASS_H
 #define REG_CLASS_H
 
 #include "llvm/CodeGen/IGNode.h"
 #include "llvm/CodeGen/InterferenceGraph.h"
-#include "llvm/CodeGen/TargetMachine.h"
-
-
+#include "llvm/Target/Machine.h"
 #include <stack>
 
-
 typedef vector<unsigned int> ReservedColorListType;
 
 
diff --git a/include/llvm/CodeGen/TargetData.h b/include/llvm/Target/Data.h
index cf449702b7..55739503e7 100644
--- a/include/llvm/CodeGen/TargetData.h
+++ b/include/llvm/Target/Data.h
@@ -1,4 +1,4 @@
-//===-- llvm/TargetData.h - Data size & alignment routines -------*- C++ -*-==//
+//===-- llvm/Target/Data.h - Data size & alignment routines ------*- C++ -*-==//
 //
 // This file defines target properties related to datatype size/offset/alignment
 // information.  It uses lazy annotations to cache information about how 
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CODEGEN_TARGETDATA_H
-#define LLVM_CODEGEN_TARGETDATA_H
+#ifndef LLVM_TARGET_DATA_H
+#define LLVM_TARGET_DATA_H
 
 #include "llvm/Type.h"
 #include <vector>
diff --git a/include/llvm/CodeGen/TargetMachine.h b/include/llvm/Target/Machine.h
index 9a72ff974b..ae0858aff5 100644
--- a/include/llvm/CodeGen/TargetMachine.h
+++ b/include/llvm/Target/Machine.h
@@ -1,18 +1,13 @@
-// $Id$ -*-c++-*-
-//***************************************************************************
-// File:
-//	TargetMachine.h
-// 
-// Purpose:
-//	
-// History:
-//	7/12/01	 -  Vikram Adve  -  Created
-//**************************************************************************/
+//===-- llvm/Target/Machine.h - General Target Information -------*- C++ -*-==//
+//
+// This file describes the general parts of a Target machine.
+//
+//===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CODEGEN_TARGETMACHINE_H
-#define LLVM_CODEGEN_TARGETMACHINE_H
+#ifndef LLVM_TARGET_MACHINE_H
+#define LLVM_TARGET_MACHINE_H
 
-#include "llvm/CodeGen/TargetData.h"
+#include "llvm/Target/Data.h"
 #include "llvm/Support/NonCopyable.h"
 #include "llvm/Support/DataTypes.h"
 #include <string>
@@ -24,8 +19,6 @@ class StructType;
 struct MachineInstrDescriptor;
 class TargetMachine;
 
-//************************ Exported Data Types *****************************/
-
 //---------------------------------------------------------------------------
 // Data types used to define information about a single machine instruction
 //---------------------------------------------------------------------------
@@ -518,7 +511,7 @@ public:
   int   l1DCacheMissPenalty;		// 7 or 9 for SPARC IIi
   int   l1ICacheMissPenalty;		// ? for SPARC IIi
   
-  bool	inOrderLoads ;			// true for SPARC IIi
+  bool	inOrderLoads;			// true for SPARC IIi
   bool	inOrderIssue;			// true for SPARC IIi
   bool	inOrderExec;			// false for most architectures
   bool	inOrderRetire;			// true for most architectures
@@ -714,7 +707,7 @@ public:
 
   virtual void colorCallArgs(vector<const Instruction *> & CallInstrList, 
 			     LiveRangeInfo& LRI, 
-			     AddedInstrMapType& AddedInstrMap ) const = 0 ;
+			     AddedInstrMapType& AddedInstrMap ) const = 0;
 
   virtual int getUnifiedRegNum(int RegClassID, int reg) const = 0;
 
diff --git a/include/llvm/CodeGen/Sparc.h b/include/llvm/Target/Sparc.h
index 83bebbddaf..83bebbddaf 100644
--- a/include/llvm/CodeGen/Sparc.h
+++ b/include/llvm/Target/Sparc.h
diff --git a/include/llvm/Target/TargetMachineImpls.h b/include/llvm/Target/TargetMachineImpls.h
new file mode 100644
index 0000000000..83bebbddaf
--- /dev/null
+++ b/include/llvm/Target/TargetMachineImpls.h
@@ -0,0 +1,17 @@
+//===-- llvm/CodeGen/Sparc.h - Sparc Target Description ----------*- C++ -*--=//
+//
+// This file defines the Sparc processor targets
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CODEGEN_SPARC_H
+#define LLVM_CODEGEN_SPARC_H
+
+class TargetMachine;
+
+// allocateSparcTargetMachine - Allocate and return a subclass of TargetMachine
+// that implements the Sparc backend.
+//
+TargetMachine *allocateSparcTargetMachine();
+
+#endif