remove the remnants of TargetMachOWriterInfo.

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

diff --git a/include/llvm/Target/TargetMachOWriterInfo.h b/include/llvm/Target/TargetMachOWriterInfo.h
deleted file mode 100644 (file)
index f723bb5..0000000
--- a/include/llvm/Target/TargetMachOWriterInfo.h
+++ /dev/null
@@ -1,112 +0,0 @@
-//===-- llvm/Target/TargetMachOWriterInfo.h - MachO Writer Info--*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the TargetMachOWriterInfo class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_TARGET_TARGETMACHOWRITERINFO_H
-#define LLVM_TARGET_TARGETMACHOWRITERINFO_H
-
-#include "llvm/CodeGen/MachineRelocation.h"
-
-namespace llvm {
-
-  class MachineBasicBlock;
-  class OutputBuffer;
-
-  //===--------------------------------------------------------------------===//
-  //                        TargetMachOWriterInfo
-  //===--------------------------------------------------------------------===//
-
-  class TargetMachOWriterInfo {
-    uint32_t CPUType;                 // CPU specifier
-    uint32_t CPUSubType;              // Machine specifier
-  public:
-    // The various CPU_TYPE_* constants are already defined by at least one
-    // system header file and create compilation errors if not respected.
-#if !defined(CPU_TYPE_I386)
-#define CPU_TYPE_I386       7
-#endif
-#if !defined(CPU_TYPE_X86_64)
-#define CPU_TYPE_X86_64     (CPU_TYPE_I386 | 0x1000000)
-#endif
-#if !defined(CPU_TYPE_ARM)
-#define CPU_TYPE_ARM        12
-#endif
-#if !defined(CPU_TYPE_SPARC)
-#define CPU_TYPE_SPARC      14
-#endif
-#if !defined(CPU_TYPE_POWERPC)
-#define CPU_TYPE_POWERPC    18
-#endif
-#if !defined(CPU_TYPE_POWERPC64)
-#define CPU_TYPE_POWERPC64  (CPU_TYPE_POWERPC | 0x1000000)
-#endif
-
-    // Constants for the cputype field
-    // see <mach/machine.h>
-    enum {
-      HDR_CPU_TYPE_I386      = CPU_TYPE_I386,
-      HDR_CPU_TYPE_X86_64    = CPU_TYPE_X86_64,
-      HDR_CPU_TYPE_ARM       = CPU_TYPE_ARM,
-      HDR_CPU_TYPE_SPARC     = CPU_TYPE_SPARC,
-      HDR_CPU_TYPE_POWERPC   = CPU_TYPE_POWERPC,
-      HDR_CPU_TYPE_POWERPC64 = CPU_TYPE_POWERPC64
-    };
-      
-#if !defined(CPU_SUBTYPE_I386_ALL)
-#define CPU_SUBTYPE_I386_ALL    3
-#endif
-#if !defined(CPU_SUBTYPE_X86_64_ALL)
-#define CPU_SUBTYPE_X86_64_ALL  3
-#endif
-#if !defined(CPU_SUBTYPE_ARM_ALL)
-#define CPU_SUBTYPE_ARM_ALL     0
-#endif
-#if !defined(CPU_SUBTYPE_SPARC_ALL)
-#define CPU_SUBTYPE_SPARC_ALL   0
-#endif
-#if !defined(CPU_SUBTYPE_POWERPC_ALL)
-#define CPU_SUBTYPE_POWERPC_ALL 0
-#endif
-
-    // Constants for the cpusubtype field
-    // see <mach/machine.h>
-    enum {
-      HDR_CPU_SUBTYPE_I386_ALL    = CPU_SUBTYPE_I386_ALL,
-      HDR_CPU_SUBTYPE_X86_64_ALL  = CPU_SUBTYPE_X86_64_ALL,
-      HDR_CPU_SUBTYPE_ARM_ALL     = CPU_SUBTYPE_ARM_ALL,
-      HDR_CPU_SUBTYPE_SPARC_ALL   = CPU_SUBTYPE_SPARC_ALL,
-      HDR_CPU_SUBTYPE_POWERPC_ALL = CPU_SUBTYPE_POWERPC_ALL
-    };
-
-    TargetMachOWriterInfo(uint32_t cputype, uint32_t cpusubtype)
-      : CPUType(cputype), CPUSubType(cpusubtype) {}
-    virtual ~TargetMachOWriterInfo();
-
-    virtual MachineRelocation GetJTRelocation(unsigned Offset,
-                                              MachineBasicBlock *MBB) const;
-
-    virtual unsigned GetTargetRelocation(MachineRelocation &MR,
-                                         unsigned FromIdx,
-                                         unsigned ToAddr,
-                                         unsigned ToIdx,
-                                         OutputBuffer &RelocOut,
-                                         OutputBuffer &SecOut,
-                                         bool Scattered,
-                                         bool Extern) const { return 0; }
-
-    uint32_t getCPUType() const { return CPUType; }
-    uint32_t getCPUSubType() const { return CPUSubType; }
-  };
-
-} // end llvm namespace
-
-#endif // LLVM_TARGET_TARGETMACHOWRITERINFO_H

diff --git a/include/llvm/Target/TargetMachine.h b/include/llvm/Target/TargetMachine.h
index 12e45ec526c201bc686b2e6cf9860bd9ce1116d4..2471067599b2322f5aade569572a8590d71ffaf4 100644 (file)
--- a/include/llvm/Target/TargetMachine.h
+++ b/include/llvm/Target/TargetMachine.h
@@ -36,7 +36,6 @@ class TargetRegisterInfo;
 class PassManagerBase;
 class PassManager;
 class Pass;
-class TargetMachOWriterInfo;
 class TargetELFWriterInfo;
 class formatted_raw_ostream;
 
@@ -163,11 +162,6 @@ public:
     return InstrItineraryData();
   }
 
-  /// getMachOWriterInfo - If this target supports a Mach-O writer, return
-  /// information for it, otherwise return null.
-  /// 
-  virtual const TargetMachOWriterInfo *getMachOWriterInfo() const { return 0; }
-
   /// getELFWriterInfo - If this target supports an ELF writer, return
   /// information for it, otherwise return null.
   /// 

diff --git a/lib/Target/CMakeLists.txt b/lib/Target/CMakeLists.txt
index 10478b4f165c94a72a38efb214399b14dfb1bdb6..43ebdac528ca1caae6952dcfcce6522f1632bc0d 100644 (file)
--- a/lib/Target/CMakeLists.txt
+++ b/lib/Target/CMakeLists.txt
@@ -9,7 +9,6 @@ add_llvm_library(LLVMTarget
   TargetInstrInfo.cpp
   TargetIntrinsicInfo.cpp
   TargetLoweringObjectFile.cpp
-  TargetMachOWriterInfo.cpp
   TargetMachine.cpp
   TargetRegisterInfo.cpp
   TargetSubtarget.cpp

diff --git a/lib/Target/TargetMachOWriterInfo.cpp b/lib/Target/TargetMachOWriterInfo.cpp
deleted file mode 100644 (file)
index d608119..0000000
--- a/lib/Target/TargetMachOWriterInfo.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//===-- llvm/Target/TargetMachOWriterInfo.h - MachO Writer Info -*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the TargetMachOWriterInfo class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Target/TargetMachOWriterInfo.h"
-#include "llvm/CodeGen/MachineRelocation.h"
-using namespace llvm;
-
-TargetMachOWriterInfo::~TargetMachOWriterInfo() {}
-
-MachineRelocation
-TargetMachOWriterInfo::GetJTRelocation(unsigned Offset,
-                                       MachineBasicBlock *MBB) const {
-  // FIXME: do something about PIC
-  return MachineRelocation::getBB(Offset, MachineRelocation::VANILLA, MBB);
-}