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

MsvcToolChain: Introduce and use wordWidthForPlatform and archForPlatform

Browse Source 
To avoid code duplication in upcoming patches.

Change-Id: I94dab58b330b137577a125d116937f47b04d788f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Oliver Wolff
2019-05-07 13:10:18 +02:00
parent fffffad325
commit 0370d8024e
2 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -349,33 +349,50 @@ static QVector<VisualStudioInstallation> detectVisualStudio()
return detectVisualStudioFromRegistry(); return detectVisualStudioFromRegistry();
} }
static unsigned char wordWidthForPlatform(MsvcToolChain::Platform platform)
{
switch (platform) {
case ProjectExplorer::Internal::MsvcToolChain::x86:
case ProjectExplorer::Internal::MsvcToolChain::arm:
case ProjectExplorer::Internal::MsvcToolChain::x86_arm:
case ProjectExplorer::Internal::MsvcToolChain::amd64_arm:
case ProjectExplorer::Internal::MsvcToolChain::amd64_x86:
return 32;
case ProjectExplorer::Internal::MsvcToolChain::amd64:
case ProjectExplorer::Internal::MsvcToolChain::x86_amd64:
case ProjectExplorer::Internal::MsvcToolChain::ia64:
case ProjectExplorer::Internal::MsvcToolChain::x86_ia64:
return 64;
}
return 0;
}
static Abi::Architecture archForPlatform(MsvcToolChain::Platform platform)
{
switch (platform) {
case ProjectExplorer::Internal::MsvcToolChain::x86:
case ProjectExplorer::Internal::MsvcToolChain::amd64:
case ProjectExplorer::Internal::MsvcToolChain::x86_amd64:
case ProjectExplorer::Internal::MsvcToolChain::amd64_x86:
return Abi::X86Architecture;
case ProjectExplorer::Internal::MsvcToolChain::arm:
case ProjectExplorer::Internal::MsvcToolChain::x86_arm:
case ProjectExplorer::Internal::MsvcToolChain::amd64_arm:
return Abi::ArmArchitecture;
case ProjectExplorer::Internal::MsvcToolChain::ia64:
case ProjectExplorer::Internal::MsvcToolChain::x86_ia64:
return Abi::ItaniumArchitecture;
}
return Abi::UnknownArchitecture;
}
static Abi findAbiOfMsvc(MsvcToolChain::Type type, static Abi findAbiOfMsvc(MsvcToolChain::Type type,
MsvcToolChain::Platform platform, MsvcToolChain::Platform platform,
const QString &version) const QString &version)
{ {
Abi::Architecture arch = Abi::X86Architecture;
Abi::OSFlavor flavor = Abi::UnknownFlavor; Abi::OSFlavor flavor = Abi::UnknownFlavor;
int wordWidth = 64;
switch (platform) {
case MsvcToolChain::x86:
case MsvcToolChain::amd64_x86:
wordWidth = 32;
break;
case MsvcToolChain::ia64:
case MsvcToolChain::x86_ia64:
arch = Abi::ItaniumArchitecture;
break;
case MsvcToolChain::amd64:
case MsvcToolChain::x86_amd64:
break;
case MsvcToolChain::arm:
case MsvcToolChain::x86_arm:
case MsvcToolChain::amd64_arm:
arch = Abi::ArmArchitecture;
wordWidth = 32;
break;
};
QString msvcVersionString = version; QString msvcVersionString = version;
if (type == MsvcToolChain::WindowsSDK) { if (type == MsvcToolChain::WindowsSDK) {
@@ -400,7 +417,8 @@ static Abi findAbiOfMsvc(MsvcToolChain::Type type,
flavor = Abi::WindowsMsvc2008Flavor; flavor = Abi::WindowsMsvc2008Flavor;
else else
flavor = Abi::WindowsMsvc2005Flavor; flavor = Abi::WindowsMsvc2005Flavor;
const Abi result = Abi(arch, Abi::WindowsOS, flavor, Abi::PEFormat, wordWidth); const Abi result = Abi(archForPlatform(platform), Abi::WindowsOS, flavor, Abi::PEFormat,
wordWidthForPlatform(platform));
if (!result.isValid()) if (!result.isValid())
qWarning("Unable to completely determine the ABI of MSVC version %s (%s).", qWarning("Unable to completely determine the ABI of MSVC version %s (%s).",
qPrintable(version), qPrintable(version),

2
src/shared/qbs

Submodule src/shared/qbs updated: 2a88460ace...1301eb87fd