diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2015-08-30 07:51:18 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2015-08-30 07:51:18 +0000 |
| commit | d96f37a77264faace54254166c23bf3d0ba8f98d (patch) | |
| tree | baa6d62ece85a2526b7eed265569e8f6ce4aab14 /clang/lib/Driver/ToolChain.cpp | |
| parent | 3309ef6f02854949f9d64d69f82504c362fe3fd1 (diff) | |
| download | llvm-d96f37a77264faace54254166c23bf3d0ba8f98d.zip llvm-d96f37a77264faace54254166c23bf3d0ba8f98d.tar.gz llvm-d96f37a77264faace54254166c23bf3d0ba8f98d.tar.bz2 | |
Update for several APIs in LLVM that now use StringRefs rather than
const char pointers. In turn, push this through Clang APIs as well,
simplifying a number of bits of code that was handling the oddities of
nullptrs.
llvm-svn: 246375
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 787422a..d4381e7 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -310,9 +310,10 @@ std::string ToolChain::ComputeLLVMTriple(const ArgList &Args, MCPU = A->getValue(); if (const Arg *A = Args.getLastArg(options::OPT_march_EQ)) MArch = A->getValue(); - std::string CPU = Triple.isOSBinFormatMachO() - ? tools::arm::getARMCPUForMArch(MArch, Triple) - : tools::arm::getARMTargetCPU(MCPU, MArch, Triple); + std::string CPU = + Triple.isOSBinFormatMachO() + ? tools::arm::getARMCPUForMArch(MArch, Triple).str() + : tools::arm::getARMTargetCPU(MCPU, MArch, Triple); StringRef Suffix = tools::arm::getLLVMArchSuffixForARM(CPU, tools::arm::getARMArch(MArch, Triple)); |