[src/netbsd-6]: src/lib/libm/arch Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6c301bfd8f8d
branches:  netbsd-6
changeset: 774419:6c301bfd8f8d
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 12 18:53:11 2012 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #477):
        lib/libm/arch/i387/fenv.c: revision 1.4
        lib/libm/arch/x86_64/fenv.c: revision 1.2
Mask off the result of feenableexcept and fedisableexcept on x86.
These shouldn't return bits outside FE_ALL_EXCEPT.

diffstat:

 lib/libm/arch/i387/fenv.c   |  8 ++++----
 lib/libm/arch/x86_64/fenv.c |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 9e19d13f0570 -r 6c301bfd8f8d lib/libm/arch/i387/fenv.c
--- a/lib/libm/arch/i387/fenv.c Sun Aug 12 18:51:09 2012 +0000
+++ b/lib/libm/arch/i387/fenv.c Sun Aug 12 18:53:11 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.c,v 1.3 2010/08/01 06:34:38 taca Exp $ */
+/* $NetBSD: fenv.c,v 1.3.8.1 2012/08/12 18:53:11 martin Exp $ */
 
 /*-
  * Copyright (c) 2004-2005 David Schultz <das%FreeBSD.ORG@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.3 2010/08/01 06:34:38 taca Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.3.8.1 2012/08/12 18:53:11 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -472,7 +472,7 @@
                __ldmxcsr(mxcsr);
        }
 
-       return (~omask);
+       return (FE_ALL_EXCEPT & ~omask);
 }
 
 int
@@ -496,7 +496,7 @@
                __ldmxcsr(mxcsr);
        }
 
-       return (~omask);
+       return (FE_ALL_EXCEPT & ~omask);
 }
 
 int
diff -r 9e19d13f0570 -r 6c301bfd8f8d lib/libm/arch/x86_64/fenv.c
--- a/lib/libm/arch/x86_64/fenv.c       Sun Aug 12 18:51:09 2012 +0000
+++ b/lib/libm/arch/x86_64/fenv.c       Sun Aug 12 18:53:11 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.c,v 1.1 2010/07/31 21:47:53 joerg Exp $ */
+/* $NetBSD: fenv.c,v 1.1.8.1 2012/08/12 18:53:11 martin Exp $ */
 
 /*-
  * Copyright (c) 2004-2005 David Schultz <das (at) FreeBSD.ORG>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: fenv.c,v 1.1 2010/07/31 21:47:53 joerg Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.1.8.1 2012/08/12 18:53:11 martin Exp $");
 
 #include <assert.h>
 #include <fenv.h>
@@ -483,7 +483,7 @@
        mxcsr &= ~(mask << _SSE_EMASK_SHIFT);
        __ldmxcsr(mxcsr);
 
-       return (~omask);
+       return (FE_ALL_EXCEPT & ~omask);
 
 }
 
@@ -505,7 +505,7 @@
        mxcsr |= mask << _SSE_EMASK_SHIFT;
        __ldmxcsr(mxcsr);
 
-       return (~omask);
+       return (FE_ALL_EXCEPT & ~omask);
 }
 
 int