From b57ca3bcfacc3ad5bcce3729e1a69cc0eefcee94 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Tue, 26 May 2020 15:56:01 +0300 Subject: BareMetal: Auto-detect IAR toolchain for Renesas R32C architecture This patch implements auto-detection for the R32C toolchain, provided by IAR Systems: * https://www.iar.com/iar-embedded-workbench/#!?architecture=R32C Change-Id: I22b6f2afdc902f659c9adda18550cc915cf48125 Reviewed-by: hjk --- src/plugins/baremetal/iarewtoolchain.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 7e81695b77..a4fbb10769 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -81,7 +81,7 @@ static QString cppLanguageOption(const FilePath &compiler) || baseName == "iccv850" || baseName == "icc78k" || baseName == "iccavr32" || baseName == "iccsh" || baseName == "icccf" || baseName == "iccm32c" - || baseName == "iccm16c") { + || baseName == "iccm16c" || baseName == "iccr32c") { return QString("--ec++"); } return {}; @@ -227,6 +227,8 @@ static Abi::Architecture guessArchitecture(const Macros ¯os) return Abi::Architecture::M32CArchitecture; if (macro.key == "__ICCM16C__") return Abi::Architecture::M16CArchitecture; + if (macro.key == "__ICCR32C__") + return Abi::Architecture::R32CArchitecture; } return Abi::Architecture::UnknownArchitecture; } @@ -260,7 +262,8 @@ static Abi::BinaryFormat guessFormat(Abi::Architecture arch) || arch == Abi::Architecture::K78Architecture || arch == Abi::Architecture::M68KArchitecture || arch == Abi::Architecture::M32CArchitecture - || arch == Abi::Architecture::M16CArchitecture) { + || arch == Abi::Architecture::M16CArchitecture + || arch == Abi::Architecture::R32CArchitecture) { return Abi::BinaryFormat::UbrofFormat; } return Abi::BinaryFormat::UnknownFormat; @@ -510,6 +513,7 @@ QList IarToolChainFactory::autoDetect(const QList &alr {{"EWCF"}, {"/cf/bin/icccf.exe"}}, {{"EWM32C"}, {"/m32c/bin/iccm32c.exe"}}, {{"EWM16C"}, {"/m16c/bin/iccm16c.exe"}}, + {{"EWR32C"}, {"/r32c/bin/iccr32c.exe"}}, }; QSettings registry(kRegistryNode, QSettings::NativeFormat); -- cgit v1.2.1