From b428b742cf54d423e5a7a68fcbec9473303eeafa Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 21 Feb 2007 11:15:54 +0000 Subject: Updated to fedora-glibc-20070221T1011 --- sysdeps/i386/i486/bits/atomic.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'sysdeps/i386/i486/bits/atomic.h') diff --git a/sysdeps/i386/i486/bits/atomic.h b/sysdeps/i386/i486/bits/atomic.h index 4577499d58..21eea7112c 100644 --- a/sysdeps/i386/i486/bits/atomic.h +++ b/sysdeps/i386/i486/bits/atomic.h @@ -199,7 +199,7 @@ typedef uintmax_t uatomic_max_t; ({ __typeof (*mem) result; \ if (sizeof (*mem) == 1) \ __asm __volatile ("xchgb %b0, %1" \ - : "=r" (result), "=m" (*mem) \ + : "=q" (result), "=m" (*mem) \ : "0" (newvalue), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ __asm __volatile ("xchgw %w0, %1" \ @@ -222,7 +222,7 @@ typedef uintmax_t uatomic_max_t; __typeof (value) __addval = (value); \ if (sizeof (*mem) == 1) \ __asm __volatile (lock "xaddb %b0, %1" \ - : "=r" (__result), "=m" (*mem) \ + : "=q" (__result), "=m" (*mem) \ : "0" (__addval), "m" (*mem), \ "i" (offsetof (tcbhead_t, multiple_threads))); \ else if (sizeof (*mem) == 2) \ @@ -272,7 +272,7 @@ typedef uintmax_t uatomic_max_t; else if (sizeof (*mem) == 1) \ __asm __volatile (lock "addb %b1, %0" \ : "=m" (*mem) \ - : "ir" (value), "m" (*mem), \ + : "iq" (value), "m" (*mem), \ "i" (offsetof (tcbhead_t, multiple_threads))); \ else if (sizeof (*mem) == 2) \ __asm __volatile (lock "addw %w1, %0" \ @@ -331,7 +331,7 @@ typedef uintmax_t uatomic_max_t; if (sizeof (*mem) == 1) \ __asm __volatile (LOCK_PREFIX "addb %b2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ - : "ir" (value), "m" (*mem)); \ + : "iq" (value), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ __asm __volatile (LOCK_PREFIX "addw %w2, %0; setz %1" \ : "=m" (*mem), "=qm" (__result) \ @@ -464,7 +464,7 @@ typedef uintmax_t uatomic_max_t; if (sizeof (*mem) == 1) \ __asm __volatile (LOCK_PREFIX "orb %b2, %0" \ : "=m" (*mem) \ - : "m" (*mem), "ir" (1 << (bit))); \ + : "m" (*mem), "iq" (1 << (bit))); \ else if (sizeof (*mem) == 2) \ __asm __volatile (LOCK_PREFIX "orw %w2, %0" \ : "=m" (*mem) \ @@ -503,11 +503,11 @@ typedef uintmax_t uatomic_max_t; #define atomic_and(mem, mask) \ do { \ if (sizeof (*mem) == 1) \ - __asm __volatile (LOCK_PREFIX "andb %1, %b0" \ + __asm __volatile (LOCK_PREFIX "andb %b1, %0" \ : "=m" (*mem) \ - : "ir" (mask), "m" (*mem)); \ + : "iq" (mask), "m" (*mem)); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (LOCK_PREFIX "andw %1, %w0" \ + __asm __volatile (LOCK_PREFIX "andw %w1, %0" \ : "=m" (*mem) \ : "ir" (mask), "m" (*mem)); \ else if (sizeof (*mem) == 4) \ @@ -522,12 +522,12 @@ typedef uintmax_t uatomic_max_t; #define __arch_or_body(lock, mem, mask) \ do { \ if (sizeof (*mem) == 1) \ - __asm __volatile (lock "orb %1, %b0" \ + __asm __volatile (lock "orb %b1, %0" \ : "=m" (*mem) \ - : "ir" (mask), "m" (*mem), \ + : "iq" (mask), "m" (*mem), \ "i" (offsetof (tcbhead_t, multiple_threads))); \ else if (sizeof (*mem) == 2) \ - __asm __volatile (lock "orw %1, %w0" \ + __asm __volatile (lock "orw %w1, %0" \ : "=m" (*mem) \ : "ir" (mask), "m" (*mem), \ "i" (offsetof (tcbhead_t, multiple_threads))); \ -- cgit v1.2.3