From 662bbadd3529564e5bc4f1e5474979ac34872f0f Mon Sep 17 00:00:00 2001 From: aurel32 Date: Sun, 7 Dec 2008 13:40:38 +0000 Subject: [PATCH] Remove gcc 3.4 check Signed-off-by: Aurelien Jarno git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5911 c046a42c-6fe2-441c-8c8c-71466251a162 --- Makefile.target | 6 ------ configure | 60 ------------------------------------------------------- 2 files changed, 66 deletions(-) diff --git a/Makefile.target b/Makefile.target index 671d72a..c553169 100644 --- a/Makefile.target +++ b/Makefile.target @@ -97,12 +97,6 @@ HELPER_CFLAGS= 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) diff --git a/configure b/configure index 304c6d8..4f44d8f 100755 --- a/configure +++ b/configure @@ -26,8 +26,6 @@ interp_prefix="/usr/gnemul/qemu-%M" 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 @@ kqemu="no" profiler="no" cocoa="no" check_gfx="yes" -check_gcc="yes" softmmu="yes" linux_user="no" darwin_user="no" @@ -273,7 +270,6 @@ for opt do --cross-prefix=*) cross_prefix="$optarg" ;; --cc=*) cc="$optarg" - gcc3_search="no" ;; --host-cc=*) host_cc="$optarg" ;; @@ -332,8 +328,6 @@ for opt do ;; --disable-gfx-check) check_gfx="no" ;; - --disable-gcc-check) check_gcc="no" - ;; --disable-system) softmmu="no" ;; --enable-system) softmmu="yes" @@ -542,40 +536,6 @@ else AIOLIBS="-lrt -lpthread" fi -# Check for gcc4, error if pre-gcc4 -if test "$check_gcc" = "yes" ; then - cat > $TMPC < /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 @@ fi # 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 @@ case "$target_cpu" in 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 -- 1.7.9.5