SOURCES: qemu-gcc4_ppc.patch, qemu-ifup.patch, qemu-nostatic.patch...

aredridel aredridel at pld-linux.org
Tue Feb 6 23:52:16 CET 2007 

Author: aredridel                    Date: Tue Feb  6 22:52:16 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- begin update to 0.9.0

---- Files affected:
SOURCES:
   qemu-gcc4_ppc.patch (1.1 -> 1.2) , qemu-ifup.patch (1.1 -> 1.2) , qemu-nostatic.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/qemu-gcc4_ppc.patch
diff -u SOURCES/qemu-gcc4_ppc.patch:1.1 SOURCES/qemu-gcc4_ppc.patch:1.2
--- SOURCES/qemu-gcc4_ppc.patch:1.1	Mon Jun 20 18:16:10 2005
+++ SOURCES/qemu-gcc4_ppc.patch	Tue Feb  6 23:52:09 2007
@@ -1,43 +1,17 @@
---- qemu/dyngen.c.x	2005-05-16 10:30:43.000000000 +0100
-+++ qemu/dyngen.c	2005-05-16 10:32:41.000000000 +0100
-@@ -1996,6 +1996,9 @@ void gen_code(const char *name, host_ulo
-     int retpos;
-     int exit_addrs[MAX_EXITS];
+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 @@
+ #else
+         fprintf(outfile, "    extern void %s();\n", name);
  #endif
 +#if defined(HOST_PPC)
 +    uint8_t *blr_addr = NULL;
 +#endif
  
-     /* Compute exact size excluding prologue and epilogue instructions.
-      * Increment start_offset to skip epilogue instructions, then compute
-@@ -2018,9 +2021,23 @@ void gen_code(const char *name, host_ulo
-         p = (void *)(p_end - 4);
-         if (p == p_start)
-             error("empty code for %s", name);
--        if (get32((uint32_t *)p) != 0x4e800020)
--            error("blr expected at the end of %s", name);
--        copy_size = p - p_start;
-+        if (get32((uint32_t *)p) == 0x4e800020) {
-+		copy_size = p - p_start; /* blr at end */
-+	} else {
-+	    /* Find the blr and note its address so that we 
-+	       can emit code to rewrite it to a branch. */
-+	    do {
-+		p -= 4;
-+
-+		if (get32((uint32_t *)p) == 0x4e800020) {
-+		    blr_addr = p;
-+		    copy_size = p_end - p_start;
-+		    break;
-+		}
-+	    } while (p > p_start);
-+	    if (p == p_start)
-+		error("blr expected in the end of %s", name);
-+	}
-     }
- #elif defined(HOST_S390)
-     {
-@@ -2633,6 +2650,9 @@ void gen_code(const char *name, host_ulo
+         for(i = 0, rel = relocs;i < nb_relocs; i++, rel++) {
+             host_ulong offset = get_rel_offset(rel);
+@@ -2053,6 +2056,9 @@
  #else
  #error unsupport object format
  #endif
@@ -47,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-ifup.patch
diff -u SOURCES/qemu-ifup.patch:1.1 SOURCES/qemu-ifup.patch:1.2
--- SOURCES/qemu-ifup.patch:1.1	Wed Aug 24 09:11:43 2005
+++ SOURCES/qemu-ifup.patch	Tue Feb  6 23:52:10 2007
@@ -1,11 +1,15 @@
---- ./vl.c~	2005-08-20 16:14:48.000000000 +0300
-+++ ./vl.c	2005-08-21 14:05:26.000000000 +0300
-@@ -85,7 +85,7 @@
+diff -ur qemu-0.9.0-o/vl.c qemu-0.9.0/vl.c
+--- qemu-0.9.0-o/vl.c	2007-02-05 16:01:54.000000000 -0700
++++ qemu-0.9.0/vl.c	2007-02-06 14:49:35.000000000 -0700
+@@ -88,7 +88,7 @@
  
- //#define DO_TB_FLUSH
+ #include "exec-all.h"
  
 -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 +#define DEFAULT_NETWORK_SCRIPT "/sbin/qemu-ifup"
- 
- //#define DEBUG_UNUSED_IOPORT
- //#define DEBUG_IOPORT
+ #ifdef __sun__
+ #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
+ #else
+Only in qemu-0.9.0: vl.c~
+Only in qemu-0.9.0: vl.c.orig
+Only in qemu-0.9.0: vl.c.rej

================================================================
Index: SOURCES/qemu-nostatic.patch
diff -u SOURCES/qemu-nostatic.patch:1.1 SOURCES/qemu-nostatic.patch:1.2
--- SOURCES/qemu-nostatic.patch:1.1	Thu Feb  5 01:51:45 2004
+++ SOURCES/qemu-nostatic.patch	Tue Feb  6 23:52:10 2007
@@ -1,24 +1,25 @@
---- qemu-0.5.2/Makefile.target~	2004-01-25 16:50:02.000000000 +0100
-+++ qemu-0.5.2/Makefile.target	2004-02-05 02:42:54.000000000 +0100
-@@ -53,7 +53,7 @@
+diff -ur qemu-0.9.0-o/Makefile.target qemu-0.9.0/Makefile.target
+--- qemu-0.9.0-o/Makefile.target	2007-02-05 16:01:54.000000000 -0700
++++ qemu-0.9.0/Makefile.target	2007-02-06 14:34:25.000000000 -0700
+@@ -66,7 +66,7 @@
  endif # !CONFIG_USER_ONLY
  
  ifdef CONFIG_STATIC
--LDFLAGS+=-static
-+#LDFLAGS+=-static
+-BASE_LDFLAGS+=-static
++#BASE_LDFLAGS+=-static
  endif
  
- ifeq ($(ARCH),i386)
-@@ -97,7 +97,7 @@
- OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
+ # 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
--LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc.ld -static
-+#LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc.ld -static
+-BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static
++#BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static
+ endif
  endif
  
- ifeq ($(ARCH),sparc64)
-@@ -211,7 +211,7 @@
+@@ -432,7 +432,7 @@
  VL_LDFLAGS=
  # specific flags are needed for non soft mmu emulator
  ifdef CONFIG_STATIC
@@ -27,3 +28,5 @@
  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/SOURCES/qemu-gcc4_ppc.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/qemu-ifup.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/qemu-nostatic.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list