about summary refs log tree commit diff
path: root/sysdeps/x86_64/fpu
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/x86_64/fpu')
-rw-r--r--sysdeps/x86_64/fpu/feholdexcpt.c21
1 files changed, 7 insertions, 14 deletions
diff --git a/sysdeps/x86_64/fpu/feholdexcpt.c b/sysdeps/x86_64/fpu/feholdexcpt.c
index b547b34957..b380479153 100644
--- a/sysdeps/x86_64/fpu/feholdexcpt.c
+++ b/sysdeps/x86_64/fpu/feholdexcpt.c
@@ -1,5 +1,5 @@
 /* Store current floating-point environment and clear exceptions.
-   Copyright (C) 2001, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,20 +22,13 @@ int
 feholdexcept (fenv_t *envp)
 {
   unsigned int mxcsr;
-  fenv_t temp;
 
-  /* Store the environment.  */
-  __asm__ ("fnstenv %0\n"
-	   "stmxcsr %1" : "=m" (temp), "=m" (temp.__mxcsr));
-  *envp = temp;
-
-  /* Now set all exceptions to non-stop, first the x87 FPU.  */
-  temp.__control_word |= 0x3f;
-
-  /* And clear all exceptions.  */
-  temp.__status_word &= ~0x3f;
-
-  __asm__ ("fldenv %0" : : "m" (temp));
+  /* Store the environment.  Recall that fnstenv has a side effect of
+     masking all exceptions.  Then clear all exceptions.  */
+  __asm__ ("fnstenv %0\n\t"
+	   "stmxcsr %1\n\t"
+	   "fnclex"
+	   : "=m" (*envp), "=m" (envp->__mxcsr));
 
   /* Set the SSE MXCSR register.  */
   mxcsr = (envp->__mxcsr | 0x1f80) & ~0x3f;