Remove bundling from the MCAssembler interface

include/llvm/MC/MCAssembler.h

 //===- MCAssembler.h - Object File Generation -------------------*- 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_MCASSEMBLER_H
@@ skipping 824 matching lines @@
 
   /// Check whether a fixup can be satisfied, or whether it needs to be relaxed
   /// (increased in size, in order to hold its value correctly).
   bool fixupNeedsRelaxation(const MCFixup &Fixup, const MCInstFragment *DF,
                             const MCAsmLayout &Layout) const;
 
   /// Check whether the given fragment needs relaxation.
   bool fragmentNeedsRelaxation(const MCInstFragment *IF,
                                const MCAsmLayout &Layout) const;
 
-  // @LOCALMOD-BEGIN
-  uint8_t ComputeBundlePadding(const MCAsmLayout &Layout,
-                               MCFragment *F,
-                               uint64_t FragmentOffset) const;
-  // @LOCALMOD-END
-
-
   /// layoutOnce - Perform one layout iteration and return true if any offsets
   /// were adjusted.
   bool layoutOnce(MCAsmLayout &Layout);
 
   bool layoutSectionOnce(MCAsmLayout &Layout, MCSectionData &SD);
 
   bool relaxInstruction(MCAsmLayout &Layout, MCInstFragment &IF);
 
   bool relaxLEB(MCAsmLayout &Layout, MCLEBFragment &IF);
 
@@ skipping 46 matching lines @@
   // implementations as we do with AsmParser.
   MCAssembler(MCContext &Context_, MCAsmBackend &Backend_,
               MCCodeEmitter &Emitter_, MCObjectWriter &Writer_,
               raw_ostream &OS);
   ~MCAssembler();
 
   MCContext &getContext() const { return Context; }
 
   MCAsmBackend &getBackend() const { return Backend; }
 
-  // @LOCALMOD-BEGIN
-  uint64_t getBundleSize() const;
-  uint64_t getBundleMask() const;
-  // @LOCALMOD-END
-
-
   MCCodeEmitter &getEmitter() const { return Emitter; }
 
   MCObjectWriter &getWriter() const { return Writer; }
 
   /// Finish - Do final processing and write the object to the output stream.
   /// \p Writer is used for custom object writer (as the MCJIT does),
   /// if not specified it is automatically created from backend.
   void Finish();
 
   // FIXME: This does not belong here.
@@ skipping 132 matching lines @@
   }
 
   /// @}
 
   void dump();
 };
 
 } // end namespace llvm
 
 #endif