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

GCC: Identify meego compiler

Browse Source
This commit is contained in:
Tobias Hunger
2011-05-11 12:14:07 +02:00
parent 0747859006
commit b6e373bcda
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,13 +182,13 @@ static QList<ProjectExplorer::Abi> guessGccAbi(const QString &m)
foreach (const QString &p, parts) { foreach (const QString &p, parts) {
if (p == QLatin1String("unknown") || p == QLatin1String("pc") || p == QLatin1String("none") if (p == QLatin1String("unknown") || p == QLatin1String("pc") || p == QLatin1String("none")
|| p == QLatin1String("gnu") || p == QLatin1String("uclibc") || p == QLatin1String("gnu") || p == QLatin1String("uclibc")
|| p == QLatin1String("86_64") || p == QLatin1String("redhat")) { || p == QLatin1String("86_64") || p == QLatin1String("redhat") || p == QLatin1String("gnueabi")) {
continue; continue;
} else if (p == QLatin1String("i386") || p == QLatin1String("i486") || p == QLatin1String("i586") } else if (p == QLatin1String("i386") || p == QLatin1String("i486") || p == QLatin1String("i586")
|| 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")) { } else if (p == QLatin1String("arm") || p == QLatin1String("armv5tel")) {
arch = ProjectExplorer::Abi::ArmArchitecture; arch = ProjectExplorer::Abi::ArmArchitecture;
width = 32; width = 32;
} else if (p == QLatin1String("mipsel")) { } else if (p == QLatin1String("mipsel")) {
@@ -203,8 +203,13 @@ static QList<ProjectExplorer::Abi> guessGccAbi(const QString &m)
width = 64; width = 64;
} else if (p == QLatin1String("linux") || p == QLatin1String("linux6e")) { } else if (p == QLatin1String("linux") || p == QLatin1String("linux6e")) {
os = ProjectExplorer::Abi::LinuxOS; os = ProjectExplorer::Abi::LinuxOS;
if (flavor == Abi::UnknownFlavor)
flavor = ProjectExplorer::Abi::GenericLinuxFlavor; flavor = ProjectExplorer::Abi::GenericLinuxFlavor;
format = ProjectExplorer::Abi::ElfFormat; format = ProjectExplorer::Abi::ElfFormat;
} else if (p == QLatin1String("meego")) {
os = ProjectExplorer::Abi::LinuxOS;
flavor = ProjectExplorer::Abi::MeegoLinuxFlavor;
format = ProjectExplorer::Abi::ElfFormat;
} else if (p == QLatin1String("symbianelf")) { } else if (p == QLatin1String("symbianelf")) {
os = ProjectExplorer::Abi::SymbianOS; os = ProjectExplorer::Abi::SymbianOS;
flavor = ProjectExplorer::Abi::SymbianDeviceFlavor; flavor = ProjectExplorer::Abi::SymbianDeviceFlavor;
@@ -880,6 +885,9 @@ void ProjectExplorerPlugin::testGccAbiGuessing_data()
<< QString::fromLatin1("x86_64-redhat-linux") << QString::fromLatin1("x86_64-redhat-linux")
<< (QStringList() << QLatin1String("x86-linux-generic-elf-64bit") << (QStringList() << QLatin1String("x86-linux-generic-elf-64bit")
<< QLatin1String("x86-linux-generic-elf-32bit")); << QLatin1String("x86-linux-generic-elf-32bit"));
QTest::newRow("Linux 7") // Meego
<< QString::fromLatin1("armv5tel-meego-linux-gnueabi")
<< (QStringList() << QLatin1String("arm-linux-meego-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")