Remove bundling from the MCAssembler interface

include/llvm/MC/MCAssembler.h

Index: include/llvm/MC/MCAssembler.h
diff --git a/include/llvm/MC/MCAssembler.h b/include/llvm/MC/MCAssembler.h
index f67aa9b96699c59b3f58624dfe21ce8ae15e4d89..949e99b50b5078ee8058b96cefe7f7c362819e35 100644
--- a/include/llvm/MC/MCAssembler.h
+++ b/include/llvm/MC/MCAssembler.h
@@ -842,13 +842,6 @@ private:
   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);
@@ -915,12 +908,6 @@ public:
 
   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; }