[BZ #3451]

	* sysdeps/i386/fpu/bits/mathinline.h (floor): Make rounding mode
	change atomic.
	(ceil): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 22add29da2e2e832356f79a910dc59087a05e034..f89997100885f9e57dbfe5f140a8f96e70dba870 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-10  Ulrich Drepper  <drepper@redhat.com>
+
+       [BZ #3451]
+       * sysdeps/i386/fpu/bits/mathinline.h (floor): Make rounding mode
+       change atomic.
+       (ceil): Likewise.
+
 2006-11-09  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Add

diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index e04ce95099b3759837f33f9a7d959ed5ae303276..28547d44b87b5251458669760436044165dd6020 100644 (file)
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -1,5 +1,5 @@
 /* Inline math functions for i387.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by John C. Bowman <bowman@math.ualberta.ca>, 1995.
@@ -529,24 +529,38 @@ __inline_mathcodeNP (tanh, __x, \
 
 __inline_mathcodeNP (floor, __x, \
   register long double __value;                                                      \
-  __volatile unsigned short int __cw;                                        \
-  __volatile unsigned short int __cwtmp;                                     \
-  __asm __volatile ("fnstcw %0" : "=m" (__cw));                                      \
-  __cwtmp = (__cw & 0xf3ff) | 0x0400; /* rounding down */                    \
-  __asm __volatile ("fldcw %0" : : "m" (__cwtmp));                           \
-  __asm __volatile ("frndint" : "=t" (__value) : "0" (__x));                 \
-  __asm __volatile ("fldcw %0" : : "m" (__cw));                                      \
+  register int __ignore;                                                     \
+  unsigned short int __cw;                                                   \
+  unsigned short int __cwtmp;                                                \
+  __asm __volatile ("fnstcw %3\n\t"                                          \
+                   "movzwl %3, %1\n\t"                                       \
+                   "andl $0xf3ff, %1\n\t"                                    \
+                   "orl $0x0400, %1\n\t"       /* rounding down */           \
+                   "movw %w1, %2\n\t"                                        \
+                   "fldcw %2\n\t"                                            \
+                   "frndint\n\t"                                             \
+                   "fldcw %3"                                                \
+                   : "=t" (__value), "=&q" (__ignore), "=m" (__cwtmp),       \
+                     "=m" (__cw)                                             \
+                   : "0" (__x));                                             \
   return __value)
 
 __inline_mathcodeNP (ceil, __x, \
   register long double __value;                                                      \
-  __volatile unsigned short int __cw;                                        \
-  __volatile unsigned short int __cwtmp;                                     \
-  __asm __volatile ("fnstcw %0" : "=m" (__cw));                                      \
-  __cwtmp = (__cw & 0xf3ff) | 0x0800; /* rounding up */                              \
-  __asm __volatile ("fldcw %0" : : "m" (__cwtmp));                           \
-  __asm __volatile ("frndint" : "=t" (__value) : "0" (__x));                 \
-  __asm __volatile ("fldcw %0" : : "m" (__cw));                                      \
+  register int __ignore;                                                     \
+  unsigned short int __cw;                                                   \
+  unsigned short int __cwtmp;                                                \
+  __asm __volatile ("fnstcw %3\n\t"                                          \
+                   "movzwl %3, %1\n\t"                                       \
+                   "andl $0xf3ff, %1\n\t"                                    \
+                   "orl $0x0800, %1\n\t"       /* rounding up */             \
+                   "movw %w1, %2\n\t"                                        \
+                   "fldcw %2\n\t"                                            \
+                   "frndint\n\t"                                             \
+                   "fldcw %3"                                                \
+                   : "=t" (__value), "=&q" (__ignore), "=m" (__cwtmp),       \
+                     "=m" (__cw)                                             \
+                   : "0" (__x));                                             \
   return __value)
 
 #ifdef __FAST_MATH__