 @@ -1,14 +1,14 @@
-/*	$NetBSD: s_nearbyint.c,v 1.1 2013/02/09 19:37:48 christos Exp $	*/
+/*	$NetBSD: s_nearbyint.c,v 1.2 2013/02/09 23:14:44 christos Exp $	*/
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,42 +20,45 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/msun/src/s_nearbyint.c,v 1.2 2008/01/14 02:12:06 das Exp $");
 #else
-__RCSID("$NetBSD: s_nearbyint.c,v 1.1 2013/02/09 19:37:48 christos Exp $");
+__RCSID("$NetBSD: s_nearbyint.c,v 1.2 2013/02/09 23:14:44 christos Exp $");
 #endif
 #include <machine/ieee.h>
 #include <fenv.h>
 #include <math.h>
 /*
  * We save and restore the floating-point environment to avoid raising
  * an inexact exception.  We can get away with using fesetenv()
  * instead of feclearexcept()/feupdateenv() to restore the environment
  * because the only exception defined for rint() is overflow, and
  * rounding can't overflow as long as emax >= p.
  */
 #define	DECL(type, fn, rint)	\
 type				\
 fn(type x)			\
 {				\
 	type ret;		\
 	fenv_t env;		\
+				\
 	fegetenv(&env);		\
 	ret = rint(x);		\
 	fesetenv(&env);		\
 	return (ret);		\
+}
 DECL(double, nearbyint, rint)
 DECL(float, nearbyintf, rintf)
 #ifdef EXT_FRACBITS
 DECL(long double, nearbyintl, rintl)
 #endif

 @@ -1,66 +1,66 @@
-/*	$NetBSD: s_nexttowardf.c,v 1.2 2013/02/09 20:19:13 christos Exp $	*/
+/*	$NetBSD: s_nexttowardf.c,v 1.3 2013/02/09 23:14:44 christos Exp $	*/
 /*
  * ====================================================
  * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
  * Developed at SunPro, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
  * is preserved.
  * ====================================================
  */
 #include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/msun/src/s_nexttowardf.c,v 1.3 2011/02/10 07:38:38 das Exp $");
 #else
-__RCSID("$NetBSD: s_nexttowardf.c,v 1.2 2013/02/09 20:19:13 christos Exp $");
+__RCSID("$NetBSD: s_nexttowardf.c,v 1.3 2013/02/09 23:14:44 christos Exp $");
 #endif
 #include <string.h>
 #include <float.h>
 #include <machine/ieee.h>
 #include "math.h"
 #include "math_private.h"
 #ifdef EXT_EXP_INFNAN
 float
 nexttowardf(float x, long double y)
+{
 	volatile float t;
 	int32_t hx,ix;
 	union ieee_ext_u uy;
 	GET_FLOAT_WORD(hx,x);
 	ix = hx&0x7fffffff;		/* |x| */
-	memset(&u, 0, sizeof u);
+	memset(&uy, 0, sizeof(uy));
 	uy.extu_ld = y;
 	uy.extu_ext.ext_frach &= ~0x80000000;
         union ieee_single_u u[2];
 	if((ix>0x7f800000) ||
 	   (uy.extu_ext.ext_exp == EXT_EXP_INFNAN &&
-	    (uy.extu_ext.ext_frach | uy.extu_ext.ext_fracl) != 0)
+	    (uy.extu_ext.ext_frach | uy.extu_ext.ext_fracl) != 0))
 	   return x+y;	/* x or y is nan */
 	if(x==y) return (float)y;		/* x=y, return y */
 	if(ix==0) {				/* x == 0 */
 	    SET_FLOAT_WORD(x,(uy.extu_ext.ext_sign<<31)|1);/* return +-minsubnormal */
 	    t = x*x;
 	    if(t==x) return t; else return x;	/* raise underflow flag */
+	}
-	if(hx>=0 ^ x < y)			/* x -= ulp */
+	if((hx >= 0) ^ (x < y))			/* x -= ulp */
 	    hx -= 1;
 	else					/* x += ulp */
 	    hx += 1;
 	ix = hx&0x7f800000;
 	if(ix>=0x7f800000) return x+x;	/* overflow  */
 	if(ix<0x00800000) {		/* underflow */
 	    t = x*x;
 	    if(t!=x) {		/* raise underflow flag */
 	        SET_FLOAT_WORD(x,hx);
 		return x;
+	    }
+	}
 	SET_FLOAT_WORD(x,hx);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: s_rintl.c,v 1.2 2013/02/09 22:33:13 christos Exp $	*/
+/*	$NetBSD: s_rintl.c,v 1.3 2013/02/09 23:14:44 christos Exp $	*/
 /*-
  * Copyright (c) 2008 David Schultz <das@FreeBSD.ORG>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,31 +20,34 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/lib/msun/src/s_rintl.c,v 1.5 2008/02/22 11:59:05 bde Exp $");
 #else
-__RCSID("$NetBSD: s_rintl.c,v 1.2 2013/02/09 22:33:13 christos Exp $");
+__RCSID("$NetBSD: s_rintl.c,v 1.3 2013/02/09 23:14:44 christos Exp $");
 #endif
 #include <float.h>
-#include <math.h>
+#include <machine/ieee.h>
 #include "math.h"
 #include "math_private.h"
 #ifdef EXT_EXP_BIAS
 static const float
 shift[2] = {
 #if EXT_FRACBITS == 64
 x1.0p63, -0x1.0p63
 #elif EXT_FRACBITS == 113
 x1.0p112, -0x1.0p112
 #else
 #error "Unsupported long double format"
 #endif
 };
 static const float zero[2] = { 0.0, -0.0 };