From 7dd075985acafa118657ef592334593204e3b135 Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@cvs.openbsd.org>
Date: Fri, 19 Aug 2011 15:44:37 +0000
Subject: Bring libc and libm in line with the compiler now that we no longer
 have a 128-bit long double.  Diff committed on behalf of martynas@

---
 sys/arch/hppa64/include/float.h | 20 ++++++++++----------
 sys/arch/hppa64/include/ieee.h  | 30 +-----------------------------
 2 files changed, 11 insertions(+), 39 deletions(-)

(limited to 'sys/arch/hppa64')

diff --git a/sys/arch/hppa64/include/float.h b/sys/arch/hppa64/include/float.h
index 8c7b4e7abb0..26f275082b8 100644
--- a/sys/arch/hppa64/include/float.h
+++ b/sys/arch/hppa64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 2011/08/19 15:44:36 kettenis Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -64,14 +64,14 @@ __END_DECLS
 #define	DBL_MAX		1.7976931348623157E+308
 #define	DBL_MAX_10_EXP	308
 
-#define	LDBL_MANT_DIG	113
-#define	LDBL_EPSILON	1.9259299443872358530559779425849273E-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
+#define	LDBL_MANT_DIG	DBL_MANT_DIG
+#define	LDBL_EPSILON	DBL_EPSILON
+#define	LDBL_DIG	DBL_DIG
+#define	LDBL_MIN_EXP	DBL_MIN_EXP
+#define	LDBL_MIN	DBL_MIN
+#define	LDBL_MIN_10_EXP	DBL_MIN_10_EXP
+#define	LDBL_MAX_EXP	DBL_MAX_EXP
+#define	LDBL_MAX	DBL_MAX
+#define	LDBL_MAX_10_EXP	DBL_MAX_10_EXP
 
 #endif /* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/hppa64/include/ieee.h b/sys/arch/hppa64/include/ieee.h
index f61c962b11a..18386cec0c9 100644
--- a/sys/arch/hppa64/include/ieee.h
+++ b/sys/arch/hppa64/include/ieee.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee.h,v 1.2 2008/09/07 20:36:06 martynas Exp $	*/
+/*	$OpenBSD: ieee.h,v 1.3 2011/08/19 15:44:36 kettenis Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -87,22 +87,6 @@
 #define	E80_FRACBITS	64
 #endif
 
-#define	EXT_EXPBITS	15
-#define	EXT_FRACHBITS	16
-#define	EXT_FRACHMBITS	32
-#define	EXT_FRACLMBITS	32
-#define	EXT_FRACLBITS	32
-#define	EXT_FRACBITS	112
-
-#define	EXT_IMPLICIT_NBIT
-
-#define	EXT_TO_ARRAY32(p, a) do {		\
-	(a)[0] = (uint32_t)(p)->ext_fracl;	\
-	(a)[1] = (uint32_t)(p)->ext_fraclm;	\
-	(a)[2] = (uint32_t)(p)->ext_frachm;	\
-	(a)[3] = (uint32_t)(p)->ext_frach;	\
-} while(0)
-
 struct ieee_single {
 	u_int	sng_sign:1;
 	u_int	sng_exp:8;
@@ -116,15 +100,6 @@ struct ieee_double {
 	u_int	dbl_fracl;
 };
 
-struct ieee_ext {
-	u_int	ext_sign:1;
-	u_int	ext_exp:15;
-	u_int	ext_frach:16;
-	u_int	ext_frachm;
-	u_int	ext_fraclm;
-	u_int	ext_fracl;
-};
-
 /*
  * Floats whose exponent is in [1..INFNAN) (of whatever type) are
  * `normal'.  Floats whose exponent is INFNAN are either Inf or NaN.
@@ -136,12 +111,10 @@ struct ieee_ext {
  */
 #define	SNG_EXP_INFNAN	255
 #define	DBL_EXP_INFNAN	2047
-#define	EXT_EXP_INFNAN	32767
 
 #if 0
 #define	SNG_QUIETNAN	(1 << 22)
 #define	DBL_QUIETNAN	(1 << 19)
-#define	EXT_QUIETNAN	(1 << 15)
 #endif
 
 /*
@@ -149,4 +122,3 @@ struct ieee_ext {
  */
 #define	SNG_EXP_BIAS	127
 #define	DBL_EXP_BIAS	1023
-#define	EXT_EXP_BIAS	16383
-- 
cgit v1.2.3