From 6c952c0d189bb38fe67d955b932c2d75fa8c942e Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Sat, 25 Oct 2008 09:23:50 +0000
Subject: [PATCH] move the float definitions all into <sparc/float.h> and make
 that version work in either 32 or 64 bit mode.

---
 sys/arch/sparc/include/float.h   | 36 +++++++++++++++++++++++++++++++-
 sys/arch/sparc64/include/float.h | 28 ++-----------------------
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/sys/arch/sparc/include/float.h b/sys/arch/sparc/include/float.h
index 571126b72d92..e7d2b35957c4 100644
--- a/sys/arch/sparc/include/float.h
+++ b/sys/arch/sparc/include/float.h
@@ -1,3 +1,37 @@
-/*	$NetBSD: float.h,v 1.10 2003/05/12 15:22:55 kleink Exp $ */
+/*	$NetBSD: float.h,v 1.11 2008/10/25 09:23:50 mrg Exp $ */
 
 #include <sys/float_ieee754.h>
+
+#ifndef _SPARC_FLOAT_H_
+#define _SPARC_FLOAT_H_
+
+#ifdef _LP64
+
+#define LDBL_MANT_DIG	113
+#define	LDBL_EPSILON	1.925929944387235853055977942584927319E-34L
+#define	LDBL_DIG	33
+#define	LDBL_MIN_EXP	(-16381)
+#define	LDBL_MIN	3.3621031431120935062626778173217526026E-4932L
+#define	LDBL_MIN_10_EXP	(-4931)
+#define	LDBL_MAX_EXP	16384
+#define	LDBL_MAX	1.1897314953572317650857593266280070162E4932L
+#define	LDBL_MAX_10_EXP	4932
+
+#endif	/* _LP64 */
+
+#include <sys/float_ieee754.h>
+
+#ifdef _LP64
+
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
+    !defined(_XOPEN_SOURCE) || \
+    ((__STDC_VERSION__ - 0) >= 199901L) || \
+    ((_POSIX_C_SOURCE - 0) >= 200112L) || \
+    ((_XOPEN_SOURCE  - 0) >= 600) || \
+    defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
+#define	DECIMAL_DIG	36
+#endif /* !defined(_ANSI_SOURCE) && ... */
+
+#endif	/* _LP64 */
+
+#endif	/* _SPARC64_FLOAT_H_ */
diff --git a/sys/arch/sparc64/include/float.h b/sys/arch/sparc64/include/float.h
index 54201ac4bec3..23c542e1ef32 100644
--- a/sys/arch/sparc64/include/float.h
+++ b/sys/arch/sparc64/include/float.h
@@ -1,27 +1,3 @@
-/*	$NetBSD: float.h,v 1.7 2005/12/11 12:19:10 christos Exp $ */
+/*	$NetBSD: float.h,v 1.8 2008/10/25 09:23:50 mrg Exp $ */
 
-#ifndef _SPARC64_FLOAT_H_
-#define _SPARC64_FLOAT_H_
-
-#define LDBL_MANT_DIG	113
-#define	LDBL_EPSILON	1.925929944387235853055977942584927319E-34L
-#define	LDBL_DIG	33
-#define	LDBL_MIN_EXP	(-16381)
-#define	LDBL_MIN	3.3621031431120935062626778173217526026E-4932L
-#define	LDBL_MIN_10_EXP	(-4931)
-#define	LDBL_MAX_EXP	16384
-#define	LDBL_MAX	1.1897314953572317650857593266280070162E4932L
-#define	LDBL_MAX_10_EXP	4932
-
-#include <sys/float_ieee754.h>
-
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_C_SOURCE) && \
-    !defined(_XOPEN_SOURCE) || \
-    ((__STDC_VERSION__ - 0) >= 199901L) || \
-    ((_POSIX_C_SOURCE - 0) >= 200112L) || \
-    ((_XOPEN_SOURCE  - 0) >= 600) || \
-    defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
-#define	DECIMAL_DIG	36
-#endif /* !defined(_ANSI_SOURCE) && ... */
-
-#endif	/* _SPARC64_FLOAT_H_ */
+#include <sparc/float.h>