OSDN Git Service

2010-12-08 Iain Sandoe <iains@gcc.gnu.org>
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index b813ca3..12377e6 100644 (file)
@@ -219,8 +219,6 @@ default_gnu_indirect_function=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=
@@ -313,29 +311,31 @@ i[34567]86-*-*)
        cpu_type=i386
        c_target_objs="i386-c.o"
        cxx_target_objs="i386-c.o"
+       extra_options="${extra_options} fused-madd.opt"
        extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
                       nmmintrin.h bmmintrin.h fma4intrin.h wmmintrin.h
                       immintrin.h x86intrin.h avxintrin.h xopintrin.h
                       ia32intrin.h cross-stdarg.h lwpintrin.h popcntintrin.h
-                      abmintrin.h"
+                      abmintrin.h bmiintrin.h tbmintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
        c_target_objs="i386-c.o"
        cxx_target_objs="i386-c.o"
+       extra_options="${extra_options} fused-madd.opt"
        extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
                       nmmintrin.h bmmintrin.h fma4intrin.h wmmintrin.h
                       immintrin.h x86intrin.h avxintrin.h xopintrin.h
                       ia32intrin.h cross-stdarg.h lwpintrin.h popcntintrin.h
-                      abmintrin.h"
+                      abmintrin.h bmiintrin.h tbmintrin.h"
        need_64bit_hwint=yes
        ;;
 ia64-*-*)
        extra_headers=ia64intrin.h
        need_64bit_hwint=yes
-       extra_options="${extra_options} g.opt"
+       extra_options="${extra_options} g.opt fused-madd.opt"
        ;;
 hppa*-*-*)
        cpu_type=pa
@@ -372,11 +372,11 @@ powerpc*-*-*)
                cpu_is_64bit=yes
                ;;
        esac
-       extra_options="${extra_options} g.opt"
+       extra_options="${extra_options} g.opt fused-madd.opt"
        ;;
 rs6000*-*-*)
        need_64bit_hwint=yes
-       extra_options="${extra_options} g.opt"
+       extra_options="${extra_options} g.opt fused-madd.opt"
        ;;
 score*-*-*)
        cpu_type=score
@@ -393,12 +393,16 @@ spu*-*-*)
 s390*-*-*)
        cpu_type=s390
        need_64bit_hwint=yes
+       extra_options="${extra_options} fused-madd.opt"
        ;;
 # Note the 'l'; we need to be able to match e.g. "shle" or "shl".
 sh[123456789lbe]*-*-* | sh-*-*)
        cpu_type=sh
        need_64bit_hwint=yes
        ;;
+xtensa*-*-*)
+       extra_options="${extra_options} fused-madd.opt"
+       ;;
 esac
 
 tm_file=${cpu_type}/${cpu_type}.h
@@ -528,6 +532,7 @@ case ${target} in
       ;;
   esac
   fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h freebsd-stdint.h"
+  extra_options="$extra_options rpath.opt freebsd.opt"
   case ${target} in
     *-*-freebsd[345].*)
       :;;
@@ -727,6 +732,7 @@ alpha*-dec-osf5.1*)
        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"
+       extra_options="${extra_options} rpath.opt"
        extra_headers=va_list.h
        use_gcc_stdint=provide
        case ${enable_threads} in
@@ -787,6 +793,7 @@ arm*-*-linux*)                      # ARM GNU/Linux with ELF
        case ${target} in
        arm*-*-linux-*eabi)
            tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+           tm_file="$tm_file ../../libgcc/config/arm/bpabi.h"
            tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
            # Define multilib configuration for arm-linux-androideabi.
            case ${target} in
@@ -814,6 +821,7 @@ arm*-*-uclinux*)            # ARM ucLinux
        case ${target} in
        arm*-*-uclinux*eabi)
            tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
+           tm_file="$tm_file ../../libgcc/config/arm/bpabi.h"
            tmake_file="$tmake_file arm/t-bpabi"
            # The BPABI long long divmod functions return a 128-bit value in
            # registers r0-r3.  Correctly modeling that requires the use of
@@ -837,6 +845,7 @@ arm*-*-eabi* | arm*-*-symbianelf* )
        need_64bit_hwint=yes
        default_use_cxa_atexit=yes
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
+       tm_file="$tm_file ../../libgcc/config/arm/bpabi.h"
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
        arm*-*-eabi*)
@@ -908,7 +917,7 @@ bfin*-linux-uclibc*)
        use_collect2=no
        ;;
 bfin*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h bfin/rtems.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h bfin/rtems.h rtems.h newlib-stdint.h"
        tmake_file="bfin/t-bfin t-rtems bfin/t-rtems"
        ;;
 bfin*-*)
@@ -957,12 +966,14 @@ fr30-*-elf)
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
 frv-*-elf)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file} frv/frv-abi.h"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+       tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
        tmake_file=frv/t-frv
        ;;
 frv-*-*linux*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} \
-                linux.h glibc-stdint.h frv/linux.h frv/frv-abi.h"
+                linux.h glibc-stdint.h frv/linux.h"
+       tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
        tmake_file="${tmake_file} frv/t-frv frv/t-linux"
        ;;
 moxie-*-elf)
@@ -1054,6 +1065,10 @@ hppa[12]*-*-hpux10*)
        fi
        use_collect2=yes
        gas=yes
+       if test "x$with_dwarf2" != x; then
+               echo "Warning: dwarf2 debug format is not supported for this target, --with-dwarf2 ignored" 1>&2
+               dwarf2=no
+       fi
        ;;
 hppa*64*-*-hpux11*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
@@ -1142,26 +1157,22 @@ hppa[12]*-*-hpux11*)
                tm_file="${tm_file} hpux-stdint.h"
                ;;
        esac
+       if test "x$with_dwarf2" != x; then
+               echo "Warning: dwarf2 debug format is not supported for this target, --with-dwarf2 ignored" 1>&2
+               dwarf2=no
+       fi
        ;;
 i[34567]86-*-darwin*)
        need_64bit_hwint=yes
        need_64bit_isa=yes
-
-       # This is so that '.../configure && make' doesn't fail due to
-       # config.guess deciding that the configuration is i386-*-darwin* and
-       # then this file using that to set --with-cpu=i386 which has no -m64
-       # support.
-       with_cpu=${with_cpu:-generic}
+       # Baseline choice for a machine that allows m64 support.
+       with_cpu=${with_cpu:-core2}
        tmake_file="${tmake_file} t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
-       extra_options="${extra_options} i386/darwin.opt"
-       lto_binary_reader=lto-macho
        ;;
 x86_64-*-darwin*)
-       with_cpu=${with_cpu:-generic}
+       with_cpu=${with_cpu:-core2}
        tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
        tm_file="${tm_file} ${cpu_type}/darwin64.h"
-       extra_options="${extra_options} i386/darwin.opt"
-       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"
@@ -1219,7 +1230,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|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                                ;;
                        X)
                                if test x$with_cpu_64 = x; then
@@ -1228,7 +1239,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 corei7 corei7-avx nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                exit 1
                                ;;
                        esac
@@ -1357,7 +1368,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|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                        ;;
                X)
                        if test x$with_cpu_64 = x; then
@@ -1366,7 +1377,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 corei7 corei7-avx nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                        exit 1
                        ;;
                esac
@@ -1410,14 +1421,12 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt"
        extra_objs="winnt.o winnt-stubs.o"
-       c_target_objs="${c_target_objs} cygwin2.o msformat-c.o"
-       cxx_target_objs="${cxx_target_objs} cygwin2.o winnt-cxx.o msformat-c.o"
-       extra_gcc_objs=cygwin1.o
+       c_target_objs="${c_target_objs} msformat-c.o"
+       cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        if test x$enable_threads = xyes; then
                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"
@@ -1439,7 +1448,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|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                                        ;;
                                X)
                                        if test x$with_cpu_64 = x; then
@@ -1448,7 +1457,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 corei7 Xcorei7-avx nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                        exit 1
                                        ;;
                                esac
@@ -1490,7 +1499,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"
@@ -1514,6 +1522,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
 i[34567]86-*-interix3*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
        tmake_file="${tmake_file} i386/t-interix"
+       extra_options="${extra_options} rpath.opt"
        extra_objs=winnt.o
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        if test x$enable_threads = xyes ; then
@@ -1593,7 +1602,7 @@ lm32-*-elf*)
        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"
+       tm_file="dbxelf.h elfos.h ${tm_file} lm32/rtems.h rtems.h newlib-stdint.h"
        tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
        tmake_file="${tmake_file} t-rtems"
          ;;
@@ -1780,6 +1789,7 @@ microblaze*-*-*)
 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"
+       extra_options="${extra_options} rpath.opt"
        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.
@@ -1979,6 +1989,7 @@ pdp11-*-*)
 picochip-*)
        tm_file="${tm_file} newlib-stdint.h"
        use_gcc_stdint=wrap
+       tmake_file="picochip/t-picochip t-pnt16-warn"
         ;;
 # port not yet contributed
 #powerpc-*-openbsd*)
@@ -2000,7 +2011,6 @@ powerpc-*-darwin*)
            ;;
        esac
        tmake_file="${tmake_file} t-slibgcc-darwin"
-       lto_binary_reader=lto-macho
        extra_headers=altivec.h
        ;;
 powerpc64-*-darwin*)
@@ -2008,7 +2018,6 @@ powerpc64-*-darwin*)
        extra_parts="crt2.o"
        tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin"
        tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
-       lto_binary_reader=lto-macho
        extra_headers=altivec.h
        ;;
 powerpc*-*-freebsd*)
@@ -2324,6 +2333,9 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        sh64*)
                tmake_file="${tmake_file} sh/t-sh64"
                tm_file="${tm_file} sh/sh64.h"
+               if test x$with_newlib = xyes; then
+                       tm_file="${tm_file} newlib-stdint.h"
+               fi
                extra_headers="shmedia.h ushmedia.h sshmedia.h"
                ;;
        *-*-symbianelf*)
@@ -2442,23 +2454,17 @@ sh-wrs-vxworks)
        tmake_file="$tmake_file sh/t-sh sh/t-elf sh/t-vxworks"
        tm_file="${tm_file} elfos.h svr4.h sh/elf.h sh/embed-elf.h vx-common.h vxworks.h sh/vxworks.h"
        ;;
-sparc-*-netbsdelf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
-       extra_options="${extra_options} sparc/long-double-switch.opt"
-       ;;
-sparc64-*-openbsd*)
-       tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h"
-       tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h sparc/openbsd64.h"
-       extra_options="${extra_options} sparc/little-endian.opt"
-       gas=yes gnu_ld=yes
-       with_cpu=ultrasparc
-       ;;
 sparc-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h svr4.h sparc/sysv4.h sparc/sp-elf.h"
        tmake_file="sparc/t-elf sparc/t-crtfm"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
-sparc-*-linux*)                # SPARC's running GNU/Linux, libc6
+sparc-*-rtems*)
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
+       tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
+       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+       ;;
+sparc-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-linux"
@@ -2470,16 +2476,9 @@ sparc-*-linux*)          # SPARC's running GNU/Linux, libc6
        fi
        tmake_file="${tmake_file} sparc/t-crtfm"
        ;;
-sparc-*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
-       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-*-netbsdelf*)
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
        ;;
 sparc*-*-solaris2*)
        tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
@@ -2542,6 +2541,17 @@ sparc64-*-elf*)
        tmake_file="${tmake_file} sparc/t-crtfm"
        extra_parts="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"
+       ;;
+sparc64-*-linux*)
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h sparc/linux64.h"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
+       tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
+       ;;
 sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        tm_file="${tm_file} ${fbsd_tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/freebsd.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
@@ -2552,17 +2562,19 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
                *) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
        esac
        ;;
-sparc64-*-linux*)              # 64-bit SPARC's running GNU/Linux
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h sparc/linux64.h"
-       extra_options="${extra_options} sparc/long-double-switch.opt"
-       tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
-       ;;
 sparc64-*-netbsd*)
        tm_file="sparc/biarch64.h ${tm_file}"
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-netbsd64"
        ;;
+sparc64-*-openbsd*)
+       tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h"
+       tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h sparc/openbsd64.h"
+       extra_options="${extra_options} sparc/little-endian.opt"
+       gas=yes gnu_ld=yes
+       with_cpu=ultrasparc
+       ;;
 spu-*-elf*)
        tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h newlib-stdint.h"
        tmake_file="spu/t-spu-elf"
@@ -2808,6 +2820,14 @@ case ${target} in
        arch=core2
        cpu=core2
        ;;
+      corei7-*)
+       arch=corei7
+       cpu=corei7
+       ;;
+      corei7_avx-*)
+       arch=corei7-avx
+       cpu=corei7-avx
+       ;;
       pentium_m-*)
        arch=pentium-m
        cpu=pentium-m
@@ -2855,6 +2875,10 @@ case ${target} in
        arch=core2
        cpu=core2
        ;;
+      corei7-*)
+       arch=corei7
+       cpu=corei7
+       ;;
       *)
        arch=x86-64
        cpu=generic
@@ -2993,6 +3017,9 @@ if test x$with_fpmath != x; then
   case ${target} in
     i[34567]86-*-* | x86_64-*-*)
       case ${with_fpmath} in
+      avx)
+       tm_file="${tm_file} i386/avxmath.h"
+       ;;
       sse)
        tm_file="${tm_file} i386/ssemath.h"
        ;;
@@ -3238,7 +3265,7 @@ case "${target}" in
                        "" | x86-64 | generic | native \
                        | k8 | k8-sse3 | athlon64 | athlon64-sse3 | opteron \
                        | opteron-sse3 | athlon-fx | bdver1 | amdfam10 \
-                       | barcelona | nocona | core2 | atom)
+                       | barcelona | nocona | core2 | corei7 | corei7-avx | atom)
                                # OK
                                ;;
                        *)