OSDN Git Service

* config.guess (i[34567]86-*-solaris2*): Default with_arch_32,
authorro@138bc75d-0d04-0410-961f-82ee72b054a4 <ro@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 1 Apr 2010 10:32:10 +0000 (10:32 +0000)
committerMasaki Muranaka <monaka@monami-software.com>
Sun, 23 May 2010 00:42:02 +0000 (09:42 +0900)
with_tune_32 to pentium4.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157903 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog
gcc/config.gcc

index 9f61676..7a194bd 100644 (file)
@@ -1,3 +1,8 @@
+2010-04-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * config.guess (i[34567]86-*-solaris2*): Default with_arch_32,
+       with_tune_32 to pentium4.
+
 2010-04-01  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/cpuid.h (__get_cpuid_max): Move misplaced comment.
index 7318a94..c26ae5a 100644 (file)
@@ -200,24 +200,27 @@ default_use_cxa_atexit=no
 target_gtfiles=
 need_64bit_hwint=
 need_64bit_isa=
-# Selects the object file format reader/writer used by LTO.
-lto_binary_reader=lto-elf
 
 # Don't carry these over build->host->target.  Please.
 xm_file=
 md_file=
 
 # Obsolete configurations.
-#case ${target} in
-# )
-#    if test "x$enable_obsolete" != xyes; then
-#      echo "*** Configuration ${target} is obsolete." >&2
-#      echo "*** Specify --enable-obsolete to build it anyway." >&2
-#      echo "*** Support will be REMOVED in the next major release of GCC," >&2
-#      echo "*** unless a maintainer comes forward." >&2
-#      exit 1
-#    fi;;
-#esac
+case ${target} in
+   alpha*-dec-osf4*                    \
+ | alpha*-dec-osf5.0*                  \
+ | mips-sgi-irix5*                     \
+ | mips-sgi-irix6.[0-4]*               \
+ | *-*-solaris2.7*                     \
+ )
+    if test "x$enable_obsolete" != xyes; then
+      echo "*** Configuration ${target} is obsolete." >&2
+      echo "*** Specify --enable-obsolete to build it anyway." >&2
+      echo "*** Support will be REMOVED in the next major release of GCC," >&2
+      echo "*** unless a maintainer comes forward." >&2
+      exit 1
+    fi;;
+esac
 
 # Unsupported targets list.  Do not put an entry in this list unless
 # it would otherwise be caught by a more permissive pattern.  The list
@@ -235,8 +238,8 @@ case ${target} in
  | *-*-linux*oldld*                    \
  | *-*-rtemsaout*                      \
  | *-*-rtemscoff*                      \
- | *-*-solaris2.[0-7]                  \
- | *-*-solaris2.[0-7].*                        \
+ | *-*-solaris2.[0-6]                  \
+ | *-*-solaris2.[0-6].*                        \
  | *-*-sysv*           \
  | vax-*-vms*                          \
  )
@@ -648,7 +651,7 @@ alpha*-*-openbsd*)
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
        ;;
-alpha*-dec-osf5.1*)
+alpha*-dec-osf[45]*)
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -658,11 +661,23 @@ alpha*-dec-osf5.1*)
                extra_passes="mips-tfile mips-tdump"
        fi
        use_collect2=yes
-       tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf5"
-       tm_file="${tm_file} alpha/osf5.h"
-       tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
+       tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf4"
+       tm_file="${tm_file} alpha/osf.h"
        extra_headers=va_list.h
        use_gcc_stdint=provide
+       case ${target} in
+         *-*-osf4*)
+           # Define TARGET_SUPPORT_ARCH except on 4.0a.
+           case ${target} in
+               *-*-osf4.0a) ;;
+               *) tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
+           esac
+           ;;
+         *-*-osf5*)
+           tm_file="${tm_file} alpha/osf5.h"
+           tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
+           ;;
+       esac
        case ${enable_threads} in
          "" | yes | posix)
            thread_file='posix'
@@ -1077,13 +1092,11 @@ i[34567]86-*-darwin*)
        # support.
        with_cpu=${with_cpu:-generic}
        tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
-       lto_binary_reader=lto-macho
        ;;
 x86_64-*-darwin*)
        with_cpu=${with_cpu:-generic}
        tmake_file="${tmake_file} t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
        tm_file="${tm_file} ${cpu_type}/darwin64.h"
-       lto_binary_reader=lto-macho
        ;;
 i[34567]86-*-elf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h"
@@ -1139,7 +1152,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
                        need_64bit_hwint=yes
                        need_64bit_isa=yes
                        case X"${with_cpu}" in
-                       Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
+                       Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                                ;;
                        X)
                                if test x$with_cpu_64 = x; then
@@ -1148,7 +1161,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
                                ;;
                        *)
                                echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                               echo "generic atom core2 nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
+                               echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                exit 1
                                ;;
                        esac
@@ -1223,31 +1236,16 @@ i[34567]86-*-rtems*)
        ;;
 i[34567]86-*-solaris2*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
-       # Set default arch_32 to pentium4, tune_32 to generic like the other
-       # i386 targets, although config.guess defaults to i386-pc-solaris2*.
-       case ${target} in
-       *-*-solaris2.8*)
-               if test x$gas = xyes; then
-                       with_arch_32=${with_arch_32:-pentium4}
-               else
-                       # Solaris 8/x86 as cannot handle sse2.
-                       with_arch_32=${with_arch_32:-pentiumpro}
-               fi
-               ;;
-       *)
-               with_arch_32=${with_arch_32:-pentium4}
-               ;;
-       esac
-       with_tune_32=${with_tune_32:-generic}
+       # Set default arch and tune to pentium4 like the other i386 targets,
+       # although config.guess defaults to i386-pc-solaris2*.
+       with_arch_32=${with_arch_32:-pentium4}
+       with_tune_32=${with_tune_32:-pentium4}
        case ${target} in
        *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} sol2-10.h"
                ;;
        esac
        tm_file="${tm_file} i386/sol2.h"
-       if test x$gnu_ld = xyes; then
-               tm_file="${tm_file} sol2-gld.h"
-       fi
        if test x$gas = xyes; then
                tm_file="${tm_file} i386/sol2-gas.h"
        fi
@@ -1278,7 +1276,7 @@ i[34567]86-*-solaris2*)
                need_64bit_isa=yes
                use_gcc_stdint=wrap
                case X"${with_cpu}" in
-               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
+               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                        ;;
                X)
                        if test x$with_cpu_64 = x; then
@@ -1287,7 +1285,7 @@ i[34567]86-*-solaris2*)
                        ;;
                *)
                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                       echo "generic atom core2 nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
+                       echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                        exit 1
                        ;;
                esac
@@ -1338,7 +1336,6 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
                thread_file='posix'
        fi
        use_gcc_stdint=wrap
-       lto_binary_reader=lto-coff
        ;;
 i[34567]86-*-mingw* | x86_64-*-mingw*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
@@ -1358,7 +1355,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                        if test x$enable_targets = xall; then
                                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                                case X"${with_cpu}" in
-                               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
+                               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                                        ;;
                                X)
                                        if test x$with_cpu_64 = x; then
@@ -1367,7 +1364,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                                        ;;
                                *)
                                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                                       echo "generic atom core2 nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
+                                       echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                        exit 1
                                        ;;
                                esac
@@ -1385,12 +1382,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        fi
        tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming"
         case ${target} in
-               x86_64-w64-*)
+               *-w64-*)
                                tmake_file="${tmake_file} i386/t-mingw-w64"
                        ;;
-              i[34567]86-w64-*)
-                       tmake_file="${tmake_file} i386/t-mingw-w32"
-                       ;;
                *)
                                tmake_file="${tmake_file} i386/t-mingw32"
                        ;;
@@ -1409,7 +1403,6 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        default_use_cxa_atexit=yes
        use_gcc_stdint=wrap
-       lto_binary_reader=lto-coff
        case ${enable_threads} in
          "" | yes | win32)       thread_file='win32'
          tmake_file="${tmake_file} i386/t-gthr-win32"
@@ -1511,11 +1504,6 @@ lm32-*-elf*)
         tm_file="dbxelf.h elfos.h ${tm_file}"
        tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
         ;;
-lm32-*-rtems*)
-       tm_file="dbxelf.h elfos.h ${tm_file} lm32/rtems.h rtems.h"
-       tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
-       tmake_file="${tmake_file} t-rtems"
-         ;;
 lm32-*-uclinux*)
         tm_file="dbxelf.h elfos.h ${tm_file} linux.h lm32/uclinux-elf.h"
        tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
@@ -1683,16 +1671,35 @@ mep-*-*)
        fi
        use_gcc_stdint=wrap
        ;;
-mips-sgi-irix6.5*)
-       tm_file="elfos.h ${tm_file} mips/iris6.h"
-       tmake_file="mips/t-iris mips/t-iris6 mips/t-slibgcc-irix"
+mips-sgi-irix[56]*)
+       tm_file="elfos.h ${tm_file} mips/iris.h"
+       tmake_file="mips/t-iris mips/t-slibgcc-irix"
        target_cpu_default="MASK_ABICALLS"
-       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
-       # Only IRIX Development Foundation 1.3 for IRIX 6.5 provides stdint.h.
-       use_gcc_stdint=wrap
+       case ${target} in
+       *-*-irix5*)
+               tm_file="${tm_file} mips/iris5.h"
+               use_gcc_stdint=provide
+               ;;
+
+       *-*-irix6*)
+               tm_file="${tm_file} mips/iris6.h"
+               tmake_file="${tmake_file} mips/t-iris6"
+               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
+               case ${target} in
+               *-*-irix6.[0-4]*)
+                       use_gcc_stdint=provide
+                       ;;
+               *-*-irix6.5*)
+                       # Only IRIX Development Foundation 1.3 for IRIX 6.5
+                       # provides stdint.h.
+                       use_gcc_stdint=wrap
+                       ;;
+               esac
+               ;;
+       esac
        if test "x$stabs" = xyes
        then
-               tm_file="${tm_file} dbx.h"
+               tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
        fi
        if test "x$gnu_ld" = xyes
        then
@@ -1760,6 +1767,7 @@ mips*-sde-elf*)
            # MIPS toolkit libraries.
            tm_file="$tm_file mips/sdemtk.h"
            tmake_file="$tmake_file mips/t-sdemtk"
+           extra_options="$extra_options mips/sdemtk.opt"
            case ${enable_threads} in
              "" | yes | mipssde)
                thread_file='mipssde'
@@ -1902,14 +1910,12 @@ powerpc-*-darwin*)
          *-darwin[0-6]*)
            ;;
        esac
-       lto_binary_reader=lto-macho
        extra_headers=altivec.h
        ;;
 powerpc64-*-darwin*)
        tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
        extra_options="${extra_options} ${cpu_type}/darwin.opt"
        # We're omitting t-darwin8 to avoid building any multilibs
-       lto_binary_reader=lto-macho
        extra_headers=altivec.h
        ;;
 powerpc*-*-freebsd*)
@@ -2376,12 +2382,6 @@ sparc-*-rtems*)
        tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
-sparc64-*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
-       extra_options="${extra_options} sparc/little-endian.opt"
-       tmake_file="${tmake_file} sparc/t-crtfm t-rtems"
-       extra_parts="crtbegin.o crtend.o"
-       ;;
 sparc*-*-solaris2*)
        tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
        case ${target} in
@@ -2407,7 +2407,7 @@ sparc*-*-solaris2*)
                tm_file="${tm_file} sparc/sol2-gas.h sparc/sol2-gas-bi.h"
        fi
        if test x$gnu_ld = xyes; then
-               tm_file="${tm_file} sol2-gld.h sparc/sol2-gld-bi.h"
+               tm_file="${tm_file} sparc/sol2-gld.h sparc/sol2-gld-bi.h"
        fi
        tm_file="${tm_file} tm-dwarf2.h"
        tmake_file="t-sol2 sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
@@ -2645,10 +2645,6 @@ case ${target} in
     ;;
   i686-*-* | i786-*-*)
     case ${target_noncanonical} in
-      bdver1-*)
-       arch=bdver1
-       cpu=bdver1
-       ;;
       amdfam10-*|barcelona-*)
        arch=amdfam10
        cpu=amdfam10
@@ -2726,10 +2722,6 @@ case ${target} in
     ;;
   x86_64-*-*)
     case ${target_noncanonical} in
-      bdver1-*)
-       arch=bdver1
-       cpu=bdver1
-       ;;
       amdfam10-*|barcelona-*)
        arch=amdfam10
        cpu=amdfam10
@@ -3136,8 +3128,8 @@ case "${target}" in
                                ;;
                        "" | x86-64 | generic | native \
                        | k8 | k8-sse3 | athlon64 | athlon64-sse3 | opteron \
-                       | opteron-sse3 | athlon-fx | bdver1 | amdfam10 \
-                       | barcelona | nocona | core2 | atom)
+                       | opteron-sse3 | athlon-fx | amdfam10 | barcelona \
+                       | nocona | core2 | atom)
                                # OK
                                ;;
                        *)
@@ -3411,9 +3403,7 @@ case ${target} in
        i[34567]86-*-darwin* | x86_64-*-darwin*)
                tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
                ;;
-       i[34567]86-*-linux* | x86_64-*-linux* | \
-         i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu | \
-         i[34567]86-*-gnu*)
+       i[34567]86-*-linux* | x86_64-*-linux* | i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu)
                tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp i386/t-linux"
                ;;
        i[34567]86-*-solaris2*)