From 38783197e39d5ae848c15ae510712e806d85e84c Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 1 Jul 2011 13:39:54 +0200 Subject: [PATCH] Gcc: Detect more arm variations Change-Id: I7ba71f862ea2be0695643efdb6ca551cc43c95c3 Reviewed-on: http://codereview.qt.nokia.com/1005 Reviewed-by: Qt Sanity Bot Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/gcctoolchain.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index a0976771f7e..1c62f61b03e 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -189,7 +189,7 @@ static QList guessGccAbi(const QString &m) || p == QLatin1String("i686") || p == QLatin1String("x86")) { arch = ProjectExplorer::Abi::X86Architecture; width = 32; - } else if (p == QLatin1String("arm") || p == QLatin1String("armv5tel")) { + } else if (p.startsWith(QLatin1String("arm"))) { arch = ProjectExplorer::Abi::ArmArchitecture; width = 32; } else if (p == QLatin1String("mipsel")) { @@ -1014,6 +1014,10 @@ void ProjectExplorerPlugin::testGccAbiGuessing_data() QTest::newRow("Linux 7") // Meego << QString::fromLatin1("armv5tel-meego-linux-gnueabi") << (QStringList() << QLatin1String("arm-linux-meego-elf-32bit")); + QTest::newRow("Linux 8") + << QString::fromLatin1("armv5tl-montavista-linux-gnueabi") + << (QStringList() << QLatin1String("arm-linux-generic-elf-32bit")); + QTest::newRow("Mingw 1") << QString::fromLatin1("i686-w64-mingw32") << (QStringList() << QLatin1String("x86-windows-msys-pe-64bit")