summaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/bits/byteswap.h2
-rw-r--r--sysdeps/i386/fpu/e_fmod.S2
-rw-r--r--sysdeps/i386/fpu/e_fmodf.S2
-rw-r--r--sysdeps/i386/fpu/e_fmodl.c2
-rw-r--r--sysdeps/i386/i486/bits/atomic.h22
5 files changed, 15 insertions, 15 deletions
diff --git a/sysdeps/i386/bits/byteswap.h b/sysdeps/i386/bits/byteswap.h
index 3baad85e8a..7f2ddc2dc5 100644
--- a/sysdeps/i386/bits/byteswap.h
+++ b/sysdeps/i386/bits/byteswap.h
@@ -68,7 +68,7 @@ __bswap_16 (unsigned short int __bsx)
# if !defined __i486__ && !defined __pentium__ && !defined __pentiumpro__ \
&& !defined __pentium4__ && !defined __k8__ && !defined __athlon__ \
&& !defined __k6__ && !defined __nocona__ && !defined __core2__ \
- && !defined __geode__
+ && !defined __geode__ && !defined __amdfam10__
# define __bswap_32(x) \
(__extension__ \
({ register unsigned int __v, __x = (x); \
diff --git a/sysdeps/i386/fpu/e_fmod.S b/sysdeps/i386/fpu/e_fmod.S
index 4cf6e92054..e801286a9b 100644
--- a/sysdeps/i386/fpu/e_fmod.S
+++ b/sysdeps/i386/fpu/e_fmod.S
@@ -10,7 +10,7 @@ RCSID("$NetBSD: e_fmod.S,v 1.4 1995/05/08 23:47:56 jtc Exp $")
ENTRY(__ieee754_fmod)
fldl 12(%esp)
fldl 4(%esp)
-1: fprem
+1: fprem1
fstsw %ax
sahf
jp 1b
diff --git a/sysdeps/i386/fpu/e_fmodf.S b/sysdeps/i386/fpu/e_fmodf.S
index bbce40976d..1850af098e 100644
--- a/sysdeps/i386/fpu/e_fmodf.S
+++ b/sysdeps/i386/fpu/e_fmodf.S
@@ -11,7 +11,7 @@ RCSID("$NetBSD: $")
ENTRY(__ieee754_fmodf)
flds 8(%esp)
flds 4(%esp)
-1: fprem
+1: fprem1
fstsw %ax
sahf
jp 1b
diff --git a/sysdeps/i386/fpu/e_fmodl.c b/sysdeps/i386/fpu/e_fmodl.c
index c7c9a60456..97a06d0016 100644
--- a/sysdeps/i386/fpu/e_fmodl.c
+++ b/sysdeps/i386/fpu/e_fmodl.c
@@ -12,7 +12,7 @@ __ieee754_fmodl (long double x, long double y)
{
long double res;
- asm ("1:\tfprem\n"
+ asm ("1:\tfprem1\n"
"fstsw %%ax\n"
"sahf\n"
"jp 1b\n"
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))); \