Inject gnueabihf environment into the effective clang triple for NaCl

lib/Driver/ToolChains.cpp

 //===--- ToolChains.cpp - ToolChain Implementations -----------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "ToolChains.h"
@@ skipping 2511 matching lines @@
     StringRef Value = A->getValue();
     if (Value == "libc++")
       return ToolChain::CST_Libcxx;
     getDriver().Diag(diag::err_drv_invalid_stdlib_name)
       << A->getAsString(Args);
   }
 
   return ToolChain::CST_Libcxx;
 }
 
+std::string NaCl_TC::ComputeEffectiveClangTriple(
+    const llvm::opt::ArgList &Args,

[jvoung (off chromium), 2015/01/21 16:36:22]

Can this just be ArgList (like the Darwin version of
ComputeEffectiveClangTriple) instead of llvm::opt::ArgList?

[Derek Schuff, 2015/01/21 17:37:37]

Done.

+    types::ID InputType) const {
+  llvm::Triple TheTriple(ComputeLLVMTriple(Args, InputType));
+  if (TheTriple.getArch() == llvm::Triple::arm)
+    TheTriple.setEnvironment(llvm::Triple::GNUEABIHF);
+  return TheTriple.getTriple();
+}
+
 Tool *NaCl_TC::buildLinker() const {
   return new tools::nacltools::Link(*this);
 }
 
 Tool *NaCl_TC::buildAssembler() const {
   if (getTriple().getArch() == llvm::Triple::arm)
     return new tools::nacltools::AssembleARM(*this);
   return new tools::gnutools::Assemble(*this);
 }
 // End NaCl
@@ skipping 1197 matching lines @@
     StringRef(cl_include_dir).split(Dirs, StringRef(EnvPathSeparatorStr));
     ArrayRef<StringRef> DirVec(Dirs);
     addSystemIncludes(DriverArgs, CC1Args, DirVec);
   }
 }
 
 void XCore::AddCXXStdlibLibArgs(const ArgList &Args,
                                 ArgStringList &CmdArgs) const {
   // We don't output any lib args. This is handled by xcc.
 }