aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-07-15 16:39:41 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-07-21 10:55:09 +0000
commitc693cd509e31a946ac5b16662d3d466a20732f3d (patch)
treedf603df0d66232a65e57003e36e49b1eb4f2b38b
parentcb958a58d9d5335588cf393c2d1bfe3ad9fe6276 (diff)
baremetal: Pass 'one-object-asm-application' test for GCC MSP430
Change-Id: Icad69d9f510d09f7e157ef410383f5d39e36f1a6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--tests/auto/blackbox/testdata-baremetal/one-object-asm-application/msp430-gcc.s5
-rw-r--r--tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs11
2 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/msp430-gcc.s b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/msp430-gcc.s
new file mode 100644
index 000000000..8e8a24980
--- /dev/null
+++ b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/msp430-gcc.s
@@ -0,0 +1,5 @@
+ .global main
+ .type main, %function
+main:
+ mov #0, r15
+ .LIRD0:
diff --git a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
index 3c0e91d03..cd1413d6f 100644
--- a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
@@ -20,11 +20,22 @@ BareMetalApplication {
return true;
if (qbs.architecture === "avr")
return true;
+ if (qbs.architecture === "msp430")
+ return true;
}
console.info("unsupported toolset: %%"
+ qbs.toolchainType + "%%, %%" + qbs.architecture + "%%");
return false;
}
+
+ Properties {
+ condition: qbs.toolchainType === "gcc"
+ && qbs.architecture === "msp430"
+ // We need to use this workaround to enable
+ // the cpp.driverFlags property.
+ cpp.linkerPath: cpp.compilerPathByLanguage["c"]
+ }
+
files: [(qbs.architecture.startsWith("arm") ? "arm" : qbs.architecture)
+ "-" + qbs.toolchainType + ".s"]
}