* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-openvg/files: 4.8.2-qatomic-x32.patch
@ 2012-06-19 22:35 Davide Pesavento (pesa)
0 siblings, 0 replies; 2+ messages in thread
From: Davide Pesavento (pesa) @ 2012-06-19 22:35 UTC (permalink / raw
To: gentoo-commits
pesa 12/06/19 22:35:16
Added: 4.8.2-qatomic-x32.patch
Log:
Add patch for x32 support in qatomic asm code (bug 420705).
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.1 x11-libs/qt-openvg/files/4.8.2-qatomic-x32.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-openvg/files/4.8.2-qatomic-x32.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-openvg/files/4.8.2-qatomic-x32.patch?rev=1.1&content-type=text/plain
Index: 4.8.2-qatomic-x32.patch
===================================================================
From 29384815fb74ddfa90007f9ffede77be45e9a0fd Mon Sep 17 00:00:00 2001
From: Davide Pesavento <davidepesa@gmail.com>
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 <thiago.macieira@intel.com>
---
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<T>::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<T>::testAndSetOrdered(T *expectedValu
template <typename T>
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::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 <typename T>
Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-openvg/files: 4.8.2-qatomic-x32.patch
@ 2012-12-29 13:44 Michael Palimaka (kensington)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka (kensington) @ 2012-12-29 13:44 UTC (permalink / raw
To: gentoo-commits
kensington 12/12/29 13:44:16
Removed: 4.8.2-qatomic-x32.patch
Log:
Remove old.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-29 13:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-29 13:44 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-openvg/files: 4.8.2-qatomic-x32.patch Michael Palimaka (kensington)
-- strict thread matches above, loose matches on Subject: below --
2012-06-19 22:35 Davide Pesavento (pesa)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox