From 3bfabf618f89c1e14076f0a94a54e1e9d40a7788 Mon Sep 17 00:00:00 2001
From: martynas <martynas@openbsd.org>
Date: Thu, 24 Jul 2008 19:00:11 +0000
Subject: [PATCH] remove.  math has isnormal, isgreater, isgreaterequal,
 isless, islessequal, isunordered.  tested by me and sthen@ ok sthen@

---
 emulators/qemu/Makefile                       |  4 +--
 .../qemu/patches/patch-fpu_softfloat-native_c | 11 --------
 .../qemu/patches/patch-fpu_softfloat-native_h | 14 +++-------
 emulators/qemu/patches/patch-gnu-c99-math_h   | 27 -------------------
 4 files changed, 6 insertions(+), 50 deletions(-)
 delete mode 100644 emulators/qemu/patches/patch-fpu_softfloat-native_c
 delete mode 100644 emulators/qemu/patches/patch-gnu-c99-math_h

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 0d65285a643..d5cad62ec4a 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2008/06/19 05:51:17 todd Exp $
+# $OpenBSD: Makefile,v 1.36 2008/07/24 19:00:11 martynas Exp $
 
 # no success building on other archs yet
 ONLY_FOR_ARCHS=		amd64 i386 powerpc
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS=		amd64 i386 powerpc
 COMMENT=		multi system emulator
 
 DISTNAME=		qemu-0.9.1
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 CATEGORIES=		emulators
 
 HOMEPAGE=		http://bellard.org/qemu/
diff --git a/emulators/qemu/patches/patch-fpu_softfloat-native_c b/emulators/qemu/patches/patch-fpu_softfloat-native_c
deleted file mode 100644
index 7c56f43f28f..00000000000
--- a/emulators/qemu/patches/patch-fpu_softfloat-native_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-fpu_softfloat-native_c,v 1.2 2007/05/01 12:55:14 todd Exp $
---- fpu/softfloat-native.c.orig	Mon Feb  5 17:01:54 2007
-+++ fpu/softfloat-native.c	Sat Mar 10 16:39:39 2007
-@@ -1,6 +1,7 @@
- /* Native implementation of soft float functions. Only a single status
-    context is supported */
- #include "softfloat.h"
-+#include "gnu-c99-math.h"
- #include <math.h>
- 
- void set_float_rounding_mode(int val STATUS_PARAM)
diff --git a/emulators/qemu/patches/patch-fpu_softfloat-native_h b/emulators/qemu/patches/patch-fpu_softfloat-native_h
index 63c0860763c..1d187351e52 100644
--- a/emulators/qemu/patches/patch-fpu_softfloat-native_h
+++ b/emulators/qemu/patches/patch-fpu_softfloat-native_h
@@ -1,13 +1,7 @@
-$OpenBSD: patch-fpu_softfloat-native_h,v 1.4 2008/04/28 22:52:38 todd Exp $
---- fpu/softfloat-native.h.orig	Sun Jan  6 14:38:42 2008
-+++ fpu/softfloat-native.h	Tue Apr  1 01:33:39 2008
-@@ -1,4 +1,5 @@
- /* Native implementation of soft float functions */
-+#include "gnu-c99-math.h"
- #include <math.h>
- 
- #if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
-@@ -84,6 +85,11 @@ typedef union {
+$OpenBSD: patch-fpu_softfloat-native_h,v 1.5 2008/07/24 19:00:11 martynas Exp $
+--- fpu/softfloat-native.h.orig	Sun Jan  6 21:38:42 2008
++++ fpu/softfloat-native.h	Thu Jul 24 21:41:56 2008
+@@ -84,6 +84,11 @@ typedef union {
  | Software IEC/IEEE floating-point rounding mode.
  *----------------------------------------------------------------------------*/
  #if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
diff --git a/emulators/qemu/patches/patch-gnu-c99-math_h b/emulators/qemu/patches/patch-gnu-c99-math_h
deleted file mode 100644
index 93bd1cce118..00000000000
--- a/emulators/qemu/patches/patch-gnu-c99-math_h
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-gnu-c99-math_h,v 1.4 2007/05/01 12:55:14 todd Exp $
---- gnu-c99-math.h.orig	Sat Mar 10 16:39:40 2007
-+++ gnu-c99-math.h	Sat Mar 10 16:39:40 2007
-@@ -0,0 +1,23 @@
-+#if (defined(__sun__) || defined(__OpenBSD__)) && defined(__GNUC__)
-+
-+/*
-+ * C99 7.12.3 classification macros
-+ * and
-+ * C99 7.12.14 comparison macros
-+ *
-+ * ... do not work on Solaris 10 using GNU CC 3.4.x.
-+ * Try to workaround the missing / broken C99 math macros.
-+ */
-+#include <ieeefp.h>
-+#include <float.h>
-+
-+#define isnormal(x)		(fabs(x) < DBL_EPSILON && !isnan(x) && !isinf(x))
-+
-+#define	isgreater(x, y)		((x) > (y))
-+#define	isgreaterequal(x, y)	((x) >= (y))
-+#define	isless(x, y)		((x) < (y))
-+#define	islessequal(x, y)	((x) <= (y))
-+
-+#define	isunordered(x,y)	(isnan(x) || isnan(y))
-+
-+#endif