diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-03-13 16:21:02 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-03-16 11:43:54 +0000 |
| commit | 35405f58a818717a65716889c16a7b86907ed491 (patch) | |
| tree | dcc89c3df573d2fa3e25c1e9827882d41263cf95 /src | |
| parent | fa371d0fa0249a17f408670e18ab1554f96f209b (diff) | |
baremetal: Auto-detect IAR toolchain for Renesas RH850 architecture
Change-Id: I4fe50d4d5d4b2a544d4f726ae3f4532763c1d11b
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
| -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 fdd46e49c..e5d25ee27 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -60,7 +60,7 @@ static QStringList knownIarCompilerNames() return {QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr"), QStringLiteral("iccstm8"), QStringLiteral("icc430"), QStringLiteral("iccrl78"), - QStringLiteral("iccrx")}; + QStringLiteral("iccrx"), QStringLiteral("iccrh850")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -80,6 +80,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("rl78"); if (baseName == QLatin1String("iccrx")) return QStringLiteral("rx"); + if (baseName == QLatin1String("iccrh850")) + return QStringLiteral("rh850"); return {}; } @@ -152,7 +154,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) || arch == QLatin1String("stm8") || arch == QLatin1String("msp430") || arch == QLatin1String("rl78") - || arch == QLatin1String("rx")) { + || arch == QLatin1String("rx") + || arch == QLatin1String("rh850")) { return Version{verCode / 100, verCode % 100}; } @@ -200,6 +203,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() {QStringLiteral("EW430"), QStringLiteral("\\430\\bin\\icc430.exe")}, {QStringLiteral("EWRL78"), QStringLiteral("\\rl78\\bin\\iccrl78.exe")}, {QStringLiteral("EWRX"), QStringLiteral("\\rx\\bin\\iccrx.exe")}, + {QStringLiteral("EWRH850"), QStringLiteral("\\rh850\\bin\\iccrh850.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); |