2 files changed, 4 insertions, 54 deletions
diff --git a/include/llvm/MC/MCObjectFormat.h b/include/llvm/MC/MCObjectFormat.h
deleted file mode 100644
index 5c3f003696..0000000000
--- a/include/llvm/MC/MCObjectFormat.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//===-- llvm/MC/MCObjectFormat.h - Object Format Info -----------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_MC_MCOBJECTFORMAT_H
-#define LLVM_MC_MCOBJECTFORMAT_H
-
-namespace llvm {
-class MCSymbol;
-
-class MCObjectFormat {
-public:
-  virtual ~MCObjectFormat();
-
-  /// isAbsolute - Check if A - B is an absolute value
-  ///
-  /// \param InSet - True if this expression is in a set. For example:
-  ///   a:
-  ///   ...
-  ///   b:
-  ///   tmp = a - b
-  ///       .long tmp
-  /// \param A - LHS
-  /// \param B - RHS
-  virtual bool isAbsolute(bool InSet, const MCSymbol &A,
-                          const MCSymbol &B) const = 0;
-};
-
-class MCELFObjectFormat : public MCObjectFormat {
-public:
-  virtual bool isAbsolute(bool InSet, const MCSymbol &A,
-                          const MCSymbol &B) const;
-};
-
-class MCMachOObjectFormat : public MCObjectFormat {
-public:
-  virtual bool isAbsolute(bool InSet, const MCSymbol &A,
-                          const MCSymbol &B) const;
-};
-
-class MCCOFFObjectFormat : public MCObjectFormat {
-public:
-  virtual bool isAbsolute(bool InSet, const MCSymbol &A,
-                          const MCSymbol &B) const;
-};
-
-}  // End llvm namespace
-
-#endif
diff --git a/include/llvm/MC/MCObjectWriter.h b/include/llvm/MC/MCObjectWriter.h
index 73bad2a179..ef1a969b8c 100644
--- a/include/llvm/MC/MCObjectWriter.h
+++ b/include/llvm/MC/MCObjectWriter.h
@@ -20,6 +20,7 @@ class MCAsmLayout;
 class MCAssembler;
 class MCFixup;
 class MCFragment;
+class MCSymbol;
 class MCSymbolRefExpr;
 class MCValue;
 class raw_ostream;
@@ -98,6 +99,9 @@ public:
                                     bool IsPCRel,
                                     const MCFragment *DF) const = 0;
 
+  virtual bool isAbsolute(bool IsSet, const MCSymbol &A,
+                          const MCSymbol &B) const = 0;
+
   /// Write the object file.
   ///
   /// This routine is called by the assembler after layout and relaxation is