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

BareMetal: Introduce isArmArchitecture() function

Browse Source 
... to simplify the architecture comparison code in Keil toolchain.

Change-Id: I1d8ee46022f73e6ec2192339848b6d1c500bf791
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Denis Shienkov
2020-03-19 22:23:50 +03:00
parent 83d2271ec6
commit f1c2a6ae5b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/baremetal/keiltoolchain.cpp
View File

@@ -204,6 +204,11 @@ static bool isMcsArchitecture(Abi::Architecture arch)
|| arch == Abi::Architecture::Mcs251Architecture; || arch == Abi::Architecture::Mcs251Architecture;
} }
static bool isArmArchitecture(Abi::Architecture arch)
{
return arch == Abi::Architecture::ArmArchitecture;
}
static HeaderPaths dumpHeaderPaths(const FilePath &compiler) static HeaderPaths dumpHeaderPaths(const FilePath &compiler)
{ {
if (!compiler.exists()) if (!compiler.exists())
@@ -220,7 +225,7 @@ static HeaderPaths dumpHeaderPaths(const FilePath &compiler)
QDir includeDir(toolkitDir); QDir includeDir(toolkitDir);
if (includeDir.cd("inc")) if (includeDir.cd("inc"))
headerPaths.push_back({includeDir.canonicalPath(), HeaderPathType::BuiltIn}); headerPaths.push_back({includeDir.canonicalPath(), HeaderPathType::BuiltIn});
} else if (arch == Abi::Architecture::ArmArchitecture) { } else if (isArmArchitecture(arch)) {
QDir includeDir(toolkitDir); QDir includeDir(toolkitDir);
if (includeDir.cd("include")) if (includeDir.cd("include"))
headerPaths.push_back({includeDir.canonicalPath(), HeaderPathType::BuiltIn}); headerPaths.push_back({includeDir.canonicalPath(), HeaderPathType::BuiltIn});
@@ -258,7 +263,7 @@ static unsigned char guessWordWidth(const Macros &macros, Abi::Architecture arch
static Abi::BinaryFormat guessFormat(Abi::Architecture arch) static Abi::BinaryFormat guessFormat(Abi::Architecture arch)
{ {
if (arch == Abi::Architecture::ArmArchitecture) if (isArmArchitecture(arch))
return Abi::BinaryFormat::ElfFormat; return Abi::BinaryFormat::ElfFormat;
if (isMcsArchitecture(arch)) if (isMcsArchitecture(arch))
return Abi::BinaryFormat::OmfFormat; return Abi::BinaryFormat::OmfFormat;