From 12d227409e1143b55bc1e49bfaef402fb641cd56 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Tue, 22 Sep 2020 18:33:59 +0300 Subject: baremetal: Implement cpp.generateCompilerListingFiles for ARMCLANG The ARMCLANG compiler does not support generating of the listing files. Instead, it is recommended to use the disassembler: * https://www.keil.com/support/docs/4152.htm Take a note that the disassembler does not work with the evaluation license! Change-Id: If8b45e40523015d27e4439cf00028815211338ed Reviewed-by: Ivan Komissarov --- .../do-not-generate-compiler-listing.qbs | 20 +++----------------- .../generate-compiler-listing.qbs | 20 +++----------------- 2 files changed, 6 insertions(+), 34 deletions(-) (limited to 'tests') diff --git a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs b/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs index 46faf9440..1bc4ba208 100644 --- a/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs +++ b/tests/auto/blackbox/testdata-baremetal/do-not-generate-compiler-listing/do-not-generate-compiler-listing.qbs @@ -2,24 +2,10 @@ import "../BareMetalApplication.qbs" as BareMetalApplication BareMetalApplication { condition: { - if (qbs.toolchainType === "sdcc") - return true; - if (qbs.toolchainType === "msvc") - return true; - if (qbs.toolchainType === "clang-cl") - return true; - if (qbs.toolchainType === "iar") - return true; - if (qbs.toolchainType === "keil") { - if (qbs.architecture === "mcs51" - || qbs.architecture === "mcs251" - || qbs.architecture === "c166") { - return true; - } - if (cpp.compilerName.startsWith("armcc")) { + if (!qbs.toolchain.contains("gcc")) { + if (cpp.compilerName.startsWith("armcc")) console.info("using short listing file names"); - return true; - } + return true; } console.info("unsupported toolset: %%" + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%"); diff --git a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs b/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs index 2596b441d..a6731d224 100644 --- a/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs +++ b/tests/auto/blackbox/testdata-baremetal/generate-compiler-listing/generate-compiler-listing.qbs @@ -2,24 +2,10 @@ import "../BareMetalApplication.qbs" as BareMetalApplication BareMetalApplication { condition: { - if (qbs.toolchainType === "sdcc") - return true; - if (qbs.toolchainType === "msvc") - return true; - if (qbs.toolchainType === "clang-cl") - return true; - if (qbs.toolchainType === "iar") - return true; - if (qbs.toolchainType === "keil") { - if (qbs.architecture === "mcs51" - || qbs.architecture === "mcs251" - || qbs.architecture === "c166") { - return true; - } - if (cpp.compilerName.startsWith("armcc")) { + if (!qbs.toolchain.contains("gcc")) { + if (cpp.compilerName.startsWith("armcc")) console.info("using short listing file names"); - return true; - } + return true; } console.info("unsupported toolset: %%" + qbs.toolchainType + "%%, %%" + qbs.architecture + "%%"); -- cgit v1.2.3