3 files changed, 4 insertions, 12 deletions
diff --git a/include/llvm/MC/MCAsmLayout.h b/include/llvm/MC/MCAsmLayout.h
index cad7664c3a5..ce9692dcaff 100644
--- a/include/llvm/MC/MCAsmLayout.h
+++ b/include/llvm/MC/MCAsmLayout.h
@@ -58,16 +58,6 @@ public:
   /// fragments size should have already been updated.
   void Invalidate(MCFragment *F);
 
-  /// \brief Update the layout, replacing Src with Dst. The contents
-  /// of Src and Dst are not modified, and must be copied by the caller.
-  /// Src will be removed from the layout, but not deleted.
-  void ReplaceFragment(MCFragment *Src, MCFragment *Dst);
-
-  /// \brief Update the layout to coalesce Src into Dst. The contents
-  /// of Src and Dst are not modified, and must be coalesced by the caller.
-  /// Src will be removed from the layout, but not deleted.
-  void CoalesceFragments(MCFragment *Src, MCFragment *Dst);
-
   /// \brief Perform a full layout.
   void LayoutFile();
 
diff --git a/include/llvm/MC/MCAssembler.h b/include/llvm/MC/MCAssembler.h
index 16c527ffc16..ba894369819 100644
--- a/include/llvm/MC/MCAssembler.h
+++ b/include/llvm/MC/MCAssembler.h
@@ -735,6 +735,9 @@ private:
   /// FinishLayout - Finalize a layout, including fragment lowering.
   void FinishLayout(MCAsmLayout &Layout);
 
+  uint64_t HandleFixup(MCObjectWriter &Writer, const MCAsmLayout &Layout,
+                       MCFragment &F, const MCFixup &Fixup);
+
 public:
   /// Find the symbol which defines the atom containing the given symbol, or
   /// null if there is no such symbol.
diff --git a/include/llvm/Target/TargetAsmBackend.h b/include/llvm/Target/TargetAsmBackend.h
index 6faedf42568..ba344726906 100644
--- a/include/llvm/Target/TargetAsmBackend.h
+++ b/include/llvm/Target/TargetAsmBackend.h
@@ -13,7 +13,6 @@
 #include "llvm/Support/DataTypes.h"
 
 namespace llvm {
-class MCDataFragment;
 class MCFixup;
 class MCInst;
 class MCObjectFormat;
@@ -87,7 +86,7 @@ public:
   /// ApplyFixup - Apply the \arg Value for given \arg Fixup into the provided
   /// data fragment, at the offset specified by the fixup and following the
   /// fixup kind as appropriate.
-  virtual void ApplyFixup(const MCFixup &Fixup, MCDataFragment &Fragment,
+  virtual void ApplyFixup(const MCFixup &Fixup, char *Data, unsigned DataSize,
                           uint64_t Value) const = 0;
 
   /// MayNeedRelaxation - Check whether the given instruction may need