summaryrefslogtreecommitdiffstats
path: root/package/qt/qt-fix-const-atomics.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-02-03 14:52:07 +0100
committerPeter Korsgaard <peter@korsgaard.com>2015-02-03 14:52:56 +0100
commit298cd8eaa21a21eee85f9551a26ad294347b1d5a (patch)
tree249fa33b66f65e6daffdbfc8ca2e5399e8d89e61 /package/qt/qt-fix-const-atomics.patch
parentdd798a45c571063595c45278e28ed4f614f2cf32 (diff)
downloadbuildroot-298cd8eaa21a21eee85f9551a26ad294347b1d5a.tar.gz
buildroot-298cd8eaa21a21eee85f9551a26ad294347b1d5a.zip
package/*: rename patches according to the new policy
Autogenerated from rename-patch.py (http://patchwork.ozlabs.org/patch/403345) Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt/qt-fix-const-atomics.patch')
-rw-r--r--package/qt/qt-fix-const-atomics.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/package/qt/qt-fix-const-atomics.patch b/package/qt/qt-fix-const-atomics.patch
deleted file mode 100644
index 64853565e8..0000000000
--- a/package/qt/qt-fix-const-atomics.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d4d07dac01796b2aa0fb501c14865cab7e42b3a9 Mon Sep 17 00:00:00 2001
-From: Mischa Jonker <mischa.jonker@synopsys.com>
-Date: Sun, 4 Nov 2012 11:42:04 +0100
-Subject: [PATCH] Fix const-related build error in generic atomic ops
-
-It's still not entirely const-correct though. In all other architectures
-this is obfuscated through the use of inline asm (which the compiler
-doesn't check). This patch obfuscates through const_cast
----
- src/corelib/arch/generic/qatomic_generic_unix.cpp | 8 ++++----
- src/corelib/arch/qatomic_generic.h | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/corelib/arch/generic/qatomic_generic_unix.cpp b/src/corelib/arch/generic/qatomic_generic_unix.cpp
-index 1c6cbf0..6fce81d 100644
---- a/src/corelib/arch/generic/qatomic_generic_unix.cpp
-+++ b/src/corelib/arch/generic/qatomic_generic_unix.cpp
-@@ -85,13 +85,13 @@ int QBasicAtomicInt_fetchAndAddOrdered(volatile int *_q_value, int valueToAdd)
-
- Q_CORE_EXPORT
- bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *_q_value,
-- void *expectedValue,
-- void *newValue)
-+ const void *expectedValue,
-+ const void *newValue)
- {
- bool returnValue = false;
- pthread_mutex_lock(&qAtomicMutex);
- if (*_q_value == expectedValue) {
-- *_q_value = newValue;
-+ *_q_value = const_cast<void*>(newValue);
- returnValue = true;
- }
- pthread_mutex_unlock(&qAtomicMutex);
-diff --git a/src/corelib/arch/qatomic_generic.h b/src/corelib/arch/qatomic_generic.h
-index 621a767..4c14679 100644
---- a/src/corelib/arch/qatomic_generic.h
-+++ b/src/corelib/arch/qatomic_generic.h
-@@ -105,7 +105,7 @@ Q_CORE_EXPORT bool QBasicAtomicInt_testAndSetOrdered(volatile int *, int, int);
- Q_CORE_EXPORT int QBasicAtomicInt_fetchAndStoreOrdered(volatile int *, int);
- Q_CORE_EXPORT int QBasicAtomicInt_fetchAndAddOrdered(volatile int *, int);
-
--Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, void *, void *);
-+Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, const void *, const void *);
- Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndStoreOrdered(void * volatile *, void *);
- Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *, qptrdiff);
-
---
-1.7.0.4
-
OpenPOWER on IntegriCloud