diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-05-06 11:36:47 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-05-06 18:15:55 +0000 |
| commit | f259fd0ada6bd1aa59a5f6f8ea016a928405dc84 (patch) | |
| tree | 5aed81817640605c2056ec31527aa682019e9ec2 /src | |
| parent | 4af28c8e5714b15f79447df077ddf98f91fb27bd (diff) | |
baremetal: Auto-detect IAR toolchain for AVR32 architecture
Change-Id: Ic5c614504aaebb7d2cb30098e8f408ca9d110150
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 | 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 de7b62574..bcaa50e55 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -61,7 +61,8 @@ static QStringList knownIarCompilerNames() QStringLiteral("iccavr"), QStringLiteral("iccstm8"), QStringLiteral("icc430"), QStringLiteral("iccrl78"), QStringLiteral("iccrx"), QStringLiteral("iccrh850"), - QStringLiteral("iccv850"), QStringLiteral("icc78k")}; + QStringLiteral("iccv850"), QStringLiteral("icc78k"), + QStringLiteral("iccavr32")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -87,6 +88,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("v850"); if (baseName == QLatin1String("icc78k")) return QStringLiteral("78k"); + if (baseName == QLatin1String("iccavr32")) + return QStringLiteral("avr32"); return {}; } @@ -162,7 +165,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) || arch == QLatin1String("rx") || arch == QLatin1String("rh850") || arch == QLatin1String("v850") - || arch == QLatin1String("78k")) { + || arch == QLatin1String("78k") + || arch == QLatin1String("avr32")) { return Version{verCode / 100, verCode % 100}; } @@ -213,6 +217,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() {QStringLiteral("EWRH850"), QStringLiteral("\\rh850\\bin\\iccrh850.exe")}, {QStringLiteral("EWV850"), QStringLiteral("\\v850\\bin\\iccv850.exe")}, {QStringLiteral("EW78K"), QStringLiteral("\\78k\\bin\\icc78k.exe")}, + {QStringLiteral("EWAVR32"), QStringLiteral("\\avr32\\bin\\iccavr32.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); |