[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[patches] Fix up feholdexcept for powerpc soft-float 2.5 branch



May I commit this fairly obvious patch?  It's the remaining difference
between the nofpu support code on 2.5 and 2.6.

-- 
Daniel Jacobowitz
CodeSourcery

Index: sysdeps/powerpc/nofpu/feholdexcpt.c
===================================================================
--- sysdeps/powerpc/nofpu/feholdexcpt.c	(revision 179212)
+++ sysdeps/powerpc/nofpu/feholdexcpt.c	(working copy)
@@ -1,6 +1,6 @@
 /* Store current floating-point environment and clear exceptions
    (soft-float edition).
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007 Free Software Foundation, Inc.
    Contributed by Aldy Hernandez <aldyh@xxxxxxxxxx>, 2002.
    This file is part of the GNU C Library.
 
@@ -33,11 +33,12 @@ feholdexcept (fenv_t *envp)
   u.fenv = *envp;
   /* Clear everything except the rounding mode.  */
   u.l[0] &= 0x3;
-
-  /* ?? Should we clear the disabled exceptions as well ?? */
+  /* Disable exceptions */
+  u.l[1] = FE_ALL_EXCEPT;
 
   /* Put the new state in effect.  */
-  fesetenv (envp);
+  fesetenv (&u.fenv);
 
   return 0;
 }
+libm_hidden_def (feholdexcept)
Index: ChangeLog.eglibc
===================================================================
--- ChangeLog.eglibc	(revision 179212)
+++ ChangeLog.eglibc	(working copy)
@@ -1,3 +1,11 @@
+2007-08-20  Daniel Jacobowitz  <dan@xxxxxxxxxxxxxxxx>
+
+	Backport:
+	2007-05-23  Steven Munroe  <sjmunroe@xxxxxxxxxx>
+        * sysdeps/powerpc/nofpu/feholdexcpt.c (feholdexcept): Disable
+        exceptions.  Use the updated env in fesetenv().
+        Add libm_hidden_def.
+
 2007-08-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	Backport: