[commits] r10453 - in /trunk/libc: ChangeLog sysdeps/sh/sh4/fpu/feholdexcpt.c

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu May 13 15:55:52 2010
New Revision: 10453

Log:
Merge changes between r10438 and r10452 from /fsf/trunk.

Modified:
    trunk/libc/ChangeLog
    trunk/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Thu May 13 15:55:52 2010
@@ -1,3 +1,8 @@
+2010-05-12  Andrew Stubbs  <ams@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/sh/sh4/fpu/feholdexcpt.c (feholdexcept): Really disable all
+	exceptions.  Return 0.
+
 2010-05-07  Roland McGrath  <roland@xxxxxxxxxx>
 
 	* elf/ldconfig.c (main): Add a const.

Modified: trunk/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c
==============================================================================
--- trunk/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c (original)
+++ trunk/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c Thu May 13 15:55:52 2010
@@ -1,5 +1,6 @@
 /* Store current floating-point environment and clear exceptions.
-   Copyright (C) 1997, 1998, 1999, 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2005, 2010
+   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
@@ -29,10 +30,15 @@
   _FPU_GETCW (temp);
   envp->__fpscr = temp;
 
+  /* Clear the status flags.  */
+  temp &= ~FE_ALL_EXCEPT;
+
   /* Now set all exceptions to non-stop.  */
-  temp &= ~FE_ALL_EXCEPT;
+  temp &= ~(FE_ALL_EXCEPT << 5);
+
   _FPU_SETCW (temp);
 
-  return 1;
+  /* Success.  */
+  return 0;
 }
 libm_hidden_def (feholdexcept)