aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-07-24 14:53:35 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-07-24 12:34:56 +0000
commite6f1b76b8c353e4a41e9b53a16e1b2b65fb1ce6a (patch)
tree12090ba5c31c942032252ae1cc4016ae593dfd69
parenta05d92ad27a135925a7f8d218caad178753a634c (diff)
baremetal: Pass 'one-object-asm-application' test for IAR RH850
... also the changes in the BareMetal{Application|StaticLibrary}.qbs files allows to pass all other IAR RH850 tests. Change-Id: I5b226e6541cb93d68f30134e7f9df5f4f8c5915b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r--tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs9
-rw-r--r--tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs9
-rw-r--r--tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs2
-rw-r--r--tests/auto/blackbox/testdata-baremetal/one-object-asm-application/rh850-iar.s7
4 files changed, 27 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
index 7876a643f..c2a431e27 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
@@ -22,6 +22,15 @@ CppApplication {
]
}
Properties {
+ condition: qbs.toolchain.contains("iar")
+ && qbs.architecture === "rh850"
+ cpp.driverLinkerFlags: [
+ "--config_def", "CSTACK_SIZE=0x1000",
+ "--config_def", "HEAP_SIZE=0x1000",
+ "--config", cpp.toolchainInstallPath + "/../config/lnkrh850_g3m.icf"
+ ]
+ }
+ Properties {
condition: qbs.toolchain.contains("keil")
&& qbs.architecture.startsWith("arm")
&& cpp.compilerName.startsWith("armcc")
diff --git a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
index d157fce98..66cba3576 100644
--- a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
@@ -22,6 +22,15 @@ StaticLibrary {
]
}
Properties {
+ condition: qbs.toolchain.contains("iar")
+ && qbs.architecture === "rh850"
+ cpp.driverLinkerFlags: [
+ "--config_def", "CSTACK_SIZE=0x1000",
+ "--config_def", "HEAP_SIZE=0x1000",
+ "--config", cpp.toolchainInstallPath + "/../config/lnkrh850_g3m.icf"
+ ]
+ }
+ Properties {
condition: qbs.toolchain.contains("keil")
&& qbs.architecture.startsWith("arm")
&& cpp.compilerName.startsWith("armcc")
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 12062d949..b13c94f12 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
@@ -24,6 +24,8 @@ BareMetalApplication {
return true;
if (qbs.architecture === "rl78")
return true;
+ if (qbs.architecture === "rh850")
+ return true;
} else if (qbs.toolchainType === "sdcc") {
if (qbs.architecture === "mcs51")
return true;
diff --git a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/rh850-iar.s b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/rh850-iar.s
new file mode 100644
index 000000000..8901027aa
--- /dev/null
+++ b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/rh850-iar.s
@@ -0,0 +1,7 @@
+ PUBLIC _main
+ SECTION `.text`:CODE:NOROOT(2)
+ CODE
+_main:
+ MOV r0, r10
+ JMP [lp]
+ END