diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-03-13 17:18:12 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-03-16 11:45:14 +0000 |
| commit | 77e8cca24ee4c39da5f2cbafbc316f9ac9e8ac80 (patch) | |
| tree | 47f498bb9ace1bd9b733db15b24472bcaecad7e7 | |
| parent | 746fce324b21ce386cf8358f330daa1c6e07ce5a (diff) | |
baremetal: Auto-detect IAR toolchain for Renesas 78K architecture
Change-Id: I659c1f4c9f367af7f77069264082cb30a836679f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/app/qbs-setup-toolchains/iarewprobe.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp index 3babf34f9..de7b62574 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -61,7 +61,7 @@ static QStringList knownIarCompilerNames() QStringLiteral("iccavr"), QStringLiteral("iccstm8"), QStringLiteral("icc430"), QStringLiteral("iccrl78"), QStringLiteral("iccrx"), QStringLiteral("iccrh850"), - QStringLiteral("iccv850")}; + QStringLiteral("iccv850"), QStringLiteral("icc78k")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -85,6 +85,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("rh850"); if (baseName == QLatin1String("iccv850")) return QStringLiteral("v850"); + if (baseName == QLatin1String("icc78k")) + return QStringLiteral("78k"); return {}; } @@ -159,7 +161,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) || arch == QLatin1String("rl78") || arch == QLatin1String("rx") || arch == QLatin1String("rh850") - || arch == QLatin1String("v850")) { + || arch == QLatin1String("v850") + || arch == QLatin1String("78k")) { return Version{verCode / 100, verCode % 100}; } @@ -209,6 +212,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() {QStringLiteral("EWRX"), QStringLiteral("\\rx\\bin\\iccrx.exe")}, {QStringLiteral("EWRH850"), QStringLiteral("\\rh850\\bin\\iccrh850.exe")}, {QStringLiteral("EWV850"), QStringLiteral("\\v850\\bin\\iccv850.exe")}, + {QStringLiteral("EW78K"), QStringLiteral("\\78k\\bin\\icc78k.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); |