Inject gnueabihf environment into the effective clang triple for NaCl

lib/Driver/Tools.cpp

 //===--- Tools.cpp - Tools Implementations --------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "Tools.h"
@@ skipping 611 matching lines @@
       case llvm::Triple::GNUEABIHF:
         FloatABI = "hard";
         break;
       default:
         // FreeBSD defaults to soft float
         FloatABI = "soft";
         break;
       }
       break;
 
     case llvm::Triple::NaCl: // @LOCALMOD

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

Seems like this localmod is no longer needed if the env is now gnueabihf?

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

Unfortunately it can't be, because this function is also called by the assembler
tool, which doesn't use the effective clang triple.

       FloatABI = "hard";
       break;
 
     default:
       switch(Triple.getEnvironment()) {
       case llvm::Triple::GNUEABIHF:
         FloatABI = "hard";
         break;
       case llvm::Triple::GNUEABI:
         FloatABI = "softfp";
@@ skipping 101 matching lines @@
         (Triple.getOS() == llvm::Triple::UnknownOS &&
          Triple.getObjectFormat() == llvm::Triple::MachO) ||
         StringRef(CPUName).startswith("cortex-m")) {
       ABIName = "aapcs";
     } else {
       ABIName = "apcs-gnu";
     }
   } else if (Triple.isOSWindows()) {
     // FIXME: this is invalid for WindowsCE
     ABIName = "aapcs";
-  } else if (Triple.isOSNaCl()) { // @LOCALMOD
-    ABIName = "aapcs-linux";
   } else {
     // Select the default based on the platform.
     switch(Triple.getEnvironment()) {
     case llvm::Triple::Android:
     case llvm::Triple::GNUEABI:
     case llvm::Triple::GNUEABIHF:
       ABIName = "aapcs-linux";
       break;
     case llvm::Triple::EABIHF:
     case llvm::Triple::EABI:
@@ skipping 7403 matching lines @@
 
   ExceptionSettings EH = exceptionSettings(Args, getToolChain().getTriple());
   if (EH.ShouldUseExceptionTables)
     CmdArgs.push_back("-fexceptions");
 
   AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);
 
   const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("xcc"));
   C.addCommand(new Command(JA, *this, Exec, CmdArgs));
 }