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

Fix build on PPC: PPC is defined to 1

Browse Source 
$ powerpc-poky-linux-gcc -dM -E -xc /dev/null | grep -i PPC
 #define _ARCH_PPC 1
 #define __PPC__ 1
 #define __PPC 1
 #define PPC 1

Not on PPC64, though (only __PPC__ and __PPC64__ are defined).

Change-Id: Ib57b52598e2f452985e9fffd145812f5098e441d
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Thiago Macieira
2016-06-14 15:14:04 -07:00
committed by Orgad Shaneh
parent 43075f5fb1
commit 74fed1d5b7
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/makefileparse.cpp
View File

@@ -167,12 +167,12 @@ void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments)
m_config.archConfig = QMakeStepConfig::NoArch; m_config.archConfig = QMakeStepConfig::NoArch;
} else if (value == QLatin1String("ppc")) { } else if (value == QLatin1String("ppc")) {
if (qa.op == QLatin1String("+=")) if (qa.op == QLatin1String("+="))
m_config.archConfig = QMakeStepConfig::PPC; m_config.archConfig = QMakeStepConfig::PowerPC;
else else
m_config.archConfig = QMakeStepConfig::NoArch; m_config.archConfig = QMakeStepConfig::NoArch;
} else if (value == QLatin1String("ppc64")) { } else if (value == QLatin1String("ppc64")) {
if (qa.op == QLatin1String("+=")) if (qa.op == QLatin1String("+="))
m_config.archConfig = QMakeStepConfig::PPC64; m_config.archConfig = QMakeStepConfig::PowerPC64;
else else
m_config.archConfig = QMakeStepConfig::NoArch; m_config.archConfig = QMakeStepConfig::NoArch;
} else if (value == QLatin1String("iphonesimulator")) { } else if (value == QLatin1String("iphonesimulator")) {

8
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -888,9 +888,9 @@ QMakeStepConfig::TargetArchConfig QMakeStepConfig::targetArchFor(const Abi &targ
arch = QMakeStepConfig::X86_64; arch = QMakeStepConfig::X86_64;
} else if (targetAbi.architecture() == ProjectExplorer::Abi::PowerPCArchitecture) { } else if (targetAbi.architecture() == ProjectExplorer::Abi::PowerPCArchitecture) {
if (targetAbi.wordWidth() == 32) if (targetAbi.wordWidth() == 32)
arch = QMakeStepConfig::PPC; arch = QMakeStepConfig::PowerPC;
else if (targetAbi.wordWidth() == 64) else if (targetAbi.wordWidth() == 64)
arch = QMakeStepConfig::PPC64; arch = QMakeStepConfig::PowerPC64;
} }
} }
return arch; return arch;
@@ -920,9 +920,9 @@ QStringList QMakeStepConfig::toArguments() const
arguments << QLatin1String("CONFIG+=x86"); arguments << QLatin1String("CONFIG+=x86");
else if (archConfig == X86_64) else if (archConfig == X86_64)
arguments << QLatin1String("CONFIG+=x86_64"); arguments << QLatin1String("CONFIG+=x86_64");
else if (archConfig == PPC) else if (archConfig == PowerPC)
arguments << QLatin1String("CONFIG+=ppc"); arguments << QLatin1String("CONFIG+=ppc");
else if (archConfig == PPC64) else if (archConfig == PowerPC64)
arguments << QLatin1String("CONFIG+=ppc64"); arguments << QLatin1String("CONFIG+=ppc64");
// TODO: make that depend on the actual Qt version that is used // TODO: make that depend on the actual Qt version that is used

2
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -71,7 +71,7 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeStepConfig
{ {
public: public:
enum TargetArchConfig { enum TargetArchConfig {
NoArch, X86, X86_64, PPC, PPC64 NoArch, X86, X86_64, PowerPC, PowerPC64
}; };
enum OsType { enum OsType {

2
tests/manual/shootout/tst_codesize.cpp
View File

@@ -360,7 +360,7 @@ void tst_CodeSize::codesize_data()
QByteArray std_tie_code = QByteArray std_tie_code =
"struct QMakeStepConfig\n" "struct QMakeStepConfig\n"
"{\n" "{\n"
" enum TargetArchConfig { NoArch, X86, X86_64, PPC, PPC64 };\n" " enum TargetArchConfig { NoArch, X86, X86_64, PowerPC, PowerPC64 };\n"
" enum OsType { NoOsType, IphoneSimulator, IphoneOS };\n" " enum OsType { NoOsType, IphoneSimulator, IphoneOS };\n"
"\n" "\n"
" QMakeStepConfig()\n" " QMakeStepConfig()\n"