Rebased PNaCl localmods in LLVM to 223109

include/llvm/Support/TargetRegistry.h

 //===-- Support/TargetRegistry.h - Target Registration ----------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file exposes the TargetRegistry interface, which tools can use to access
@@ skipping 715 matching lines @@
     /// given target.
     ///
     /// Clients are responsible for ensuring that registration doesn't occur
     /// while another thread is attempting to access the registry. Typically
     /// this is done by initializing all targets at program startup.
     ///
     /// @param T - The target being registered.
     /// @param Fn - A function to construct an MCInstPrinter for the target.
     static void RegisterMCInstPrinter(Target &T,
                                       Target::MCInstPrinterCtorTy Fn) {
+      // @LOCALMOD-BEGIN
+      // Prune out the .s printer for the sandboxed translator,
+      // by preventing an InstPrinter from being used at all.
+      #if !defined(__native_client__)
       T.MCInstPrinterCtorFn = Fn;
+      #endif
+      // @LOCALMOD-END
     }
 
     /// RegisterMCCodeEmitter - Register a MCCodeEmitter implementation for the
     /// given target.
     ///
     /// Clients are responsible for ensuring that registration doesn't occur
     /// while another thread is attempting to access the registry. Typically
     /// this is done by initializing all targets at program startup.
     ///
     /// @param T - The target being registered.
@@ skipping 398 matching lines @@
                                     const MCRegisterInfo &/*MRI*/,
                                     const MCSubtargetInfo &/*STI*/,
                                     MCContext &/*Ctx*/) {
       return new MCCodeEmitterImpl();
     }
   };
 
 }
 
 #endif