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

Abi: Handle ARM OSABI in elf files

Browse Source 
Task-number: QTCREATORBUG-6765

Change-Id: I6b2c5bec19264934f1170d88ea6880567194b7fc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-01-25 10:54:21 +01:00
parent d76c09bd12
commit ef411fe115
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/abi.cpp
View File

@@ -190,6 +190,7 @@ static QList<Abi> abiOf(const QByteArray &data)
break; break;
case 3: // Linux: case 3: // Linux:
case 0: // no extra info available: Default to Linux: case 0: // no extra info available: Default to Linux:
case 97: // ARM, also linux most of the time.
os = Abi::LinuxOS; os = Abi::LinuxOS;
flavor = Abi::GenericLinuxFlavor; flavor = Abi::GenericLinuxFlavor;
break; break;
@@ -822,6 +823,9 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary_data()
QTest::newRow("dynamic QtCore: arm linux 32bit") QTest::newRow("dynamic QtCore: arm linux 32bit")
<< QString::fromLatin1("%1/dynamic/arm-linux.so").arg(prefix) << QString::fromLatin1("%1/dynamic/arm-linux.so").arg(prefix)
<< (QStringList() << QString::fromLatin1("arm-linux-generic-elf-32bit")); << (QStringList() << QString::fromLatin1("arm-linux-generic-elf-32bit"));
QTest::newRow("dynamic QtCore: arm linux 32bit, using ARM as OSABI")
<< QString::fromLatin1("%1/dynamic/arm-linux2.so").arg(prefix)
<< (QStringList() << QString::fromLatin1("arm-linux-generic-elf-32bit"));
QTest::newRow("dynamic QtCore: arm linux 32bit (angstrom)") QTest::newRow("dynamic QtCore: arm linux 32bit (angstrom)")
<< QString::fromLatin1("%1/dynamic/arm-angstrom-linux.so").arg(prefix) << QString::fromLatin1("%1/dynamic/arm-angstrom-linux.so").arg(prefix)
<< (QStringList() << QString::fromLatin1("arm-linux-generic-elf-32bit")); << (QStringList() << QString::fromLatin1("arm-linux-generic-elf-32bit"));