- update from AC-branch

Changed files:
    qemu-gcc4_ppc.patch -> 1.4
    qemu-nostatic.patch -> 1.3

diff --git a/qemu-gcc4_ppc.patch b/qemu-gcc4_ppc.patch
index 7dd2443e00ce80b1a7d8c4e75a3214833957585d..703455287b3dc90c241dbb16c1e90ae2f820b2a7 100644 (file)
--- a/qemu-gcc4_ppc.patch
+++ b/qemu-gcc4_ppc.patch
@@ -1,3 +1,4 @@
+diff -ur qemu-0.9.0-o/dyngen.c qemu-0.9.0/dyngen.c
 --- qemu-0.9.0-o/dyngen.c      2007-02-06 14:44:57.000000000 -0700
 +++ qemu-0.9.0/dyngen.c        2007-02-06 14:46:11.000000000 -0700
 @@ -1692,6 +1692,9 @@
@@ -20,3 +21,36 @@
              }
  #elif defined(HOST_S390)
              {
+diff -ur qemu-0.9.0-o/dyngen.c.orig qemu-0.9.0/dyngen.c.orig
+--- qemu-0.9.0-o/dyngen.c.orig 2007-02-05 16:01:54.000000000 -0700
++++ qemu-0.9.0/dyngen.c.orig   2007-02-06 14:44:57.000000000 -0700
+@@ -1206,13 +1206,11 @@
+     } else if (strstart(sym_name, "__op_gen_label", &p)) {
+         snprintf(name, name_size, "gen_labels[param%s]", p);
+     } else {
+-#ifdef HOST_SPARC
+         if (sym_name[0] == '.')
+             snprintf(name, name_size,
+                      "(long)(&__dot_%s)",
+                      sym_name + 1);
+         else
+-#endif
+             snprintf(name, name_size, "(long)(&%s)", sym_name);
+     }
+ }
+@@ -1706,14 +1704,12 @@
+                     !strstart(sym_name, "__op_param", NULL) &&
+                     !strstart(sym_name, "__op_jmp", NULL) &&
+                     !strstart(sym_name, "__op_gen_label", NULL)) {
+-#if defined(HOST_SPARC)
+                   if (sym_name[0] == '.') {
+                       fprintf(outfile,
+                               "extern char __dot_%s __asm__(\"%s\");\n",
+                               sym_name+1, sym_name);
+                       continue;
+                   }
+-#endif
+ #if defined(__APPLE__)
+ /* set __attribute((unused)) on darwin because we wan't to avoid warning when we don't use the symbol */
+                     fprintf(outfile, "extern char %s __attribute__((unused));\n", sym_name);
+Only in qemu-0.9.0: dyngen.c.rej

diff --git a/qemu-nostatic.patch b/qemu-nostatic.patch
index 398b56af344eb5bf80152c3e5f9648d19b806474..70833a37efaf32552ce4b02b8638d2486b57fd1a 100644 (file)
--- a/qemu-nostatic.patch
+++ b/qemu-nostatic.patch
@@ -10,13 +10,13 @@ diff -ur qemu-0.9.0-o/Makefile.target qemu-0.9.0/Makefile.target
  endif
  
  # We require -O2 to avoid the stack setup prologue in EXIT_TB
-@@ -124,7 +124,7 @@
- OP_CFLAGS+=-fno-delayed-branch -ffixed-i0
- HELPER_CFLAGS=$(CFLAGS) -ffixed-i0 -mflat
- # -static is used to avoid g1/g3 usage by the dynamic linker
--BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static
-+#BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static
- endif
+@@ -160,7 +160,7 @@
+     BASE_CFLAGS+=-ffixed-g1 -ffixed-g6
+     HELPER_CFLAGS=$(CFLAGS) -ffixed-i0
+     # -static is used to avoid g1/g3 usage by the dynamic linker
+-    BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static
++    #BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static
+   endif
  endif
  
 @@ -432,7 +432,7 @@
@@ -28,5 +28,3 @@ diff -ur qemu-0.9.0-o/Makefile.target qemu-0.9.0/Makefile.target
  endif
  ifndef CONFIG_SOFTMMU
  VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld 
-Only in qemu-0.9.0: Makefile.target~
-Only in qemu-0.9.0: Makefile.target.orig