Rebased PNaCl localmods in LLVM to 223109

lib/LTO/LTOCodeGenerator.cpp

 //===-LTOCodeGenerator.cpp - LLVM Link Time Optimizer ---------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the Link Time Optimization library. This library is
@@ skipping 259 matching lines @@
     return nullptr;
   *length = NativeObjectFile->getBufferSize();
   return NativeObjectFile->getBufferStart();
 }
 
 bool LTOCodeGenerator::determineTarget(std::string &errMsg) {
   if (TargetMach)
     return true;
 
   std::string TripleStr = IRLinker.getModule()->getTargetTriple();
+
+  // @LOCALMOD-BEGIN
+  // Pretend that we are ARM for name mangling and assembly conventions.
+  // https://code.google.com/p/nativeclient/issues/detail?id=2554
+  if (TripleStr == "le32-unknown-nacl") {
+    TripleStr = "armv7a-none-nacl-gnueabi";
+  }
+  // @LOCALMOD-END
+
   if (TripleStr.empty())
     TripleStr = sys::getDefaultTargetTriple();
   llvm::Triple Triple(TripleStr);
 
   // create target machine from info for merged modules
   const Target *march = TargetRegistry::lookupTarget(TripleStr, errMsg);
   if (!march)
     return false;
 
   // The relocation model is actually a static member of TargetMachine and
@@ skipping 287 matching lines @@
                                        void *Ctxt) {
   this->DiagHandler = DiagHandler;
   this->DiagContext = Ctxt;
   if (!DiagHandler)
     return Context.setDiagnosticHandler(nullptr, nullptr);
   // Register the LTOCodeGenerator stub in the LLVMContext to forward the
   // diagnostic to the external DiagHandler.
   Context.setDiagnosticHandler(LTOCodeGenerator::DiagnosticHandler, this,
                                /* RespectFilters */ true);
 }