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

lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp

Index: lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp
diff --git a/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp b/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp
index 2e2f4b9612bf41af8404f70ddda3c319cd301379..be83b54b6124426b2257aedf0ed26f9b47b06e56 100644
--- a/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp
+++ b/lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp
@@ -132,16 +132,7 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
                                     bool NoExecStack) {
   Triple TheTriple(TT);
 
-  // @LOCALMOD-BEGIN
-  if (TheTriple.isOSNaCl()) {
-    MCStreamer *Streamer = createMipsELFStreamer(Ctx, MAB, _OS, _Emitter,
-                                                 RelaxAll, NoExecStack);
-    Streamer->EmitBundleAlignMode(4);
-    return Streamer;
-  } else {
-    return createMipsELFStreamer(Ctx, MAB, _OS, _Emitter, RelaxAll, NoExecStack);
-  }
-  // @LOCALMOD-END
+  return createMipsELFStreamer(Ctx, MAB, _OS, _Emitter, RelaxAll, NoExecStack);
 }
 
 extern "C" void LLVMInitializeMipsTargetMC() {