[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/qemu/FC-4 qemu-0.7.0-build.patch,1.1,1.2 qemu.spec,1.8,1.9



Author: dwmw2

Update of /cvs/extras/rpms/qemu/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4097

Modified Files:
	qemu-0.7.0-build.patch qemu.spec 
Log Message:
Fix i386 build

qemu-0.7.0-build.patch:

Index: qemu-0.7.0-build.patch
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-4/qemu-0.7.0-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-0.7.0-build.patch	30 Apr 2005 11:34:52 -0000	1.1
+++ qemu-0.7.0-build.patch	17 Mar 2006 10:08:47 -0000	1.2
@@ -4,7 +4,7 @@
  -include config-host.mak
  
 -CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
-+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing 
++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing 
  ifdef CONFIG_DARWIN
  CFLAGS+= -mdynamic-no-pic
  endif
@@ -15,7 +15,7 @@
  DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
  endif
 -CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing
++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing 
  #CFLAGS+=-Werror
  LDFLAGS=-g
  LIBS=
@@ -24,7 +24,7 @@
  # -msmall-data is not used because we want two-instruction relocations
  # for the constant constructions
 -OP_CFLAGS=-Wall -O2 -g
-+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall
++OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall
  # Ensure there's only a single GP
  CFLAGS += -msmall-data
  LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qemu.spec	17 Mar 2006 00:32:16 -0000	1.8
+++ qemu.spec	17 Mar 2006 10:08:47 -0000	1.9
@@ -74,6 +74,9 @@
 %config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
+* Fri Mar 17 2006 David Woodhouse <dwmw2 infradead org> 0.8.0-2
+- Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it
+
 * Fri Mar 17 2006 David Woodhouse <dwmw2 infradead org> 0.8.0-1
 - Update to 0.8.0
 - Resort to using compat-gcc-32


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]