diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
| commit | 27a5414804f7b8ab41101aad219ebef02d364bde (patch) | |
| tree | c9535dfed260314855b3ba1fe2c75652fdf60a1a /package/qt5/qt5base/qt5base-0004-qatomic-ppc.patch | |
| parent | f6162290fb6800fecffb86eed42069aa0f813f87 (diff) | |
| parent | fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff) | |
| download | buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.tar.gz buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.zip | |
Merge branch 'next'
Conflicts:
package/gdb/Config.in.host
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5base/qt5base-0004-qatomic-ppc.patch')
| -rw-r--r-- | package/qt5/qt5base/qt5base-0004-qatomic-ppc.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/package/qt5/qt5base/qt5base-0004-qatomic-ppc.patch b/package/qt5/qt5base/qt5base-0004-qatomic-ppc.patch deleted file mode 100644 index 906b56a0d4..0000000000 --- a/package/qt5/qt5base/qt5base-0004-qatomic-ppc.patch +++ /dev/null @@ -1,29 +0,0 @@ -Set loadAcquire() as const - -Fixes powerpc build. - -Fetched-from: https://bugzilla.redhat.com/attachment.cgi?id=812643 -Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> - -Index: qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h -=================================================================== ---- qtbase-opensource-src-5.1.1.orig/src/corelib/thread/qoldbasicatomic.h -+++ qtbase-opensource-src-5.1.1/src/corelib/thread/qoldbasicatomic.h -@@ -63,7 +63,7 @@ public: - // Atomic API, implemented in qatomic_XXX.h - - int load() const { return _q_value; } -- int loadAcquire() { return _q_value; } -+ int loadAcquire() const { return _q_value; } - void store(int newValue) { _q_value = newValue; } - void storeRelease(int newValue) { _q_value = newValue; } - -@@ -107,7 +107,7 @@ public: - // Atomic API, implemented in qatomic_XXX.h - - T *load() const { return _q_value; } -- T *loadAcquire() { return _q_value; } -+ T *loadAcquire() const { return _q_value; } - void store(T *newValue) { _q_value = newValue; } - void storeRelease(T *newValue) { _q_value = newValue; } - |
