backport from 4.7 branch to fix s390(x) atomic ops crashes
This commit is contained in:
parent
c0a03f9a24
commit
c5e74df90d
43
qt-everywhere-opensource-src-4.6.2-atomic-s390.patch
Normal file
43
qt-everywhere-opensource-src-4.6.2-atomic-s390.patch
Normal file
@ -0,0 +1,43 @@
|
||||
diff -up qt-everywhere-opensource-src-4.6.2/src/corelib/arch/qatomic_s390.h.than qt-everywhere-opensource-src-4.6.2/src/corelib/arch/qatomic_s390.h
|
||||
--- qt-everywhere-opensource-src-4.6.2/src/corelib/arch/qatomic_s390.h.than 2010-03-29 15:44:24.000000000 +0200
|
||||
+++ qt-everywhere-opensource-src-4.6.2/src/corelib/arch/qatomic_s390.h 2010-03-29 15:48:23.000000000 +0200
|
||||
@@ -366,11 +366,9 @@ template <typename T>
|
||||
Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
|
||||
{
|
||||
#ifndef __s390x__
|
||||
- return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr",
|
||||
- "", "bcr 15,0\n");
|
||||
+ return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "", "");
|
||||
#else
|
||||
- return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr",
|
||||
- "", "bcr 15,0\n");
|
||||
+ return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "", "");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -378,9 +376,9 @@ template <typename T>
|
||||
Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
|
||||
{
|
||||
#ifndef __s390x__
|
||||
- return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr", "", "");
|
||||
+ return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "", "bcr 15,0 \n");
|
||||
#else
|
||||
- return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr", "", "");
|
||||
+ return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "", "bcr 15,0 \n");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -388,11 +386,9 @@ template <typename T>
|
||||
Q_INLINE_TEMPLATE T* QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
|
||||
{
|
||||
#ifndef __s390x__
|
||||
- return (T*)__CS_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (int)newValue, "lr",
|
||||
- "bcr 15,0 \n", "");
|
||||
+ return (T*)__CS_OLD_LOOP(&_q_value, (int)newValue, "lr", "bcr 15,0 \n", "");
|
||||
#else
|
||||
- return (T*)__CSG_OLD_LOOP(reinterpret_cast<volatile long*>(_q_value), (long)newValue, "lgr",
|
||||
- "bcr 15,0\n", "");
|
||||
+ return (T*)__CSG_OLD_LOOP(&_q_value, (long)newValue, "lgr", "bcr 15,0\n", "");
|
||||
#endif
|
||||
}
|
||||
|
7
qt.spec
7
qt.spec
@ -13,7 +13,7 @@ Summary: Qt toolkit
|
||||
Name: qt
|
||||
Epoch: 1
|
||||
Version: 4.6.2
|
||||
Release: 12%{?dist}
|
||||
Release: 13%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
@ -86,6 +86,7 @@ Patch213: qt-x11-opensource-src-4.6.2-tablet-wacom-QTBUG-8599.patch
|
||||
# backport from 4.7 to fix a crash when reparenting an item in QGraphicsView
|
||||
# it should be included in 4.6.3
|
||||
Patch214: qt-everywhere-opensource-src-4.6.2-QTBUG-6932.patch
|
||||
patch215: qt-everywhere-opensource-src-4.6.2-atomic-s390.patch
|
||||
|
||||
Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
|
||||
Source11: hi16-phonon-gstreamer.png
|
||||
@ -443,6 +444,7 @@ Qt libraries used for drawing widgets and OpenGL items.
|
||||
%patch212 -p1 -b .kde-qt-0012
|
||||
%patch213 -p1 -b .tablet-wacom-QTBUG-8599
|
||||
%patch214 -p1 -b .QTBUG-6932
|
||||
%patch215 -p1 -b .atomic-s390
|
||||
|
||||
# drop -fexceptions from $RPM_OPT_FLAGS
|
||||
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
|
||||
@ -1036,6 +1038,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Apr 06 2010 Than Ngo <than@redhat.com> - 4.6.2-13
|
||||
- backport from 4.7 branch to fix s390(x) atomic ops crashes
|
||||
|
||||
* Fri Apr 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.6.2-12
|
||||
- Associate text/vnd.trolltech.linguist with linguist (#579082)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user