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

MSVC: Add support for ARM64 toolchain

Browse Source 
Qt nowadays supports ARM64 builds using MSVC. While running from Creator
is not possible, support of building projects can be done with this
patch.

Change-Id: I39eed497b222a05b01af7f251e933432afca0cef
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Oliver Wolff
2021-05-28 16:14:59 +02:00
parent 2a375a4f60
commit 841b6a84cd
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/abi.cpp
View File

@@ -240,6 +240,10 @@ static Abis parseCoffHeader(const QByteArray &data)
arch = Abi::ArmArchitecture;
width = 32;
break;
case 0xaa64: // ARM64
arch = Abi::ArmArchitecture;
width = 64;
break;
case 0x8664: // x86_64
arch = Abi::X86Architecture;
width = 64;

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

@@ -103,7 +103,9 @@ const MsvcPlatform platforms[]
{MsvcToolChain::arm, "arm", "/bin/arm", "vcvarsarm.bat"},
{MsvcToolChain::x86_arm, "x86_arm", "/bin/x86_arm", "vcvarsx86_arm.bat"},
{MsvcToolChain::amd64_arm, "amd64_arm", "/bin/amd64_arm", "vcvarsamd64_arm.bat"},
{MsvcToolChain::amd64_x86, "amd64_x86", "/bin/amd64_x86", "vcvarsamd64_x86.bat"}};
{MsvcToolChain::amd64_x86, "amd64_x86", "/bin/amd64_x86", "vcvarsamd64_x86.bat"},
{MsvcToolChain::x86_arm64, "x86_arm64", "/bin/x86_arm64", "vcvarsx86_arm64.bat"},
{MsvcToolChain::amd64_arm64, "amd64_arm64", "/bin/amd64_arm64", "vcvarsamd64_arm64.bat"}};
static QList<const MsvcToolChain *> g_availableMsvcToolchains;
@@ -128,12 +130,13 @@ static bool hostSupportsPlatform(MsvcToolChain::Platform platform)
switch (Utils::HostOsInfo::hostArchitecture()) {
case Utils::HostOsInfo::HostArchitectureAMD64:
if (platform == MsvcToolChain::amd64 || platform == MsvcToolChain::amd64_arm
|| platform == MsvcToolChain::amd64_x86)
|| platform == MsvcToolChain::amd64_x86 || platform == MsvcToolChain::amd64_arm64)
return true;
Q_FALLTHROUGH(); // all x86 toolchains are also working on an amd64 host
case Utils::HostOsInfo::HostArchitectureX86:
return platform == MsvcToolChain::x86 || platform == MsvcToolChain::x86_amd64
|| platform == MsvcToolChain::x86_ia64 || platform == MsvcToolChain::x86_arm;
|| platform == MsvcToolChain::x86_ia64 || platform == MsvcToolChain::x86_arm
|| platform == MsvcToolChain::x86_arm64;
case Utils::HostOsInfo::HostArchitectureArm:
return platform == MsvcToolChain::arm;
case Utils::HostOsInfo::HostArchitectureItanium:
@@ -364,6 +367,8 @@ static unsigned char wordWidthForPlatform(MsvcToolChain::Platform platform)
case ProjectExplorer::Internal::MsvcToolChain::x86_amd64:
case ProjectExplorer::Internal::MsvcToolChain::ia64:
case ProjectExplorer::Internal::MsvcToolChain::x86_ia64:
case ProjectExplorer::Internal::MsvcToolChain::amd64_arm64:
case ProjectExplorer::Internal::MsvcToolChain::x86_arm64:
return 64;
}
@@ -381,6 +386,8 @@ static Abi::Architecture archForPlatform(MsvcToolChain::Platform platform)
case ProjectExplorer::Internal::MsvcToolChain::arm:
case ProjectExplorer::Internal::MsvcToolChain::x86_arm:
case ProjectExplorer::Internal::MsvcToolChain::amd64_arm:
case ProjectExplorer::Internal::MsvcToolChain::x86_arm64:
case ProjectExplorer::Internal::MsvcToolChain::amd64_arm64:
return Abi::ArmArchitecture;
case ProjectExplorer::Internal::MsvcToolChain::ia64:
case ProjectExplorer::Internal::MsvcToolChain::x86_ia64:
@@ -899,6 +906,7 @@ QStringList MsvcToolChain::suggestedMkspecList() const
case Abi::WindowsMsvc2019Flavor:
return {"win32-msvc",
"win32-msvc2019",
"win32-arm64-msvc",
"winrt-arm-msvc2019",
"winrt-x86-msvc2019",
"winrt-x64-msvc2019"};
@@ -1272,10 +1280,10 @@ MsvcToolChainConfigWidget::MsvcToolChainConfigWidget(ToolChain *tc)
m_varsBatArchCombo->addItem("arm", MsvcToolChain::arm);
m_varsBatArchCombo->addItem("x86_amd64", MsvcToolChain::x86_amd64);
m_varsBatArchCombo->addItem("x86_arm", MsvcToolChain::x86_arm);
// m_varsBatArchCombo->addItem("x86_arm64", MsvcToolChain::x86_arm64);
m_varsBatArchCombo->addItem("x86_arm64", MsvcToolChain::x86_arm64);
m_varsBatArchCombo->addItem("amd64_x86", MsvcToolChain::amd64_x86);
m_varsBatArchCombo->addItem("amd64_arm", MsvcToolChain::amd64_arm);
// m_varsBatArchCombo->addItem("amd64_arm64", MsvcToolChain::amd64_arm64);
m_varsBatArchCombo->addItem("amd64_arm64", MsvcToolChain::amd64_arm64);
m_varsBatArchCombo->addItem("ia64", MsvcToolChain::ia64);
m_varsBatArchCombo->addItem("x86_ia64", MsvcToolChain::x86_ia64);
m_varsBatArgumentsEdit->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
@@ -1826,7 +1834,9 @@ static void detectCppBuildTools2015(QList<ToolChain *> *list)
const Entry entries[] = {{" (x86)", "x86", Abi::X86Architecture, Abi::PEFormat, 32},
{" (x64)", "amd64", Abi::X86Architecture, Abi::PEFormat, 64},
{" (x86_arm)", "x86_arm", Abi::ArmArchitecture, Abi::PEFormat, 32},
{" (x64_arm)", "amd64_arm", Abi::ArmArchitecture, Abi::PEFormat, 64}};
{" (x64_arm)", "amd64_arm", Abi::ArmArchitecture, Abi::PEFormat, 32},
{" (x86_arm64)", "x86_arm64", Abi::ArmArchitecture, Abi::PEFormat, 64},
{" (x64_arm64)", "amd64_arm64", Abi::ArmArchitecture, Abi::PEFormat, 64}};
const QString name = "Microsoft Visual C++ Build Tools";
const QString vcVarsBat = windowsProgramFilesDir() + '/' + name + "/vcbuildtools.bat";
@@ -1915,6 +1925,8 @@ QList<ToolChain *> MsvcToolChainFactory::autoDetect(const QList<ToolChain *> &al
MsvcToolChain::arm,
MsvcToolChain::x86_arm,
MsvcToolChain::amd64_arm,
MsvcToolChain::x86_arm64,
MsvcToolChain::amd64_arm64,
MsvcToolChain::ia64,
MsvcToolChain::x86_ia64};

3
src/plugins/projectexplorer/msvctoolchain.h
View File

@@ -57,7 +57,8 @@ class MsvcToolChain : public ToolChain
public:
enum Type { WindowsSDK, VS };
enum Platform { x86, amd64, x86_amd64, ia64, x86_ia64, arm, x86_arm, amd64_arm, amd64_x86 };
enum Platform { x86, amd64, x86_amd64, ia64, x86_ia64, arm, x86_arm, amd64_arm, amd64_x86,
x86_arm64, amd64_arm64 };
explicit MsvcToolChain(Utils::Id typeId);
~MsvcToolChain() override;