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

lib/Target/Mips/MipsAsmPrinter.cpp

 //===-- MipsAsmPrinter.cpp - Mips LLVM Assembly Printer -------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains a printer that converts from our internal representation
@@ skipping 16 matching lines @@
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineMemOperand.h"
 #include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/InlineAsm.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCInst.h"
+#include "llvm/MC/MCNaCl.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/Support/ELF.h"
 #include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Target/Mangler.h"
 #include "llvm/Target/TargetLoweringObjectFile.h"
 #include "llvm/Target/TargetOptions.h"
 
 using namespace llvm;
@@ skipping 514 matching lines @@
       else
         OutStreamer.EmitRawText(StringRef("\t.section .gcc_compiled_long64"));
     }
   }
 
   // return to previous section
   if (OutStreamer.hasRawTextSupport())
     OutStreamer.EmitRawText(StringRef("\t.previous"));
 
   // @LOCALMOD-START
-  if (Subtarget->isTargetNaCl() && OutStreamer.hasRawTextSupport()) {
-    std::string str;
-    raw_string_ostream OS(str);
-    EmitMipsSFIHeaders(OS);
-    OutStreamer.EmitRawText(StringRef(OS.str()));
+  if (Subtarget->isTargetNaCl()) {
+    if (OutStreamer.hasRawTextSupport()) {
+      std::string str;
+      raw_string_ostream OS(str);
+      EmitMipsSFIHeaders(OS);
+      OutStreamer.EmitRawText(StringRef(OS.str()));
+    }
+    initializeNaClMCStreamer(OutStreamer, OutContext,
+                             Triple(Subtarget->getTargetTriple()));
   }
   // @LOCALMOD-END
 }
 
 // @LOCALMOD-START
 unsigned MipsAsmPrinter::GetTargetLabelAlign(const MachineInstr *MI) const {
   if (Subtarget->isTargetNaCl()) {
     switch (MI->getOpcode()) {
       default: return 0;
       // These labels may indicate an indirect entry point that is
@@ skipping 36 matching lines @@
   // TODO: implement
 }
 
 // Force static initialization.
 extern "C" void LLVMInitializeMipsAsmPrinter() {
   RegisterAsmPrinter<MipsAsmPrinter> X(TheMipsTarget);
   RegisterAsmPrinter<MipsAsmPrinter> Y(TheMipselTarget);
   RegisterAsmPrinter<MipsAsmPrinter> A(TheMips64Target);
   RegisterAsmPrinter<MipsAsmPrinter> B(TheMips64elTarget);
 }