From fc751750f105d6e68799ca39c755b1ba96cf5373 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Fri, 13 Mar 2020 16:54:15 +0300 Subject: baremetal: Auto-detect IAR toolchain for Renesas V850 architecture Change-Id: I7862904f26a8e4c807d10cb1b136aba6eabbba55 Reviewed-by: Christian Kandeler Reviewed-by: Ivan Komissarov --- src/app/qbs-setup-toolchains/iarewprobe.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp index e5d25ee27..3babf34f9 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -60,7 +60,8 @@ static QStringList knownIarCompilerNames() return {QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr"), QStringLiteral("iccstm8"), QStringLiteral("icc430"), QStringLiteral("iccrl78"), - QStringLiteral("iccrx"), QStringLiteral("iccrh850")}; + QStringLiteral("iccrx"), QStringLiteral("iccrh850"), + QStringLiteral("iccv850")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -82,6 +83,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("rx"); if (baseName == QLatin1String("iccrh850")) return QStringLiteral("rh850"); + if (baseName == QLatin1String("iccv850")) + return QStringLiteral("v850"); return {}; } @@ -155,7 +158,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) || arch == QLatin1String("msp430") || arch == QLatin1String("rl78") || arch == QLatin1String("rx") - || arch == QLatin1String("rh850")) { + || arch == QLatin1String("rh850") + || arch == QLatin1String("v850")) { return Version{verCode / 100, verCode % 100}; } @@ -204,6 +208,7 @@ static std::vector installedIarsFromRegistry() {QStringLiteral("EWRL78"), QStringLiteral("\\rl78\\bin\\iccrl78.exe")}, {QStringLiteral("EWRX"), QStringLiteral("\\rx\\bin\\iccrx.exe")}, {QStringLiteral("EWRH850"), QStringLiteral("\\rh850\\bin\\iccrh850.exe")}, + {QStringLiteral("EWV850"), QStringLiteral("\\v850\\bin\\iccv850.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); -- cgit v1.2.3