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

BareMetal: Auto-detect IAR toolchain for Renesas M32C architecture

Browse Source 
This patch implements auto-detection for the M32C toolchain,
provided by IAR Systems:

 * https://www.iar.com/iar-embedded-workbench/#!?architecture=M32C

Change-Id: I0d983f82436dc527af7cb8550e0ebe745316c698
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Denis Shienkov
2020-05-19 14:57:03 +03:00
parent dc372d7d1f
commit 0c6386a548
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

@@ -78,7 +78,7 @@ static QString cppLanguageOption(const FilePath &compiler)
|| baseName == "iccstm8" || baseName == "icc430" || baseName == "iccstm8" || baseName == "icc430"
|| baseName == "iccv850" || baseName == "icc78k" || baseName == "iccv850" || baseName == "icc78k"
|| baseName == "iccavr32" || baseName == "iccsh" || baseName == "iccavr32" || baseName == "iccsh"
|| baseName == "icccf") { || baseName == "icccf" || baseName == "iccm32c") {
return QString("--ec++"); return QString("--ec++");
} }
return {}; return {};
@@ -219,6 +219,8 @@ static Abi::Architecture guessArchitecture(const Macros &macros)
return Abi::Architecture::RiscVArchitecture; return Abi::Architecture::RiscVArchitecture;
if (macro.key == "__ICCCF__") if (macro.key == "__ICCCF__")
return Abi::Architecture::M68KArchitecture; return Abi::Architecture::M68KArchitecture;
if (macro.key == "__ICCM32C__")
return Abi::Architecture::M32CArchitecture;
} }
return Abi::Architecture::UnknownArchitecture; return Abi::Architecture::UnknownArchitecture;
} }
@@ -250,7 +252,8 @@ static Abi::BinaryFormat guessFormat(Abi::Architecture arch)
|| arch == Abi::Architecture::Msp430Architecture || arch == Abi::Architecture::Msp430Architecture
|| arch == Abi::Architecture::V850Architecture || arch == Abi::Architecture::V850Architecture
|| arch == Abi::Architecture::K78Architecture || arch == Abi::Architecture::K78Architecture
|| arch == Abi::Architecture::M68KArchitecture) { || arch == Abi::Architecture::M68KArchitecture
|| arch == Abi::Architecture::M32CArchitecture) {
return Abi::BinaryFormat::UbrofFormat; return Abi::BinaryFormat::UbrofFormat;
} }
return Abi::BinaryFormat::UnknownFormat; return Abi::BinaryFormat::UnknownFormat;
@@ -484,6 +487,7 @@ QList<ToolChain *> IarToolChainFactory::autoDetect(const QList<ToolChain *> &alr
{{"EWSH"}, {"/sh/bin/iccsh.exe"}}, {{"EWSH"}, {"/sh/bin/iccsh.exe"}},
{{"EWRISCV"}, {"/riscv/bin/iccriscv.exe"}}, {{"EWRISCV"}, {"/riscv/bin/iccriscv.exe"}},
{{"EWCF"}, {"/cf/bin/icccf.exe"}}, {{"EWCF"}, {"/cf/bin/icccf.exe"}},
{{"EWM32C"}, {"/m32c/bin/iccm32c.exe"}},
}; };
QSettings registry(kRegistryNode, QSettings::NativeFormat); QSettings registry(kRegistryNode, QSettings::NativeFormat);