subclassed MCAsmStreamer

tools/llvm-mc/llvm-mc.cpp

 //===-- llvm-mc.cpp - Machine Code Hacking Driver -------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This utility is a simple driver that allows command line hacking on machine
@@ skipping 448 matching lines @@
     IP->setPrintImmHex(PrintImmHex);
 
     // Set up the AsmStreamer.
     MCCodeEmitter *CE = nullptr;
     MCAsmBackend *MAB = nullptr;
     if (ShowEncoding || T.isOSNaCl()) { // @LOCALMOD
       CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, Ctx);
       MAB = TheTarget->createMCAsmBackend(*MRI, TripleName, MCPU);
     }
     auto FOut = llvm::make_unique<formatted_raw_ostream>(*OS);
-    Str.reset(TheTarget->createAsmStreamer(
-        Ctx, std::move(FOut), /*asmverbose*/ true,
-        /*useDwarfDirectory*/ true, IP, CE, MAB, ShowInst));
 
+    if (T.isOSNaCl()) {
+      Str.reset(TheTarget->createNaClAsmStreamer(
+                Ctx, std::move(FOut), /*asmverbose*/ true,
+                /*useDwarfDirectory*/ true, IP, CE, MAB, ShowInst));
+      if (NoExecStack)
+        Str->InitSections(true);
+
+      Str->InitSections(NoExecStack);
+      initializeNaClMCStreamer(*Str.get(), Ctx, T);
+    } else {
+      Str.reset(TheTarget->createAsmStreamer(
+                Ctx, std::move(FOut), /*asmverbose*/ true,
+                /*useDwarfDirectory*/ true, IP, CE, MAB, ShowInst));
+    }
   } else if (FileType == OFT_Null) {
     Str.reset(TheTarget->createNullStreamer(Ctx));
   } else {
     assert(FileType == OFT_ObjectFile && "Invalid file type!");
 
     if (!Out->os().supportsSeeking()) {
       BOS = make_unique<buffer_ostream>(Out->os());
       OS = BOS.get();
     }
 
@@ skipping 34 matching lines @@
     break;
   }
   if (disassemble)
     Res = Disassembler::disassemble(*TheTarget, TripleName, *STI, *Str,
                                     *Buffer, SrcMgr, Out->os());
 
   // Keep output if no errors.
   if (Res == 0) Out->keep();
   return Res;
 }