2006-07-25 Paolo Bonzini <bonzini@gnu.org>

[pf3gnuchains/gcc-fork.git] / gcc / config.gcc

diff --git a/gcc/config.gcc b/gcc/config.gcc
index dbc6deb..058fef7 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -301,7 +301,7 @@ powerpc*-*-*)
        extra_headers="ppc-asm.h altivec.h spe.h"
        need_64bit_hwint=yes
        case x$with_cpu in
-           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345]|xrs64a)
+           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[3456]|xrs64a)
                cpu_is_64bit=yes
                ;;
        esac
@@ -931,6 +931,7 @@ hppa[12]*-*-hpux10*)
        fi
        use_collect2=yes
        use_fixproto=yes
+       gas=yes
        ;;
 hppa*64*-*-hpux11*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
@@ -938,16 +939,9 @@ hppa*64*-*-hpux11*)
        then
                target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
        fi
-       if test x$gas = xyes
-       then
-               tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h \
-                        pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
-                        pa/pa-hpux11.h"
-       else
-               tm_file="pa/pa64-start.h ${tm_file} dbxelf.h pa/elf.h \
-                        pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
-                        pa/pa-hpux11.h"
-       fi
+       tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h \
+                pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
+                pa/pa-hpux11.h"
        case ${target} in
        *-*-hpux11.[1-9]*)
                tm_file="${tm_file} pa/pa-hpux1111.h pa/pa-64.h pa/pa64-hpux.h"
@@ -974,6 +968,7 @@ hppa*64*-*-hpux11*)
                thread_file=posix 
                ;;
        esac
+       gas=yes
        ;;
 hppa[12]*-*-hpux11*)
        case ${target} in
@@ -1003,6 +998,7 @@ hppa[12]*-*-hpux11*)
                ;;
        esac
        use_collect2=yes
+       gas=yes
        ;;
 i[34567]86-*-darwin*)
        # All the configuration is presently done generically.
@@ -1168,6 +1164,9 @@ i[34567]86-*-solaris2*)
        else
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
+       if test x$gas = xyes; then
+               tm_file="usegas.h ${tm_file}"
+       fi
        case ${target} in
        *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
                tm_file="$tm_file tm-dwarf2.h"
@@ -1179,6 +1178,20 @@ i[34567]86-*-solaris2*)
                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                tmake_file="$tmake_file i386/t-sol2-10"
                need_64bit_hwint=yes
+               # FIXME: -m64 for i[34567]86-*-* should be allowed just
+               # like -m32 for x86_64-*-*.
+               case X"${with_cpu}" in
+               Xgeneric|Xnocona|Xx86-64|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                       ;;
+               X)
+                       with_cpu=generic
+                       ;;
+               *)
+                       echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
+                       echo "generic nocona x86-64 k8 opteron athlon64 athlon-fx" 1>&2
+                       exit 1
+                       ;;
+               esac
                # Solaris 2.10 provides crt1.o, crti.o, crtn.o, and gcrt1.o as 
                # part of the base system.
                extra_parts="gmon.o crtbegin.o crtend.o"
@@ -1557,7 +1570,7 @@ mipsisa64sr71k-*-elf*)
         ;;
 mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
-       tmake_file=mips/t-elf
+       tmake_file="mips/t-elf mips/t-sb1"
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
@@ -2812,7 +2825,7 @@ case "${target}" in
                                eval "with_$which=405"
                                ;;
                        "" | common \
-                       | power | power[2345] | powerpc | powerpc64 \
+                       | power | power[23456] | powerpc | powerpc64 \
                        | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
                        | 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
                        | 601 | 602 | 603 | 603e | ec603e | 604 \