Revert patch.

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

2 files changed, 3 insertions, 75 deletions

diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h
index f69751d..13b0d37 100644
--- a/include/llvm/Target/TargetMachine.h
+++ b/include/llvm/Target/TargetMachine.h
@@ -21,7 +21,6 @@
 namespace llvm {
 
 class TargetAsmInfo;
-class TargetObjInfo;
 class TargetData;
 class TargetSubtarget;
 class TargetInstrInfo;
@@ -67,7 +66,7 @@ class TargetMachine {
   TargetMachine(const TargetMachine &);   // DO NOT IMPLEMENT
   void operator=(const TargetMachine &);  // DO NOT IMPLEMENT
 protected: // Can only create subclasses.
-  TargetMachine() : AsmInfo(NULL), ObjInfo(NULL) { }
+  TargetMachine() : AsmInfo(NULL) { }
 
   /// getSubtargetImpl - virtual method implemented by subclasses that returns
   /// a reference to that target's TargetSubtarget-derived member variable.
@@ -76,19 +75,11 @@ protected: // Can only create subclasses.
   /// AsmInfo - Contains target specific asm information.
   ///
   mutable const TargetAsmInfo *AsmInfo;
-
+  
   /// createTargetAsmInfo - Create a new instance of target specific asm
   /// information.
   virtual const TargetAsmInfo *createTargetAsmInfo() const { return NULL; }
 
-  /// ObjInfo - Contains target specific object file information.
-  /// 
-  mutable const TargetObjInfo *ObjInfo;
-  
-  /// createTargetObjInfo - Create a new instance of target specific object
-  /// information.
-  virtual const TargetObjInfo *createTargetObjInfo() const { return NULL; }
-
 public:
   virtual ~TargetMachine();
 
@@ -116,6 +107,7 @@ public:
   virtual       TargetLowering    *getTargetLowering() const { return 0; }
   virtual const TargetData            *getTargetData() const { return 0; }
   
+  
   /// getTargetAsmInfo - Return target specific asm information.
   ///
   const TargetAsmInfo *getTargetAsmInfo() const {
@@ -123,13 +115,6 @@ public:
     return AsmInfo;
   }
   
-  /// getTargetObjInfo - Return target specific object information.
-  ///
-  const TargetObjInfo *getTargetObjInfo() const {
-    if (!ObjInfo) ObjInfo = createTargetObjInfo();
-    return ObjInfo;
-  }
-  
   /// getSubtarget - This method returns a pointer to the specified type of
   /// TargetSubtarget.  In debug builds, it verifies that the object being
   /// returned is of the correct type.
diff --git a/include/llvm/Target/TargetObjInfo.h b/include/llvm/Target/TargetObjInfo.h
deleted file mode 100644
index ffad354..0000000
--- a/include/llvm/Target/TargetObjInfo.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//===-- llvm/Target/TargetObjInfo.h - Object File Info ----------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Bill Wendling and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains a class to be used as the basis for target specific object
-// writers.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TARGET_OBJ_INFO_H
-#define LLVM_TARGET_OBJ_INFO_H
-
-#include <string>
-#include <vector>
-
-namespace llvm {
-
-  struct TargetObjInfo {
-    TargetObjInfo() {}
-    virtual ~TargetObjInfo() {}
-
-    typedef std::vector<unsigned char> DataBuffer;
-
-    virtual void align(DataBuffer &Output, unsigned Boundary) const = 0;
-
-    //===------------------------------------------------------------------===//
-    // Out Functions - Output the specified value to the data buffer.
-
-    virtual void outbyte(DataBuffer &Output, unsigned char X) const = 0;
-    virtual void outhalf(DataBuffer &Output, unsigned short X) const = 0;
-    virtual void outword(DataBuffer &Output, unsigned X) const = 0;
-    virtual void outxword(DataBuffer &Output, uint64_t X) const = 0;
-    virtual void outaddr32(DataBuffer &Output, unsigned X) const = 0;
-    virtual void outaddr64(DataBuffer &Output, uint64_t X) const = 0;
-    virtual void outaddr(DataBuffer &Output, uint64_t X) const = 0;
-    virtual void outstring(DataBuffer &Output, std::string &S,
-                           unsigned Length) const = 0;
-
-    //===------------------------------------------------------------------===//
-    // Fix Functions - Replace an existing entry at an offset.
-
-    virtual void fixhalf(DataBuffer &Output, unsigned short X,
-                         unsigned Offset) const = 0;
-    virtual void fixword(DataBuffer &Output, unsigned X,
-                         unsigned Offset) const = 0;
-    virtual void fixaddr(DataBuffer &Output, uint64_t X,
-                         unsigned Offset) const = 0;
-  };
-
-} // end llvm namespace
-
-#endif // LLVM_TARGET_OBJ_INFO_H