Revert patch.

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

4 files changed, 0 insertions, 169 deletions

diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp
index 194a677815..8bcda9a290 100644
--- a/lib/Target/X86/X86TargetMachine.cpp
+++ b/lib/Target/X86/X86TargetMachine.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86TargetAsmInfo.h"
-#include "X86TargetObjInfo.h"
 #include "X86TargetMachine.h"
 #include "X86.h"
 #include "llvm/Module.h"
@@ -43,10 +42,6 @@ const TargetAsmInfo *X86TargetMachine::createTargetAsmInfo() const {
   return new X86TargetAsmInfo(*this);
 }
 
-const TargetObjInfo *X86TargetMachine::createTargetObjInfo() const {
-  return new ELFTargetObjInfo(*this);
-}
-
 unsigned X86_32TargetMachine::getJITMatchQuality() {
 #if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)
   return 10;
diff --git a/lib/Target/X86/X86TargetMachine.h b/lib/Target/X86/X86TargetMachine.h
index 64ddab561c..05cb9484d6 100644
--- a/lib/Target/X86/X86TargetMachine.h
+++ b/lib/Target/X86/X86TargetMachine.h
@@ -35,7 +35,6 @@ class X86TargetMachine : public LLVMTargetMachine {
 
 protected:
   virtual const TargetAsmInfo *createTargetAsmInfo() const;
-  virtual const TargetObjInfo *createTargetObjInfo() const;
   
 public:
   X86TargetMachine(const Module &M, const std::string &FS, bool is64Bit);
diff --git a/lib/Target/X86/X86TargetObjInfo.cpp b/lib/Target/X86/X86TargetObjInfo.cpp
deleted file mode 100644
index 4333a402f9..0000000000
--- a/lib/Target/X86/X86TargetObjInfo.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===-- X86TargetObjInfo.cpp - Object File Info ----------------------------==//
-//
-//                     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 defines target object file properties for X86
-//
-//===----------------------------------------------------------------------===//
-
-#include "X86TargetObjInfo.h"
-#include "llvm/Target/TargetData.h"
-#include "llvm/Target/TargetMachine.h"
-using namespace llvm;
-
-ELFTargetObjInfo::ELFTargetObjInfo(const TargetMachine &tm)
-  : TM(tm),
-    is64Bit(TM.getTargetData()->getPointerSizeInBits() == 64),
-    isLittleEndian(TM.getTargetData()->isLittleEndian()) {}
diff --git a/lib/Target/X86/X86TargetObjInfo.h b/lib/Target/X86/X86TargetObjInfo.h
deleted file mode 100644
index 57580ea024..0000000000
--- a/lib/Target/X86/X86TargetObjInfo.h
+++ /dev/null
@@ -1,141 +0,0 @@
-//===-- X86TargetObjInfo.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 defines target object file properties for X86
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef X86TARGETOBJINFO_H
-#define X86TARGETOBJINFO_H
-
-#include "llvm/Target/TargetObjInfo.h"
-
-namespace llvm {
-
-  class TargetMachine;
-
-  struct ELFTargetObjInfo : public TargetObjInfo {
-    ELFTargetObjInfo(const TargetMachine &tm);
-
-    // align - Emit padding into the file until the current output position is
-    // aligned to the specified power of two boundary.
-    virtual void align(DataBuffer &Output, unsigned Boundary) const {
-      assert(Boundary && (Boundary & (Boundary - 1)) == 0 &&
-             "Must align to 2^k boundary");
-      size_t Size = Output.size();
-
-      if (Size & (Boundary - 1)) {
-        // Add padding to get alignment to the correct place.
-        size_t Pad = Boundary - (Size & (Boundary - 1));
-        Output.resize(Size + Pad);
-      }
-    }
-
-    //===------------------------------------------------------------------===//
-    // Out Functions - Output the specified value to the data buffer.
-
-    virtual void outbyte(DataBuffer &Output, unsigned char X) const {
-      Output.push_back(X);
-    }
-    virtual void outhalf(DataBuffer &Output, unsigned short X) const {
-      if (isLittleEndian) {
-        Output.push_back(X & 255);
-        Output.push_back(X >> 8);
-      } else {
-        Output.push_back(X >> 8);
-        Output.push_back(X & 255);
-      }
-    }
-    virtual void outword(DataBuffer &Output, unsigned X) const {
-      if (isLittleEndian) {
-        Output.push_back((X >>  0) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >> 24) & 255);
-      } else {
-        Output.push_back((X >> 24) & 255);
-        Output.push_back((X >> 16) & 255);
-        Output.push_back((X >>  8) & 255);
-        Output.push_back((X >>  0) & 255);
-      }
-    }
-    virtual void outxword(DataBuffer &Output, uint64_t X) const {
-      if (isLittleEndian) {
-        Output.push_back(unsigned(X >>  0) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 56) & 255);
-      } else {
-        Output.push_back(unsigned(X >> 56) & 255);
-        Output.push_back(unsigned(X >> 48) & 255);
-        Output.push_back(unsigned(X >> 40) & 255);
-        Output.push_back(unsigned(X >> 32) & 255);
-        Output.push_back(unsigned(X >> 24) & 255);
-        Output.push_back(unsigned(X >> 16) & 255);
-        Output.push_back(unsigned(X >>  8) & 255);
-        Output.push_back(unsigned(X >>  0) & 255);
-      }
-    }
-    virtual void outaddr32(DataBuffer &Output, unsigned X) const {
-      outword(Output, X);
-    }
-    virtual void outaddr64(DataBuffer &Output, uint64_t X) const {
-      outxword(Output, X);
-    }
-    virtual void outaddr(DataBuffer &Output, uint64_t X) const {
-      if (!is64Bit)
-        outword(Output, (unsigned)X);
-      else
-        outxword(Output, X);
-    }
-    virtual void outstring(DataBuffer &Output, std::string &S,
-                           unsigned Length) const {
-      // Not implemented
-    }
-
-    //===------------------------------------------------------------------===//
-    // Fix Functions - Replace an existing entry at an offset.
-
-    virtual void fixhalf(DataBuffer &Output, unsigned short X,
-                         unsigned Offset) const {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 8)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 0)) & 255;
-    }
-    virtual void fixword(DataBuffer &Output, unsigned X,
-                         unsigned Offset) const {
-      unsigned char *P = &Output[Offset];
-      P[0] = (X >> (isLittleEndian ?  0 : 24)) & 255;
-      P[1] = (X >> (isLittleEndian ?  8 : 16)) & 255;
-      P[2] = (X >> (isLittleEndian ? 16 :  8)) & 255;
-      P[3] = (X >> (isLittleEndian ? 24 :  0)) & 255;
-    }
-    virtual void fixaddr(DataBuffer &Output, uint64_t X,
-                         unsigned Offset) const {
-      if (!is64Bit)
-        fixword(Output, (unsigned)X, Offset);
-      else
-        assert(0 && "Emission of 64-bit data not implemented yet!");
-    }
-  private:
-    /// Target machine description.
-    const TargetMachine &TM;
-
-    /// is64Bit/isLittleEndian - This information is inferred from the target
-    /// machine directly, indicating what header values and flags to set.
-    bool is64Bit, isLittleEndian;
-  };
-
-} // end llvm namespace
-
-#endif // X86TARGETOBJINFO_H