diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/debugger/memoryagent.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/abi.cpp | 14 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/abi.h | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp index 38da3f77b3..e5cae67815 100644 --- a/src/plugins/debugger/memoryagent.cpp +++ b/src/plugins/debugger/memoryagent.cpp @@ -315,6 +315,7 @@ bool MemoryAgent::isBigEndian(const ProjectExplorer::Abi &a) case ProjectExplorer::Abi::X86Architecture: case ProjectExplorer::Abi::ItaniumArchitecture: // Configureable case ProjectExplorer::Abi::ArmArchitecture: // Configureable + case ProjectExplorer::Abi::ShArchitecture: // Configureable break; case ProjectExplorer::Abi::MipsArchitecture: // Configureable case ProjectExplorer::Abi::PowerPCArchitecture: // Configureable diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index d3f7b3d751..37f52ff2da 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -225,6 +225,9 @@ static QList<Abi> abiOf(const QByteArray &data) case 62: // EM_X86_64 result.append(Abi(Abi::X86Architecture, os, flavor, Abi::ElfFormat, 64)); break; + case 42: // EM_SH + result.append(Abi(Abi::ShArchitecture, os, flavor, Abi::ElfFormat, 32)); + break; case 50: // EM_IA_64 result.append(Abi(Abi::ItaniumArchitecture, os, flavor, Abi::ElfFormat, 64)); break; @@ -340,6 +343,8 @@ Abi::Abi(const QString &abiString) : m_architecture = PowerPCArchitecture; else if (abiParts.at(0) == QLatin1String("itanium")) m_architecture = ItaniumArchitecture; + else if (abiParts.at(0) == QLatin1String("sh")) + m_architecture = ShArchitecture; else return; } @@ -511,6 +516,8 @@ QString Abi::toString(const Architecture &a) return QLatin1String("ppc"); case ItaniumArchitecture: return QLatin1String("itanium"); + case ShArchitecture: + return QLatin1String("sh "); case UnknownArchitecture: // fall through! default: return QLatin1String("unknown"); @@ -818,6 +825,9 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary_data() 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")); + QTest::newRow("dynamic QtCore: sh4 linux 32bit") + << QString::fromLatin1("%1/dynamic/sh4-linux.so").arg(prefix) + << (QStringList() << QString::fromLatin1("sh-linux-generic-elf-32bit")); QTest::newRow("dynamic QtCore: mips linux 32bit") << QString::fromLatin1("%1/dynamic/mips-linux.so").arg(prefix) << (QStringList() << QString::fromLatin1("mips-linux-generic-elf-32bit")); @@ -833,6 +843,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary_data() QTest::newRow("dynamic QtCore: x86 freebsd 32bit") << QString::fromLatin1("%1/dynamic/freebsd-elf-32bit.so").arg(prefix) << (QStringList() << QString::fromLatin1("x86-bsd-freebsd-elf-32bit")); + + QTest::newRow("executable: x86 win 32bit cygwin executable") + << QString::fromLatin1("%1/executable/cygwin-32bit.exe").arg(prefix) + << (QStringList() << QString::fromLatin1("x86-windows-msys-pe-32bit")); } void ProjectExplorer::ProjectExplorerPlugin::testAbiOfBinary() diff --git a/src/plugins/projectexplorer/abi.h b/src/plugins/projectexplorer/abi.h index 92b97b71d4..4532f43a56 100644 --- a/src/plugins/projectexplorer/abi.h +++ b/src/plugins/projectexplorer/abi.h @@ -52,6 +52,7 @@ public: ItaniumArchitecture, MipsArchitecture, PowerPCArchitecture, + ShArchitecture, UnknownArchitecture }; |