Rebased PNaCl localmods in LLVM to 223109

lib/Target/X86/X86TargetMachine.cpp

 //===-- X86TargetMachine.cpp - Define TargetMachine for the X86 -----------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines the X86 specific subclass of TargetMachine.
@@ skipping 20 matching lines @@
 
 static std::unique_ptr<TargetLoweringObjectFile> createTLOF(const Triple &TT) {
   if (TT.isOSBinFormatMachO()) {
     if (TT.getArch() == Triple::x86_64)
       return make_unique<X86_64MachoTargetObjectFile>();
     return make_unique<TargetLoweringObjectFileMachO>();
   }
 
   if (TT.isOSLinux())
     return make_unique<X86LinuxTargetObjectFile>();
+  // @LOCALMOD-BEGIN
+  if (TT.isOSNaCl())
+    return make_unique<TargetLoweringObjectFileNaCl>();
+  // @LOCALMOD-END
   if (TT.isOSBinFormatELF())
     return make_unique<TargetLoweringObjectFileELF>();
   if (TT.isKnownWindowsMSVCEnvironment())
     return make_unique<X86WindowsTargetObjectFile>();
   if (TT.isOSBinFormatCOFF())
     return make_unique<TargetLoweringObjectFileCOFF>();
   llvm_unreachable("unknown subtarget type");
 }
 
 /// X86TargetMachine ctor - Create an X86 target.
@@ skipping 157 matching lines @@
     addPass(createX86IssueVZeroUpperPass());
     ShouldPrint = true;
   }
 
   if (getOptLevel() != CodeGenOpt::None) {
     addPass(createX86PadShortFunctions());
     addPass(createX86FixupLEAs());
     ShouldPrint = true;
   }
 
+  // @LOCALMOD-START
+  if (getX86Subtarget().isTargetNaCl()) {
+    addPass(createX86NaClRewritePass());
+    ShouldPrint = true;
+  }
+  // @LOCALMOD-END
+
   return ShouldPrint;
 }