Update to 0.15.0

* Many bug fixes and improvements
* Add LatticeMico32 and unicore32 targets are added.
* And many changes. See http://wiki.qemu.org/ChangeLog/0.15

Tested on NetBSD/i386 current, NetBSD/i386 5.1, DragonFly/i386 2.10.1,
and Gentoo Linux/i386.

19 files changed, 173 insertions, 141 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 67786843f1b..120e87e7c05 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2011/07/11 09:57:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.81 2011/08/22 12:00:34 ryoon Exp $
 
-DISTNAME=		qemu-0.14.1
+DISTNAME=		qemu-0.15.0
 CATEGORIES=		emulators
-MASTER_SITES=		http://download.savannah.gnu.org/releases/qemu/
+MASTER_SITES=		http://wiki.qemu.org/download/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.qemu.org/
@@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS+=		qemu-bin-[0-9]*
 NOT_FOR_PLATFORM=	NetBSD-1.[0-6]*-*
 
-USE_TOOLS+=		gmake makeinfo perl:build
+USE_TOOLS+=		gmake makeinfo perl:build pkg-config
 UNLIMIT_RESOURCES=	datasize
 HAS_CONFIGURE=		yes
 
@@ -28,6 +28,7 @@ CONFIGURE_ENV+=		mansuffix=/${PKGMANDIR}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--interp-prefix=${PREFIX}/share/qemu
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--python=${PYTHONBIN}
 
 CONF_FILES=		${EGDIR}/target-x86_64.conf \
 			${PKG_SYSCONFDIR}/target-x86_64.conf
@@ -50,6 +51,7 @@ SUBST_FILES.qaudio=	arch_init.c monitor.c savevm.c vl.c \
 			hw/gus.c \
 			hw/hda-audio.c \
 			hw/marvell_88w8618_audio.c \
+			hw/milkymist-ac97.c \
 			hw/mips_fulong2e.c \
 			hw/mips_jazz.c \
 			hw/mips_malta.c \
@@ -73,7 +75,7 @@ INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/doc/qemu
 
 UE_ARCHS+=		alpha arm armeb cris i386 m68k microblaze mips mipsel
 UE_ARCHS+=		ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus
-UE_ARCHS+=		sparc64 x86_64
+UE_ARCHS+=		sparc64 x86_64 microblazeel s390x unicore32
 
 .if ${OPSYS} == "NetBSD"
 .if (!empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6-9].*))
@@ -114,6 +116,8 @@ post-install:
 .if empty(OPSYS:MDarwin)
 .include "../../mk/oss.buildlink3.mk"
 .endif
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index ae85ea3b1ce..b8ca9e69832 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,29 +1,35 @@
-@comment $NetBSD: PLIST,v 1.26 2011/07/31 09:55:09 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.27 2011/08/22 12:00:34 ryoon Exp $
 bin/qemu
 ${PLIST.alpha}bin/qemu-alpha
 ${PLIST.arm}bin/qemu-arm
 ${PLIST.armeb}bin/qemu-armeb
 ${PLIST.cris}bin/qemu-cris
+bin/qemu-ga
 ${PLIST.i386}bin/qemu-i386
 bin/qemu-img
 bin/qemu-io
 ${PLIST.m68k}bin/qemu-m68k
 ${PLIST.microblaze}bin/qemu-microblaze
+${PLIST.microblazeel}bin/qemu-microblazeel
 ${PLIST.mips}bin/qemu-mips
 ${PLIST.mipsel}bin/qemu-mipsel
 ${PLIST.nbd}bin/qemu-nbd
 ${PLIST.ppc}bin/qemu-ppc
 ${PLIST.ppc64}bin/qemu-ppc64
 ${PLIST.ppc64abi32}bin/qemu-ppc64abi32
+${PLIST.s390x}bin/qemu-s390x
 ${PLIST.sh4}bin/qemu-sh4
 ${PLIST.sh4eb}bin/qemu-sh4eb
 ${PLIST.sparc}bin/qemu-sparc
 ${PLIST.sparc32plus}bin/qemu-sparc32plus
 ${PLIST.sparc64}bin/qemu-sparc64
+${PLIST.unicore32}bin/qemu-unicore32
 bin/qemu-system-arm
 bin/qemu-system-cris
+bin/qemu-system-lm32
 bin/qemu-system-m68k
 bin/qemu-system-microblaze
+bin/qemu-system-microblazeel
 bin/qemu-system-mips
 bin/qemu-system-mips64
 bin/qemu-system-mips64el
@@ -31,6 +37,7 @@ bin/qemu-system-mipsel
 bin/qemu-system-ppc
 bin/qemu-system-ppc64
 bin/qemu-system-ppcemb
+bin/qemu-system-s390x
 bin/qemu-system-sh4
 bin/qemu-system-sh4eb
 bin/qemu-system-sparc
@@ -46,7 +53,6 @@ share/doc/qemu/qemu-tech.html
 share/examples/qemu/target-x86_64.conf
 share/qemu/bamboo.dtb
 share/qemu/bios.bin
-share/qemu/gpxe-eepro100-80861209.rom
 share/qemu/keymaps/ar
 share/qemu/keymaps/common
 share/qemu/keymaps/da
@@ -83,18 +89,23 @@ share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
 share/qemu/linuxboot.bin
+share/qemu/mpc8544ds.dtb
 share/qemu/multiboot.bin
 share/qemu/openbios-ppc
 share/qemu/openbios-sparc32
 share/qemu/openbios-sparc64
+share/qemu/petalogix-ml605.dtb
 share/qemu/petalogix-s3adsp1800.dtb
 share/qemu/ppc_rom.bin
-share/qemu/pxe-e1000.bin
-share/qemu/pxe-ne2k_pci.bin
-share/qemu/pxe-pcnet.bin
-share/qemu/pxe-rtl8139.bin
-share/qemu/pxe-virtio.bin
+share/qemu/pxe-e1000.rom
+share/qemu/pxe-eepro100.rom
+share/qemu/pxe-ne2k_pci.rom
+share/qemu/pxe-pcnet.rom
+share/qemu/pxe-rtl8139.rom
+share/qemu/pxe-virtio.rom
 share/qemu/s390-zipl.rom
+share/qemu/slof.bin
+share/qemu/spapr-rtas.bin
 share/qemu/vgabios-cirrus.bin
 share/qemu/vgabios-qxl.bin
 share/qemu/vgabios-stdvga.bin
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 1eecb1a0b53..841eaf363fe 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,18 +1,19 @@
-$NetBSD: distinfo,v 1.68 2011/08/04 18:48:16 ryoon Exp $
+$NetBSD: distinfo,v 1.69 2011/08/22 12:00:34 ryoon Exp $
 
-SHA1 (qemu-0.14.1.tar.gz) = 1a5003a03004b62b52562d1cbb8f50c5f135e0b8
-RMD160 (qemu-0.14.1.tar.gz) = 0601ff4e613fea0a6ce80907e2bfa11704048b36
-Size (qemu-0.14.1.tar.gz) = 5439697 bytes
-SHA1 (patch-ao) = 332f53e573e5ed52df81a1162e6cd0eb0be04654
-SHA1 (patch-ba) = 802597199b574a6680620908612510d0094a44c3
-SHA1 (patch-dd) = 8c67f9bc491c33d36563e00006ca91940004a31f
-SHA1 (patch-ed) = 489f9da73852cbce66dde7506136040a1f6fc95f
-SHA1 (patch-ef) = f05a2b2a394114ea039bd8be5bd4d9a1fac8be76
-SHA1 (patch-eg) = d78fdb8fb5a0cc6b7e5c41ffc749285866bb5243
-SHA1 (patch-eh) = 3d2c69d52bfa1ef0a64427db09a27a63f281ea58
-SHA1 (patch-ei) = f575651f2f5653e3e24649c4c9dbd1a627cdee77
-SHA1 (patch-ej) = 2ac3bd790d66f0a4bbf94df9a33caee54e6f6bfe
-SHA1 (patch-el) = 3e2dd725ca3cf658b43a9ec07dc8d596f65bf3c9
-SHA1 (patch-en) = 9ea3b764e0bb7161d593ac830a0e24b598a179b6
-SHA1 (patch-et) = 09129c2eac330f83af7ac27a43fc7f19dbca8859
-SHA1 (patch-ioport.c) = 9597054f97d2c57eee61349ae4d5d1e94bf86a04
+SHA1 (qemu-0.15.0.tar.gz) = 57a7269b58544054a90b158225fce05fe1d04a85
+RMD160 (qemu-0.15.0.tar.gz) = f33048765e48e1dc6413ef079df99944b2329211
+Size (qemu-0.15.0.tar.gz) = 9577243 bytes
+SHA1 (patch-ao) = 610e77fd51595f0f77b82a745d0a546712f6442d
+SHA1 (patch-ba) = c8ad6502b0693cc22a79f89d2935d962066b5d91
+SHA1 (patch-dd) = 20637d652963c94c5fe7999f27c31c7fd8864e43
+SHA1 (patch-ed) = 7a77ba9b33d654c9f8278d69f81a2fc06e17a7d3
+SHA1 (patch-ef) = f26f1b860cca477d5e80c9cb2755c8dc6fa593ac
+SHA1 (patch-eg) = 1f3a0320344d930c8df97e322411de3136f398d7
+SHA1 (patch-eh) = c79b915f08941af95611aa43c8c9a342486632d4
+SHA1 (patch-ei) = e2ffd48420e7aa0f0507a741afe6f24c6f06e4c9
+SHA1 (patch-en) = 267500f7c11efacdf1a9ae323595e0469aa791c9
+SHA1 (patch-et) = 53b38e0fbe12c4d199997327b66248f125988a4c
+SHA1 (patch-hw_ppc__newworld.c) = a0011c05cd35aff8982b97c3ec669e18c11ad07b
+SHA1 (patch-hw_ppc__oldworld.c) = 790daed4d0bdc51628a6252716480510f8c444c8
+SHA1 (patch-hw_xilinx__axienet.c) = 6f715e4e2241c3c9006bc571084ca5fd12658f13
+SHA1 (patch-ioport.c) = bb0c6671eaf39ef9b846d0ea2633cb1d56edddb1
diff --git a/emulators/qemu/patches/patch-ao b/emulators/qemu/patches/patch-ao
index c73e7420fb3..a4c7f5969cc 100644
--- a/emulators/qemu/patches/patch-ao
+++ b/emulators/qemu/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.4 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-ao,v 1.5 2011/08/22 12:00:34 ryoon Exp $
 
---- audio/mixeng.c.orig	2011-05-06 19:01:43.000000000 +0000
+--- audio/mixeng.c.orig	2011-08-08 18:28:42 +0000
 +++ audio/mixeng.c
 @@ -143,56 +143,64 @@
  #undef IN_T
diff --git a/emulators/qemu/patches/patch-ba b/emulators/qemu/patches/patch-ba
index 47be0a7d2bf..53c2f92d97e 100644
--- a/emulators/qemu/patches/patch-ba
+++ b/emulators/qemu/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.4 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-ba,v 1.5 2011/08/22 12:00:34 ryoon Exp $
 
---- hw/pcspk.c.orig	2011-05-06 19:01:43.000000000 +0000
+--- hw/pcspk.c.orig	2011-08-08 18:28:42 +0000
 +++ hw/pcspk.c
 @@ -42,7 +42,6 @@ typedef struct {
      unsigned int samples;
@@ -36,7 +36,7 @@ $NetBSD: patch-ba,v 1.4 2011/07/11 09:57:18 ryoon Exp $
      int out;
  
 -    s->dummy_refresh_clock ^= (1 << 4);
-     out = pit_get_out(s->pit, 2, qemu_get_clock(vm_clock)) << 5;
+     out = pit_get_out(s->pit, 2, qemu_get_clock_ns(vm_clock)) << 5;
  
 -    return pit_get_gate(s->pit, 2) | (s->data_on << 1) | s->dummy_refresh_clock | out;
 +    return pit_get_gate(s->pit, 2) | (s->data_on << 1) |
diff --git a/emulators/qemu/patches/patch-dd b/emulators/qemu/patches/patch-dd
index 31e20c2f09d..ed45be85bb0 100644
--- a/emulators/qemu/patches/patch-dd
+++ b/emulators/qemu/patches/patch-dd
@@ -1,4 +1,4 @@
-$NetBSD: patch-dd,v 1.6 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-dd,v 1.7 2011/08/22 12:00:34 ryoon Exp $
 
 Remove confsuffix from sysconfdir so that our PKG_SYSCONFSUBDIR setting
 works.
@@ -8,9 +8,9 @@ Install man pages into ${PREFIX}/man, not ${PREFIX}/share/man.
 Handle arm and armeb case on NetBSD.
 XXX: it looks mips is always treated as big endian.
 
---- configure.orig	2011-05-06 19:01:43.000000000 +0000
+--- configure.orig	2011-08-08 18:28:42 +0000
 +++ configure
-@@ -140,12 +140,12 @@ bigendian="no"
+@@ -141,13 +141,13 @@ bigendian="no"
  mingw32="no"
  EXESUF=""
  prefix="/usr/local"
@@ -19,13 +19,14 @@ XXX: it looks mips is always treated as big endian.
  datadir="\${prefix}/share/qemu"
  docdir="\${prefix}/share/doc/qemu"
  bindir="\${prefix}/bin"
+ libdir="\${prefix}/lib"
  sysconfdir="\${prefix}/etc"
 -confsuffix="/qemu"
 +confsuffix=""
  slirp="yes"
  fmod_lib=""
  fmod_inc=""
-@@ -275,12 +275,18 @@ elif check_define __s390__ ; then
+@@ -281,12 +281,18 @@ elif check_define __s390__ ; then
    else
      cpu="s390"
    fi
@@ -40,12 +41,12 @@ XXX: it looks mips is always treated as big endian.
  fi
  
  case "$cpu" in
--  alpha|cris|ia64|m68k|microblaze|ppc|ppc64|sparc64)
-+  alpha|arm|armeb|cris|ia64|m68k|microblaze|ppc|ppc64|sparc64)
+-  alpha|cris|ia64|lm32|m68k|microblaze|ppc|ppc64|sparc64|unicore32)
++  alpha|arm|armeb|cris|ia64|lm32|m68k|microblaze|ppc|ppc64|sparc64|unicore32)
      cpu="$cpu"
    ;;
    i386|i486|i586|i686|i86pc|BePC)
-@@ -1080,7 +1086,7 @@ else
+@@ -1152,7 +1158,7 @@ else
  
  # if cross compiling, cannot launch a program, so make a static guess
  case "$cpu" in
@@ -54,8 +55,8 @@ XXX: it looks mips is always treated as big endian.
      bigendian=yes
    ;;
  esac
-@@ -2498,7 +2504,7 @@ case "$cpu" in
-   i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64)
+@@ -2730,7 +2736,7 @@ case "$cpu" in
+   i386|x86_64|alpha|cris|hppa|ia64|lm32|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64|unicore32)
      ARCH=$cpu
    ;;
 -  armv4b|armv4l)
diff --git a/emulators/qemu/patches/patch-ed b/emulators/qemu/patches/patch-ed
index 4758d5ca5da..bdbbb896c5d 100644
--- a/emulators/qemu/patches/patch-ed
+++ b/emulators/qemu/patches/patch-ed
@@ -1,8 +1,8 @@
-$NetBSD: patch-ed,v 1.3 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-ed,v 1.4 2011/08/22 12:00:34 ryoon Exp $
 
---- target-i386/translate.c.orig	2011-05-06 19:01:44.000000000 +0000
+--- target-i386/translate.c.orig	2011-08-08 18:28:42 +0000
 +++ target-i386/translate.c
-@@ -4857,20 +4857,23 @@ static target_ulong disas_insn(DisasCont
+@@ -4856,20 +4856,23 @@ static target_ulong disas_insn(DisasCont
              tcg_gen_sub_tl(t2, cpu_regs[R_EAX], t0);
              gen_extu(ot, t2);
              tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, label1);
diff --git a/emulators/qemu/patches/patch-ef b/emulators/qemu/patches/patch-ef
index cec74b0df19..20fb5b3e197 100644
--- a/emulators/qemu/patches/patch-ef
+++ b/emulators/qemu/patches/patch-ef
@@ -1,9 +1,9 @@
-$NetBSD: patch-ef,v 1.2 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-ef,v 1.3 2011/08/22 12:00:34 ryoon Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- audio/audio.c.orig	2011-05-06 19:01:43.000000000 +0000
+--- audio/audio.c.orig	2011-08-08 18:28:42 +0000
 +++ audio/audio.c
 @@ -1162,7 +1162,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, 
          return 0;
diff --git a/emulators/qemu/patches/patch-eg b/emulators/qemu/patches/patch-eg
index b73eec14fc8..58f3b3a3c30 100644
--- a/emulators/qemu/patches/patch-eg
+++ b/emulators/qemu/patches/patch-eg
@@ -1,9 +1,9 @@
-$NetBSD: patch-eg,v 1.2 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-eg,v 1.3 2011/08/22 12:00:34 ryoon Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- hw/etraxfs_eth.c.orig	2011-05-06 19:01:43.000000000 +0000
+--- hw/etraxfs_eth.c.orig	2011-08-08 18:28:42 +0000
 +++ hw/etraxfs_eth.c
 @@ -184,7 +184,7 @@ static void mdio_read_req(struct qemu_md
  
diff --git a/emulators/qemu/patches/patch-eh b/emulators/qemu/patches/patch-eh
index 7bcfc45c370..21c78608d91 100644
--- a/emulators/qemu/patches/patch-eh
+++ b/emulators/qemu/patches/patch-eh
@@ -1,9 +1,9 @@
-$NetBSD: patch-eh,v 1.2 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-eh,v 1.3 2011/08/22 12:00:34 ryoon Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- hw/omap_dss.c.orig	2011-05-06 19:01:43.000000000 +0000
+--- hw/omap_dss.c.orig	2011-08-08 18:28:42 +0000
 +++ hw/omap_dss.c
 @@ -774,18 +774,18 @@ static void omap_rfbi_write(void *opaque
          break;
diff --git a/emulators/qemu/patches/patch-ei b/emulators/qemu/patches/patch-ei
index 59a87acf552..c681698a0e1 100644
--- a/emulators/qemu/patches/patch-ei
+++ b/emulators/qemu/patches/patch-ei
@@ -1,9 +1,9 @@
-$NetBSD: patch-ei,v 1.2 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-ei,v 1.3 2011/08/22 12:00:34 ryoon Exp $
 
 Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 (PR lib/43832: ssp causes common names to be defines)
 
---- rwhandler.c.orig	2011-05-06 19:01:44.000000000 +0000
+--- rwhandler.c.orig	2011-08-08 18:28:42 +0000
 +++ rwhandler.c
 @@ -13,7 +13,7 @@ static void name(void *opaque, type addr
  static uint32_t name(void *opaque, type addr) \
diff --git a/emulators/qemu/patches/patch-ej b/emulators/qemu/patches/patch-ej
deleted file mode 100644
index 89ce8af6d83..00000000000
--- a/emulators/qemu/patches/patch-ej
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ej,v 1.5 2011/08/04 12:20:54 ryoon Exp $
-
-* include <sys/types.h> to fix build on Mac OS X
-
---- ui/vnc-enc-tight.c.orig	2011-05-06 19:01:44.000000000 +0000
-+++ ui/vnc-enc-tight.c
-@@ -35,6 +35,7 @@
- #include <stdio.h>
- #include <jpeglib.h>
- #endif
-+#include <sys/types.h>
- 
- #include "qemu-common.h"
- 
diff --git a/emulators/qemu/patches/patch-el b/emulators/qemu/patches/patch-el
deleted file mode 100644
index eb9a94daea4..00000000000
--- a/emulators/qemu/patches/patch-el
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-el,v 1.2 2011/07/11 09:57:18 ryoon Exp $
-
-NetBSD 4.0 (actually around 4.99.10) and prior don't have some C99 FP macro.
-(PR pkg/42899)
-
---- fpu/softfloat-native.h.orig	2011-05-06 19:01:43.000000000 +0000
-+++ fpu/softfloat-native.h
-@@ -19,11 +19,15 @@
-  *        or Solaris 10 systems running GCC 3.x or less.
-  *   Solaris 10 with GCC4 does not need these macros as they
-  *   are defined in <iso/math_c99.h> with a compiler directive
-+ *
-+ *   NetBSD has got these macro around 4.99.10
-+ *   (i.e. 5.0 release and later)
-  */
- #if defined(CONFIG_SOLARIS) && \
-            ((CONFIG_SOLARIS_VERSION <= 9 ) || \
-            ((CONFIG_SOLARIS_VERSION == 10) && (__GNUC__ < 4))) \
--    || (defined(__OpenBSD__) && (OpenBSD < 200811))
-+    || (defined(__OpenBSD__) && (OpenBSD < 200811)) \
-+    || (defined(__NetBSD__) && (__NetBSD_Version__ < 499001000))
- /*
-  * C99 7.12.3 classification macros
-  * and
-@@ -32,30 +36,13 @@
-  * ... do not work on Solaris 10 using GNU CC 3.4.x.
-  * Try to workaround the missing / broken C99 math macros.
-  */
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #define unordered(x, y) (isnan(x) || isnan(y))
- #endif
- 
--#ifdef __NetBSD__
--#ifndef isgreater
--#define isgreater(x, y)		__builtin_isgreater(x, y)
--#endif
--#ifndef isgreaterequal
--#define isgreaterequal(x, y)	__builtin_isgreaterequal(x, y)
--#endif
--#ifndef isless
--#define isless(x, y)		__builtin_isless(x, y)
--#endif
--#ifndef islessequal
--#define islessequal(x, y)	__builtin_islessequal(x, y)
--#endif
--#ifndef isunordered
--#define isunordered(x, y)	__builtin_isunordered(x, y)
--#endif
--#endif
--
--
-+#if !defined(__NetBSD__) /* NetBSD has had isnormal() since 2.0 */
- #define isnormal(x)             (fpclass(x) >= FP_NZERO)
-+#endif
- #define isgreater(x, y)         ((!unordered(x, y)) && ((x) > (y)))
- #define isgreaterequal(x, y)    ((!unordered(x, y)) && ((x) >= (y)))
- #define isless(x, y)            ((!unordered(x, y)) && ((x) < (y)))
diff --git a/emulators/qemu/patches/patch-en b/emulators/qemu/patches/patch-en
index c2860473711..2edb9df77a6 100644
--- a/emulators/qemu/patches/patch-en
+++ b/emulators/qemu/patches/patch-en
@@ -1,10 +1,6 @@
-$NetBSD: patch-en,v 1.2 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-en,v 1.3 2011/08/22 12:00:34 ryoon Exp $
 
-Use ligbcc builtin __clear_cache() declared in exec-all.h
-instead of original __builtin___clear_cache() because
-the latter one is not available in (at least) gcc 4.1.3.
-
---- tcg/arm/tcg-target.h.orig	2011-05-06 19:01:44.000000000 +0000
+--- tcg/arm/tcg-target.h.orig	2011-08-08 18:28:42 +0000
 +++ tcg/arm/tcg-target.h
 @@ -83,7 +83,7 @@ enum {
  static inline void flush_icache_range(unsigned long start, unsigned long stop)
diff --git a/emulators/qemu/patches/patch-et b/emulators/qemu/patches/patch-et
index 815e5728423..c3975bf6a26 100644
--- a/emulators/qemu/patches/patch-et
+++ b/emulators/qemu/patches/patch-et
@@ -1,8 +1,8 @@
-$NetBSD: patch-et,v 1.2 2011/07/11 09:57:18 ryoon Exp $
+$NetBSD: patch-et,v 1.3 2011/08/22 12:00:34 ryoon Exp $
 
---- Makefile.orig	2011-05-06 19:01:43.000000000 +0000
+--- Makefile.orig	2011-08-08 18:28:42 +0000
 +++ Makefile
-@@ -229,8 +229,8 @@ ifdef CONFIG_POSIX
+@@ -261,8 +261,8 @@ ifdef CONFIG_POSIX
  endif
  
  install-sysconfig:
diff --git a/emulators/qemu/patches/patch-hw_ppc__newworld.c b/emulators/qemu/patches/patch-hw_ppc__newworld.c
new file mode 100644
index 00000000000..844851f6717
--- /dev/null
+++ b/emulators/qemu/patches/patch-hw_ppc__newworld.c
@@ -0,0 +1,38 @@
+$NetBSD: patch-hw_ppc__newworld.c,v 1.1 2011/08/22 12:00:34 ryoon Exp $
+
+Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
+
+--- hw/ppc_newworld.c.orig	2011-08-08 18:28:42 +0000
++++ hw/ppc_newworld.c
+@@ -120,7 +120,7 @@ static uint64_t translate_kernel_address
+     return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
+ }
+ 
+-static target_phys_addr_t round_page(target_phys_addr_t addr)
++static target_phys_addr_t round_pageq(target_phys_addr_t addr)
+ {
+     return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
+ }
+@@ -225,7 +225,7 @@ static void ppc_core99_init (ram_addr_t 
+         }
+         /* load initrd */
+         if (initrd_filename) {
+-            initrd_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
++            initrd_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
+             initrd_size = load_image_targphys(initrd_filename, initrd_base,
+                                               ram_size - initrd_base);
+             if (initrd_size < 0) {
+@@ -233,11 +233,11 @@ static void ppc_core99_init (ram_addr_t 
+                          initrd_filename);
+                 exit(1);
+             }
+-            cmdline_base = round_page(initrd_base + initrd_size);
++            cmdline_base = round_pageq(initrd_base + initrd_size);
+         } else {
+             initrd_base = 0;
+             initrd_size = 0;
+-            cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
++            cmdline_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
+         }
+         ppc_boot_device = 'm';
+     } else {
diff --git a/emulators/qemu/patches/patch-hw_ppc__oldworld.c b/emulators/qemu/patches/patch-hw_ppc__oldworld.c
new file mode 100644
index 00000000000..e6bdfb70362
--- /dev/null
+++ b/emulators/qemu/patches/patch-hw_ppc__oldworld.c
@@ -0,0 +1,38 @@
+$NetBSD: patch-hw_ppc__oldworld.c,v 1.1 2011/08/22 12:00:34 ryoon Exp $
+
+Avoid conflicts with round_page() macro in DragonFly's <cpu/param.h>
+
+--- hw/ppc_oldworld.c.orig	2011-08-08 18:28:42 +0000
++++ hw/ppc_oldworld.c
+@@ -59,7 +59,7 @@ static uint64_t translate_kernel_address
+     return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
+ }
+ 
+-static target_phys_addr_t round_page(target_phys_addr_t addr)
++static target_phys_addr_t round_pageq(target_phys_addr_t addr)
+ {
+     return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
+ }
+@@ -162,7 +162,7 @@ static void ppc_heathrow_init (ram_addr_
+         }
+         /* load initrd */
+         if (initrd_filename) {
+-            initrd_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
++            initrd_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
+             initrd_size = load_image_targphys(initrd_filename, initrd_base,
+                                               ram_size - initrd_base);
+             if (initrd_size < 0) {
+@@ -170,11 +170,11 @@ static void ppc_heathrow_init (ram_addr_
+                          initrd_filename);
+                 exit(1);
+             }
+-            cmdline_base = round_page(initrd_base + initrd_size);
++            cmdline_base = round_pageq(initrd_base + initrd_size);
+         } else {
+             initrd_base = 0;
+             initrd_size = 0;
+-            cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
++            cmdline_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
+         }
+         ppc_boot_device = 'm';
+     } else {
diff --git a/emulators/qemu/patches/patch-hw_xilinx__axienet.c b/emulators/qemu/patches/patch-hw_xilinx__axienet.c
new file mode 100644
index 00000000000..72002a37e4b
--- /dev/null
+++ b/emulators/qemu/patches/patch-hw_xilinx__axienet.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-hw_xilinx__axienet.c,v 1.1 2011/08/22 12:00:34 ryoon Exp $
+
+Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
+
+--- hw/xilinx_axienet.c.orig	2011-08-08 18:28:42 +0000
++++ hw/xilinx_axienet.c
+@@ -189,7 +189,7 @@ static uint16_t mdio_read_req(struct MDI
+ 
+     phy = bus->devs[addr];
+     if (phy && phy->read) {
+-        data = phy->read(phy, reg);
++        data = (*phy->read)(phy, reg);
+     } else {
+         data = 0xffff;
+     }
diff --git a/emulators/qemu/patches/patch-ioport.c b/emulators/qemu/patches/patch-ioport.c
index 9e39d84c400..49ea6c2e725 100644
--- a/emulators/qemu/patches/patch-ioport.c
+++ b/emulators/qemu/patches/patch-ioport.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-ioport.c,v 1.3 2011/08/04 18:48:17 ryoon Exp $
+$NetBSD: patch-ioport.c,v 1.4 2011/08/22 12:00:34 ryoon Exp $
 
-* Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
+Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
 
---- ioport.c.orig	2011-05-06 19:01:44.000000000 +0000
+--- ioport.c.orig	2011-08-08 18:28:42 +0000
 +++ ioport.c
-@@ -179,7 +179,7 @@ static uint32_t ioport_readb_thunk(void 
+@@ -181,7 +181,7 @@ static uint32_t ioport_readb_thunk(void 
      IORange *ioport = opaque;
      uint64_t data;
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ioport.c,v 1.3 2011/08/04 18:48:17 ryoon Exp $
      return data;
  }
  
-@@ -188,7 +188,7 @@ static uint32_t ioport_readw_thunk(void 
+@@ -190,7 +190,7 @@ static uint32_t ioport_readw_thunk(void 
      IORange *ioport = opaque;
      uint64_t data;
  
@@ -22,7 +22,7 @@ $NetBSD: patch-ioport.c,v 1.3 2011/08/04 18:48:17 ryoon Exp $
      return data;
  }
  
-@@ -197,7 +197,7 @@ static uint32_t ioport_readl_thunk(void 
+@@ -199,7 +199,7 @@ static uint32_t ioport_readl_thunk(void 
      IORange *ioport = opaque;
      uint64_t data;