Commit a8ae618d authored by hjk's avatar hjk

toolchain: fix enum naming style

Reviewed-By: Tobias Hunger
parent 3331aea7
......@@ -408,10 +408,10 @@ void CMakeRunPage::initializePage()
foreach (ProjectExplorer::ToolChain *tc, tcs) {
ProjectExplorer::Abi targetAbi = tc->targetAbi();
QVariant tcVariant = qVariantFromValue(static_cast<void *>(tc));
if (targetAbi.os() == ProjectExplorer::Abi::Windows) {
if (targetAbi.osFlavor() == ProjectExplorer::Abi::Windows_msvc)
if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor)
m_generatorComboBox->addItem(tr("NMake Generator (%1)").arg(tc->displayName()), tcVariant);
else if (targetAbi.osFlavor() == ProjectExplorer::Abi::Windows_msys)
else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor)
m_generatorComboBox->addItem(tr("MinGW Generator (%1)").arg(tc->displayName()), tcVariant);
else
continue;
......@@ -449,8 +449,8 @@ void CMakeRunPage::runCMake()
CMakeManager *cmakeManager = m_cmakeWizard->cmakeManager();
QString generator = QLatin1String("-GCodeBlocks - Unix Makefiles");
if (tc->targetAbi().os() == ProjectExplorer::Abi::Windows) {
if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::Windows_msvc)
if (tc->targetAbi().os() == ProjectExplorer::Abi::WindowsOS) {
if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor)
generator = QLatin1String("-GCodeBlocks - NMake Makefiles");
else
generator = QLatin1String("-GCodeBlocks - MinGW Makefiles");
......
......@@ -299,7 +299,7 @@ static inline bool validMode(DebuggerStartMode sm)
return true;
}
static inline QString msgCdbDisabled(const ProjectExplorer::Abi &abi)
static inline QString msgCdbDisabled(const Abi &abi)
{
return CdbEngine::tr("The CDB debug engine required for %1 is currently disabled.").
arg(abi.toString());
......@@ -337,11 +337,11 @@ bool isCdbEngineEnabled()
#endif
}
ConfigurationCheck checkCdbConfiguration(const ProjectExplorer::Abi &abi)
ConfigurationCheck checkCdbConfiguration(const Abi &abi)
{
ConfigurationCheck check;
if (abi.binaryFormat() == ProjectExplorer::Abi::Format_PE
&& abi.osFlavor() != ProjectExplorer::Abi::Windows_msys) {
if (abi.binaryFormat() == Abi::PEFormat
&& abi.osFlavor() != Abi::WindowsMSysFlavor) {
if (!isCdbEngineEnabled()) {
check.errorMessage = msgCdbDisabled(abi);
check.settingsPage = CdbOptionsPage::settingsId();
......@@ -637,11 +637,11 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
// Determine binary (force MSVC), extension lib name and path to use
// The extension is passed as relative name with the path variable set
//(does not work with absolute path names)
ProjectExplorer::Abi abi = sp.toolChainAbi;
if (abi.osFlavor() == ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR || abi.osFlavor() == ProjectExplorer::Abi::Windows_msys)
abi = ProjectExplorer::Abi(abi.architecture(), abi.os(),
ProjectExplorer::Abi::Windows_msvc,
abi.binaryFormat(), abi.wordWidth());
Abi abi = sp.toolChainAbi;
if (abi.osFlavor() == Abi::UnknownFlavor
|| abi.osFlavor() == Abi::WindowsMSysFlavor)
abi = Abi(abi.architecture(), abi.os(), Abi::WindowsMsvcFlavor,
abi.binaryFormat(), abi.wordWidth());
const QString executable = debuggerCore()->debuggerForAbi(abi);
if (executable.isEmpty()) {
*errorMessage = tr("There is no CDB executable specified.");
......
......@@ -1354,7 +1354,7 @@ void DebuggerPluginPrivate::startExternalApplication()
// Fixme: 1 of 3 testing hacks.
if (sp.processArgs.startsWith(__("@tcf@ ")) || sp.processArgs.startsWith(__("@sym@ ")))
// Set up an ARM Symbian Abi
sp.toolChainAbi = Abi(Abi::ARM, Abi::Symbian, Abi::Symbian_device, Abi::Format_ELF, false);
sp.toolChainAbi = Abi(Abi::ArmArchitecture, Abi::SymbianOS, Abi::SymbianDeviceFlavor, Abi::ElfFormat, false);
if (dlg.breakAtMain()) {
#ifdef Q_OS_WIN
......@@ -1438,9 +1438,9 @@ void DebuggerPluginPrivate::startRemoteCdbSession()
DebuggerStartParameters sp;
Abi hostAbi = Abi::hostAbi();
sp.toolChainAbi = ProjectExplorer::Abi(hostAbi.architecture(),
ProjectExplorer::Abi::Windows,
ProjectExplorer::Abi::Windows_msvc,
ProjectExplorer::Abi::Format_PE,
ProjectExplorer::Abi::WindowsOS,
ProjectExplorer::Abi::WindowsMsvcFlavor,
ProjectExplorer::Abi::PEFormat,
true);
sp.startMode = AttachToRemote;
StartRemoteCdbDialog dlg(mainWindow());
......
......@@ -167,9 +167,9 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForExecutable
// executables.
Abi hostAbi = Abi::hostAbi();
ConfigurationCheck check = checkDebugConfiguration(Abi(hostAbi.architecture(),
Abi::Windows,
Abi::WindowsOS,
hostAbi.osFlavor(),
Abi::Format_PE,
Abi::PEFormat,
hostAbi.wordWidth()));
if (!check) {
m_errorMessage = check.errorMessage;
......@@ -224,16 +224,16 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForMode
static DebuggerEngineType engineForToolChain(const Abi &toolChain)
{
switch (toolChain.binaryFormat()) {
case Abi::Format_ELF:
case Abi::Format_Mach_O:
case Abi::ElfFormat:
case Abi::MachOFormat:
#ifdef WITH_LLDB
// lldb override
if (Core::ICore::instance()->settings()->value("LLDB/enabled").toBool())
return LldbEngineType;
#endif
return GdbEngineType;
case Abi::Format_PE:
if (toolChain.osFlavor() == Abi::Windows_msys)
case Abi::PEFormat:
if (toolChain.osFlavor() == Abi::WindowsMSysFlavor)
return GdbEngineType;
return CdbEngineType;
default:
......@@ -385,9 +385,9 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi)
if (!(debuggerCore()->activeLanguages() & CppLanguage))
return result;
if (abi.binaryFormat() == Abi::Format_ELF ||
abi.binaryFormat() == Abi::Format_Mach_O ||
(abi.binaryFormat() == Abi::Format_PE && abi.osFlavor() == Abi::Windows_msys)) {
if (abi.binaryFormat() == Abi::ElfFormat ||
abi.binaryFormat() == Abi::MachOFormat ||
(abi.binaryFormat() == Abi::PEFormat && abi.osFlavor() == Abi::WindowsMSysFlavor)) {
if (debuggerCore()->debuggerForAbi(abi).isEmpty()) {
result.errorMessage = msgNoBinaryForToolChain(abi);
if (!result.errorMessage.isEmpty())
......@@ -395,8 +395,8 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi)
result.errorMessage += QLatin1Char(' ') + msgEngineNotAvailable("Gdb");
result.settingsPage = _(Constants::DEBUGGER_COMMON_SETTINGS_ID);
}
} else if (abi.binaryFormat() == Abi::Format_PE
&& abi.osFlavor() != Abi::Windows_msys) {
} else if (abi.binaryFormat() == Abi::PEFormat
&& abi.osFlavor() != Abi::WindowsMSysFlavor) {
result = checkCdbConfiguration(abi);
if (!result) {
if (!result.errorMessage.isEmpty())
......
......@@ -102,6 +102,8 @@
#endif
#include <ctype.h>
using namespace ProjectExplorer;
namespace Debugger {
namespace Internal {
......@@ -1805,7 +1807,7 @@ QString msgNoBinaryForToolChain(const ProjectExplorer::Abi &tc)
AbstractGdbAdapter *GdbEngine::createAdapter()
{
const DebuggerStartParameters &sp = startParameters();
if (sp.toolChainAbi.os() == ProjectExplorer::Abi::Symbian) {
if (sp.toolChainAbi.os() == ProjectExplorer::Abi::SymbianOS) {
// FIXME: 1 of 3 testing hacks.
if (sp.debugClient == DebuggerStartParameters::DebugClientCoda)
return new CodaGdbAdapter(this);
......@@ -4208,13 +4210,14 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb,
const DebuggerStartParameters &sp = startParameters();
m_gdb = QString::fromLocal8Bit(qgetenv("QTC_DEBUGGER_PATH"));
if (m_gdb.isEmpty() && sp.startMode != StartRemoteGdb) {
// We want the MinGW gdb also in case we got started using some compatible ABI.
ProjectExplorer::Abi abi = startParameters().toolChainAbi;
if (abi.os() == ProjectExplorer::Abi::Windows) {
if (abi.osFlavor() == ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR || abi.osFlavor() == ProjectExplorer::Abi::Windows_msvc)
abi = ProjectExplorer::Abi(abi.architecture(), abi.os(),
ProjectExplorer::Abi::Windows_msys,
abi.binaryFormat(), abi.wordWidth());
// We want the MinGW gdb also in case we got started using
// some compatible ABI.
Abi abi = startParameters().toolChainAbi;
if (abi.os() == Abi::WindowsOS) {
if (abi.osFlavor() == Abi::UnknownFlavor
|| abi.osFlavor() == Abi::WindowsMsvcFlavor)
abi = Abi(abi.architecture(), abi.os(), Abi::WindowsMSysFlavor,
abi.binaryFormat(), abi.wordWidth());
}
m_gdb = debuggerCore()->debuggerForAbi(abi);
}
......
......@@ -77,9 +77,9 @@ RemoteGdbServerAdapter::RemoteGdbServerAdapter(GdbEngine *engine,
AbstractGdbAdapter::DumperHandling RemoteGdbServerAdapter::dumperHandling() const
{
if (m_abi.os() == ProjectExplorer::Abi::Symbian
|| m_abi.os() == ProjectExplorer::Abi::Windows
|| m_abi.binaryFormat() == ProjectExplorer::Abi::Format_ELF)
if (m_abi.os() == ProjectExplorer::Abi::SymbianOS
|| m_abi.os() == ProjectExplorer::Abi::WindowsOS
|| m_abi.binaryFormat() == ProjectExplorer::Abi::ElfFormat)
return DumperLoadedByGdb;
return DumperLoadedByGdbPreload;
}
......
......@@ -42,113 +42,113 @@
namespace ProjectExplorer {
Abi::Abi(const Architecture &a, const OS &o,
const OSFlavour &of, const BinaryFormat &f, unsigned char w) :
const OSFlavor &of, const BinaryFormat &f, unsigned char w) :
m_architecture(a), m_os(o), m_osFlavor(of), m_binaryFormat(f), m_wordWidth(w)
{
switch (m_os) {
case ProjectExplorer::Abi::UNKNOWN_OS:
m_osFlavor = UNKNOWN_OSFLAVOUR;
case ProjectExplorer::Abi::UnknownOS:
m_osFlavor = UnknownFlavor;
break;
case ProjectExplorer::Abi::Linux:
if (m_osFlavor < Linux_generic || m_osFlavor > Linux_meego)
m_osFlavor = UNKNOWN_OSFLAVOUR;
case ProjectExplorer::Abi::LinuxOS:
if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > MeegoLinuxFlavor)
m_osFlavor = UnknownFlavor;
break;
case ProjectExplorer::Abi::Mac:
if (m_osFlavor < Mac_generic || m_osFlavor > Mac_generic)
m_osFlavor = UNKNOWN_OSFLAVOUR;
case ProjectExplorer::Abi::MacOS:
if (m_osFlavor < GenericMacFlavor || m_osFlavor > GenericMacFlavor)
m_osFlavor = UnknownFlavor;
break;
case ProjectExplorer::Abi::Symbian:
if (m_osFlavor < Symbian_device || m_osFlavor > Symbian_emulator)
m_osFlavor = UNKNOWN_OSFLAVOUR;
case ProjectExplorer::Abi::SymbianOS:
if (m_osFlavor < SymbianDeviceFlavor || m_osFlavor > SymbianEmulatorFlavor)
m_osFlavor = UnknownFlavor;
break;
case ProjectExplorer::Abi::UNIX:
if (m_osFlavor < Unix_generic || m_osFlavor > Unix_generic)
m_osFlavor = UNKNOWN_OSFLAVOUR;
case ProjectExplorer::Abi::UnixOS:
if (m_osFlavor < GenericUnixFlavor || m_osFlavor > GenericUnixFlavor)
m_osFlavor = UnknownFlavor;
break;
case ProjectExplorer::Abi::Windows:
if (m_osFlavor < Windows_msvc || m_osFlavor > Windows_ce)
m_osFlavor = UNKNOWN_OSFLAVOUR;
case ProjectExplorer::Abi::WindowsOS:
if (m_osFlavor < WindowsMsvcFlavor || m_osFlavor > WindowsCEFlavor)
m_osFlavor = UnknownFlavor;
break;
}
}
Abi::Abi(const QString &abiString) :
m_architecture(UNKNOWN_ARCHITECTURE), m_os(UNKNOWN_OS),
m_osFlavor(UNKNOWN_OSFLAVOUR), m_binaryFormat(UNKNOWN_FORMAT), m_wordWidth(0)
m_architecture(UnknownArchitecture), m_os(UnknownOS),
m_osFlavor(UnknownFlavor), m_binaryFormat(UnknownFormat), m_wordWidth(0)
{
QStringList abiParts = abiString.split(QLatin1Char('-'));
if (abiParts.count() >= 1) {
if (abiParts.at(0) == QLatin1String("unknown"))
m_architecture = UNKNOWN_ARCHITECTURE;
m_architecture = UnknownArchitecture;
else if (abiParts.at(0) == QLatin1String("arm"))
m_architecture = ARM;
m_architecture = ArmArchitecture;
else if (abiParts.at(0) == QLatin1String("x86"))
m_architecture = x86;
m_architecture = X86Architecture;
else if (abiParts.at(0) == QLatin1String("mips"))
m_architecture = Mips;
m_architecture = MipsArcitecture;
else if (abiParts.at(0) == QLatin1String("ppc"))
m_architecture = PowerPC;
m_architecture = PowerPCArchitecture;
else if (abiParts.at(0) == QLatin1String("itanium"))
m_architecture = Itanium;
m_architecture = ItaniumArchitecture;
else
return;
}
if (abiParts.count() >= 2) {
if (abiParts.at(1) == QLatin1String("unknown"))
m_os = UNKNOWN_OS;
m_os = UnknownOS;
else if (abiParts.at(1) == QLatin1String("linux"))
m_os = Linux;
m_os = LinuxOS;
else if (abiParts.at(1) == QLatin1String("macos"))
m_os = Mac;
m_os = MacOS;
else if (abiParts.at(1) == QLatin1String("symbian"))
m_os = Symbian;
m_os = SymbianOS;
else if (abiParts.at(1) == QLatin1String("unix"))
m_os = UNIX;
m_os = UnixOS;
else if (abiParts.at(1) == QLatin1String("windows"))
m_os = Windows;
m_os = WindowsOS;
else
return;
}
if (abiParts.count() >= 3) {
if (abiParts.at(2) == QLatin1String("unknown"))
m_osFlavor = UNKNOWN_OSFLAVOUR;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == Linux)
m_osFlavor = Linux_generic;
else if (abiParts.at(2) == QLatin1String("maemo") && m_os == Linux)
m_osFlavor = Linux_maemo;
else if (abiParts.at(2) == QLatin1String("meego") && m_os == Linux)
m_osFlavor = Linux_meego;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == Mac)
m_osFlavor = Mac_generic;
else if (abiParts.at(2) == QLatin1String("device") && m_os == Symbian)
m_osFlavor = Symbian_device;
else if (abiParts.at(2) == QLatin1String("emulator") && m_os == Symbian)
m_osFlavor = Symbian_emulator;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == UNIX)
m_osFlavor = Unix_generic;
else if (abiParts.at(2) == QLatin1String("msvc") && m_os == Windows)
m_osFlavor = Windows_msvc;
else if (abiParts.at(2) == QLatin1String("msys") && m_os == Windows)
m_osFlavor = Windows_msys;
else if (abiParts.at(2) == QLatin1String("ce") && m_os == Windows)
m_osFlavor = Windows_ce;
m_osFlavor = UnknownFlavor;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == LinuxOS)
m_osFlavor = GenericLinuxFlavor;
else if (abiParts.at(2) == QLatin1String("maemo") && m_os == LinuxOS)
m_osFlavor = MaemoLinuxFlavor;
else if (abiParts.at(2) == QLatin1String("meego") && m_os == LinuxOS)
m_osFlavor = MeegoLinuxFlavor;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == MacOS)
m_osFlavor = GenericMacFlavor;
else if (abiParts.at(2) == QLatin1String("device") && m_os == SymbianOS)
m_osFlavor = SymbianDeviceFlavor;
else if (abiParts.at(2) == QLatin1String("emulator") && m_os == SymbianOS)
m_osFlavor = SymbianEmulatorFlavor;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == UnixOS)
m_osFlavor = GenericUnixFlavor;
else if (abiParts.at(2) == QLatin1String("msvc") && m_os == WindowsOS)
m_osFlavor = WindowsMsvcFlavor;
else if (abiParts.at(2) == QLatin1String("msys") && m_os == WindowsOS)
m_osFlavor = WindowsMSysFlavor;
else if (abiParts.at(2) == QLatin1String("ce") && m_os == WindowsOS)
m_osFlavor = WindowsCEFlavor;
else
return;
}
if (abiParts.count() >= 4) {
if (abiParts.at(3) == QLatin1String("unknown"))
m_binaryFormat = UNKNOWN_FORMAT;
m_binaryFormat = UnknownFormat;
else if (abiParts.at(3) == QLatin1String("elf"))
m_binaryFormat = Format_ELF;
m_binaryFormat = ElfFormat;
else if (abiParts.at(3) == QLatin1String("pe"))
m_binaryFormat = Format_PE;
m_binaryFormat = PEFormat;
else if (abiParts.at(3) == QLatin1String("mach_o"))
m_binaryFormat = Format_Mach_O;
m_binaryFormat = MachOFormat;
else if (abiParts.at(3) == QLatin1String("qml_rt"))
m_binaryFormat = Format_Runtime_QML;
m_binaryFormat = RuntimeQmlFormat;
else
return;
}
......@@ -191,36 +191,36 @@ bool Abi::operator == (const Abi &other) const
bool Abi::isCompatibleWith(const Abi &other) const
{
return (architecture() == other.architecture() || other.architecture() == Abi::UNKNOWN_ARCHITECTURE)
&& (os() == other.os() || other.os() == Abi::UNKNOWN_OS)
&& (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UNKNOWN_OSFLAVOUR)
&& (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UNKNOWN_FORMAT)
return (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture)
&& (os() == other.os() || other.os() == Abi::UnknownOS)
&& (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UnknownFlavor)
&& (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat)
&& ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0);
}
bool Abi::isValid() const
{
return m_architecture != UNKNOWN_ARCHITECTURE
&& m_os != UNKNOWN_OS
&& m_osFlavor != UNKNOWN_OSFLAVOUR
&& m_binaryFormat != UNKNOWN_FORMAT
return m_architecture != UnknownArchitecture
&& m_os != UnknownOS
&& m_osFlavor != UnknownFlavor
&& m_binaryFormat != UnknownFormat
&& m_wordWidth != 0;
}
QString Abi::toString(const Architecture &a)
{
switch (a) {
case ARM:
case ArmArchitecture:
return QLatin1String("arm");
case x86:
case X86Architecture:
return QLatin1String("x86");
case Mips:
case MipsArcitecture:
return QLatin1String("mips");
case PowerPC:
case PowerPCArchitecture:
return QLatin1String("ppc");
case Itanium:
case ItaniumArchitecture:
return QLatin1String("itanium");
case UNKNOWN_ARCHITECTURE: // fall through!
case UnknownArchitecture: // fall through!
default:
return QLatin1String("unknown");
}
......@@ -229,48 +229,48 @@ QString Abi::toString(const Architecture &a)
QString Abi::toString(const OS &o)
{
switch (o) {
case Linux:
case LinuxOS:
return QLatin1String("linux");
case Mac:
case MacOS:
return QLatin1String("macos");
case Symbian:
case SymbianOS:
return QLatin1String("symbian");
case UNIX:
case UnixOS:
return QLatin1String("unix");
case Windows:
case WindowsOS:
return QLatin1String("windows");
case UNKNOWN_OS: // fall through!
case UnknownOS: // fall through!
default:
return QLatin1String("unknown");
};
}
QString Abi::toString(const OSFlavour &of)
QString Abi::toString(const OSFlavor &of)
{
switch (of) {
case ProjectExplorer::Abi::Linux_generic:
case ProjectExplorer::Abi::GenericLinuxFlavor:
return QLatin1String("generic");
case ProjectExplorer::Abi::Linux_maemo:
case ProjectExplorer::Abi::MaemoLinuxFlavor:
return QLatin1String("maemo");
case ProjectExplorer::Abi::Linux_harmattan:
case ProjectExplorer::Abi::HarmattanLinuxFlavor:
return QLatin1String("harmattan");
case ProjectExplorer::Abi::Linux_meego:
case ProjectExplorer::Abi::MeegoLinuxFlavor:
return QLatin1String("meego");
case ProjectExplorer::Abi::Mac_generic:
case ProjectExplorer::Abi::GenericMacFlavor:
return QLatin1String("generic");
case ProjectExplorer::Abi::Symbian_device:
case ProjectExplorer::Abi::SymbianDeviceFlavor:
return QLatin1String("device");
case ProjectExplorer::Abi::Symbian_emulator:
case ProjectExplorer::Abi::SymbianEmulatorFlavor:
return QLatin1String("emulator");
case ProjectExplorer::Abi::Unix_generic:
case ProjectExplorer::Abi::GenericUnixFlavor:
return QLatin1String("generic");
case ProjectExplorer::Abi::Windows_msvc:
case ProjectExplorer::Abi::WindowsMsvcFlavor:
return QLatin1String("msvc");
case ProjectExplorer::Abi::Windows_msys:
case ProjectExplorer::Abi::WindowsMSysFlavor:
return QLatin1String("msys");
case ProjectExplorer::Abi::Windows_ce:
case ProjectExplorer::Abi::WindowsCEFlavor:
return QLatin1String("ce");
case ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR: // fall throught!
case ProjectExplorer::Abi::UnknownFlavor: // fall throught!
default:
return QLatin1String("unknown");
}
......@@ -279,15 +279,15 @@ QString Abi::toString(const OSFlavour &of)
QString Abi::toString(const BinaryFormat &bf)
{
switch (bf) {
case Format_ELF:
case ElfFormat:
return QLatin1String("elf");
case Format_PE:
case PEFormat:
return QLatin1String("pe");
case Format_Mach_O:
case MachOFormat:
return QLatin1String("mach_o");
case Format_Runtime_QML:
case RuntimeQmlFormat:
return QLatin1String("qml_rt");
case UNKNOWN_FORMAT: // fall through!
case UnknownFormat: // fall through!
default:
return QLatin1String("unknown");
}
......@@ -304,22 +304,22 @@ QString Abi::toString(int w)
Abi Abi::hostAbi()
{
Architecture arch = QTC_CPU; // define set by qmake
OS os = UNKNOWN_OS;
OSFlavour subos = UNKNOWN_OSFLAVOUR;
BinaryFormat format = UNKNOWN_FORMAT;
OS os = UnknownOS;
OSFlavor subos = UnknownFlavor;
BinaryFormat format = UnknownFormat;
#if defined (Q_OS_WIN)
os = Windows;
subos = Windows_msvc;
format = Format_PE;
os = WindowsOS;
subos = WindowsMsvcFlavor;
format = PEFormat;
#elif defined (Q_OS_LINUX)
os = Linux;
subos = Linux_generic;
format = Format_ELF;
os = LinuxOS;
subos = GenericLinuxFlavor;
format = ElfFormat;
#elif defined (Q_OS_MAC)
os = Mac;
subos = Mac_generic;
format = Format_Mach_O;
os = MacOS;
subos = GenericMacFlavor;
format = MachOFormat;
#endif
return Abi(arch, os, subos, format, QSysInfo::WordSize);
......@@ -328,15 +328,15 @@ Abi Abi::hostAbi()
static Abi macAbiForCpu(quint32 type) {
switch (type) {
case 7: // CPU_TYPE_X86, CPU_TYPE_I386
return Abi(Abi::x86, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 32);
return Abi(Abi::X86Architecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 32);
case 0x01000000 + 7: // CPU_TYPE_X86_64
return Abi(Abi::x86, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 64);
return Abi(Abi::X86Architecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 64);
case 18: // CPU_TYPE_POWERPC
return Abi(Abi::PowerPC, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 32);
return Abi(Abi::PowerPCArchitecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 32);
case 0x01000000 + 18: // CPU_TYPE_POWERPC64
return Abi(Abi::PowerPC, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 32);
return Abi(Abi::PowerPCArchitecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 32);
case 12: // CPU_TYPE_ARM
return Abi(Abi::ARM, Abi::Mac, Abi::Mac_generic, Abi::Format_Mach_O, 32);
return Abi(Abi::ArmArchitecture, Abi::MacOS, Abi::GenericMacFlavor, Abi::MachOFormat, 32);
default:
return Abi();
}
......@@ -363,22 +363,22 @@ QList<Abi> Abi::abisOfBinary(const QString &path)
quint16 machine = (data.at(19) << 8) + data.at(18);
switch (machine) {
case 3: // EM_386
result.append(Abi(Abi::x86, Abi::Linux, Abi::Linux_generic, Abi::Format_ELF, 32));
result.append(Abi(Abi::X86Architecture, Abi::LinuxOS, Abi::GenericLinuxFlavor