[Qemu-devel] [4337] Qemu 32-bit i386, gcc >= 3.4 spill error fix

[Qemu-devel] [4337] Qemu 32-bit i386, gcc >= 3.4 spill error fix

[Aurelien Jarno]

Revision: 4337
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4337
Author:   aurel32
Date:     2008-05-05 06:00:27 +0000 (Mon, 05 May 2008)

Log Message:
-----------
Qemu 32-bit i386, gcc >= 3.4 spill error fix

(Ben Taylor)

Modified Paths:
--------------
    trunk/Makefile.target
    trunk/configure

Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target	2008-05-04 21:42:11 UTC (rev 4336)
+++ trunk/Makefile.target	2008-05-05 06:00:27 UTC (rev 4337)
@@ -96,7 +96,13 @@
 ifeq ($(ARCH),i386)
 HELPER_CFLAGS+=-fomit-frame-pointer
 OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer
+# op.c and helper.c need this on 32-bit x86 system to avoid
+# a compiler spill error. This can probably go away
+# once the SSE ops have been converted to TCG
+ifeq ($(HAVE_GT_GCC_3_3), true)
+I386_CFLAGS=-march=i586 -mtune=i686
 endif
+endif
 
 ifeq ($(ARCH),ppc)
 CPPFLAGS+= -D__powerpc__
@@ -309,7 +315,7 @@
 	$(DYNGEN) -g -o $@ $<
 
 op.o: op.c
-	$(CC) $(OP_CFLAGS) $(CPPFLAGS) -c -o $@ $<
+	$(CC) $(OP_CFLAGS) $(CPPFLAGS) $(I386_CFLAGS) -c -o $@ $<
 
 machine.o: machine.c
 	$(CC) $(OP_CFLAGS) $(CPPFLAGS) -c -o $@ $<
@@ -319,7 +325,7 @@
 ifeq ($(TARGET_BASE_ARCH), i386)
 # XXX: rename helper.c to op_helper.c
 helper.o: helper.c
-	$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) $(I386_CFLAGS) -c -o $@ $<
 else
 op_helper.o: op_helper.c
 	$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<

Modified: trunk/configure
===================================================================
--- trunk/configure	2008-05-04 21:42:11 UTC (rev 4336)
+++ trunk/configure	2008-05-05 06:00:27 UTC (rev 4337)
@@ -1199,6 +1199,13 @@
     then
       echo "#define USE_KQEMU 1" >> $config_h
     fi
+    gcc3minver=`$cc --version 2> /dev/null| fgrep "(GCC) 3." | awk '{ print $3 }' | cut -f2 -d.`
+    if test -n "$gcc3minver" -a $gcc3minver -gt 3
+    then
+      echo "HAVE_GT_GCC_3_3=true" >> $config_mak
+    else
+      echo "HAVE_GT_GCC_3_3=false" >> $config_mak
+    fi
   ;;
   x86_64)
     echo "TARGET_ARCH=x86_64" >> $config_mak