LLVM: Add ELF Note section to NaCl object files identifying them as such to gold

lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp

Index: lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
index c67bb944b6f5edfd9df0b8faf69f0a13c18c4cd9..5e84530cd729be92ed707f028f80361ba82ca3e9 100644
--- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
+++ b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
@@ -366,14 +366,7 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
   if (TheTriple.isOSWindows() && TheTriple.getEnvironment() != Triple::ELF)
     return createWinCOFFStreamer(Ctx, MAB, *_Emitter, _OS, RelaxAll);
 
-  // @LOCALMOD-BEGIN
-  MCStreamer *Streamer = createELFStreamer(Ctx, MAB, _OS, _Emitter,
-                                           RelaxAll, NoExecStack);
-  if (TheTriple.isOSNaCl())
-    Streamer->EmitBundleAlignMode(5);
-
-  return Streamer;
-  // @LOCALMOD-END
+  return createELFStreamer(Ctx, MAB, _OS, _Emitter, RelaxAll, NoExecStack);
 }
 
 static MCInstPrinter *createX86MCInstPrinter(const Target &T,