aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2020-05-18 13:13:21 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2020-05-19 11:13:40 +0000
commit39c2b0aad7b6b27ffa90341bda0f291afd5c37bf (patch)
tree0205bbc885491967854961ae89bdb84468711609
parent63277596843d53e200b44c3b04326e768c1a685a (diff)
baremetal: Auto-detect IAR toolchain for Renesas M32C architecture
Change-Id: I1c7deb28a34c5259b9b8f5c55cd84696ba68204b Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/app/qbs-setup-toolchains/iarewprobe.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp
index 230c06b76..af01b1b65 100644
--- a/src/app/qbs-setup-toolchains/iarewprobe.cpp
+++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp
@@ -63,7 +63,8 @@ static QStringList knownIarCompilerNames()
QStringLiteral("iccrx"), QStringLiteral("iccrh850"),
QStringLiteral("iccv850"), QStringLiteral("icc78k"),
QStringLiteral("iccavr32"), QStringLiteral("iccsh"),
- QStringLiteral("iccriscv"), QStringLiteral("icccf")};
+ QStringLiteral("iccriscv"), QStringLiteral("icccf"),
+ QStringLiteral("iccm32c")};
}
static QString guessIarArchitecture(const QFileInfo &compiler)
@@ -97,6 +98,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler)
return QStringLiteral("riscv");
if (baseName == QLatin1String("icccf"))
return QStringLiteral("m68k");
+ if (baseName == QLatin1String("iccm32c"))
+ return QStringLiteral("m32c");
return {};
}
@@ -176,7 +179,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler)
|| arch == QLatin1String("avr32")
|| arch == QLatin1String("sh")
|| arch == QLatin1String("riscv")
- || arch == QLatin1String("m68k")) {
+ || arch == QLatin1String("m68k")
+ || arch == QLatin1String("m32c")) {
return Version{verCode / 100, verCode % 100};
}
@@ -231,6 +235,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry()
{QStringLiteral("EWSH"), QStringLiteral("/sh/bin/iccsh.exe")},
{QStringLiteral("EWRISCV"), QStringLiteral("/riscv/bin/iccriscv.exe")},
{QStringLiteral("EWCF"), QStringLiteral("/cf/bin/icccf.exe")},
+ {QStringLiteral("EWM32C"), QStringLiteral("/m32c/bin/iccm32c.exe")},
};
QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat);