Commit 662bbadd3529564e5bc4f1e5474979ac34872f0f
1 parent
45d827d2
Remove gcc 3.4 check
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5911 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
0 additions
and
66 deletions
Makefile.target
| ... | ... | @@ -97,12 +97,6 @@ HELPER_CFLAGS= |
| 97 | 97 | ifeq ($(ARCH),i386) |
| 98 | 98 | HELPER_CFLAGS+=-fomit-frame-pointer |
| 99 | 99 | OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer |
| 100 | -# op.c and helper.c need this on 32-bit x86 system to avoid | |
| 101 | -# a compiler spill error. This can probably go away | |
| 102 | -# once the SSE ops have been converted to TCG | |
| 103 | -ifeq ($(HAVE_GT_GCC_3_3), true) | |
| 104 | -I386_CFLAGS=-march=i586 -mtune=i686 | |
| 105 | -endif | |
| 106 | 100 | endif |
| 107 | 101 | |
| 108 | 102 | ifeq ($(ARCH),ppc) | ... | ... |
configure
| ... | ... | @@ -26,8 +26,6 @@ interp_prefix="/usr/gnemul/qemu-%M" |
| 26 | 26 | static="no" |
| 27 | 27 | cross_prefix="" |
| 28 | 28 | cc="gcc" |
| 29 | -gcc3_search="yes" | |
| 30 | -gcc3_list="gcc-3.4.6 gcc-3.4 gcc34 gcc-3.3.6 gcc-3.3 gcc33 gcc-3.2 gcc32" | |
| 31 | 29 | audio_drv_list="" |
| 32 | 30 | audio_card_list="" |
| 33 | 31 | host_cc="gcc" |
| ... | ... | @@ -106,7 +104,6 @@ kqemu="no" |
| 106 | 104 | profiler="no" |
| 107 | 105 | cocoa="no" |
| 108 | 106 | check_gfx="yes" |
| 109 | -check_gcc="yes" | |
| 110 | 107 | softmmu="yes" |
| 111 | 108 | linux_user="no" |
| 112 | 109 | darwin_user="no" |
| ... | ... | @@ -273,7 +270,6 @@ for opt do |
| 273 | 270 | --cross-prefix=*) cross_prefix="$optarg" |
| 274 | 271 | ;; |
| 275 | 272 | --cc=*) cc="$optarg" |
| 276 | - gcc3_search="no" | |
| 277 | 273 | ;; |
| 278 | 274 | --host-cc=*) host_cc="$optarg" |
| 279 | 275 | ;; |
| ... | ... | @@ -332,8 +328,6 @@ for opt do |
| 332 | 328 | ;; |
| 333 | 329 | --disable-gfx-check) check_gfx="no" |
| 334 | 330 | ;; |
| 335 | - --disable-gcc-check) check_gcc="no" | |
| 336 | - ;; | |
| 337 | 331 | --disable-system) softmmu="no" |
| 338 | 332 | ;; |
| 339 | 333 | --enable-system) softmmu="yes" |
| ... | ... | @@ -542,40 +536,6 @@ else |
| 542 | 536 | AIOLIBS="-lrt -lpthread" |
| 543 | 537 | fi |
| 544 | 538 | |
| 545 | -# Check for gcc4, error if pre-gcc4 | |
| 546 | -if test "$check_gcc" = "yes" ; then | |
| 547 | - cat > $TMPC <<EOF | |
| 548 | -#if __GNUC__ < 4 | |
| 549 | -#error gcc3 | |
| 550 | -#endif | |
| 551 | -int main(){return 0;} | |
| 552 | -EOF | |
| 553 | - if "$cc" $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then | |
| 554 | - echo "WARNING: \"$cc\" looks like gcc 4.x" | |
| 555 | - found_compat_cc="no" | |
| 556 | - if test "$gcc3_search" = "yes" ; then | |
| 557 | - echo "Looking for gcc 3.x" | |
| 558 | - for compat_cc in $gcc3_list ; do | |
| 559 | - if "$cross_prefix$compat_cc" --version 2> /dev/null | fgrep '(GCC) 3.' > /dev/null 2>&1 ; then | |
| 560 | - echo "Found \"$compat_cc\"" | |
| 561 | - cc="$cross_prefix$compat_cc" | |
| 562 | - found_compat_cc="yes" | |
| 563 | - break | |
| 564 | - fi | |
| 565 | - done | |
| 566 | - if test "$found_compat_cc" = "no" ; then | |
| 567 | - echo "gcc 3.x not found!" | |
| 568 | - fi | |
| 569 | - fi | |
| 570 | - if test "$found_compat_cc" = "no" ; then | |
| 571 | - echo "QEMU is known to have problems when compiled with gcc 4.x" | |
| 572 | - echo "It is recommended that you use gcc 3.x to build QEMU" | |
| 573 | - echo "To use this compiler anyway, configure with --disable-gcc-check" | |
| 574 | - exit 1; | |
| 575 | - fi | |
| 576 | - fi | |
| 577 | -fi | |
| 578 | - | |
| 579 | 539 | if test ! -x "$(which cgcc 2>/dev/null)"; then |
| 580 | 540 | sparse="no" |
| 581 | 541 | fi |
| ... | ... | @@ -584,19 +544,6 @@ fi |
| 584 | 544 | # Solaris specific configure tool chain decisions |
| 585 | 545 | # |
| 586 | 546 | if test "$solaris" = "yes" ; then |
| 587 | - # | |
| 588 | - # gcc for solaris 10/fcs in /usr/sfw/bin doesn't compile qemu correctly | |
| 589 | - # override the check with --disable-gcc-check | |
| 590 | - # | |
| 591 | - if test "$solarisrev" -eq 10 -a "$check_gcc" = "yes" ; then | |
| 592 | - solgcc=`which $cc` | |
| 593 | - if test "$solgcc" = "/usr/sfw/bin/gcc" ; then | |
| 594 | - echo "Solaris 10/FCS gcc in /usr/sfw/bin will not compiled qemu correctly." | |
| 595 | - echo "please get gcc-3.4.3 or later, from www.blastwave.org using pkg-get -i gcc3" | |
| 596 | - echo "or get the latest patch from SunSolve for gcc" | |
| 597 | - exit 1 | |
| 598 | - fi | |
| 599 | - fi | |
| 600 | 547 | solinst=`which $install 2> /dev/null | /usr/bin/grep -v "no $install in"` |
| 601 | 548 | if test -z "$solinst" ; then |
| 602 | 549 | echo "Solaris install program not found. Use --install=/usr/ucb/install or" |
| ... | ... | @@ -1536,13 +1483,6 @@ case "$target_cpu" in |
| 1536 | 1483 | echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak |
| 1537 | 1484 | echo "#define CONFIG_KVM 1" >> $config_h |
| 1538 | 1485 | fi |
| 1539 | - gcc3minver=`$cc --version 2> /dev/null| fgrep "(GCC) 3." | awk '{ print $3 }' | cut -f2 -d.` | |
| 1540 | - if test -n "$gcc3minver" && test $gcc3minver -gt 3 | |
| 1541 | - then | |
| 1542 | - echo "HAVE_GT_GCC_3_3=true" >> $config_mak | |
| 1543 | - else | |
| 1544 | - echo "HAVE_GT_GCC_3_3=false" >> $config_mak | |
| 1545 | - fi | |
| 1546 | 1486 | ;; |
| 1547 | 1487 | x86_64) |
| 1548 | 1488 | echo "TARGET_ARCH=x86_64" >> $config_mak | ... | ... |