Author: alelab01 Date: Wed Oct 28 05:10:03 2015 New Revision: 251507 URL: http://llvm.org/viewvc/llvm-project?rev=251507&view=rev Log: When running clang with an arm triple such as '--target=thumbv7m-none-eabi' that has a thumb only CPU by default (cortex-m3), and when using the assembler, the default thumb state of the CPU does not get passed via the triple to LLVM:
$ clang -target thumbv7m-none-eabi -c -v test.s clang -cc1as ... -triple armv7m-none--eabi ... test.s Differential Revision: http://reviews.llvm.org/D14121 Modified: cfe/trunk/lib/Driver/ToolChain.cpp cfe/trunk/test/Driver/arm-ias-Wa.s Modified: cfe/trunk/lib/Driver/ToolChain.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChain.cpp?rev=251507&r1=251506&r2=251507&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChain.cpp (original) +++ cfe/trunk/lib/Driver/ToolChain.cpp Wed Oct 28 05:10:03 2015 @@ -23,10 +23,12 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/TargetRegistry.h" +#include "llvm/Support/TargetParser.h" using namespace clang::driver; using namespace clang::driver::tools; using namespace clang; +using namespace llvm; using namespace llvm::opt; static llvm::opt::Arg *GetRTTIArgument(const ArgList &Args) { @@ -466,9 +468,9 @@ std::string ToolChain::ComputeLLVMTriple : tools::arm::getARMTargetCPU(MCPU, MArch, Triple); StringRef Suffix = tools::arm::getLLVMArchSuffixForARM(CPU, MArch, Triple); - bool ThumbDefault = Suffix.startswith("v6m") || Suffix.startswith("v7m") || - Suffix.startswith("v7em") || - (Suffix.startswith("v7") && getTriple().isOSBinFormatMachO()); + bool IsMProfile = ARM::parseArchProfile(Suffix) == ARM::PK_M; + bool ThumbDefault = IsMProfile || (ARM::parseArchVersion(Suffix) == 7 && + getTriple().isOSBinFormatMachO()); // FIXME: this is invalid for WindowsCE if (getTriple().isOSWindows()) ThumbDefault = true; @@ -478,9 +480,9 @@ std::string ToolChain::ComputeLLVMTriple else ArchName = "arm"; - // Assembly files should start in ARM mode. - if (InputType != types::TY_PP_Asm && - Args.hasFlag(options::OPT_mthumb, options::OPT_mno_thumb, ThumbDefault)) + // Assembly files should start in ARM mode, unless arch is M-profile. + if (IsMProfile || (InputType != types::TY_PP_Asm && + Args.hasFlag(options::OPT_mthumb, options::OPT_mno_thumb, ThumbDefault))) { if (IsBigEndian) ArchName = "thumbeb"; Modified: cfe/trunk/test/Driver/arm-ias-Wa.s URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arm-ias-Wa.s?rev=251507&r1=251506&r2=251507&view=diff ============================================================================== --- cfe/trunk/test/Driver/arm-ias-Wa.s (original) +++ cfe/trunk/test/Driver/arm-ias-Wa.s Wed Oct 28 05:10:03 2015 @@ -62,3 +62,20 @@ // RUN: | FileCheck --check-prefix=CHECK-DUP-HDIV %s // CHECK-DUP-HDIV: "-target-feature" "-hwdiv-arm" // CHECK-DUP-HDIV: "-target-feature" "+hwdiv" + +// ========================================================== Triple +// RUN: %clang -target armv7a-none-eabi -c %s -### 2>&1 \ +// RUN: %clang -target x86_64-apple-darwin -arch armv7 -c %s -### 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-A-PROFILE %s +// CHECK-A-PROFILE: "-triple" "armv7-{{.*}}" + +// RUN: %clang -target armv7r-none-eabi -c %s -### 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-R-PROFILE %s +// CHECK-R-PROFILE: "-triple" "armv7r-none--eabi" + +// RUN: %clang -target armv7m-none-eabi -c %s -### 2>&1 \ +// RUN: %clang -target thumbv7m-none-eabi -c %s -### 2>&1 \ +// RUN: %clang -target x86_64-apple-darwin -arch armv7m -c %s -### 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-M-PROFILE %s +// CHECK-M-PROFILE: "-triple" "thumbv7m-{{.*}}" + _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
