[commits] r2198 - in /fsf/trunk/libc: ChangeLog sysdeps/ia64/fpu/fraiseexcpt.c sysdeps/s390/fpu/feholdexcpt.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu May 10 00:02:17 2007
New Revision: 2198

Log:
Import glibc-mainline for 2007-05-10

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/ia64/fpu/fraiseexcpt.c
    fsf/trunk/libc/sysdeps/s390/fpu/feholdexcpt.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu May 10 00:02:17 2007
@@ -1,3 +1,12 @@
+2007-05-09  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
+	exception in addition to inexact when asked to raise only FE_INEXACT.
+
+	[BZ #3427]
+	* sysdeps/s390/fpu/feholdexcpt.c (feholdexcept): Don't clear exceptions
+	in *envp.
+
 2007-05-07  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #4403]

Modified: fsf/trunk/libc/sysdeps/ia64/fpu/fraiseexcpt.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ia64/fpu/fraiseexcpt.c (original)
+++ fsf/trunk/libc/sysdeps/ia64/fpu/fraiseexcpt.c Thu May 10 00:02:17 2007
@@ -1,5 +1,6 @@
 /* Raise given exceptions.
-   Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000, 2001, 2002, 2007
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jes Sorensen <Jes.Sorensen@xxxxxxx>, 2000.
 
@@ -70,7 +71,7 @@
   if (FE_INEXACT & excepts)
     {
       dummy = DBL_MAX;
-      __asm__ __volatile__ ("fadd.d.s0 %0=%1,f1" : "=f" (dummy) : "0" (dummy));
+      __asm__ __volatile__ ("fsub.d.s0 %0=%1,f1" : "=f" (dummy) : "0" (dummy));
     }
 
   /* Success.  */

Modified: fsf/trunk/libc/sysdeps/s390/fpu/feholdexcpt.c
==============================================================================
--- fsf/trunk/libc/sysdeps/s390/fpu/feholdexcpt.c (original)
+++ fsf/trunk/libc/sysdeps/s390/fpu/feholdexcpt.c Thu May 10 00:02:17 2007
@@ -1,5 +1,5 @@
 /* Store current floating-point environment and clear exceptions.
-   Copyright (C) 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2005, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Denis Joseph Barrow (djbarrow@xxxxxxxxxx).
 
@@ -23,13 +23,14 @@
 
 int feholdexcept (fenv_t *envp)
 {
+  fexcept_t fpc;
   /* Store the environment.  */
   fegetenv (envp);
   /* Clear the current sticky bits as more than one exception
      may be generated.  */
-  envp->fpc &= ~(FPC_FLAGS_MASK | FPC_DXC_MASK);
+  fpc = envp->fpc & ~(FPC_FLAGS_MASK | FPC_DXC_MASK);
   /* Hold from generating fpu exceptions temporarily.  */
-  _FPU_SETCW ((envp->fpc & ~(FE_ALL_EXCEPT << FPC_EXCEPTION_MASK_SHIFT)));
+  _FPU_SETCW ((fpc & ~(FE_ALL_EXCEPT << FPC_EXCEPTION_MASK_SHIFT)));
   return 0;
 }
 libm_hidden_def (feholdexcept)