From 94584640d5a917bb68ba32593a10b88ffa0e448b Mon Sep 17 00:00:00 2001 From: hawk Date: Fri, 4 Aug 2006 14:33:25 +0000 Subject: [PATCH 1/1] - updated for 0.8.2 Changed files: qemu-cc.patch -> 1.2 qemu-dot.patch -> 1.2 --- qemu-cc.patch | 18 +++++++++--------- qemu-dot.patch | 9 ++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/qemu-cc.patch b/qemu-cc.patch index 017759d..861949e 100644 --- a/qemu-cc.patch +++ b/qemu-cc.patch @@ -1,12 +1,12 @@ ---- qemu-0.8.1/configure~ 2006-05-20 01:27:00.000000000 +0300 -+++ qemu-0.8.1/configure 2006-05-20 01:29:38.000000000 +0300 -@@ -294,8 +294,7 @@ - strip="${cross_prefix}${strip}" - - if [ ! -x "`which $cc`" ] ; then -- echo "Compiler $cc could not be found" -- exit -+ echo "Warning: Compiler $cc could not be found" +--- qemu.orig/configure 2006-07-22 19:23:34.000000000 +0200 ++++ qemu/configure 2006-08-04 15:16:48.263651500 +0200 +@@ -309,8 +309,7 @@ + if $cc -c -o $TMPO $TMPC 2>/dev/null ; then + : C compiler works ok + else +- echo "ERROR: \"$cc\" either does not exist or does not work" +- exit 1 ++ echo "Warning: \"$cc\" either does not exist or does not work" fi if test "$mingw32" = "yes" ; then diff --git a/qemu-dot.patch b/qemu-dot.patch index 7cf400d..0cc12eb 100644 --- a/qemu-dot.patch +++ b/qemu-dot.patch @@ -1,13 +1,12 @@ ---- qemu-0.7.0/dyngen.c.orig 2005-04-27 22:52:05.000000000 +0200 -+++ qemu-0.7.0/dyngen.c 2005-05-01 14:00:00.000000000 +0200 +--- qemu.orig/dyngen.c 2006-07-22 19:23:34.000000000 +0200 ++++ qemu/dyngen.c 2006-08-04 15:31:19.578105250 +0200 @@ -1194,13 +1194,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, sizeof(name), -+ snprintf(name, name_size, + snprintf(name, name_size, "(long)(&__dot_%s)", sym_name + 1); else @@ -15,7 +14,7 @@ snprintf(name, name_size, "(long)(&%s)", sym_name); } } -@@ -1590,14 +1588,12 @@ +@@ -1627,14 +1625,12 @@ !strstart(sym_name, "__op_param", NULL) && !strstart(sym_name, "__op_jmp", NULL) && !strstart(sym_name, "__op_gen_label", NULL)) { -- 2.44.0