SOURCES: qemu-gcc4_ppc.patch, qemu-nostatic.patch - update from AC...

[glen]

Author: glen                         Date: Mon Feb 11 14:26:28 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update from AC-branch

---- Files affected:
SOURCES:
   qemu-gcc4_ppc.patch (1.3 -> 1.4) , qemu-nostatic.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/qemu-gcc4_ppc.patch
diff -u SOURCES/qemu-gcc4_ppc.patch:1.3 SOURCES/qemu-gcc4_ppc.patch:1.4
--- SOURCES/qemu-gcc4_ppc.patch:1.3	Sat Dec 15 23:50:55 2007
+++ SOURCES/qemu-gcc4_ppc.patch	Mon Feb 11 15:26:23 2008
@@ -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

================================================================
Index: SOURCES/qemu-nostatic.patch
diff -u SOURCES/qemu-nostatic.patch:1.2 SOURCES/qemu-nostatic.patch:1.3
--- SOURCES/qemu-nostatic.patch:1.2	Tue Feb  6 23:52:10 2007
+++ SOURCES/qemu-nostatic.patch	Mon Feb 11 15:26:23 2008
@@ -10,13 +10,13 @@
  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 @@
  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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/qemu-gcc4_ppc.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/qemu-nostatic.patch?r1=1.2&r2=1.3&f=u