Commit ef411fe1 authored by Tobias Hunger's avatar Tobias Hunger

Abi: Handle ARM OSABI in elf files

Task-number: QTCREATORBUG-6765

Change-Id: I6b2c5bec19264934f1170d88ea6880567194b7fc
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent d76c09bd
......@@ -190,6 +190,7 @@ static QList<Abi> abiOf(const QByteArray &data)
break;
case 3: // Linux:
case 0: // no extra info available: Default to Linux:
case 97: // ARM, also linux most of the time.
os = Abi::LinuxOS;
flavor = Abi::GenericLinuxFlavor;
break;
......@@ -822,6 +823,9 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary_data()
QTest::newRow("dynamic QtCore: arm linux 32bit")
<< QString::fromLatin1("%1/dynamic/arm-linux.so").arg(prefix)
<< (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)")
<< QString::fromLatin1("%1/dynamic/arm-angstrom-linux.so").arg(prefix)
<< (QStringList() << QString::fromLatin1("arm-linux-generic-elf-32bit"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment