From fa69e5ea1e80225eaad95f5daecabc64f63eeb17 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 11 Aug 2014 23:41:30 +0300 Subject: [PATCH] Abi: Fix detection of mips64el Change-Id: I3821a8817bbb7e76f95f53d058c2f1599320bff7 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/abi.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index f8fb18ed76b..d4ca72033e7 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -471,7 +471,7 @@ Abi Abi::abiFromTargetTriplet(const QString &triple) width = 32; } else if (p.startsWith(QLatin1String("mips"))) { 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")) { arch = Abi::X86Architecture; width = 64; @@ -1065,6 +1065,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data() QTest::newRow("mips64-linux-octeon-gnu") << int(Abi::MipsArchitecture) << int(Abi::LinuxOS) << int(Abi::GenericLinuxFlavor) << 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()