CVS commit: src/lib/libm/arch/i387

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Sat Jul 31 22:14:18 UTC 2010

Modified Files:
        src/lib/libm/arch/i387: fenv.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/arch/i387/fenv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/lib/libm/arch/i387/fenv.c
diff -u src/lib/libm/arch/i387/fenv.c:1.1 src/lib/libm/arch/i387/fenv.c:1.2
--- src/lib/libm/arch/i387/fenv.c:1.1	Sat Jul 31 21:47:53 2010
+++ src/lib/libm/arch/i387/fenv.c	Sat Jul 31 22:14:18 2010
@@ -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 <d...@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.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;
 }