baremetal: Auto-detect IAR toolchain for RISC-V architecture

Change-Id: I659d1fbfb11d325d6ff62b0dda8f429d4249f794
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

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 5f4b95512..93549028f 100644
--- a/src/app/qbs-setup-toolchains/iarewprobe.cpp
+++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp
@@ -62,7 +62,8 @@ static QStringList knownIarCompilerNames()
             QStringLiteral("icc430"), QStringLiteral("iccrl78"),
             QStringLiteral("iccrx"), QStringLiteral("iccrh850"),
             QStringLiteral("iccv850"), QStringLiteral("icc78k"),
-            QStringLiteral("iccavr32"), QStringLiteral("iccsh")};
+            QStringLiteral("iccavr32"), QStringLiteral("iccsh"),
+            QStringLiteral("iccriscv")};
 }
 
 static QString guessIarArchitecture(const QFileInfo &compiler)
@@ -92,6 +93,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler)
         return QStringLiteral("avr32");
     if (baseName == QLatin1String("iccsh"))
         return QStringLiteral("sh");
+    if (baseName == QLatin1String("iccriscv"))
+        return QStringLiteral("riscv");
     return {};
 }
 
@@ -169,7 +172,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler)
                || arch == QLatin1String("v850")
                || arch == QLatin1String("78k")
                || arch == QLatin1String("avr32")
-               || arch == QLatin1String("sh")) {
+               || arch == QLatin1String("sh")
+               || arch == QLatin1String("riscv")) {
         return Version{verCode / 100, verCode % 100};
     }
 
@@ -222,6 +226,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry()
             {QStringLiteral("EW78K"), QStringLiteral("/78k/bin/icc78k.exe")},
             {QStringLiteral("EWAVR32"), QStringLiteral("/avr32/bin/iccavr32.exe")},
             {QStringLiteral("EWSH"), QStringLiteral("/sh/bin/iccsh.exe")},
+            {QStringLiteral("EWRISCV"), QStringLiteral("/riscv/bin/iccriscv.exe")},
         };
 
         QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat);