PR preprocessor/19475

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

diff --git a/gcc/config.gcc b/gcc/config.gcc
index bcd3525..4468992 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -184,10 +184,11 @@ md_file=
 
 # Obsolete configurations.
 case ${target} in
-   sparclite-*-coff*   \
- | sparclite-*-elf*    \
- | sparc86x-*-elf*     \
- | sparc-*-openbsd*    \
+   sparc-*-openbsd*    \
+ | i860-*-sysv4*       \
+ | ip2k-*-elf          \
+ | ns32k-*-netbsdelf*  \
+ | ns32k-*-netbsd*     \
  )
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration ${target} is obsolete." >&2
@@ -231,6 +232,7 @@ esac
 # machines.
 tm_p_file=
 cpu_type=`echo ${target} | sed 's/-.*$//'`
+cpu_is_64bit=
 case ${target} in
 alpha*-*-*)
        cpu_type=alpha
@@ -246,6 +248,9 @@ arm*-*-*)
        cpu_type=arm
        extra_headers="mmintrin.h"
        ;;
+bfin*-*)
+       cpu_type=bfin
+       ;;
 ep9312*-*-*)
        cpu_type=arm
        ;;
@@ -287,6 +292,11 @@ powerpc*-*-*)
        cpu_type=rs6000
        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)
+               cpu_is_64bit=yes
+               ;;
+       esac
        ;;
 rs6000*-*-*)
        need_64bit_hwint=yes
@@ -592,15 +602,15 @@ alpha*-dec-osf[45]*)
        extra_headers=va_list.h
        case ${target} in
          *-*-osf4*)
-           # Set target_cpu_default except on 4.0a.
+           # Define TARGET_SUPPORT_ARCH except on 4.0a.
            case ${target} in
                *-*-osf4.0a) ;;
-               *) target_cpu_default=MASK_SUPPORT_ARCH
+               *) tm_defines="TARGET_SUPPORT_ARCH=1"
            esac
            ;;
          *-*-osf5*)
            tm_file="${tm_file} alpha/osf5.h"
-           target_cpu_default=MASK_SUPPORT_ARCH
+           tm_defines="TARGET_SUPPORT_ARCH=1"
            ;;
        esac
        case ${enable_threads} in
@@ -720,6 +730,16 @@ avr-*-*)
        tm_file="avr/avr.h dbxelf.h"
        use_fixproto=yes
        ;;
+bfin*-elf*)
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
+        tmake_file=bfin/t-bfin-elf
+        use_collect2=no
+        ;;  
+bfin*-*)
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
+        tmake_file=bfin/t-bfin
+        use_collect2=no
+        ;;  
 c4x-*-rtems* | tic4x-*-rtems*)
        tmake_file="c4x/t-c4x t-rtems c4x/t-rtems"
        tm_file="c4x/c4x.h c4x/rtems.h rtems.h"
@@ -1061,12 +1081,12 @@ i[34567]86-*-solaris2*)
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
        case ${target} in
-       *-*-solaris2.[789] | *-*-solaris2.1[0-9])
+       *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
                tm_file="$tm_file tm-dwarf2.h"
                ;;
        esac
        case ${target} in
-       *-*-solaris2.1[0-9])
+       *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h"
                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                tmake_file="$tmake_file i386/t-sol2-10"
@@ -1227,6 +1247,7 @@ ia64*-*-hpux*)
        use_collect2=no
        c_target_objs="ia64-c.o"
        cxx_target_objs="ia64-c.o"
+       extra_options="${extra_options} ia64/ilp32.opt"
        # If we decide to run fixproto we should define FIXPROTO_DEFINES
        # in ia64/t-hpux, and also fix the definition of putenv in
        # sys-protos.h (const char not char).
@@ -1535,12 +1556,10 @@ avr-*-*)
 #      extra_headers=
 #      ;;
 powerpc64-*-linux*)
-       tm_file="rs6000/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-       case x$with_cpu in
-       x|xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345]|xrs64a)
-               tm_file="${tm_file} rs6000/default64.h";;
-       esac
-       tm_file="${tm_file} rs6000/linux64.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+       test x$with_cpu != x || cpu_is_64bit=yes
+       test x$cpu_is_64bit != xyes || tm_file="${tm_file} rs6000/default64.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
        tmake_file="rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64"
        ;;
 powerpc64-*-gnu*)
@@ -1619,8 +1638,20 @@ powerpc-*-linux*spe*)
        tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
        ;;
 powerpc-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       case ${enable_targets}:${cpu_is_64bit} in
+           *powerpc64* | all:* | *:yes)
+               if test x$cpu_is_64bit = xyes; then
+                   tm_file="${tm_file} rs6000/default64.h"
+               fi
+               tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
+               tmake_file="$tmake_file rs6000/t-linux64"
+               ;;
+           *)
+               tm_file="${tm_file} rs6000/linux.h"
+               ;;
+       esac
        ;;
 powerpc-*-gnu-gnualtivec*)
        tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h"
@@ -1971,7 +2002,7 @@ sparc-*-solaris2*)
                        tm_file="${tm_file} sparc/sol26-sld.h"
                fi
                ;;
-       *-*-solaris2.[789] | *-*-solaris2.1[0-9])
+       *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
                tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h tm-dwarf2.h"
                if test x$gnu_ld = xyes; then
                        tm_file="${tm_file} sparc/sol2-gld-bi.h"
@@ -2010,22 +2041,6 @@ sparc-*-sysv4*)
        extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
-sparclite-*-coff*)
-       tm_file="${tm_file} sparc/lite.h svr3.h sparc/litecoff.h dbxcoff.h libgloss.h"
-       tmake_file=sparc/t-sparclite
-       ;;
-sparclite-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/liteelf.h"
-       tmake_file="sparc/t-sparclite sparc/t-crtfm"
-        extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
-       ;;
-sparc86x-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/sp86x-elf.h"
-       tmake_file="sparc/t-sp86x sparc/t-crtfm"
-        extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
-       ;;
 sparc64-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h"
        tmake_file="${tmake_file} sparc/t-crtfm"
@@ -2171,6 +2186,7 @@ xstormy16-*-elf)
        tm_p_file=stormy16/stormy16-protos.h
        md_file=stormy16/stormy16.md
        out_file=stormy16/stormy16.c
+       extra_options=stormy16/stormy16.opt
        tmake_file="stormy16/t-stormy16"
        extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
@@ -2752,9 +2768,6 @@ case ${target} in
                xsparc)
                        with_cpu=v7
                        ;;
-               xsparc86x)
-                       with_cpu=sparclite86x
-                       ;;
                xsparcv9 | xsparc64)
                        with_cpu=v9
                        ;;