feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BareMetal: Auto-detect IAR toolchain for Renesas R32C architecture

Browse Source 
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 <hjk@qt.io>
This commit is contained in:
Denis Shienkov
2020-05-26 15:56:01 +03:00
parent d03bbab58e
commit b57ca3bcfa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/baremetal/iarewtoolchain.cpp
View File

@@ -81,7 +81,7 @@ static QString cppLanguageOption(const FilePath &compiler)
|| baseName == "iccv850" || baseName == "icc78k" || baseName == "iccv850" || baseName == "icc78k"
|| baseName == "iccavr32" || baseName == "iccsh" || baseName == "iccavr32" || baseName == "iccsh"
|| baseName == "icccf" || baseName == "iccm32c" || baseName == "icccf" || baseName == "iccm32c"
|| baseName == "iccm16c") { || baseName == "iccm16c" || baseName == "iccr32c") {
return QString("--ec++"); return QString("--ec++");
} }
return {}; return {};
@@ -227,6 +227,8 @@ static Abi::Architecture guessArchitecture(const Macros &macros)
return Abi::Architecture::M32CArchitecture; return Abi::Architecture::M32CArchitecture;
if (macro.key == "__ICCM16C__") if (macro.key == "__ICCM16C__")
return Abi::Architecture::M16CArchitecture; return Abi::Architecture::M16CArchitecture;
if (macro.key == "__ICCR32C__")
return Abi::Architecture::R32CArchitecture;
} }
return Abi::Architecture::UnknownArchitecture; return Abi::Architecture::UnknownArchitecture;
} }
@@ -260,7 +262,8 @@ static Abi::BinaryFormat guessFormat(Abi::Architecture arch)
|| arch == Abi::Architecture::K78Architecture || arch == Abi::Architecture::K78Architecture
|| arch == Abi::Architecture::M68KArchitecture || arch == Abi::Architecture::M68KArchitecture
|| arch == Abi::Architecture::M32CArchitecture || arch == Abi::Architecture::M32CArchitecture
|| arch == Abi::Architecture::M16CArchitecture) { || arch == Abi::Architecture::M16CArchitecture
|| arch == Abi::Architecture::R32CArchitecture) {
return Abi::BinaryFormat::UbrofFormat; return Abi::BinaryFormat::UbrofFormat;
} }
return Abi::BinaryFormat::UnknownFormat; return Abi::BinaryFormat::UnknownFormat;
@@ -510,6 +513,7 @@ QList<ToolChain *> IarToolChainFactory::autoDetect(const QList<ToolChain *> &alr
{{"EWCF"}, {"/cf/bin/icccf.exe"}}, {{"EWCF"}, {"/cf/bin/icccf.exe"}},
{{"EWM32C"}, {"/m32c/bin/iccm32c.exe"}}, {{"EWM32C"}, {"/m32c/bin/iccm32c.exe"}},
{{"EWM16C"}, {"/m16c/bin/iccm16c.exe"}}, {{"EWM16C"}, {"/m16c/bin/iccm16c.exe"}},
{{"EWR32C"}, {"/r32c/bin/iccr32c.exe"}},
}; };
QSettings registry(kRegistryNode, QSettings::NativeFormat); QSettings registry(kRegistryNode, QSettings::NativeFormat);