diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-05-21 16:39:43 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-05-25 09:55:13 +0000 |
| commit | 771237e13a47b432af07d1f409a2d2ecac42361c (patch) | |
| tree | d476ddf01718074784e822ed41e1adb868e09478 /src | |
| parent | c2fb3251062fca72a72ea291d9ee944936872cb3 (diff) | |
baremetal: Auto-detect IAR toolchain for Renesas M16C/R8C architecture
Change-Id: I3f5822316d328e8861e54d43994de405c591c0b3
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 249698ca0..e4d62136c 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -64,7 +64,8 @@ static QStringList knownIarCompilerNames() QStringLiteral("iccv850"), QStringLiteral("icc78k"), QStringLiteral("iccavr32"), QStringLiteral("iccsh"), QStringLiteral("iccriscv"), QStringLiteral("icccf"), - QStringLiteral("iccm32c"), QStringLiteral("iccr32c")}; + QStringLiteral("iccm32c"), QStringLiteral("iccr32c"), + QStringLiteral("iccm16c")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -102,6 +103,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("m32c"); if (baseName == QLatin1String("iccr32c")) return QStringLiteral("r32c"); + if (baseName == QLatin1String("iccm16c")) + return QStringLiteral("m16c"); return {}; } @@ -183,7 +186,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) || arch == QLatin1String("riscv") || arch == QLatin1String("m68k") || arch == QLatin1String("m32c") - || arch == QLatin1String("r32c")) { + || arch == QLatin1String("r32c") + || arch == QLatin1String("m16c")) { return Version{verCode / 100, verCode % 100}; } @@ -240,6 +244,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() {QStringLiteral("EWCF"), QStringLiteral("/cf/bin/icccf.exe")}, {QStringLiteral("EWM32C"), QStringLiteral("/m32c/bin/iccm32c.exe")}, {QStringLiteral("EWR32C"), QStringLiteral("/r32c/bin/iccr32c.exe")}, + {QStringLiteral("EWM16C"), QStringLiteral("/m16c/bin/iccm16c.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); |