Daily bump.

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

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 8434663..6d3cab1 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -30,7 +30,7 @@
 #
 #  with_*              Various variables as set by configure.
 #
-#  enable_threads_flag Either the name, yes or no depending on whether
+#  enable_threads      Either the name, yes or no depending on whether
 #                      threads support was requested.
 #
 #  default_use_cxa_atexit
@@ -167,7 +167,6 @@ thread_file=
 # configure entries modify them.
 gas="$gas_flag"
 gnu_ld="$gnu_ld_flag"
-enable_threads=$enable_threads_flag
 default_use_cxa_atexit=no
 target_gtfiles=
 need_64bit_hwint=
@@ -790,13 +789,15 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
        target_cpu_default="(MASK_PA_11 | MASK_BIG_SWITCH)"
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
-       if test x$enable_threads = x; then
-           enable_threads=$have_pthread_h
-       fi
-       case x${enable_threads} in
-       xyes | xdce)
-               tmake_file="${tmake_file} pa/t-dce-thr"
-               ;;
+       case ${enable_threads} in
+         "")
+           if test x$have_pthread_h = xyes ; then
+             tmake_file="${tmake_file} pa/t-dce-thr"
+           fi
+           ;;
+         yes | dce)
+           tmake_file="${tmake_file} pa/t-dce-thr"
+           ;;
        esac
        use_collect2=yes
        use_fixproto=yes
@@ -804,13 +805,15 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
 hppa1.0-*-hpux10*)
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
-       if test x$enable_threads = x; then
-           enable_threads=$have_pthread_h
-       fi
-       case x${enable_threads} in
-       xyes | xdce)
-               tmake_file="${tmake_file} pa/t-dce-thr"
-               ;;
+       case ${enable_threads} in
+         "")
+           if test x$have_pthread_h = xyes ; then
+             tmake_file="${tmake_file} pa/t-dce-thr"
+           fi
+           ;;
+         yes | dce)
+           tmake_file="${tmake_file} pa/t-dce-thr"
+           ;;
        esac
        use_collect2=yes
        use_fixproto=yes
@@ -985,19 +988,11 @@ i[34567]86-*-solaris2*)
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
        extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-       if test x${enable_threads} = x; then
-           enable_threads=$have_pthread_h
-           if test x${enable_threads} = x; then
-               enable_threads=$have_thread_h
-           fi
-       fi
-       if test x${enable_threads} = xyes; then
-           if test x${have_pthread_h} = xyes; then
-               thread_file='posix'
-           else
-               thread_file='solaris'
-           fi
-       fi
+       case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
+         no:*:*) ;;
+         *:yes:* ) thread_file=posix ;;
+         yes:*:* | *:*:yes ) thread_file=solaris ;;
+       esac
        ;;
 i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h"
@@ -1414,7 +1409,6 @@ mips64-*-elf* | mips64el-*-elf*)
        ;;
 mips64vr-*-elf* | mips64vrel-*-elf*)
         tm_file="mips/vr.h ${tm_file} mips/elf64.h"
-        tm_defines="MIPS_ABI_DEFAULT=ABI_O64 MIPS_MARCH_CONTROLS_SOFT_FLOAT=1"
         tmake_file=mips/t-vr
        use_fixproto=yes
         ;;
@@ -1785,10 +1779,6 @@ sh-*-*)
        tm_file="${tm_file} dbxcoff.h sh/coff.h"
        use_fixproto=yes
        ;;
-sparc-tti-*)
-       tm_file="${tm_file} sparc/pbd.h"
-       use_fixproto=yes
-       ;;
 sparc-*-netbsdelf*)
        tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
        ;;
@@ -1813,7 +1803,7 @@ sparc-*-elf*)
        ;;
 sparc-*-linux*)                # SPARC's running GNU/Linux, libc6
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
-       tmake_file="${tmake_file} sparc/t-linux sparc/t-crtfm"
+       tmake_file="${tmake_file} sparc/t-crtfm"
        ;;
 sparc-*-rtems*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/rtemself.h rtems.h"
@@ -1835,19 +1825,11 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
        extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
-       if test x${enable_threads} = x ; then
-           enable_threads=$have_pthread_h
-           if test x${enable_threads} = x ; then
-               enable_threads=$have_thread_h
-           fi
-       fi
-       if test x${enable_threads} = xyes ; then
-           if test x${have_pthread_h} = xyes ; then
-               thread_file='posix'
-           else
-               thread_file='solaris'
-           fi
-       fi
+       case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
+         no:*:*) ;;
+         *:yes:* ) thread_file=posix ;;
+         yes:*:* | *:*:yes ) thread_file=solaris ;;
+       esac
        need_64bit_hwint=yes
        ;;
 sparc-*-solaris2*)
@@ -1880,19 +1862,11 @@ sparc-*-solaris2*)
                ;;
        esac
        extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-       if test x${enable_threads} = x; then
-           enable_threads=$have_pthread_h
-           if test x${enable_threads} = x; then
-               enable_threads=$have_thread_h
-           fi
-       fi
-       if test x${enable_threads} = xyes; then
-           if test x${have_pthread_h} = xyes; then
-               thread_file='posix'
-           else
-               thread_file='solaris'
-           fi
-       fi
+       case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
+         no:*:*) ;;
+         *:yes:* ) thread_file=posix ;;
+         yes:*:* | *:*:yes ) thread_file=solaris ;;
+       esac
        ;;
 sparc-*-sysv4*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sysv4-only.h"
@@ -2227,7 +2201,7 @@ fi
                ;;
 
        arm*-*-*)
-               supported_defaults="arch cpu float tune fpu"
+               supported_defaults="arch cpu float tune fpu abi"
                for which in cpu tune; do
                        eval "val=\$with_$which"
                        case "$val" in
@@ -2281,13 +2255,24 @@ fi
                        # OK
                        ;;
                *)
-                       echo "Unknown fpu used in --with-fpu=$fpu" 2>&1
+                       echo "Unknown fpu used in --with-fpu=$with_fpu" 2>&1
+                       exit 1
+                       ;;
+               esac
+
+               case "$with_abi" in
+               "" \
+               | apcs-gnu | atpcs | aapcs | iwmmxt )
+                       #OK
+                       ;;
+               *)
+                       echo "Unknown ABI used in --with-abi=$with_abi"
                        exit 1
                        ;;
                esac
 
                if test "x$with_arch" != x && test "x$with_cpu" != x; then
-                       echo "Warning: --with-arch overrides --with-cpu" 1>&2
+                       echo "Warning: --with-arch overrides --with-cpu=$with_cpu" 1>&2
                fi
                ;;