From b8de501cf9a6121df09b60e45e3024fcca0df9fd Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Tue, 19 Jun 2012 22:41:32 +0000 Subject: Add patch for x32 support in qatomic asm code (bug 420705). Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64 --- x11-libs/qt-assistant/ChangeLog | 6 ++- .../qt-assistant/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-assistant/qt-assistant-4.8.2.ebuild | 6 ++- x11-libs/qt-bearer/ChangeLog | 6 ++- x11-libs/qt-bearer/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-bearer/qt-bearer-4.8.2.ebuild | 6 ++- x11-libs/qt-core/ChangeLog | 6 ++- x11-libs/qt-core/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-core/qt-core-4.8.2.ebuild | 3 +- x11-libs/qt-dbus/ChangeLog | 6 ++- x11-libs/qt-dbus/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-dbus/qt-dbus-4.8.2.ebuild | 3 +- x11-libs/qt-declarative/ChangeLog | 6 ++- .../qt-declarative/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ .../qt-declarative/qt-declarative-4.8.2.ebuild | 6 ++- x11-libs/qt-gui/ChangeLog | 6 ++- x11-libs/qt-gui/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-gui/qt-gui-4.8.2.ebuild | 3 +- x11-libs/qt-multimedia/ChangeLog | 6 ++- .../qt-multimedia/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-multimedia/qt-multimedia-4.8.2.ebuild | 3 +- x11-libs/qt-opengl/ChangeLog | 6 ++- x11-libs/qt-opengl/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-opengl/qt-opengl-4.8.2.ebuild | 6 ++- x11-libs/qt-openvg/ChangeLog | 6 ++- x11-libs/qt-openvg/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-openvg/qt-openvg-4.8.2.ebuild | 6 ++- x11-libs/qt-phonon/ChangeLog | 6 ++- x11-libs/qt-phonon/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild | 6 ++- x11-libs/qt-qt3support/ChangeLog | 6 ++- .../qt-qt3support/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild | 6 ++- x11-libs/qt-script/ChangeLog | 6 ++- x11-libs/qt-script/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-script/qt-script-4.8.2.ebuild | 6 ++- x11-libs/qt-sql/ChangeLog | 6 ++- x11-libs/qt-sql/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-sql/qt-sql-4.8.2.ebuild | 6 ++- x11-libs/qt-svg/ChangeLog | 6 ++- x11-libs/qt-svg/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-svg/qt-svg-4.8.2.ebuild | 6 ++- x11-libs/qt-test/ChangeLog | 6 ++- x11-libs/qt-test/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-test/qt-test-4.8.2.ebuild | 6 ++- x11-libs/qt-webkit/ChangeLog | 6 ++- x11-libs/qt-webkit/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild | 3 +- x11-libs/qt-xmlpatterns/ChangeLog | 6 ++- .../qt-xmlpatterns/files/4.8.2-qatomic-x32.patch | 50 ++++++++++++++++++++++ .../qt-xmlpatterns/qt-xmlpatterns-4.8.2.ebuild | 6 ++- 51 files changed, 1005 insertions(+), 34 deletions(-) create mode 100644 x11-libs/qt-assistant/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-bearer/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-core/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-dbus/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-declarative/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-gui/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-multimedia/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-opengl/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-openvg/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-phonon/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-qt3support/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-script/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-sql/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-svg/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-test/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-webkit/files/4.8.2-qatomic-x32.patch create mode 100644 x11-libs/qt-xmlpatterns/files/4.8.2-qatomic-x32.patch (limited to 'x11-libs') diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog index b382e826445b..5c4246ebbec1 100644 --- a/x11-libs/qt-assistant/ChangeLog +++ b/x11-libs/qt-assistant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-assistant # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.138 2012/06/18 22:55:03 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.139 2012/06/19 22:30:13 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-assistant-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-assistant/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-assistant/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-assistant/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.2.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.2.ebuild index 4d2112275cf3..eca25ba69653 100644 --- a/x11-libs/qt-assistant/qt-assistant-4.8.2.ebuild +++ b/x11-libs/qt-assistant/qt-assistant-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.2.ebuild,v 1.2 2012/06/18 21:44:47 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.2.ebuild,v 1.3 2012/06/19 22:30:13 pesa Exp $ EAPI=4 @@ -28,6 +28,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { # Pixeltool isn't really assistant related, but it relies on # the assistant libraries. diff --git a/x11-libs/qt-bearer/ChangeLog b/x11-libs/qt-bearer/ChangeLog index d2f238ff9f54..0fc14f5ef532 100644 --- a/x11-libs/qt-bearer/ChangeLog +++ b/x11-libs/qt-bearer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-bearer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/ChangeLog,v 1.9 2012/06/18 22:55:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/ChangeLog,v 1.10 2012/06/19 22:30:55 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-bearer-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-bearer/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-bearer/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-bearer/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-bearer/qt-bearer-4.8.2.ebuild b/x11-libs/qt-bearer/qt-bearer-4.8.2.ebuild index 5b434953a355..b6f004e8da8c 100644 --- a/x11-libs/qt-bearer/qt-bearer-4.8.2.ebuild +++ b/x11-libs/qt-bearer/qt-bearer-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/qt-bearer-4.8.2.ebuild,v 1.2 2012/05/25 16:17:39 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/qt-bearer-4.8.2.ebuild,v 1.3 2012/06/19 22:30:55 pesa Exp $ EAPI=4 @@ -25,6 +25,10 @@ RDEPEND="${DEPEND} networkmanager? ( net-misc/networkmanager ) " +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_EXTRACT_DIRECTORIES=" include/QtCore diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index fcea9f2aaf1e..9a66ff10abfe 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.175 2012/06/18 22:56:03 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.176 2012/06/19 22:31:29 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-core-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-core/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-core/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-core/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-core/qt-core-4.8.2.ebuild b/x11-libs/qt-core/qt-core-4.8.2.ebuild index dbb26265e08c..98cdaea8f577 100644 --- a/x11-libs/qt-core/qt-core-4.8.2.ebuild +++ b/x11-libs/qt-core/qt-core-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.2.ebuild,v 1.1 2012/05/22 15:19:29 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.2.ebuild,v 1.2 2012/06/19 22:31:29 pesa Exp $ EAPI=4 @@ -30,6 +30,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}/moc-workaround-for-boost-1.48.patch" + "${FILESDIR}/${PV}-qatomic-x32.patch" ) pkg_setup() { diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog index 45dcd3022583..e4a662a1ae1a 100644 --- a/x11-libs/qt-dbus/ChangeLog +++ b/x11-libs/qt-dbus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-dbus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.115 2012/06/18 22:56:34 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.116 2012/06/19 22:32:01 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-dbus-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-dbus/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-dbus/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-dbus/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.2.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.2.ebuild index c0e6ffe9c919..0e04f321e662 100644 --- a/x11-libs/qt-dbus/qt-dbus-4.8.2.ebuild +++ b/x11-libs/qt-dbus/qt-dbus-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.8.2.ebuild,v 1.1 2012/05/22 15:20:18 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.8.2.ebuild,v 1.2 2012/06/19 22:32:01 pesa Exp $ EAPI=4 @@ -23,6 +23,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch" + "${FILESDIR}/${PV}-qatomic-x32.patch" ) pkg_setup() { diff --git a/x11-libs/qt-declarative/ChangeLog b/x11-libs/qt-declarative/ChangeLog index 638c0dd3d76d..c02eabdb277c 100644 --- a/x11-libs/qt-declarative/ChangeLog +++ b/x11-libs/qt-declarative/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-declarative # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.46 2012/06/18 22:57:20 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.47 2012/06/19 22:32:31 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-declarative-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-declarative/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-declarative/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-declarative/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.2.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.2.ebuild index bc9d54e30f32..ed392c42cb53 100644 --- a/x11-libs/qt-declarative/qt-declarative-4.8.2.ebuild +++ b/x11-libs/qt-declarative/qt-declarative-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.8.2.ebuild,v 1.2 2012/06/18 21:46:29 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.8.2.ebuild,v 1.3 2012/06/19 22:32:31 pesa Exp $ EAPI=4 @@ -28,6 +28,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/declarative diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog index 574892d01af0..57a0e4139d20 100644 --- a/x11-libs/qt-gui/ChangeLog +++ b/x11-libs/qt-gui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-gui # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.185 2012/06/18 22:58:25 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.186 2012/06/19 22:33:09 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-gui-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-gui/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-gui/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-gui/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-gui/qt-gui-4.8.2.ebuild b/x11-libs/qt-gui/qt-gui-4.8.2.ebuild index 66c4429b05e8..b2a1b9bc66a4 100644 --- a/x11-libs/qt-gui/qt-gui-4.8.2.ebuild +++ b/x11-libs/qt-gui/qt-gui-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.2.ebuild,v 1.1 2012/05/22 15:22:03 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.2.ebuild,v 1.2 2012/06/19 22:33:09 pesa Exp $ EAPI=4 @@ -60,6 +60,7 @@ PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,debug=,qpa=] ) PATCHES=( "${FILESDIR}/${PN}-4.7.3-cups.patch" + "${FILESDIR}/${PV}-qatomic-x32.patch" ) pkg_setup() { diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog index 1cb52ec16194..4b74c61d1a37 100644 --- a/x11-libs/qt-multimedia/ChangeLog +++ b/x11-libs/qt-multimedia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-multimedia # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.58 2012/06/18 22:58:56 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.59 2012/06/19 22:34:00 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-multimedia-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-multimedia/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-multimedia/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-multimedia/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.2.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.2.ebuild index 414ed5a86a57..6069e3bbdcdd 100644 --- a/x11-libs/qt-multimedia/qt-multimedia-4.8.2.ebuild +++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.8.2.ebuild,v 1.1 2012/05/22 15:22:37 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.8.2.ebuild,v 1.2 2012/06/19 22:34:00 pesa Exp $ EAPI=4 @@ -24,6 +24,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-4.8.0-alsa.patch" + "${FILESDIR}/${PV}-qatomic-x32.patch" ) pkg_setup() { diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog index 9985ee6b8d3b..70817a5187ce 100644 --- a/x11-libs/qt-opengl/ChangeLog +++ b/x11-libs/qt-opengl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-opengl # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.113 2012/06/18 22:59:34 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.114 2012/06/19 22:34:36 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-opengl-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-opengl/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-opengl/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-opengl/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.2.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.2.ebuild index 21faff97e5ed..42a283930a3e 100644 --- a/x11-libs/qt-opengl/qt-opengl-4.8.2.ebuild +++ b/x11-libs/qt-opengl/qt-opengl-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.8.2.ebuild,v 1.1 2012/05/22 15:23:08 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.8.2.ebuild,v 1.2 2012/06/19 22:34:36 pesa Exp $ EAPI=4 @@ -22,6 +22,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/opengl diff --git a/x11-libs/qt-openvg/ChangeLog b/x11-libs/qt-openvg/ChangeLog index dcdb38745720..0ab77690f85c 100644 --- a/x11-libs/qt-openvg/ChangeLog +++ b/x11-libs/qt-openvg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-openvg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/ChangeLog,v 1.9 2012/06/18 23:00:01 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/ChangeLog,v 1.10 2012/06/19 22:35:16 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-openvg-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-openvg/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-openvg/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-openvg/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.2.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.2.ebuild index 0ae1582a39e3..7b85fe1fc06a 100644 --- a/x11-libs/qt-openvg/qt-openvg-4.8.2.ebuild +++ b/x11-libs/qt-openvg/qt-openvg-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/qt-openvg-4.8.2.ebuild,v 1.1 2012/05/22 15:23:37 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/qt-openvg-4.8.2.ebuild,v 1.2 2012/06/19 22:35:16 pesa Exp $ EAPI=4 @@ -22,6 +22,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/openvg diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog index 783fb82fff86..6d113386626e 100644 --- a/x11-libs/qt-phonon/ChangeLog +++ b/x11-libs/qt-phonon/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-phonon # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.116 2012/06/18 23:00:38 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.117 2012/06/19 22:36:05 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-phonon-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-phonon/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-phonon/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-phonon/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild index 10f34a7dd397..1b173a67dc60 100644 --- a/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild +++ b/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild,v 1.1 2012/05/22 15:24:08 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.8.2.ebuild,v 1.2 2012/06/19 22:36:05 pesa Exp $ EAPI=4 @@ -28,6 +28,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/phonon diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog index 70921fbe1c24..346761ce93be 100644 --- a/x11-libs/qt-qt3support/ChangeLog +++ b/x11-libs/qt-qt3support/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-qt3support # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.118 2012/06/18 23:01:19 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.119 2012/06/19 22:36:56 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-qt3support-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-qt3support/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-qt3support/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-qt3support/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild index a4446fd0d5d9..f7d7c738d215 100644 --- a/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild +++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild,v 1.1 2012/05/22 15:24:40 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.8.2.ebuild,v 1.2 2012/06/19 22:36:56 pesa Exp $ EAPI=4 @@ -22,6 +22,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/qt3support diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog index ed97be8ceadd..f83d3023834f 100644 --- a/x11-libs/qt-script/ChangeLog +++ b/x11-libs/qt-script/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-script # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.118 2012/06/18 23:02:07 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.119 2012/06/19 22:37:44 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-script-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-script/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-script/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-script/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-script/qt-script-4.8.2.ebuild b/x11-libs/qt-script/qt-script-4.8.2.ebuild index bc2d68ba70ba..ca9f4572dd32 100644 --- a/x11-libs/qt-script/qt-script-4.8.2.ebuild +++ b/x11-libs/qt-script/qt-script-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.8.2.ebuild,v 1.1 2012/05/22 15:25:33 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.8.2.ebuild,v 1.2 2012/06/19 22:37:44 pesa Exp $ EAPI=4 @@ -20,6 +20,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/script" diff --git a/x11-libs/qt-sql/ChangeLog b/x11-libs/qt-sql/ChangeLog index 0b967422fadd..d0cece55322b 100644 --- a/x11-libs/qt-sql/ChangeLog +++ b/x11-libs/qt-sql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-sql # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.137 2012/06/18 23:13:27 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/ChangeLog,v 1.138 2012/06/19 22:38:42 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-sql-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento -qt-sql-4.8.1-r1.ebuild: Remove unused revision. diff --git a/x11-libs/qt-sql/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-sql/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-sql/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-sql/qt-sql-4.8.2.ebuild b/x11-libs/qt-sql/qt-sql-4.8.2.ebuild index df402c57efdc..0a9bf752ad57 100644 --- a/x11-libs/qt-sql/qt-sql-4.8.2.ebuild +++ b/x11-libs/qt-sql/qt-sql-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.8.2.ebuild,v 1.1 2012/05/22 15:26:05 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.8.2.ebuild,v 1.2 2012/06/19 22:38:42 pesa Exp $ EAPI=4 @@ -31,6 +31,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/sql diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog index c9824dd70dd4..c6e4b9caa22c 100644 --- a/x11-libs/qt-svg/ChangeLog +++ b/x11-libs/qt-svg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-svg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.111 2012/06/18 23:03:50 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.112 2012/06/19 22:39:23 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-svg-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-svg/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-svg/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-svg/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-svg/qt-svg-4.8.2.ebuild b/x11-libs/qt-svg/qt-svg-4.8.2.ebuild index 9d142a5c59e6..8a08a5ff2f0f 100644 --- a/x11-libs/qt-svg/qt-svg-4.8.2.ebuild +++ b/x11-libs/qt-svg/qt-svg-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.8.2.ebuild,v 1.1 2012/05/22 15:26:40 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.8.2.ebuild,v 1.2 2012/06/19 22:39:23 pesa Exp $ EAPI=4 @@ -22,6 +22,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/svg diff --git a/x11-libs/qt-test/ChangeLog b/x11-libs/qt-test/ChangeLog index 458a783bfa78..227ca0e1df5b 100644 --- a/x11-libs/qt-test/ChangeLog +++ b/x11-libs/qt-test/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-test # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.109 2012/06/18 23:04:39 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/ChangeLog,v 1.110 2012/06/19 22:40:04 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-test-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-test/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-test/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-test/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-test/qt-test-4.8.2.ebuild b/x11-libs/qt-test/qt-test-4.8.2.ebuild index 92eb5e2dce1a..ff2698f32502 100644 --- a/x11-libs/qt-test/qt-test-4.8.2.ebuild +++ b/x11-libs/qt-test/qt-test-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.8.2.ebuild,v 1.1 2012/05/22 15:27:12 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.8.2.ebuild,v 1.2 2012/06/19 22:40:04 pesa Exp $ EAPI=4 @@ -20,6 +20,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/testlib" diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index a1f93703f1f7..5b3aa9bddbae 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.156 2012/06/18 22:38:38 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.157 2012/06/19 22:40:45 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-webkit-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml, qt-webkit-4.8.1.ebuild, qt-webkit-4.8.2.ebuild: diff --git a/x11-libs/qt-webkit/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-webkit/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-webkit/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild index f7626df9e0f6..a767e3dd7a53 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild,v 1.4 2012/06/18 22:38:38 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild,v 1.5 2012/06/19 22:40:45 pesa Exp $ EAPI=4 @@ -37,6 +37,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.8.0-c++0x-fix.patch" "${FILESDIR}/${PN}-4.8.1+glib-2.31.patch" "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch" + "${FILESDIR}/${PV}-qatomic-x32.patch" ) pkg_setup() { diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog index 3c39f76f5720..ec8b61a39cd5 100644 --- a/x11-libs/qt-xmlpatterns/ChangeLog +++ b/x11-libs/qt-xmlpatterns/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-xmlpatterns # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.110 2012/06/18 23:05:21 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.111 2012/06/19 22:41:32 pesa Exp $ + + 19 Jun 2012; Davide Pesavento + +files/4.8.2-qatomic-x32.patch, qt-xmlpatterns-4.8.2.ebuild: + Add patch for x32 support in qatomic asm code (bug 420705). 18 Jun 2012; Davide Pesavento metadata.xml: Cleanup metadata and add upstream info. diff --git a/x11-libs/qt-xmlpatterns/files/4.8.2-qatomic-x32.patch b/x11-libs/qt-xmlpatterns/files/4.8.2-qatomic-x32.patch new file mode 100644 index 000000000000..5f352b1acc83 --- /dev/null +++ b/x11-libs/qt-xmlpatterns/files/4.8.2-qatomic-x32.patch @@ -0,0 +1,50 @@ +From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Thu, 14 Jun 2012 00:44:43 +0200 +Subject: [PATCH] Fix qatomic inline asm for x32 ABI. + +Drop the 'q' suffix from x86_64 asm instructions. It's not needed, +because the assembler can automatically determine the proper size +based on the target, and it is in fact causing compilation failures +on x32. + +Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 +Reviewed-by: Thiago Macieira +--- + src/corelib/arch/qatomic_x86_64.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/arch/qatomic_x86_64.h b/src/corelib/arch/qatomic_x86_64.h +index c2627c8..dc78140 100644 +--- a/src/corelib/arch/qatomic_x86_64.h ++++ b/src/corelib/arch/qatomic_x86_64.h +@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + { + unsigned char ret; + asm volatile("lock\n" +- "cmpxchgq %3,%2\n" ++ "cmpxchg %3,%2\n" + "sete %1\n" + : "=a" (newValue), "=qm" (ret), "+m" (_q_value) + : "r" (newValue), "0" (expectedValue) +@@ -181,7 +181,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetOrdered(T *expectedValu + template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndStoreOrdered(T *newValue) + { +- asm volatile("xchgq %0,%1" ++ asm volatile("xchg %0,%1" + : "=r" (newValue), "+m" (_q_value) + : "0" (newValue) + : "memory"); +@@ -192,7 +192,7 @@ template + Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueToAdd) + { + asm volatile("lock\n" +- "xaddq %0,%1" ++ "xadd %0,%1" + : "=r" (valueToAdd), "+m" (_q_value) + : "0" (valueToAdd * sizeof(T)) + : "memory"); +-- +1.7.10 + diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.2.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.2.ebuild index 0ac0e733f600..d362f2e89f80 100644 --- a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.2.ebuild +++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.2.ebuild,v 1.1 2012/05/22 15:28:21 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.2.ebuild,v 1.2 2012/06/19 22:41:32 pesa Exp $ EAPI=4 @@ -20,6 +20,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PV}-qatomic-x32.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/xmlpatterns -- cgit v1.2.3-65-gdbad