diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-08-11 23:41:30 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2014-08-25 11:18:54 +0200 |
| commit | fa69e5ea1e80225eaad95f5daecabc64f63eeb17 (patch) | |
| tree | 29a0040a23bb14b7fb8296391c700a6c132eab53 | |
| parent | 5b5a7d1deaa77aac0e3c3c3e89523ee9562bc4a6 (diff) | |
| download | qt-creator-fa69e5ea1e80225eaad95f5daecabc64f63eeb17.tar.gz | |
Abi: Fix detection of mips64el
Change-Id: I3821a8817bbb7e76f95f53d058c2f1599320bff7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| -rw-r--r-- | src/plugins/projectexplorer/abi.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index f8fb18ed76..d4ca72033e 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() |