diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-03-12 14:20:40 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-03-12 12:45:48 +0000 |
| commit | 349e32028d4a407a5fd000ff928fe52e296a32a3 (patch) | |
| tree | 716b6578da92c9f527688e4300bd61e1375e0384 /src | |
| parent | 1947af7ab5bdb45bc6d5ed2cc6885a8bdf84ba5d (diff) | |
baremetal: Auto-detect IAR toolchain for Renesas RX architecture
Change-Id: Ifbf58bb93210808eeb35c9529765a9c464128f76
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/qbs-setup-toolchains/iarewprobe.cpp | 9 |
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 d0da1a2c1..fdd46e49c 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -59,7 +59,8 @@ static QStringList knownIarCompilerNames() { return {QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr"), QStringLiteral("iccstm8"), - QStringLiteral("icc430"), QStringLiteral("iccrl78")}; + QStringLiteral("icc430"), QStringLiteral("iccrl78"), + QStringLiteral("iccrx")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -77,6 +78,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("msp430"); if (baseName == QLatin1String("iccrl78")) return QStringLiteral("rl78"); + if (baseName == QLatin1String("iccrx")) + return QStringLiteral("rx"); return {}; } @@ -148,7 +151,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) || arch == QLatin1String("mcs51") || arch == QLatin1String("stm8") || arch == QLatin1String("msp430") - || arch == QLatin1String("rl78")) { + || arch == QLatin1String("rl78") + || arch == QLatin1String("rx")) { return Version{verCode / 100, verCode % 100}; } @@ -195,6 +199,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() {QStringLiteral("EWSTM8"), QStringLiteral("\\stm8\\bin\\iccstm8.exe")}, {QStringLiteral("EW430"), QStringLiteral("\\430\\bin\\icc430.exe")}, {QStringLiteral("EWRL78"), QStringLiteral("\\rl78\\bin\\iccrl78.exe")}, + {QStringLiteral("EWRX"), QStringLiteral("\\rx\\bin\\iccrx.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); |