Inject gnueabihf environment into the effective clang triple for NaCl

lib/Driver/ToolChains.cpp

Index: lib/Driver/ToolChains.cpp
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index ec67c5d36108d0e7337fa6722861f28a5c399bb6..29958aac3d7a3e6c40bc64e10a5f23d89b460073 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -2529,6 +2529,15 @@ ToolChain::CXXStdlibType NaCl_TC::GetCXXStdlibType(const ArgList &Args) const {
   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);
 }