- add proper double_t and float_t definitions for each arch

- math.h shouldn't define FLT_EVAL_METHOD, but float.h should (per
C99).  remove from math.h, and add proper definitions in float.h
ok millert@

29 files changed, 74 insertions, 34 deletions

diff --git a/include/math.h b/include/math.h
index 7c039b09b15..665f22c76a4 100644
--- a/include/math.h
+++ b/include/math.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: math.h,v 1.16 2008/07/16 15:01:19 martynas Exp $	*/
+/*	$OpenBSD: math.h,v 1.17 2008/07/21 20:50:54 martynas Exp $	*/
 /*
  * ====================================================
  * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -17,6 +17,7 @@
 #ifndef _MATH_H_
 #define _MATH_H_
 
+#include <sys/_types.h>
 #include <sys/cdefs.h>
 
 /*
@@ -29,11 +30,8 @@ extern char __infinity[];
  * C99
  */
 
-/* XXX just appease the committee for now, needs proper defs... */
-
-typedef float float_t;
-typedef double double_t;
-#define FLT_EVAL_METHOD (-1)
+typedef __double_t	double_t;
+typedef __float_t	float_t;
 
 /*
  * XOPEN/SVID
diff --git a/sys/arch/alpha/include/_types.h b/sys/arch/alpha/include/_types.h
index aa00ab491b3..e05901e0a3f 100644
--- a/sys/arch/alpha/include/_types.h
+++ b/sys/arch/alpha/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.9 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.10 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef double			__double_t;
+typedef float			__float_t;
 typedef long			__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/alpha/include/float.h b/sys/arch/alpha/include/float.h
index 94fa7b2ecb1..7033150e8b5 100644
--- a/sys/arch/alpha/include/float.h
+++ b/sys/arch/alpha/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.6 2003/06/02 23:27:43 millert Exp $	*/
+/*	$OpenBSD: float.h,v 1.7 2008/07/21 20:50:54 martynas Exp $	*/
 /*	$NetBSD: float.h,v 1.4 1995/06/20 20:45:22 jtc Exp $	*/
 
 /*
@@ -41,6 +41,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/amd64/include/_types.h b/sys/arch/amd64/include/_types.h
index ad32a2a8138..772c5291238 100644
--- a/sys/arch/amd64/include/_types.h
+++ b/sys/arch/amd64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.4 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.5 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef	double			__double_t;
+typedef	float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/amd64/include/float.h b/sys/arch/amd64/include/float.h
index c9e8d6a4893..6050cd4fa76 100644
--- a/sys/arch/amd64/include/float.h
+++ b/sys/arch/amd64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.2 2006/10/01 18:16:54 kettenis Exp $	*/
+/*	$OpenBSD: float.h,v 1.3 2008/07/21 20:50:54 martynas Exp $	*/
 /*	$NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $	*/
 
 /*
@@ -43,6 +43,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/arm/include/_types.h b/sys/arch/arm/include/_types.h
index ea013402cad..2586c872d12 100644
--- a/sys/arch/arm/include/_types.h
+++ b/sys/arch/arm/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.5 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.6 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef double			__double_t;
+typedef float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/arm/include/float.h b/sys/arch/arm/include/float.h
index 0795daaad25..46d7792966e 100644
--- a/sys/arch/arm/include/float.h
+++ b/sys/arch/arm/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
+/*	$OpenBSD: float.h,v 1.3 2008/07/21 20:50:54 martynas Exp $	*/
 /*	$NetBSD: float.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
 
 /*
@@ -56,6 +56,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-7F	/* b**(1-p) */
diff --git a/sys/arch/hppa/include/_types.h b/sys/arch/hppa/include/_types.h
index c1b8062d201..a25871e696e 100644
--- a/sys/arch/hppa/include/_types.h
+++ b/sys/arch/hppa/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.9 2008/04/27 14:36:38 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.10 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -101,6 +101,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef double			__double_t;
+typedef float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/hppa/include/float.h b/sys/arch/hppa/include/float.h
index a9f06b68e1a..490231408e3 100644
--- a/sys/arch/hppa/include/float.h
+++ b/sys/arch/hppa/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.8 2007/07/16 21:20:03 jason Exp $	*/
+/*	$OpenBSD: float.h,v 1.9 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -42,6 +42,7 @@ __END_DECLS
 
 #define	FLT_RADIX	2
 #define	FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define	FLT_MANT_DIG	24
 #define	FLT_EPSILON	1.19209290E-07F
diff --git a/sys/arch/hppa64/include/_types.h b/sys/arch/hppa64/include/_types.h
index 02b161c0eff..540fc9bd27d 100644
--- a/sys/arch/hppa64/include/_types.h
+++ b/sys/arch/hppa64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.3 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.4 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -101,6 +101,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef double			__double_t;
+typedef float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/hppa64/include/float.h b/sys/arch/hppa64/include/float.h
index 4260471309c..b6c689c8444 100644
--- a/sys/arch/hppa64/include/float.h
+++ b/sys/arch/hppa64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.1 2005/04/01 10:40:48 mickey Exp $	*/
+/*	$OpenBSD: float.h,v 1.2 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -42,6 +42,7 @@ __END_DECLS
 
 #define	FLT_RADIX	2
 #define	FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define	FLT_MANT_DIG	24
 #define	FLT_EPSILON	1.19209290E-07F
diff --git a/sys/arch/i386/include/_types.h b/sys/arch/i386/include/_types.h
index 81481c9162f..84998e0556d 100644
--- a/sys/arch/i386/include/_types.h
+++ b/sys/arch/i386/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.8 2008/05/07 20:42:02 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.9 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef long double		__double_t;
+typedef long double		__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/i386/include/float.h b/sys/arch/i386/include/float.h
index fd74a076d5d..e2f99895e0c 100644
--- a/sys/arch/i386/include/float.h
+++ b/sys/arch/i386/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.6 2006/10/01 18:14:40 kettenis Exp $	*/
+/*	$OpenBSD: float.h,v 1.7 2008/07/21 20:50:54 martynas Exp $	*/
 /*	$NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $	*/
 
 /*
@@ -43,6 +43,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	2		/* long double */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/m68k/include/_types.h b/sys/arch/m68k/include/_types.h
index 4073832a445..485460e8657 100644
--- a/sys/arch/m68k/include/_types.h
+++ b/sys/arch/m68k/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.6 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.7 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef long double		__double_t;
+typedef long double		__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/m68k/include/float.h b/sys/arch/m68k/include/float.h
index 114cb739c79..cf252b96b1b 100644
--- a/sys/arch/m68k/include/float.h
+++ b/sys/arch/m68k/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.5 2003/06/02 23:27:48 millert Exp $	*/
+/*	$OpenBSD: float.h,v 1.6 2008/07/21 20:50:54 martynas Exp $	*/
 /*	$NetBSD: float.h,v 1.10 1995/06/20 20:45:41 jtc Exp $	*/
 
 /*
@@ -43,6 +43,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	2		/* long double */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/m88k/include/_types.h b/sys/arch/m88k/include/_types.h
index 718e177981e..4c27f7769de 100644
--- a/sys/arch/m88k/include/_types.h
+++ b/sys/arch/m88k/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.4 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.5 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef long double		__double_t;
+typedef long double		__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/m88k/include/float.h b/sys/arch/m88k/include/float.h
index e21d2ea9527..e6c0d7f3240 100644
--- a/sys/arch/m88k/include/float.h
+++ b/sys/arch/m88k/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.1 2004/04/26 12:34:05 miod Exp $	*/
+/*	$OpenBSD: float.h,v 1.2 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -42,6 +42,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	2		/* long double */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/mips64/include/_types.h b/sys/arch/mips64/include/_types.h
index 37ad2cde899..4531dfd5efb 100644
--- a/sys/arch/mips64/include/_types.h
+++ b/sys/arch/mips64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.4 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.5 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -101,6 +101,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef double			__double_t;
+typedef float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/mips64/include/float.h b/sys/arch/mips64/include/float.h
index de2a1353966..f3fe1b0ed1e 100644
--- a/sys/arch/mips64/include/float.h
+++ b/sys/arch/mips64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.3 2005/08/07 07:29:44 miod Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 2008/07/21 20:50:54 martynas Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,6 +42,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/powerpc/include/_types.h b/sys/arch/powerpc/include/_types.h
index a89a4434cb3..9d3a51f6e95 100644
--- a/sys/arch/powerpc/include/_types.h
+++ b/sys/arch/powerpc/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.7 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.8 2008/07/21 20:50:55 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef double			__double_t;
+typedef float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/powerpc/include/float.h b/sys/arch/powerpc/include/float.h
index 73328987b45..38b4e0b8e17 100644
--- a/sys/arch/powerpc/include/float.h
+++ b/sys/arch/powerpc/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.7 2003/06/02 23:27:53 millert Exp $	*/
+/*	$OpenBSD: float.h,v 1.8 2008/07/21 20:50:55 martynas Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -42,6 +42,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/sh/include/_types.h b/sys/arch/sh/include/_types.h
index 7756280fc4c..b9006b473be 100644
--- a/sys/arch/sh/include/_types.h
+++ b/sys/arch/sh/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.5 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.6 2008/07/21 20:50:55 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef double			__double_t;
+typedef float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/sh/include/float.h b/sys/arch/sh/include/float.h
index b39dd8fe6ff..9d8f67f7f06 100644
--- a/sys/arch/sh/include/float.h
+++ b/sys/arch/sh/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.1 2006/10/06 21:02:55 miod Exp $	*/
+/*	$OpenBSD: float.h,v 1.2 2008/07/21 20:50:55 martynas Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -42,6 +42,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/sparc/include/_types.h b/sys/arch/sparc/include/_types.h
index b2ef3e869a4..0353ef1e1ae 100644
--- a/sys/arch/sparc/include/_types.h
+++ b/sys/arch/sparc/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.8 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.9 2008/07/21 20:50:55 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef double			__double_t;
+typedef float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/sparc/include/float.h b/sys/arch/sparc/include/float.h
index 786302745be..5bf1736cf8d 100644
--- a/sys/arch/sparc/include/float.h
+++ b/sys/arch/sparc/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.5 2003/06/02 23:27:54 millert Exp $	*/
+/*	$OpenBSD: float.h,v 1.6 2008/07/21 20:50:55 martynas Exp $	*/
 /*	$NetBSD: float.h,v 1.6 1997/07/18 05:11:52 thorpej Exp $ */
 
 /*
@@ -52,6 +52,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/sparc64/include/_types.h b/sys/arch/sparc64/include/_types.h
index c9b18cf22b6..38510638a6b 100644
--- a/sys/arch/sparc64/include/_types.h
+++ b/sys/arch/sparc64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.7 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.8 2008/07/21 20:50:55 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -99,6 +99,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef	double			__double_t;
+typedef	float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/sparc64/include/float.h b/sys/arch/sparc64/include/float.h
index 7e7e5efb493..a65587d8b65 100644
--- a/sys/arch/sparc64/include/float.h
+++ b/sys/arch/sparc64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.4 2003/06/02 23:27:56 millert Exp $	*/
+/*	$OpenBSD: float.h,v 1.5 2008/07/21 20:50:55 martynas Exp $	*/
 /*	$NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp $ */
 
 /*
@@ -52,6 +52,7 @@ __END_DECLS
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
diff --git a/sys/arch/vax/include/_types.h b/sys/arch/vax/include/_types.h
index 88f19e3b5be..678bd907faf 100644
--- a/sys/arch/vax/include/_types.h
+++ b/sys/arch/vax/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.7 2007/05/16 17:27:30 art Exp $	*/
+/*	$OpenBSD: _types.h,v 1.8 2008/07/21 20:50:55 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -93,6 +93,8 @@ typedef unsigned long		__psize_t;
 /* Standard system types */
 typedef int			__clock_t;
 typedef int			__clockid_t;
+typedef	double			__double_t;
+typedef	float			__float_t;
 typedef long long		__off_t;
 typedef long			__ptrdiff_t;
 typedef	unsigned long		__size_t;
diff --git a/sys/arch/vax/include/float.h b/sys/arch/vax/include/float.h
index ffcf2df33ea..c9f76c10468 100644
--- a/sys/arch/vax/include/float.h
+++ b/sys/arch/vax/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.6 2003/06/02 23:27:57 millert Exp $	*/
+/*	$OpenBSD: float.h,v 1.7 2008/07/21 20:50:55 martynas Exp $	*/
 /*	$NetBSD: float.h,v 1.5 1998/10/10 02:13:55 matt Exp $	*/
 
 /*
@@ -37,6 +37,7 @@
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	1		/* FP addition rounds to nearest */
+#define FLT_EVAL_METHOD	0		/* no promotions */
 
 #define FLT_MANT_DIG	24		/* p */
 #define FLT_EPSILON	1.19209290E-7F	/* b**(1-p) */