diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-10 11:16:41 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-13 12:02:11 +0100 |
commit | 771a3f29f96d2004d6d39740180a80ef93567cb8 (patch) | |
tree | 1d32b7db14875b1dbacf747d903dcb0ca26a3564 /src/corelib/thread | |
parent | c4759d19f8428b64b46bfd1e07a5cfda2937e7d1 (diff) |
Remove HP PA-RISC atomic implementation.
This architecture is obsolete and discontinued.
Support for PA-RISC can be re-added if needed, but it would be preferred
to use the GCC intrinsic support from qatomic_gcc.h (on Linux/HPPA, for
example).
Change-Id: I952e521a2c8c68840df0d44843b5487d5c20b135
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread')
-rw-r--r-- | src/corelib/thread/qatomic.h | 12 | ||||
-rw-r--r-- | src/corelib/thread/qoldbasicatomic.h | 10 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index b75ae94429..94cef790db 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -63,17 +63,11 @@ public: // Non-atomic API inline QAtomicInt(int value = 0) { -#ifdef QT_ARCH_PARISC - this->_q_lock[0] = this->_q_lock[1] = this->_q_lock[2] = this->_q_lock[3] = -1; -#endif _q_value = value; } inline QAtomicInt(const QAtomicInt &other) { -#ifdef QT_ARCH_PARISC - this->_q_lock[0] = this->_q_lock[1] = this->_q_lock[2] = this->_q_lock[3] = -1; -#endif store(other.load()); } @@ -123,16 +117,10 @@ class QAtomicPointer : public QBasicAtomicPointer<T> public: inline QAtomicPointer(T *value = 0) { -#ifdef QT_ARCH_PARISC - this->_q_lock[0] = this->_q_lock[1] = this->_q_lock[2] = this->_q_lock[3] = -1; -#endif this->store(value); } inline QAtomicPointer(const QAtomicPointer<T> &other) { -#ifdef QT_ARCH_PARISC - this->_q_lock[0] = this->_q_lock[1] = this->_q_lock[2] = this->_q_lock[3] = -1; -#endif this->store(other.load()); } diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h index 4697da6301..2bd62f6942 100644 --- a/src/corelib/thread/qoldbasicatomic.h +++ b/src/corelib/thread/qoldbasicatomic.h @@ -61,9 +61,6 @@ QT_END_HEADER class Q_CORE_EXPORT QBasicAtomicInt { public: -#ifdef QT_ARCH_PARISC - int _q_lock[4]; -#endif #if defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE) union { // needed for Q_BASIC_ATOMIC_INITIALIZER volatile long _q_value; @@ -114,9 +111,6 @@ template <typename T> class QBasicAtomicPointer { public: -#ifdef QT_ARCH_PARISC - int _q_lock[4]; -#endif #if defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE) union { T * volatile _q_value; @@ -163,9 +157,7 @@ public: T *fetchAndAddOrdered(qptrdiff valueToAdd); }; -#ifdef QT_ARCH_PARISC -# define Q_BASIC_ATOMIC_INITIALIZER(a) {{-1,-1,-1,-1},(a)} -#elif defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE) +#if defined(QT_ARCH_WINDOWS) || defined(QT_ARCH_WINDOWSCE) # define Q_BASIC_ATOMIC_INITIALIZER(a) { {(a)} } #else # define Q_BASIC_ATOMIC_INITIALIZER(a) { (a) } |