qemu-svn: Upgrade from r4027 -> 4242. Removes the need for gcc 3.x, adds USB networking for the n800

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4332 311d38ba-8fff-0310-9ca6-ca027cbcb966

30 files changed, 2645 insertions, 14373 deletions

diff --git a/meta/packages/qemu/qemu-0.9.1+svn/02_snapshot_use_tmpdir.patch b/meta/packages/qemu/qemu-0.9.1+svn/02_snapshot_use_tmpdir.patch
deleted file mode 100644
index 40264ed443..0000000000
--- a/meta/packages/qemu/qemu-0.9.1+svn/02_snapshot_use_tmpdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-#DPATCHLEVEL=0
----
-# block.c |    6 +++++-
-# 1 file changed, 5 insertions(+), 1 deletion(-)
-#
-Index: block.c
-===================================================================
---- block.c.orig	2007-12-03 23:47:25.000000000 +0000
-+++ block.c	2007-12-03 23:47:31.000000000 +0000
-@@ -191,8 +191,12 @@ void get_tmp_filename(char *filename, in
- void get_tmp_filename(char *filename, int size)
- {
-     int fd;
-+    char *tmpdir;
-     /* XXX: race condition possible */
--    pstrcpy(filename, size, "/tmp/vl.XXXXXX");
-+    tmpdir = getenv("TMPDIR");
-+    if (!tmpdir)
-+        tmpdir = "/tmp";
-+    snprintf(filename, size, "%s/vl.XXXXXX", tmpdir);
-     fd = mkstemp(filename);
-     close(fd);
- }
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/04_do_not_print_rtc_freq_if_ok.patch b/meta/packages/qemu/qemu-0.9.1+svn/04_do_not_print_rtc_freq_if_ok.patch
deleted file mode 100644
index 31c9da491d..0000000000
--- a/meta/packages/qemu/qemu-0.9.1+svn/04_do_not_print_rtc_freq_if_ok.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-#DPATCHLEVEL=1
----
-# vl.c |    5 ++++-
-# 1 file changed, 4 insertions(+), 1 deletion(-)
-#
-Index: qemu/vl.c
-===================================================================
---- qemu.orig/vl.c	2007-12-03 15:44:35.000000000 +0000
-+++ qemu/vl.c	2007-12-03 15:51:03.000000000 +0000
-@@ -1289,12 +1289,15 @@ static void hpet_stop_timer(struct qemu_
- 
- static int rtc_start_timer(struct qemu_alarm_timer *t)
- {
-+    unsigned long current_rtc_freq = 0;
-     int rtc_fd;
- 
-     TFR(rtc_fd = open("/dev/rtc", O_RDONLY));
-     if (rtc_fd < 0)
-         return -1;
--    if (ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) {
-+    ioctl(rtc_fd, RTC_IRQP_READ, &current_rtc_freq);
-+    if (current_rtc_freq != RTC_FREQ &&
-+        ioctl(rtc_fd, RTC_IRQP_SET, RTC_FREQ) < 0) {
-         fprintf(stderr, "Could not configure '/dev/rtc' to have a 1024 Hz timer. This is not a fatal\n"
-                 "error, but for better emulation accuracy either use a 2.6 host Linux kernel or\n"
-                 "type 'echo 1024 > /proc/sys/dev/rtc/max-user-freq' as root.\n");
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/05_non-fatal_if_linux_hd_missing.patch b/meta/packages/qemu/qemu-0.9.1+svn/05_non-fatal_if_linux_hd_missing.patch
index fdd922605e..a66737d9ce 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/05_non-fatal_if_linux_hd_missing.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/05_non-fatal_if_linux_hd_missing.patch
@@ -3,12 +3,12 @@
 # hw/pc.c |    1 -
 # 1 file changed, 1 deletion(-)
 #
-Index: qemu/hw/pc.c
+Index: trunk/hw/pc.c
 ===================================================================
---- qemu.orig/hw/pc.c	2007-12-03 23:47:25.000000000 +0000
-+++ qemu/hw/pc.c	2007-12-03 23:47:38.000000000 +0000
-@@ -385,7 +385,6 @@ static void generate_bootsect(uint32_t g
-     if (bs_table[0] == NULL) {
+--- trunk.orig/hw/pc.c	2008-04-24 20:15:46.000000000 +0100
++++ trunk/hw/pc.c	2008-04-24 20:15:49.000000000 +0100
+@@ -399,7 +399,6 @@
+     if (hda == -1) {
  	fprintf(stderr, "A disk image must be given for 'hda' when booting "
  		"a Linux kernel\n");
 -	exit(1);
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/06_exit_segfault.patch b/meta/packages/qemu/qemu-0.9.1+svn/06_exit_segfault.patch
index 06123d0626..bc02d31839 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/06_exit_segfault.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/06_exit_segfault.patch
@@ -5,9 +5,9 @@
 #
 Index: linux-user/main.c
 ===================================================================
---- linux-user/main.c.orig	2007-12-03 23:47:25.000000000 +0000
-+++ linux-user/main.c	2007-12-03 23:47:41.000000000 +0000
-@@ -714,7 +714,7 @@ void cpu_loop (CPUSPARCState *env)
+--- linux-user/main.c.orig	2008-04-24 20:15:46.000000000 +0100
++++ linux-user/main.c	2008-04-24 20:15:53.000000000 +0100
+@@ -765,7 +765,7 @@
          default:
              printf ("Unhandled trap: 0x%x\n", trapnr);
              cpu_dump_state(env, stderr, fprintf, 0);
@@ -16,7 +16,7 @@ Index: linux-user/main.c
          }
          process_pending_signals (env);
      }
-@@ -1634,7 +1634,7 @@ void cpu_loop (CPUState *env)
+@@ -1697,7 +1697,7 @@
          default:
              printf ("Unhandled trap: 0x%x\n", trapnr);
              cpu_dump_state(env, stderr, fprintf, 0);
@@ -25,7 +25,7 @@ Index: linux-user/main.c
          }
          process_pending_signals (env);
      }
-@@ -1954,7 +1954,7 @@ int main(int argc, char **argv)
+@@ -2026,7 +2026,7 @@
                  for(item = cpu_log_items; item->mask != 0; item++) {
                      printf("%-10s %s\n", item->name, item->help);
                  }
@@ -34,7 +34,7 @@ Index: linux-user/main.c
              }
              cpu_set_log(mask);
          } else if (!strcmp(r, "s")) {
-@@ -1973,7 +1973,7 @@ int main(int argc, char **argv)
+@@ -2045,7 +2045,7 @@
              if (qemu_host_page_size == 0 ||
                  (qemu_host_page_size & (qemu_host_page_size - 1)) != 0) {
                  fprintf(stderr, "page size must be a power of two\n");
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/10_signal_jobs.patch b/meta/packages/qemu/qemu-0.9.1+svn/10_signal_jobs.patch
index 34282adc9d..d79482d2f4 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/10_signal_jobs.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/10_signal_jobs.patch
@@ -5,9 +5,9 @@
 #
 Index: linux-user/signal.c
 ===================================================================
---- linux-user/signal.c.orig	2007-12-03 15:40:26.000000000 +0000
-+++ linux-user/signal.c	2007-12-03 15:55:49.000000000 +0000
-@@ -364,10 +364,15 @@ int queue_signal(int sig, target_siginfo
+--- linux-user/signal.c.orig	2008-04-24 20:15:46.000000000 +0100
++++ linux-user/signal.c	2008-04-24 20:15:55.000000000 +0100
+@@ -364,10 +364,15 @@
      k = &sigact_table[sig - 1];
      handler = k->sa._sa_handler;
      if (handler == TARGET_SIG_DFL) {
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/11_signal_sigaction.patch b/meta/packages/qemu/qemu-0.9.1+svn/11_signal_sigaction.patch
index 33c5e8b12d..cd56541b71 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/11_signal_sigaction.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/11_signal_sigaction.patch
@@ -5,9 +5,9 @@
 #
 Index: linux-user/signal.c
 ===================================================================
---- linux-user/signal.c.orig	2007-12-03 23:47:44.000000000 +0000
-+++ linux-user/signal.c	2007-12-03 23:47:46.000000000 +0000
-@@ -512,6 +512,11 @@ int do_sigaction(int sig, const struct t
+--- linux-user/signal.c.orig	2008-04-24 20:15:55.000000000 +0100
++++ linux-user/signal.c	2008-04-24 20:15:57.000000000 +0100
+@@ -512,6 +512,11 @@
  
      if (sig < 1 || sig > TARGET_NSIG || sig == SIGKILL || sig == SIGSTOP)
          return -EINVAL;
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/22_net_tuntap_stall.patch b/meta/packages/qemu/qemu-0.9.1+svn/22_net_tuntap_stall.patch
index 6017df0f6d..0e1038983b 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/22_net_tuntap_stall.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/22_net_tuntap_stall.patch
@@ -5,9 +5,9 @@
 #
 Index: vl.c
 ===================================================================
---- vl.c.orig	2007-12-03 23:47:36.000000000 +0000
-+++ vl.c	2007-12-03 23:47:48.000000000 +0000
-@@ -4023,7 +4023,7 @@ static int tap_open(char *ifname, int if
+--- vl.c.orig	2008-04-24 20:15:46.000000000 +0100
++++ vl.c	2008-04-24 20:15:58.000000000 +0100
+@@ -4155,7 +4155,7 @@
          return -1;
      }
      memset(&ifr, 0, sizeof(ifr));
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/31_syscalls.patch b/meta/packages/qemu/qemu-0.9.1+svn/31_syscalls.patch
index 95a7332ee8..15565ae11d 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/31_syscalls.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/31_syscalls.patch
@@ -5,9 +5,9 @@
 #
 Index: linux-user/syscall.c
 ===================================================================
---- linux-user/syscall.c.orig	2007-12-03 19:32:56.000000000 +0000
-+++ linux-user/syscall.c	2007-12-03 19:33:41.000000000 +0000
-@@ -250,6 +250,7 @@ extern int getresuid(uid_t *, uid_t *, u
+--- linux-user/syscall.c.orig	2008-04-24 20:15:46.000000000 +0100
++++ linux-user/syscall.c	2008-04-24 20:15:59.000000000 +0100
+@@ -250,6 +250,7 @@
  extern int setresgid(gid_t, gid_t, gid_t);
  extern int getresgid(gid_t *, gid_t *, gid_t *);
  extern int setgroups(int, gid_t *);
@@ -15,7 +15,7 @@ Index: linux-user/syscall.c
  
  #define ERRNO_TABLE_SIZE 1200
  
-@@ -4024,7 +4025,8 @@ abi_long do_syscall(void *cpu_env, int n
+@@ -4041,7 +4042,8 @@
  #endif
  #ifdef TARGET_NR_uselib
      case TARGET_NR_uselib:
@@ -25,7 +25,7 @@ Index: linux-user/syscall.c
  #endif
  #ifdef TARGET_NR_swapon
      case TARGET_NR_swapon:
-@@ -5289,7 +5291,9 @@ abi_long do_syscall(void *cpu_env, int n
+@@ -5322,7 +5324,9 @@
          goto unimplemented;
  #ifdef TARGET_NR_mincore
      case TARGET_NR_mincore:
@@ -36,7 +36,7 @@ Index: linux-user/syscall.c
  #endif
  #ifdef TARGET_NR_madvise
      case TARGET_NR_madvise:
-@@ -5429,7 +5433,8 @@ abi_long do_syscall(void *cpu_env, int n
+@@ -5462,7 +5466,8 @@
          break;
  #ifdef TARGET_NR_readahead
      case TARGET_NR_readahead:
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/32_syscall_sysctl.patch b/meta/packages/qemu/qemu-0.9.1+svn/32_syscall_sysctl.patch
index 5e8dd75b0e..d42c44cebc 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/32_syscall_sysctl.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/32_syscall_sysctl.patch
@@ -5,8 +5,8 @@
 #
 Index: linux-user/syscall.c
 ===================================================================
---- linux-user/syscall.c.orig	2007-12-03 15:56:24.000000000 +0000
-+++ linux-user/syscall.c	2007-12-03 15:57:36.000000000 +0000
+--- linux-user/syscall.c.orig	2008-04-24 20:15:59.000000000 +0100
++++ linux-user/syscall.c	2008-04-24 20:16:01.000000000 +0100
 @@ -52,6 +52,7 @@
  //#include <sys/user.h>
  #include <netinet/ip.h>
@@ -15,7 +15,7 @@ Index: linux-user/syscall.c
  
  #define termios host_termios
  #define winsize host_winsize
-@@ -4739,9 +4740,34 @@ abi_long do_syscall(void *cpu_env, int n
+@@ -4758,9 +4759,34 @@
          break;
  #endif
      case TARGET_NR__sysctl:
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/33_syscall_ppc_clone.patch b/meta/packages/qemu/qemu-0.9.1+svn/33_syscall_ppc_clone.patch
index 3f733b6ab8..962f821523 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/33_syscall_ppc_clone.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/33_syscall_ppc_clone.patch
@@ -5,9 +5,9 @@
 #
 Index: linux-user/syscall.c
 ===================================================================
---- linux-user/syscall.c.orig	2007-12-03 15:58:11.000000000 +0000
-+++ linux-user/syscall.c	2007-12-03 15:58:46.000000000 +0000
-@@ -2750,11 +2750,7 @@ int do_fork(CPUState *env, unsigned int 
+--- linux-user/syscall.c.orig	2008-04-24 20:16:01.000000000 +0100
++++ linux-user/syscall.c	2008-04-24 20:16:02.000000000 +0100
+@@ -2760,11 +2760,7 @@
          if (!newsp)
              newsp = env->gpr[1];
          new_env->gpr[1] = newsp;
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/39_syscall_fadvise64.patch b/meta/packages/qemu/qemu-0.9.1+svn/39_syscall_fadvise64.patch
index 54ee3e0948..845232cfca 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/39_syscall_fadvise64.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/39_syscall_fadvise64.patch
@@ -4,9 +4,9 @@
 
 Index: linux-user/syscall.c
 ===================================================================
---- linux-user/syscall.c.orig	2007-12-03 19:33:47.000000000 +0000
-+++ linux-user/syscall.c	2007-12-03 19:33:48.000000000 +0000
-@@ -5317,6 +5317,12 @@ abi_long do_syscall(void *cpu_env, int n
+--- linux-user/syscall.c.orig	2008-04-24 20:16:02.000000000 +0100
++++ linux-user/syscall.c	2008-04-24 20:16:03.000000000 +0100
+@@ -5350,6 +5350,12 @@
          ret = get_errno(mincore((void*)arg1, (size_t)arg2, (unsigned char*)arg3));
          break;
  #endif
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/41_arm_fpa_sigfpe.patch b/meta/packages/qemu/qemu-0.9.1+svn/41_arm_fpa_sigfpe.patch
deleted file mode 100644
index cea3afc7ff..0000000000
--- a/meta/packages/qemu/qemu-0.9.1+svn/41_arm_fpa_sigfpe.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-#DPATCHLEVEL=0
----
-# linux-user/main.c        |   51 ++++++++++++++++++++++++++++++++++++++++++++++-
-# target-arm/nwfpe/fpa11.c |    7 ++++++
-# 2 files changed, 57 insertions(+), 1 deletion(-)
-#
-Index: linux-user/main.c
-===================================================================
---- linux-user/main.c.orig	2007-12-03 15:59:10.000000000 +0000
-+++ linux-user/main.c	2007-12-03 16:01:27.000000000 +0000
-@@ -377,18 +377,67 @@ void cpu_loop(CPUARMState *env)
-             {
-                 TaskState *ts = env->opaque;
-                 uint32_t opcode;
-+                int rc;
- 
-                 /* we handle the FPU emulation here, as Linux */
-                 /* we get the opcode */
-                 /* FIXME - what to do if get_user() fails? */
-                 get_user_u32(opcode, env->regs[15]);
- 
--                if (EmulateAll(opcode, &ts->fpa, env) == 0) {
-+                rc = EmulateAll(opcode, &ts->fpa, env);
-+                if (rc == 0) { /* illegal instruction */
-                     info.si_signo = SIGILL;
-                     info.si_errno = 0;
-                     info.si_code = TARGET_ILL_ILLOPN;
-                     info._sifields._sigfault._addr = env->regs[15];
-                     queue_signal(info.si_signo, &info);
-+                } else if (rc < 0) { /* FP exception */
-+                    int arm_fpe=0;
-+
-+                     /* translate softfloat flags to FPSR flags */
-+                    if (-rc & float_flag_invalid)
-+                      arm_fpe |= BIT_IOC;
-+                    if (-rc & float_flag_divbyzero)
-+                      arm_fpe |= BIT_DZC;
-+                    if (-rc & float_flag_overflow)
-+                      arm_fpe |= BIT_OFC;
-+                    if (-rc & float_flag_underflow)
-+                      arm_fpe |= BIT_UFC;
-+                    if (-rc & float_flag_inexact)
-+                      arm_fpe |= BIT_IXC;
-+
-+                    FPSR fpsr = ts->fpa.fpsr;
-+                    //printf("fpsr 0x%x, arm_fpe 0x%x\n",fpsr,arm_fpe);
-+
-+                    if (fpsr & (arm_fpe << 16)) { /* exception enabled? */
-+                      info.si_signo = SIGFPE;
-+                      info.si_errno = 0;
-+
-+                      /* ordered by priority, least first */
-+                      if (arm_fpe & BIT_IXC) info.si_code = TARGET_FPE_FLTRES;
-+                      if (arm_fpe & BIT_UFC) info.si_code = TARGET_FPE_FLTUND;
-+                      if (arm_fpe & BIT_OFC) info.si_code = TARGET_FPE_FLTOVF;
-+                      if (arm_fpe & BIT_DZC) info.si_code = TARGET_FPE_FLTDIV;
-+                      if (arm_fpe & BIT_IOC) info.si_code = TARGET_FPE_FLTINV;
-+
-+                      info._sifields._sigfault._addr = env->regs[15];
-+                      queue_signal(info.si_signo, &info);
-+                    } else {
-+                      env->regs[15] += 4;
-+                    }
-+
-+                    /* accumulate unenabled exceptions */
-+                    if ((!(fpsr & BIT_IXE)) && (arm_fpe & BIT_IXC))
-+                      fpsr |= BIT_IXC;
-+                    if ((!(fpsr & BIT_UFE)) && (arm_fpe & BIT_UFC))
-+                      fpsr |= BIT_UFC;
-+                    if ((!(fpsr & BIT_OFE)) && (arm_fpe & BIT_OFC))
-+                      fpsr |= BIT_OFC;
-+                    if ((!(fpsr & BIT_DZE)) && (arm_fpe & BIT_DZC))
-+                      fpsr |= BIT_DZC;
-+                    if ((!(fpsr & BIT_IOE)) && (arm_fpe & BIT_IOC))
-+                      fpsr |= BIT_IOC;
-+                    ts->fpa.fpsr=fpsr;
-                 } else {
-                     /* increment PC */
-                     env->regs[15] += 4;
-Index: target-arm/nwfpe/fpa11.c
-===================================================================
---- target-arm/nwfpe/fpa11.c.orig	2007-12-03 15:40:26.000000000 +0000
-+++ target-arm/nwfpe/fpa11.c	2007-12-03 15:59:11.000000000 +0000
-@@ -162,6 +162,8 @@ unsigned int EmulateAll(unsigned int opc
-     fpa11->initflag = 1;
-   }
- 
-+  set_float_exception_flags(0, &fpa11->fp_status);  
-+
-   if (TEST_OPCODE(opcode,MASK_CPRT))
-   {
-     //fprintf(stderr,"emulating CPRT\n");
-@@ -191,6 +193,11 @@ unsigned int EmulateAll(unsigned int opc
-   }
- 
- //  restore_flags(flags);
-+  if(nRc == 1 && get_float_exception_flags(&fpa11->fp_status))
-+  {
-+    //printf("fef 0x%x\n",float_exception_flags);
-+    nRc=-get_float_exception_flags(&fpa11->fp_status);
-+  }
- 
-   //printf("returning %d\n",nRc);
-   return(nRc);
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/52_ne2000_return.patch b/meta/packages/qemu/qemu-0.9.1+svn/52_ne2000_return.patch
index e4ea33f2c6..e364bff731 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/52_ne2000_return.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/52_ne2000_return.patch
@@ -2,11 +2,11 @@
  hw/ne2000.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: qemu/hw/ne2000.c
+Index: trunk/hw/ne2000.c
 ===================================================================
---- qemu.orig/hw/ne2000.c	2007-12-03 19:32:52.000000000 +0000
-+++ qemu/hw/ne2000.c	2007-12-03 19:33:55.000000000 +0000
-@@ -217,7 +217,7 @@ static int ne2000_can_receive(void *opaq
+--- trunk.orig/hw/ne2000.c	2008-04-24 20:15:46.000000000 +0100
++++ trunk/hw/ne2000.c	2008-04-24 20:16:05.000000000 +0100
+@@ -217,7 +217,7 @@
      NE2000State *s = opaque;
  
      if (s->cmd & E8390_STOP)
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/61_safe_64bit_int.patch b/meta/packages/qemu/qemu-0.9.1+svn/61_safe_64bit_int.patch
index 9b1ace81a5..9a67feac6b 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/61_safe_64bit_int.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/61_safe_64bit_int.patch
@@ -5,8 +5,8 @@
 #
 Index: dyngen-exec.h
 ===================================================================
---- dyngen-exec.h.orig	2007-12-31 13:06:21.000000000 +0000
-+++ dyngen-exec.h	2007-12-31 13:08:54.000000000 +0000
+--- dyngen-exec.h.orig	2008-04-24 20:15:46.000000000 +0100
++++ dyngen-exec.h	2008-04-24 20:16:06.000000000 +0100
 @@ -38,7 +38,7 @@
  // Linux/Sparc64 defines uint64_t
  #if !(defined (__sparc_v9__) && defined(__linux__))
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/63_sparc_build.patch b/meta/packages/qemu/qemu-0.9.1+svn/63_sparc_build.patch
index 37b38f641b..097f55a09e 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/63_sparc_build.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/63_sparc_build.patch
@@ -5,9 +5,9 @@
 #
 Index: sparc.ld
 ===================================================================
---- sparc.ld.orig	2007-12-03 15:40:26.000000000 +0000
-+++ sparc.ld	2007-12-03 16:05:06.000000000 +0000
-@@ -6,7 +6,7 @@ ENTRY(_start)
+--- sparc.ld.orig	2008-04-24 20:15:46.000000000 +0100
++++ sparc.ld	2008-04-24 20:16:07.000000000 +0100
+@@ -6,7 +6,7 @@
  SECTIONS
  {
    /* Read-only sections, merged into text segment: */
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/64_ppc_asm_constraints.patch b/meta/packages/qemu/qemu-0.9.1+svn/64_ppc_asm_constraints.patch
index e4858b79d7..7d19817278 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/64_ppc_asm_constraints.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/64_ppc_asm_constraints.patch
@@ -3,11 +3,11 @@
 # cpu-all.h |    2 +-
 # 1 file changed, 1 insertion(+), 1 deletion(-)
 #
-Index: qemu/cpu-all.h
+Index: trunk/cpu-all.h
 ===================================================================
---- qemu.orig/cpu-all.h	2007-06-13 11:48:22.000000000 +0100
-+++ qemu/cpu-all.h	2007-06-13 11:51:56.000000000 +0100
-@@ -250,7 +250,7 @@ static inline void stw_le_p(void *ptr, i
+--- trunk.orig/cpu-all.h	2008-04-24 20:15:46.000000000 +0100
++++ trunk/cpu-all.h	2008-04-24 20:16:08.000000000 +0100
+@@ -285,7 +285,7 @@
  static inline void stl_le_p(void *ptr, int v)
  {
  #ifdef __powerpc__
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/65_kfreebsd.patch b/meta/packages/qemu/qemu-0.9.1+svn/65_kfreebsd.patch
index dfece800ac..028e85a878 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/65_kfreebsd.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/65_kfreebsd.patch
@@ -5,9 +5,9 @@
 
 Index: configure
 ===================================================================
---- configure.orig	2007-12-03 15:40:26.000000000 +0000
-+++ configure	2007-12-03 16:05:34.000000000 +0000
-@@ -129,6 +129,12 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64
+--- configure.orig	2008-04-24 20:15:46.000000000 +0100
++++ configure	2008-04-24 20:16:09.000000000 +0100
+@@ -135,6 +135,12 @@
      kqemu="yes"
  fi
  ;;
@@ -22,8 +22,8 @@ Index: configure
  oss="yes"
 Index: vl.c
 ===================================================================
---- vl.c.orig	2007-12-03 16:05:32.000000000 +0000
-+++ vl.c	2007-12-03 16:05:34.000000000 +0000
+--- vl.c.orig	2008-04-24 20:15:58.000000000 +0100
++++ vl.c	2008-04-24 20:16:09.000000000 +0100
 @@ -97,6 +97,8 @@
  #include <stropts.h>
  #endif
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/66_tls_ld.patch b/meta/packages/qemu/qemu-0.9.1+svn/66_tls_ld.patch
index 54e02eff8b..cbd3f873d8 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/66_tls_ld.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/66_tls_ld.patch
@@ -5,9 +5,9 @@
 
 Index: arm.ld
 ===================================================================
---- arm.ld.orig	2007-06-13 11:48:22.000000000 +0100
-+++ arm.ld	2007-06-13 11:51:56.000000000 +0100
-@@ -26,6 +26,10 @@ SECTIONS
+--- arm.ld.orig	2008-04-24 20:15:45.000000000 +0100
++++ arm.ld	2008-04-24 20:16:11.000000000 +0100
+@@ -26,6 +26,10 @@
      { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
    .rela.rodata   :
      { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
@@ -18,7 +18,7 @@ Index: arm.ld
    .rel.got       : { *(.rel.got)		}
    .rela.got      : { *(.rela.got)		}
    .rel.ctors     : { *(.rel.ctors)	}
-@@ -58,6 +62,9 @@ SECTIONS
+@@ -58,6 +62,9 @@
    .ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
     __exidx_end = .;
    .reginfo : { *(.reginfo) }
@@ -30,9 +30,9 @@ Index: arm.ld
    . = ALIGN(0x100000) + (. & (0x100000 - 1));
 Index: i386.ld
 ===================================================================
---- i386.ld.orig	2007-06-13 11:48:22.000000000 +0100
-+++ i386.ld	2007-06-13 11:51:56.000000000 +0100
-@@ -28,6 +28,10 @@ SECTIONS
+--- i386.ld.orig	2008-04-24 20:15:45.000000000 +0100
++++ i386.ld	2008-04-24 20:16:11.000000000 +0100
+@@ -28,6 +28,10 @@
      { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
    .rela.rodata   :
      { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
@@ -43,7 +43,7 @@ Index: i386.ld
    .rel.got       : { *(.rel.got)		}
    .rela.got      : { *(.rela.got)		}
    .rel.ctors     : { *(.rel.ctors)	}
-@@ -53,6 +57,9 @@ SECTIONS
+@@ -53,6 +57,9 @@
    _etext = .;
    PROVIDE (etext = .);
    .fini      : { *(.fini)    } =0x47ff041f
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/91-oh-sdl-cursor.patch b/meta/packages/qemu/qemu-0.9.1+svn/91-oh-sdl-cursor.patch
index 0d60c1c306..b3d95a4534 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/91-oh-sdl-cursor.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/91-oh-sdl-cursor.patch
@@ -5,9 +5,9 @@
 
 Index: sdl.c
 ===================================================================
---- sdl.c.orig	2007-12-03 19:32:15.000000000 +0000
-+++ sdl.c	2007-12-03 19:34:04.000000000 +0000
-@@ -247,7 +247,7 @@ static void sdl_hide_cursor(void)
+--- sdl.c.orig	2008-04-24 20:15:45.000000000 +0100
++++ sdl.c	2008-04-24 20:16:12.000000000 +0100
+@@ -247,7 +247,7 @@
  
      if (kbd_mouse_is_absolute()) {
          SDL_ShowCursor(1);
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch b/meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch
index 783198d9e3..f15e001dd6 100644
--- a/meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch
+++ b/meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch
@@ -1,6 +1,8 @@
---- qemu/linux-user/syscall.c1	(revision 16)
-+++ qemu/linux-user/syscall.c	(working copy)
-@@ -441,7 +441,7 @@
+Index: trunk/linux-user/syscall.c
+===================================================================
+--- trunk.orig/linux-user/syscall.c	2008-04-24 20:16:24.000000000 +0100
++++ trunk/linux-user/syscall.c	2008-04-24 20:16:32.000000000 +0100
+@@ -440,7 +440,7 @@
      if (!new_brk)
          return target_brk;
      if (new_brk < target_original_brk)
@@ -9,7 +11,7 @@
  
      brk_page = HOST_PAGE_ALIGN(target_brk);
  
-@@ -456,12 +456,11 @@
+@@ -455,12 +455,11 @@
      mapped_addr = get_errno(target_mmap(brk_page, new_alloc_size,
                                          PROT_READ|PROT_WRITE,
                                          MAP_ANON|MAP_FIXED|MAP_PRIVATE, 0, 0));
@@ -26,9 +28,11 @@
  }
  
  static inline abi_long copy_from_user_fdset(fd_set *fds,
---- qemu/linux-user/mmap.c1	(revision 16)
-+++ qemu/linux-user/mmap.c	(working copy)
-@@ -260,6 +259,9 @@
+Index: trunk/linux-user/mmap.c
+===================================================================
+--- trunk.orig/linux-user/mmap.c	2008-04-24 20:16:16.000000000 +0100
++++ trunk/linux-user/mmap.c	2008-04-24 20:16:32.000000000 +0100
+@@ -264,6 +264,9 @@
              host_start += offset - host_offset;
          start = h2g(host_start);
      } els