diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-05-15 18:13:45 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-05-18 08:07:42 +0000 |
commit | 6af1d7e0a371b82995a86ea2325fe4a728ab4942 (patch) | |
tree | 1c532d6efb88f2186d854865b942669f1be38a27 | |
parent | cb17489a4ed14f28e4c351286c892f4f414fc01a (diff) |
baremetal: Auto-detect IAR toolchain for ColdFire (aka M68K) architecture
Change-Id: Iad69544737cbca42d69cddaa182bf3aba97a770f
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 93549028f..230c06b76 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -63,7 +63,7 @@ static QStringList knownIarCompilerNames() QStringLiteral("iccrx"), QStringLiteral("iccrh850"), QStringLiteral("iccv850"), QStringLiteral("icc78k"), QStringLiteral("iccavr32"), QStringLiteral("iccsh"), - QStringLiteral("iccriscv")}; + QStringLiteral("iccriscv"), QStringLiteral("icccf")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -95,6 +95,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("sh"); if (baseName == QLatin1String("iccriscv")) return QStringLiteral("riscv"); + if (baseName == QLatin1String("icccf")) + return QStringLiteral("m68k"); return {}; } @@ -173,7 +175,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) || arch == QLatin1String("78k") || arch == QLatin1String("avr32") || arch == QLatin1String("sh") - || arch == QLatin1String("riscv")) { + || arch == QLatin1String("riscv") + || arch == QLatin1String("m68k")) { return Version{verCode / 100, verCode % 100}; } @@ -227,6 +230,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() {QStringLiteral("EWAVR32"), QStringLiteral("/avr32/bin/iccavr32.exe")}, {QStringLiteral("EWSH"), QStringLiteral("/sh/bin/iccsh.exe")}, {QStringLiteral("EWRISCV"), QStringLiteral("/riscv/bin/iccriscv.exe")}, + {QStringLiteral("EWCF"), QStringLiteral("/cf/bin/icccf.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); |