aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-07-21 21:22:13 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-07-23 08:01:10 +0000
commit4bd119f1063a2e73085b47772f1e6838ecf172ed (patch)
tree2733afd7409fe24f4c919d2c72987239dded2b06
parent1d2e98101d835bf699984a9770eeb055efcad2c3 (diff)
baremetal: Pass 'one-object-asm-application' test for IAR ARM
Change-Id: Ie4dee42345d4ca1d3280b1b65155d0dc173beffd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--tests/auto/blackbox/testdata-baremetal/one-object-asm-application/arm-iar.s7
-rw-r--r--tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs10
2 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/arm-iar.s b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/arm-iar.s
new file mode 100644
index 000000000..0a13a5dc2
--- /dev/null
+++ b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/arm-iar.s
@@ -0,0 +1,7 @@
+ PUBLIC main
+ SECTION `.text`:CODE:NOROOT(1)
+ THUMB
+main:
+ MOVS R0, #+0
+ BX LR
+ END
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 cd1413d6f..0bf07b0d7 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
@@ -8,6 +8,8 @@ BareMetalApplication {
if (qbs.architecture === "mcs51")
return true;
} else if (qbs.toolchainType === "iar") {
+ if (qbs.architecture.startsWith("arm"))
+ return true;
if (qbs.architecture === "mcs51")
return true;
} else if (qbs.toolchainType === "sdcc") {
@@ -36,6 +38,14 @@ BareMetalApplication {
cpp.linkerPath: cpp.compilerPathByLanguage["c"]
}
+ Properties {
+ condition: qbs.toolchainType === "iar"
+ && qbs.architecture.startsWith("arm")
+ cpp.entryPoint: "main"
+ }
+
+ cpp.linkerPath: original
+
files: [(qbs.architecture.startsWith("arm") ? "arm" : qbs.architecture)
+ "-" + qbs.toolchainType + ".s"]
}