forked from qt-creator/qt-creator
Abi: Fix detection of mips64el
Change-Id: I3821a8817bbb7e76f95f53d058c2f1599320bff7 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
5b5a7d1dea
commit
fa69e5ea1e
@@ -471,7 +471,7 @@ Abi Abi::abiFromTargetTriplet(const QString &triple)
|
|||||||
width = 32;
|
width = 32;
|
||||||
} else if (p.startsWith(QLatin1String("mips"))) {
|
} else if (p.startsWith(QLatin1String("mips"))) {
|
||||||
arch = Abi::MipsArchitecture;
|
arch = Abi::MipsArchitecture;
|
||||||
width = p.endsWith(QLatin1String("64")) ? 64 : 32;
|
width = p.contains(QLatin1String("64")) ? 64 : 32;
|
||||||
} else if (p == QLatin1String("x86_64") || p == QLatin1String("amd64")) {
|
} else if (p == QLatin1String("x86_64") || p == QLatin1String("amd64")) {
|
||||||
arch = Abi::X86Architecture;
|
arch = Abi::X86Architecture;
|
||||||
width = 64;
|
width = 64;
|
||||||
@@ -1065,6 +1065,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data()
|
|||||||
QTest::newRow("mips64-linux-octeon-gnu") << int(Abi::MipsArchitecture)
|
QTest::newRow("mips64-linux-octeon-gnu") << int(Abi::MipsArchitecture)
|
||||||
<< int(Abi::LinuxOS) << int(Abi::GenericLinuxFlavor)
|
<< int(Abi::LinuxOS) << int(Abi::GenericLinuxFlavor)
|
||||||
<< int(Abi::ElfFormat) << 64;
|
<< int(Abi::ElfFormat) << 64;
|
||||||
|
|
||||||
|
QTest::newRow("mips64el-linux-gnuabi") << int(Abi::MipsArchitecture)
|
||||||
|
<< int(Abi::LinuxOS) << int(Abi::GenericLinuxFlavor)
|
||||||
|
<< int(Abi::ElfFormat) << 64;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet()
|
void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet()
|
||||||
|
Reference in New Issue
Block a user