From 64f68248cda569a2ed9402a9a87eea42202e9794 Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Wed, 23 Sep 2015 09:29:32 +0000 Subject: [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/Tools.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'clang/lib/Driver/Tools.h') diff --git a/clang/lib/Driver/Tools.h b/clang/lib/Driver/Tools.h index 532b1ce0a4d..3f63aface9f 100644 --- a/clang/lib/Driver/Tools.h +++ b/clang/lib/Driver/Tools.h @@ -246,7 +246,8 @@ std::string getARMTargetCPU(StringRef CPU, StringRef Arch, const std::string getARMArch(StringRef Arch, const llvm::Triple &Triple); StringRef getARMCPUForMArch(StringRef Arch, const llvm::Triple &Triple); -StringRef getLLVMArchSuffixForARM(StringRef CPU, StringRef Arch); +StringRef getLLVMArchSuffixForARM(StringRef CPU, StringRef Arch, + const llvm::Triple &Triple); void appendEBLinkFlags(const llvm::opt::ArgList &Args, ArgStringList &CmdArgs, const llvm::Triple &Triple); -- cgit v1.2.3