3 files changed, 23 insertions, 55 deletions

diff --git a/emulators/qemu/files/patch-configure b/emulators/qemu/files/patch-configure
deleted file mode 100644
index 1036edd69c21..000000000000
--- a/emulators/qemu/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: qemu/configure
-@@ -157,7 +157,7 @@
- fi
- 
- for opt do
--  optarg=`expr "$opt" : '[^=]*=\(.*\)'`
-+  optarg=`echo "$opt" |sed 's/^[^=]*=//'`
-   case "$opt" in
-   --help|-h) show_help=yes
-   ;;
diff --git a/emulators/qemu/files/patch-fbsd b/emulators/qemu/files/patch-fbsd
index 8a7823279624..88b01def0e4d 100644
--- a/emulators/qemu/files/patch-fbsd
+++ b/emulators/qemu/files/patch-fbsd
@@ -63,12 +63,24 @@ Index: qemu/fpu/softfloat-native.c
  #define llrint(d)		((long long)rint(d))
  #endif
 Index: qemu/fpu/softfloat-native.h
-@@ -1,7 +1,17 @@
+@@ -1,8 +1,28 @@
  /* Native implementation of soft float functions */
  #include <math.h>
--#if defined(_BSD) && !defined(__APPLE__)
-+#if defined(_BSD) && !defined(__APPLE__) && \
-+    (!defined(__FreeBSD__) || __FreeBSD_version < 500000)
+ 
+-#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
++#ifdef __FreeBSD__
++#include <osreldate.h>
++long double fabsl(long double x);
++long double remainderl(long double x, long double y);
++long double sqrtl(long double x);
++long double rintl(long double x);
++long lrintl(long double x);
++long long llrintl(long double x);
++#endif
++
++#if (defined(_BSD) && !defined(__APPLE__) && \
++     (!defined(__FreeBSD__) || __FreeBSD_version < 500000)) || \
++    defined(HOST_SOLARIS)
  #include <ieeefp.h>
 +#if defined(__FreeBSD__)
 +#define isgreater(x, y)		__builtin_isgreater((x), (y))
@@ -77,29 +89,21 @@ Index: qemu/fpu/softfloat-native.h
 +#define islessequal(x, y)	__builtin_islessequal((x), (y))
 +#define islessgreater(x, y)	__builtin_islessgreater((x), (y))
 +#define isunordered(x, y)	__builtin_isunordered((x), (y))
-+long double fabsl(long double x);
 +#endif
+ #define fabsf(f) ((float)fabs(f))
  #else
  #include <fenv.h>
- #endif
-@@ -33,12 +43,13 @@
+@@ -60,7 +80,9 @@
  /*----------------------------------------------------------------------------
  | Software IEC/IEEE floating-point rounding mode.
  *----------------------------------------------------------------------------*/
--#if defined(_BSD) && !defined(__APPLE__)
-+#if defined(_BSD) && !defined(__APPLE__) && \
-+    (!defined(__FreeBSD__) || __FreeBSD_version < 500000)
+-#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
++#if (defined(_BSD) && !defined(__APPLE__) && \
++     (!defined(__FreeBSD__) || __FreeBSD_version < 500000)) || \
++    defined(HOST_SOLARIS)
  enum {
      float_round_nearest_even = FP_RN,
--    float_round_down         = FE_RM,
--    float_round_up           = FE_RP,
--    float_round_to_zero      = FE_RZ
-+    float_round_down         = FP_RM,
-+    float_round_up           = FP_RP,
-+    float_round_to_zero      = FP_RZ
- };
- #elif defined(__arm__)
- enum {
+     float_round_down         = FP_RM,
 Index: qemu/fpu/softfloat.h
 @@ -84,7 +84,8 @@
  #define FLOAT128
diff --git a/emulators/qemu/files/patch-slirp-mbuf.c b/emulators/qemu/files/patch-slirp-mbuf.c
deleted file mode 100644
index 1bd32d6ad7dc..000000000000
--- a/emulators/qemu/files/patch-slirp-mbuf.c
+++ /dev/null
@@ -1,26 +0,0 @@
-# http://lists.gnu.org/archive/html/qemu-devel/2005-05/msg00228.html
-
-Index: qemu/slirp/mbuf.c
-@@ -146,18 +146,19 @@
-         struct mbuf *m;
-         int size;
- {
-+	int datasize;
-+
- 	/* some compiles throw up on gotos.  This one we can fake. */
-         if(m->m_size>size) return;
- 
-         if (m->m_flags & M_EXT) {
--	  /* datasize = m->m_data - m->m_ext; */
-+	  datasize = m->m_data - m->m_ext;
- 	  m->m_ext = (char *)realloc(m->m_ext,size);
- /*		if (m->m_ext == NULL)
-  *			return (struct mbuf *)NULL;
-  */		
--	  /* m->m_data = m->m_ext + datasize; */
-+	  m->m_data = m->m_ext + datasize;
-         } else {
--	  int datasize;
- 	  char *dat;
- 	  datasize = m->m_data - m->m_dat;
- 	  dat = (char *)malloc(size);