aboutsummaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-10-21 16:52:17 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-10-30 14:45:29 +0000
commitd0567a74115483b0d36df2e56e298dd488f14b2b (patch)
tree097cbe01cb2fbf574f011479d2a6a9ae1b121240 /src/app
parent0bf83bc7060a76eba7b496773431306b7f2183e4 (diff)
baremetal: Auto-detect IAR toolchain for Renesas RL78 architecture
Change-Id: I49dec9b3d33de7a1bf69c785f485e3db7baaa3d5 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/qbs-setup-toolchains/iarewprobe.cpp8
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 47592b9c0..26ee57da9 100644
--- a/src/app/qbs-setup-toolchains/iarewprobe.cpp
+++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp
@@ -59,7 +59,7 @@ static QStringList knownIarCompilerNames()
{
return {QStringLiteral("icc8051"), QStringLiteral("iccarm"),
QStringLiteral("iccavr"), QStringLiteral("iccstm8"),
- QStringLiteral("icc430")};
+ QStringLiteral("icc430"), QStringLiteral("iccrl78")};
}
static QString guessIarArchitecture(const QFileInfo &compiler)
@@ -75,6 +75,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler)
return QStringLiteral("stm8");
if (baseName == QLatin1String("icc430"))
return QStringLiteral("msp430");
+ if (baseName == QLatin1String("iccrl78"))
+ return QStringLiteral("rl78");
return {};
}
@@ -145,7 +147,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler)
} else if (arch == QLatin1String("avr")
|| arch == QLatin1String("mcs51")
|| arch == QLatin1String("stm8")
- || arch == QLatin1String("msp430")) {
+ || arch == QLatin1String("msp430")
+ || arch == QLatin1String("rl78")) {
return Version{verCode / 100, verCode % 100};
}
@@ -191,6 +194,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry()
{QStringLiteral("EW8051"), QStringLiteral("\\8051\\bin\\icc8051.exe")},
{QStringLiteral("EWSTM8"), QStringLiteral("\\stm8\\bin\\iccstm8.exe")},
{QStringLiteral("EW430"), QStringLiteral("\\430\\bin\\icc430.exe")},
+ {QStringLiteral("EWRL78"), QStringLiteral("\\rl78\\bin\\iccrl78.exe")},
};
QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat);