diff --git a/sys/amd64/include/_types.h b/sys/amd64/include/_types.h
index 4217c82b060b..89d2e861b418 100644
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
@@ -64,7 +64,7 @@ typedef	__int32_t	__clock_t;		/* clock()... */
 typedef	unsigned int	__cpumask_t;
 typedef	__int64_t	__critical_t;
 typedef	double		__double_t;
-typedef	double		__float_t;
+typedef	float		__float_t;
 typedef	__int64_t	__intfptr_t;
 typedef	__int64_t	__intmax_t;
 typedef	__int64_t	__intptr_t;
diff --git a/sys/amd64/include/float.h b/sys/amd64/include/float.h
index 52b899f6e4ce..8f0d7136bba5 100644
--- a/sys/amd64/include/float.h
+++ b/sys/amd64/include/float.h
@@ -42,7 +42,7 @@ __END_DECLS
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	__flt_rounds()
 #if __ISO_C_VISIBLE >= 1999
-#define	FLT_EVAL_METHOD	(-1)		/* i387 semantics are...interesting */
+#define	FLT_EVAL_METHOD	0		/* no promotions */
 #define	DECIMAL_DIG	21		/* max precision in decimal digits */
 #endif