[src/trunk]: src/lib/libm/arch/i387 Fix merge error: drop machine from an old...

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

details:   https://anonhg.NetBSD.org/src/rev/42fb7eb449c8
branches:  trunk
changeset: 756767:42fb7eb449c8
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Jul 31 22:14:18 2010 +0000

description:
Fix merge error: drop machine from an older workaround for machine.sse
under compat32, drop the assertion, initialize oldlen.

diffstat:

 lib/libm/arch/i387/fenv.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (32 lines):

diff -r 5aee6b6471ad -r 42fb7eb449c8 lib/libm/arch/i387/fenv.c
--- a/lib/libm/arch/i387/fenv.c Sat Jul 31 21:47:52 2010 +0000
+++ b/lib/libm/arch/i387/fenv.c Sat Jul 31 22:14:18 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.c,v 1.1 2010/07/31 21:47:53 joerg Exp $ */
+/* $NetBSD: fenv.c,v 1.2 2010/07/31 22:14:18 joerg 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.1 2010/07/31 21:47:53 joerg Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.2 2010/07/31 22:14:18 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -119,12 +119,10 @@
 
 static void __test_sse(void)
 {
-       char machine[64];
-       size_t oldlen;
+       size_t oldlen = sizeof(HAS_SSE);
        int rv;
 
        rv = sysctlbyname("machdep.sse", &__HAS_SSE, &oldlen, NULL, 0);
-       _DIAGASSERT(rv != -1);
        if (rv == -1)
                __HAS_SSE = 0;
 }