commit 64f68248cda569a2ed9402a9a87eea42202e9794
author Vladimir Sukharev <vladimir.sukharev@arm.com> Wed Sep 23 09:29:32 2015 +0000
committer Vladimir Sukharev <vladimir.sukharev@arm.com> Wed Sep 23 09:29:32 2015 +0000
tree 52fc0409400b2990d1ef9f6cd3903becbd9d489e
parent f2ed5c68d2c44588e7059212589de328768bf7c6

[ARM] Fix crash "-target arm -mcpu=generic", without "-march="

An assertion hit has been fixed for cmdlines like

$ clang --target=arm-linux-gnueabi -mcpu=generic hello.c

Related to: http://reviews.llvm.org/rL245445

Reviewers: rengolin

Subscribers: cfe-commits

Differential Revision: http://reviews.llvm.org/D13013

llvm-svn: 248370

clang/lib/Driver/ToolChain.cpp

diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index b3b3959..570826e 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -317,8 +317,7 @@
             ? tools::arm::getARMCPUForMArch(MArch, Triple).str()
             : tools::arm::getARMTargetCPU(MCPU, MArch, Triple);
     StringRef Suffix =
-      tools::arm::getLLVMArchSuffixForARM(CPU,
-                                          tools::arm::getARMArch(MArch, Triple));
+      tools::arm::getLLVMArchSuffixForARM(CPU, MArch, Triple);
     bool ThumbDefault = Suffix.startswith("v6m") || Suffix.startswith("v7m") ||
       Suffix.startswith("v7em") ||
       (Suffix.startswith("v7") && getTriple().isOSBinFormatMachO());