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/arch | |
| 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/arch')
| -rw-r--r-- | src/corelib/arch/arch.pri | 2 | ||||
| -rw-r--r-- | src/corelib/arch/qatomic_power.h (renamed from src/corelib/arch/qatomic_powerpc.h) | 16 | ||||
| -rw-r--r-- | src/corelib/arch/qatomic_vxworks.h | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index c64bbe2821..c611087043 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -12,7 +12,7 @@ HEADERS += \ arch/qatomic_i386.h \ arch/qatomic_ia64.h \ arch/qatomic_mips.h \ - arch/qatomic_powerpc.h \ + arch/qatomic_power.h \ arch/qatomic_s390.h \ arch/qatomic_sh4a.h \ arch/qatomic_sparc.h \ diff --git a/src/corelib/arch/qatomic_powerpc.h b/src/corelib/arch/qatomic_power.h index 10f6e4c488..a531dfedc8 100644 --- a/src/corelib/arch/qatomic_powerpc.h +++ b/src/corelib/arch/qatomic_power.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QATOMIC_POWERPC_H -#define QATOMIC_POWERPC_H +#ifndef QATOMIC_POWER_H +#define QATOMIC_POWER_H #include <QtCore/qoldbasicatomic.h> @@ -105,13 +105,11 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree() #if defined(Q_CC_GNU) -#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2) \ - || (!defined(__64BIT__) && !defined(__powerpc64__) && !defined(__ppc64__)) +#ifdef Q_PROCESSOR_POWER_32 # define _Q_VALUE "0, %[_q_value]" # define _Q_VALUE_MEMORY_OPERAND "+m" (_q_value) # define _Q_VALUE_REGISTER_OPERAND [_q_value] "r" (&_q_value), -#else -// On 64-bit with gcc >= 4.2 +#else // Q_PROCESSOR_POWER_64 # define _Q_VALUE "%y[_q_value]" # define _Q_VALUE_MEMORY_OPERAND [_q_value] "+Z" (_q_value) # define _Q_VALUE_REGISTER_OPERAND @@ -301,7 +299,7 @@ inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd) return originalValue; } -#if defined(__64BIT__) || defined(__powerpc64__) || defined(__ppc64__) +#ifdef Q_PROCESSOR_POWER_64 # define LPARX "ldarx" # define STPCX "stdcx." #else @@ -475,7 +473,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueTo #undef _Q_VALUE_REGISTER_OPERAND #else -# error "This compiler for PowerPC is not supported" +# error "This compiler for Power/PowerPC is not supported" #endif inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue) @@ -515,4 +513,4 @@ QT_END_NAMESPACE QT_END_HEADER -#endif // QATOMIC_POWERPC_H +#endif // QATOMIC_POWER_H diff --git a/src/corelib/arch/qatomic_vxworks.h b/src/corelib/arch/qatomic_vxworks.h index dbec16a540..564a07f3ea 100644 --- a/src/corelib/arch/qatomic_vxworks.h +++ b/src/corelib/arch/qatomic_vxworks.h @@ -45,7 +45,7 @@ QT_BEGIN_HEADER #if defined(__ppc) -# include <QtCore/qatomic_powerpc.h> +# include <QtCore/qatomic_power.h> #else // generic implementation with taskLock() #include <QtCore/qoldbasicatomic.h> |