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

lib/Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp

 //===-- MipsMCTargetDesc.cpp - Mips Target Descriptions -------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file provides Mips specific target descriptions.
@@ skipping 114 matching lines @@
 }
 
 static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
                                     MCContext &Ctx, MCAsmBackend &MAB,
                                     raw_ostream &_OS,
                                     MCCodeEmitter *_Emitter,
                                     bool RelaxAll,
                                     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() {
   // Register the MC asm info.
   RegisterMCAsmInfoFn X(TheMipsTarget, createMipsMCAsmInfo);
   RegisterMCAsmInfoFn Y(TheMipselTarget, createMipsMCAsmInfo);
   RegisterMCAsmInfoFn A(TheMips64Target, createMipsMCAsmInfo);
   RegisterMCAsmInfoFn B(TheMips64elTarget, createMipsMCAsmInfo);
 
   // Register the MC codegen info.
@@ skipping 60 matching lines @@
   // Register the MCInstPrinter.
   TargetRegistry::RegisterMCInstPrinter(TheMipsTarget,
                                         createMipsMCInstPrinter);
   TargetRegistry::RegisterMCInstPrinter(TheMipselTarget,
                                         createMipsMCInstPrinter);
   TargetRegistry::RegisterMCInstPrinter(TheMips64Target,
                                         createMipsMCInstPrinter);
   TargetRegistry::RegisterMCInstPrinter(TheMips64elTarget,
                                         createMipsMCInstPrinter);
 }