Rebased localmods in clang to 223109.

tools/driver/cc1as_main.cpp

Index: tools/driver/cc1as_main.cpp
diff --git a/tools/driver/cc1as_main.cpp b/tools/driver/cc1as_main.cpp
index 55c9fe602fa35bb2e2bcac4dc1f19eabcf189bf0..8d6d29b9d1cbb0690e517b99ef58bba12cb1d501 100644
--- a/tools/driver/cc1as_main.cpp
+++ b/tools/driver/cc1as_main.cpp
@@ -27,6 +27,7 @@
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCInstrInfo.h"
+#include "llvm/MC/MCNaCl.h" // @LOCALMOD
 #include "llvm/MC/MCObjectFileInfo.h"
 #include "llvm/MC/MCParser/MCAsmParser.h"
 #include "llvm/MC/MCRegisterInfo.h"
@@ -382,6 +383,11 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts,
     Str.reset(TheTarget->createMCObjectStreamer(Opts.Triple, Ctx, *MAB, *Out,
                                                 CE, *STI, Opts.RelaxAll));
     Str.get()->InitSections(Opts.NoExecStack);
+    // @LOCALMOD-BEGIN
+    Triple T(Opts.Triple);
+    if (T.isOSNaCl())
+      initializeNaClMCStreamer(*Str.get(), Ctx, T);
+    // @LOCALMOD-END
   }
 
   bool Failed = false;
@@ -487,4 +493,3 @@ int cc1as_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
 
   return !!Failed;
 }
-