diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-05-14 12:31:43 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-05-14 15:22:31 +0000 |
| commit | 17e6d4bbe6210267938e762e132bbb6b4f3d4306 (patch) | |
| tree | e846d69c5c33a9f080616034c3d2a6f460f73799 /src | |
| parent | 4e708af88e5a3e6a92ef926e65eb1a9c8dbd6857 (diff) | |
baremetal: Auto-detect IAR toolchain for Renesas SH architecture
Change-Id: I9d9f90841c6deb8e02f5583bee4083aae6e11c79
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 bcaa50e55..c505ca5fb 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -62,7 +62,7 @@ static QStringList knownIarCompilerNames() QStringLiteral("icc430"), QStringLiteral("iccrl78"), QStringLiteral("iccrx"), QStringLiteral("iccrh850"), QStringLiteral("iccv850"), QStringLiteral("icc78k"), - QStringLiteral("iccavr32")}; + QStringLiteral("iccavr32"), QStringLiteral("iccsh")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -90,6 +90,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("78k"); if (baseName == QLatin1String("iccavr32")) return QStringLiteral("avr32"); + if (baseName == QLatin1String("iccsh")) + return QStringLiteral("sh"); return {}; } @@ -166,7 +168,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) || arch == QLatin1String("rh850") || arch == QLatin1String("v850") || arch == QLatin1String("78k") - || arch == QLatin1String("avr32")) { + || arch == QLatin1String("avr32") + || arch == QLatin1String("sh")) { return Version{verCode / 100, verCode % 100}; } @@ -218,6 +221,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() {QStringLiteral("EWV850"), QStringLiteral("\\v850\\bin\\iccv850.exe")}, {QStringLiteral("EW78K"), QStringLiteral("\\78k\\bin\\icc78k.exe")}, {QStringLiteral("EWAVR32"), QStringLiteral("\\avr32\\bin\\iccavr32.exe")}, + {QStringLiteral("EWSH"), QStringLiteral("\\sh\\bin\\iccsh.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); |