Rebased PNaCl localmods in LLVM to 223109

include/llvm/Support/TargetRegistry.h

Index: include/llvm/Support/TargetRegistry.h
diff --git a/include/llvm/Support/TargetRegistry.h b/include/llvm/Support/TargetRegistry.h
index 8ac4b904bb8807f18f681c4e94e79c14dda87cf3..693f00d0bd8150774bde345a56c5e8d529cecfcb 100644
--- a/include/llvm/Support/TargetRegistry.h
+++ b/include/llvm/Support/TargetRegistry.h
@@ -733,7 +733,13 @@ namespace llvm {
     /// @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