aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules/cpp/iar.js
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-06-26 19:39:32 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-06-28 17:17:37 +0000
commit3545a25377330fb49f7a4aeacbf0bfe21adf04b2 (patch)
tree35e067a3008a99c17cc0b2d891ad2074a58de387 /share/qbs/modules/cpp/iar.js
parentbbc4594721683a47365518406457daf9c62e02c1 (diff)
baremetal: Fix architecture code detection for ARM using IAR toolchain
We need to use architecture.startsWith("arm") for the ARM architecture, because now the ARM architecture has detailed name (like 'armv7 and etc). Change-Id: Ia9bed35af66de954ec47d8b4a0622a6ad78bf074 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules/cpp/iar.js')
-rw-r--r--share/qbs/modules/cpp/iar.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/iar.js b/share/qbs/modules/cpp/iar.js
index 5ed85ead4..53088c7d8 100644
--- a/share/qbs/modules/cpp/iar.js
+++ b/share/qbs/modules/cpp/iar.js
@@ -94,8 +94,12 @@ function architectureCode(architecture) {
return "34";
case "cr16":
return "45";
- case "arm": case "rh850": case "rl78": case "rx": case "stm8": case "sh": case "riscv":
+ case "rh850": case "rl78": case "rx": case "stm8": case "sh": case "riscv":
return "";
+ default:
+ if (architecture.startsWith("arm"))
+ return "";
+ break;
}
}