[Qemu-devel] [5911] Remove gcc 3.4 check

[Qemu-devel] [5911] Remove gcc 3.4 check

[Aurelien Jarno]

Revision: 5911
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5911
Author:   aurel32
Date:     2008-12-07 13:40:38 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
Remove gcc 3.4 check

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

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

Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target	2008-12-07 13:40:29 UTC (rev 5910)
+++ trunk/Makefile.target	2008-12-07 13:40:38 UTC (rev 5911)
@@ -97,13 +97,7 @@
 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__

Modified: trunk/configure
===================================================================
--- trunk/configure	2008-12-07 13:40:29 UTC (rev 5910)
+++ trunk/configure	2008-12-07 13:40:38 UTC (rev 5911)
@@ -26,8 +26,6 @@
 static="no"
 cross_prefix=""
 cc="gcc"
-gcc3_search="yes"
-gcc3_list="gcc-3.4.6 gcc-3.4 gcc34 gcc-3.3.6 gcc-3.3 gcc33 gcc-3.2 gcc32"
 audio_drv_list=""
 audio_card_list=""
 host_cc="gcc"
@@ -106,7 +104,6 @@
 profiler="no"
 cocoa="no"
 check_gfx="yes"
-check_gcc="yes"
 softmmu="yes"
 linux_user="no"
 darwin_user="no"
@@ -273,7 +270,6 @@
   --cross-prefix=*) cross_prefix="$optarg"
   ;;
   --cc=*) cc="$optarg"
-  gcc3_search="no"
   ;;
   --host-cc=*) host_cc="$optarg"
   ;;
@@ -332,8 +328,6 @@
   ;;
   --disable-gfx-check) check_gfx="no"
   ;;
-  --disable-gcc-check) check_gcc="no"
-  ;;
   --disable-system) softmmu="no"
   ;;
   --enable-system) softmmu="yes"
@@ -542,40 +536,6 @@
     AIOLIBS="-lrt -lpthread"
 fi
 
-# Check for gcc4, error if pre-gcc4
-if test "$check_gcc" = "yes" ; then
-    cat > $TMPC <<EOF
-#if __GNUC__ < 4
-#error gcc3
-#endif
-int main(){return 0;}
-EOF
-    if "$cc" $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
-	echo "WARNING: \"$cc\" looks like gcc 4.x"
-	found_compat_cc="no"
-	if test "$gcc3_search" = "yes" ; then
-	    echo "Looking for gcc 3.x"
-	    for compat_cc in $gcc3_list ; do
-		if "$cross_prefix$compat_cc" --version 2> /dev/null | fgrep '(GCC) 3.' > /dev/null 2>&1 ; then
-		    echo "Found \"$compat_cc\""
-		    cc="$cross_prefix$compat_cc"
-		    found_compat_cc="yes"
-		    break
-		fi
-	    done
-	    if test "$found_compat_cc" = "no" ; then
-		echo "gcc 3.x not found!"
-	    fi
-	fi
-	if test "$found_compat_cc" = "no" ; then
-	    echo "QEMU is known to have problems when compiled with gcc 4.x"
-	    echo "It is recommended that you use gcc 3.x to build QEMU"
-	    echo "To use this compiler anyway, configure with --disable-gcc-check"
-	    exit 1;
-	fi
-    fi
-fi
-
 if test ! -x "$(which cgcc 2>/dev/null)"; then
     sparse="no"
 fi
@@ -584,19 +544,6 @@
 # Solaris specific configure tool chain decisions
 #
 if test "$solaris" = "yes" ; then
-  #
-  # gcc for solaris 10/fcs in /usr/sfw/bin doesn't compile qemu correctly
-  # override the check with --disable-gcc-check
-  #
-  if test "$solarisrev" -eq 10 -a "$check_gcc" = "yes" ; then
-    solgcc=`which $cc`
-    if test "$solgcc" = "/usr/sfw/bin/gcc" ; then
-      echo "Solaris 10/FCS gcc in /usr/sfw/bin will not compiled qemu correctly."
-      echo "please get gcc-3.4.3 or later, from www.blastwave.org using pkg-get -i gcc3"
-      echo "or get the latest patch from SunSolve for gcc"
-      exit 1
-    fi
-  fi
   solinst=`which $install 2> /dev/null | /usr/bin/grep -v "no $install in"`
   if test -z "$solinst" ; then
     echo "Solaris install program not found. Use --install=/usr/ucb/install or"
@@ -1536,13 +1483,6 @@
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
       echo "#define CONFIG_KVM 1" >> $config_h
     fi
-    gcc3minver=`$cc --version 2> /dev/null| fgrep "(GCC) 3." | awk '{ print $3 }' | cut -f2 -d.`
-    if test -n "$gcc3minver" && test $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

Re: [Qemu-devel] [5911] Remove gcc 3.4 check

[Anthony Liguori]

Aurelien Jarno wrote:
> Revision: 5911
>           http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5911
> Author:   aurel32
> Date:     2008-12-07 13:40:38 +0000 (Sun, 07 Dec 2008)
>
> Log Message:
> -----------
> Remove gcc 3.4 check
>
> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
>   

I owe you a beer :-)

Are you going to remove dyngen?

Regards,

Anthony Liguori

Re: [Qemu-devel] [5911] Remove gcc 3.4 check

[Aurelien Jarno]

On Sun, Dec 07, 2008 at 08:03:46AM -0600, Anthony Liguori wrote:
> Aurelien Jarno wrote:
> >Revision: 5911
> >          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5911
> >Author:   aurel32
> >Date:     2008-12-07 13:40:38 +0000 (Sun, 07 Dec 2008)
> >
> >Log Message:
> >-----------
> >Remove gcc 3.4 check
> >
> >Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
> >  
> 
> I owe you a beer :-)
> 
> Are you going to remove dyngen?
> 

That's my plan, but before actually removing it from the SVN, I would
prefer that others agree with this way to go.

Aurelien

-- 
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32@debian.org         | aurelien@aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net

Re: [Qemu-devel] [5911] Remove gcc 3.4 check

[Blue Swirl]

On 12/7/08, Aurelien Jarno <aurelien@aurel32.net> wrote:
> On Sun, Dec 07, 2008 at 08:03:46AM -0600, Anthony Liguori wrote:
>  > Aurelien Jarno wrote:
>  > >Revision: 5911
>  > >          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5911
>  > >Author:   aurel32
>  > >Date:     2008-12-07 13:40:38 +0000 (Sun, 07 Dec 2008)
>  > >
>  > >Log Message:
>  > >-----------
>  > >Remove gcc 3.4 check
>  > >
>  > >Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
>  > >
>  >
>  > I owe you a beer :-)
>  >
>  > Are you going to remove dyngen?
>  >
>
>  That's my plan, but before actually removing it from the SVN, I would
>  prefer that others agree with this way to go.

Dyngen can go. It's in SVN history if someone needs to resurrect it.

Re: [Qemu-devel] [5911] Remove gcc 3.4 check

[Andreas Färber]

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

Aurélien,

Am 07.12.2008 um 14:40 schrieb Aurelien Jarno:

> Revision: 5911
>          http://svn.sv.gnu.org/viewvc/? 
> view=rev&root=qemu&revision=5911
> Author:   aurel32
> Date:     2008-12-07 13:40:38 +0000 (Sun, 07 Dec 2008)
>
> Log Message:
> -----------
> Remove gcc 3.4 check
>
> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Thanks for your work and guidance on this!

ppc-softmmu now compiles on Mac OS X v10.5 ppc.
It does not yet on i386 though, because dyngen(.c) is still compiled.  
The attached patch removes dyngen from the Makefile and finally allows  
it to compile on OSX/i386. Not sure if that breaks any other target  
though.

Signed-off-by: Andreas Faerber <andreas.faerber@web.de>

Andreas

[-- Attachment #2: dyngen-removal.diff --]
[-- Type: application/octet-stream, Size: 837 bytes --]

diff --git a/Makefile b/Makefile
index 76470a4..3b3a01b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,9 +36,6 @@ all: $(TOOLS) $(DOCS) recurse-all
 
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
 
-subdir-%: dyngen$(EXESUF)
-	$(MAKE) -C $(subst subdir-,,$@) all
-
 $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
 $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a
 
@@ -195,10 +192,6 @@ qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
 qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
 
-# dyngen host tool
-dyngen$(EXESUF): dyngen.c
-	$(HOST_CC) $(CFLAGS) $(CPPFLAGS) -o $@ $^
-
 clean:
 # avoid old build problems by removing potentially incorrect old files
 	rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h

[-- Attachment #3: Type: text/plain, Size: 1 bytes --]

Re: [Qemu-devel] [5911] Remove gcc 3.4 check

[Aurélien Jarno]

On Sun, Dec 07, 2008 at 03:49:42PM +0100, Andreas Färber wrote:
> Aurélien,
> 
> Am 07.12.2008 um 14:40 schrieb Aurelien Jarno:
> 
> >Revision: 5911
> >         http://svn.sv.gnu.org/viewvc/? 
> >view=rev&root=qemu&revision=5911
> >Author:   aurel32
> >Date:     2008-12-07 13:40:38 +0000 (Sun, 07 Dec 2008)
> >
> >Log Message:
> >-----------
> >Remove gcc 3.4 check
> >
> >Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
> 
> Thanks for your work and guidance on this!
> 
> ppc-softmmu now compiles on Mac OS X v10.5 ppc.
> It does not yet on i386 though, because dyngen(.c) is still compiled.  
> The attached patch removes dyngen from the Makefile and finally allows  
> it to compile on OSX/i386. Not sure if that breaks any other target  
> though.
> 

It breaks all the target in the sense the subdirs are not build anymore.
Please wait I am already working on dyngen remocal.

-- 
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32@debian.org         | aurelien@aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net

Re: [Qemu-devel] [5911] Remove gcc 3.4 check

[Andreas Färber]

Am 07.12.2008 um 16:19 schrieb Aurélien Jarno:

> On Sun, Dec 07, 2008 at 03:49:42PM +0100, Andreas Färber wrote:
>> Aurélien,
>>
>> Am 07.12.2008 um 14:40 schrieb Aurelien Jarno:
>>
>>> Revision: 5911
>>>        http://svn.sv.gnu.org/viewvc/?
>>> view=rev&root=qemu&revision=5911
>>> Author:   aurel32
>>> Date:     2008-12-07 13:40:38 +0000 (Sun, 07 Dec 2008)
>>>
>>> Log Message:
>>> -----------
>>> Remove gcc 3.4 check
>>>
>>> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
>>
>> Thanks for your work and guidance on this!
>>
>> ppc-softmmu now compiles on Mac OS X v10.5 ppc.
>> It does not yet on i386 though, because dyngen(.c) is still compiled.
>> The attached patch removes dyngen from the Makefile and finally  
>> allows
>> it to compile on OSX/i386. Not sure if that breaks any other target
>> though.
>>
>
> It breaks all the target in the sense the subdirs are not build  
> anymore.

Oops! Was too quick.

I still think we should leave dyngen[.dSYM] in the clean target, so  
that it gets removed for anyone who had previously built it.

Andreas

Re: [Qemu-devel] [5911] Remove gcc 3.4 check

[Aurelien Jarno]

On Sun, Dec 07, 2008 at 04:49:08PM +0100, Andreas Färber wrote:
> 
> Am 07.12.2008 um 16:19 schrieb Aurélien Jarno:
> 
> >On Sun, Dec 07, 2008 at 03:49:42PM +0100, Andreas Färber wrote:
> >>Aurélien,
> >>
> >>Am 07.12.2008 um 14:40 schrieb Aurelien Jarno:
> >>
> >>>Revision: 5911
> >>>       http://svn.sv.gnu.org/viewvc/?
> >>>view=rev&root=qemu&revision=5911
> >>>Author:   aurel32
> >>>Date:     2008-12-07 13:40:38 +0000 (Sun, 07 Dec 2008)
> >>>
> >>>Log Message:
> >>>-----------
> >>>Remove gcc 3.4 check
> >>>
> >>>Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
> >>
> >>Thanks for your work and guidance on this!
> >>
> >>ppc-softmmu now compiles on Mac OS X v10.5 ppc.
> >>It does not yet on i386 though, because dyngen(.c) is still compiled.
> >>The attached patch removes dyngen from the Makefile and finally  
> >>allows
> >>it to compile on OSX/i386. Not sure if that breaks any other target
> >>though.
> >>
> >
> >It breaks all the target in the sense the subdirs are not build  
> >anymore.
> 
> Oops! Was too quick.
> 
> I still think we should leave dyngen[.dSYM] in the clean target, so  
> that it gets removed for anyone who had previously built it.
> 

This only concerns people building qemu from SVN, I think they can
remove it by hand.

-- 
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32@debian.org         | aurelien@aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net

Re: [Qemu-devel] [5911] Remove gcc 3.4 check

[Edgar E. Iglesias]

On Sun, Dec 07, 2008 at 03:26:24PM +0100, Aurelien Jarno wrote:
> On Sun, Dec 07, 2008 at 08:03:46AM -0600, Anthony Liguori wrote:
> > Aurelien Jarno wrote:
> > >Revision: 5911
> > >          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5911
> > >Author:   aurel32
> > >Date:     2008-12-07 13:40:38 +0000 (Sun, 07 Dec 2008)
> > >
> > >Log Message:
> > >-----------
> > >Remove gcc 3.4 check
> > >
> > >Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
> > >  
> > 
> > I owe you a beer :-)
> > 
> > Are you going to remove dyngen?

Aurelien, you've done an amazing job with the TCG conversion. I also whish
I could share a beer you but ATM I cannot, so I'll just have one myself :)

Cheers