Author: fhahn Date: Fri Aug 4 03:40:18 2017 New Revision: 310047 URL: http://llvm.org/viewvc/llvm-project?rev=310047&view=rev Log: [Driver] Error if ARM mode was selected explicitly for M-profile CPUs.
Summary: M-class profiles do not support ARM execution mode, so providing -marm/-mno-thumb does not make sense in combination with -mcpu/-march options that support the M-profile. This is a follow-up patch to D35569 and it seemed pretty clear that we should emit an error in the driver in this case. We probably also should warn/error if the provided -mcpu/-march options do not match, e.g. -mcpu=cortex-m0 -march=armv8-a is invalid, as cortex-m0 does not support armv8-a. But that should be a separate patch I think. Reviewers: echristo, richard.barton.arm, rengolin, labrinea, charles.baylis Reviewed By: rengolin Subscribers: aemerson, javed.absar, kristof.beyls, cfe-commits Differential Revision: https://reviews.llvm.org/D35826 Added: cfe/trunk/test/Driver/arm-thumb-only-cores.c Modified: cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td cfe/trunk/lib/Driver/ToolChain.cpp Modified: cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td?rev=310047&r1=310046&r2=310047&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td Fri Aug 4 03:40:18 2017 @@ -106,6 +106,10 @@ def err_drv_malformed_sanitizer_blacklis def err_target_unsupported_arch : Error<"the target architecture '%0' is not supported by the target '%1'">; +def err_cpu_unsupported_isa + : Error<"CPU '%0' does not support '%1' execution mode">; +def err_arch_unsupported_isa + : Error<"Architecture '%0' does not support '%1' execution mode">; def err_drv_I_dash_not_supported : Error< "'%0' not supported, please use -iquote instead">; Modified: cfe/trunk/lib/Driver/ToolChain.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChain.cpp?rev=310047&r1=310046&r2=310047&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChain.cpp (original) +++ cfe/trunk/lib/Driver/ToolChain.cpp Fri Aug 4 03:40:18 2017 @@ -517,6 +517,18 @@ std::string ToolChain::ComputeLLVMTriple else ArchName = "arm"; + // Check if ARM ISA was explicitly selected (using -mno-thumb or -marm) for + // M-Class CPUs/architecture variants, which is not supported. + bool ARMModeRequested = !Args.hasFlag(options::OPT_mthumb, + options::OPT_mno_thumb, ThumbDefault); + if (IsMProfile && ARMModeRequested) { + if (!MCPU.empty()) + getDriver().Diag(diag::err_cpu_unsupported_isa) << CPU << "ARM"; + else + getDriver().Diag(diag::err_arch_unsupported_isa) + << tools::arm::getARMArch(MArch, getTriple()) << "ARM"; + } + // Assembly files should start in ARM mode, unless arch is M-profile. // Windows is always thumb. if ((InputType != types::TY_PP_Asm && Args.hasFlag(options::OPT_mthumb, Added: cfe/trunk/test/Driver/arm-thumb-only-cores.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arm-thumb-only-cores.c?rev=310047&view=auto ============================================================================== --- cfe/trunk/test/Driver/arm-thumb-only-cores.c (added) +++ cfe/trunk/test/Driver/arm-thumb-only-cores.c Fri Aug 4 03:40:18 2017 @@ -0,0 +1,12 @@ +// RUN: not %clang -target arm-unknown-linux -marm -mcpu=cortex-m0 %s -o /dev/null 2>&1 \ +// RUN: | FileCheck --check-prefix M0 %s +// M0: error: CPU 'cortex-m0' does not support 'ARM' execution mode + +// RUN: not %clang -target arm-unknown-linux -marm -march=armv7m %s -o /dev/null 2>&1 \ +// RUN: | FileCheck --check-prefix ARMV7M %s +// RUN: not %clang -target armv7m-unknown-linux -mno-thumb %s -o /dev/null 2>&1 \ +// RUN: | FileCheck --check-prefix ARMV7M %s +// ARMV7M: error: Architecture 'armv7m' does not support 'ARM' execution mode +// +// RUN: %clang -S -emit-llvm -target arm-unknown-linux -mcpu=cortex-m0 %s -o /dev/null 2>&1 +// M-Profile CPUs default to Thumb mode even if arm triples are provided. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits