1 files changed, 3 insertions, 7 deletions
diff --git a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
index 2c155aaf40..3d6e99f664 100644
--- a/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
@@ -208,13 +208,9 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
   if (TheTriple.isOSWindows()) {
     llvm_unreachable("ARM does not support Windows COFF format");
   }
-  // @LOCALMOD-BEGIN
-  MCStreamer *Streamer = createARMELFStreamer(Ctx, MAB, OS, Emitter, false,
-                           NoExecStack, TheTriple.getArch() == Triple::thumb);
-  if (TheTriple.isOSNaCl())
-    Streamer->EmitBundleAlignMode(4);
-  return Streamer;
-  // @LOCALMOD-END
+
+  return createARMELFStreamer(Ctx, MAB, OS, Emitter, false, NoExecStack,
+                              TheTriple.getArch() == Triple::thumb);
 }
 
 static MCInstPrinter *createARMMCInstPrinter(const Target &T,