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

Gcc: Detect more arm variations

Browse Source 
Change-Id: I7ba71f862ea2be0695643efdb6ca551cc43c95c3
Reviewed-on: http://codereview.qt.nokia.com/1005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-07-01 13:39:54 +02:00
parent ccb41b3fdc
commit 38783197e3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -189,7 +189,7 @@ static QList<ProjectExplorer::Abi> guessGccAbi(const QString &m)
|| p == QLatin1String("i686") || p == QLatin1String("x86")) { || p == QLatin1String("i686") || p == QLatin1String("x86")) {
arch = ProjectExplorer::Abi::X86Architecture; arch = ProjectExplorer::Abi::X86Architecture;
width = 32; width = 32;
} else if (p == QLatin1String("arm") || p == QLatin1String("armv5tel")) { } else if (p.startsWith(QLatin1String("arm"))) {
arch = ProjectExplorer::Abi::ArmArchitecture; arch = ProjectExplorer::Abi::ArmArchitecture;
width = 32; width = 32;
} else if (p == QLatin1String("mipsel")) { } else if (p == QLatin1String("mipsel")) {
@@ -1014,6 +1014,10 @@ void ProjectExplorerPlugin::testGccAbiGuessing_data()
QTest::newRow("Linux 7") // Meego QTest::newRow("Linux 7") // Meego
<< QString::fromLatin1("armv5tel-meego-linux-gnueabi") << QString::fromLatin1("armv5tel-meego-linux-gnueabi")
<< (QStringList() << QLatin1String("arm-linux-meego-elf-32bit")); << (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") QTest::newRow("Mingw 1")
<< QString::fromLatin1("i686-w64-mingw32") << QString::fromLatin1("i686-w64-mingw32")
<< (QStringList() << QLatin1String("x86-windows-msys-pe-64bit") << (QStringList() << QLatin1String("x86-windows-msys-pe-64bit")