- gcc 3.4 workaround.

Changed files:
    qemu-gcc34.patch -> 1.1
    qemu.spec -> 1.9

diff --git a/qemu-gcc34.patch b/qemu-gcc34.patch
new file mode 100644 (file)
index 0000000..a80f108
--- /dev/null
+++ b/qemu-gcc34.patch
@@ -0,0 +1,19 @@
+--- qemu-0.6.0/softmmu_header.h.orig   2004-07-10 20:20:09.000000000 +0200
++++ qemu-0.6.0/softmmu_header.h        2004-10-16 14:48:12.804616248 +0200
+@@ -77,12 +77,15 @@
+ #define RES_TYPE int
+ #endif
+ 
++#if !((__GNUC__ == 3) && (__GNUC_MINOR__ == 3))
++#define ASM_SOFTMMU
++#endif
+ 
+ DATA_TYPE REGPARM(1) glue(glue(__ld, SUFFIX), MMUSUFFIX)(unsigned long addr,
+                                                          int is_user);
+ void REGPARM(2) glue(glue(__st, SUFFIX), MMUSUFFIX)(unsigned long addr, DATA_TYPE v, int is_user);
+ 
+-#if (DATA_SIZE <= 4) && defined(__i386__) && (ACCESS_TYPE <= 1) && defined(ASM_SOFTMMU)
++#if (DATA_SIZE <= 4) && defined(__i386__) && (ACCESS_TYPE <= 1) && !defined(ASM_SOFTMMU)
+ 
+ static inline RES_TYPE glue(glue(ld, USUFFIX), MEMSUFFIX)(void *ptr)
+ {

diff --git a/qemu.spec b/qemu.spec
index 950595c8b65b7e4ddc02efe5747f893ec2589986..7079b3724338cee9cc132505f5c0eb8b626c9092 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -12,6 +12,7 @@ Patch0:               %{name}-nostatic.patch
 Patch1:                %{name}-DESTDIR.patch
 Patch2:                %{name}-amd64.patch
 Patch3:                %{name}-longjmp.patch
+Patch4:                %{name}-gcc34.patch
 #Patch0:               qemu-0.5.0-cvsupdates.patch.bz2
 #Patch1:               qemu-0.1.6-glibc23-ldscripts.patch.bz2
 #Patch2:               qemu-0.5.0-sdl-static-libs.patch.bz2
@@ -64,6 +65,7 @@ aby dzia
 %patch1        -p1
 %patch2        -p1
 %patch3        -p1
+%patch4        -p1
 
 #%patch0 -p1 -b .cvsupdates
 #%patch1 -p1 -b .glibc23-ldscripts