diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-17 14:17:54 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-20 09:36:51 +0100 |
| commit | 3cb078a23cb8b86169bd9d8259f5658be0c2082e (patch) | |
| tree | 81f3692c53532c2384607cfd0d5c4f0f5442f9fb /src/corelib/global/qprocessordetection.h | |
| parent | 52072a8c8acb1184a649bf0e78d92d108fb0bb24 (diff) | |
Rename Q_PROCESSOR_POWERPC to Q_PROCESSOR_POWER
IBM's POWER and the PowerPC architecture have been merged into a single
ISA, the Power ISA (see http://www.power.org). Use this unified name in
Qt.
Change-Id: Ia41492b0031d890843e43c5f7ecd1e60c65bb75b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qprocessordetection.h')
| -rw-r--r-- | src/corelib/global/qprocessordetection.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index 69815ba199..fd02f0e4c5 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -145,17 +145,21 @@ # endif /* - POWER family, optional variant: 64-bit + Power family, known variants: 32- and 64-bit There are many more known variants/revisions that we do not handle/detect. See http://en.wikipedia.org/wiki/Power_Architecture and http://en.wikipedia.org/wiki/File:PowerISA-evolution.svg */ -// #elif defined(__powerpc__) || defined(__ppc__) || defined(_M_MPPC) || defined(_M_PPC) -// # define Q_PROCESSOR_POWERPC -// # if defined(__64BIT__) || defined(__powerpc64__) || defined(__ppc64__) -// # define Q_PROCESSOR_POWERPC_64 -// # endif +#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \ + || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC) \ + || defined(_M_MPPC) || defined(_M_PPC) +# define Q_PROCESSOR_POWER +# if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__) +# define Q_PROCESSOR_POWER_64 +# else +# define Q_PROCESSOR_POWER_32 +# endif /* S390 family, known variant: S390X (64-bit) |