]> git.ipfire.org Git - thirdparty/gcc.git/blobdiff - gcc/config.gcc
configure.ac: Don't add ${libgcj} for arm*-*-freebsd*.
[thirdparty/gcc.git] / gcc / config.gcc
index 2156640710731e7be376b1a9807ba9386119cae8..0dfc08fc0f19ff27d2636db50d7fdeaf503d922b 100644 (file)
@@ -1,5 +1,5 @@
 # GCC target-specific configuration file.
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2015 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
 #  gas                 Set to yes or no depending on whether the target
 #                      system normally uses GNU as.
 #
-#  need_64bit_hwint    Set to yes if HOST_WIDE_INT must be 64 bits wide
-#                      for this target.  This is true if this target
-#                      supports "long" or "wchar_t" wider than 32 bits,
-#                      or BITS_PER_WORD is wider than 32 bits.
-#                      The setting made here must match the one made in
-#                      other locations such as libcpp/configure.ac
-#
 #  configure_default_options
 #                      Set to an initializer for configure_default_options
 #                      in configargs.h, based on --with-cpu et cetera.
@@ -233,7 +226,6 @@ gnu_ld="$gnu_ld_flag"
 default_use_cxa_atexit=no
 default_gnu_indirect_function=no
 target_gtfiles=
-need_64bit_hwint=
 need_64bit_isa=
 native_system_header_dir=/usr/include
 target_type_format_char='@'
@@ -244,9 +236,8 @@ md_file=
 
 # Obsolete configurations.
 case ${target} in
-   picochip-*                          \
- | score-*                             \
- | *-*-solaris2.9*                     \
+# Currently there are no obsolete targets.
+ nothing                               \
  )
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration ${target} is obsolete." >&2
@@ -268,7 +259,6 @@ case ${target} in
    arm*-wince-pe*                      \
  | arm*-*-ecos-elf                     \
  | arm*-*-elf                          \
- | arm*-*-freebsd*                     \
  | arm*-*-linux*                       \
  | arm*-*-uclinux*                     \
  | i[34567]86-go32-*                   \
@@ -287,8 +277,8 @@ case ${target} in
  | *-*-rtemsaout*                      \
  | *-*-rtemscoff*                      \
  | *-*-solaris2                                \
- | *-*-solaris2.[0-8]                  \
- | *-*-solaris2.[0-8].*                        \
+ | *-*-solaris2.[0-9]                  \
+ | *-*-solaris2.[0-9].*                        \
  | *-*-sysv*                           \
  | vax-*-vms*                          \
  )
@@ -311,14 +301,13 @@ m32c*-*-*)
         ;;
 aarch64*-*-*)
        cpu_type=aarch64
-       need_64bit_hwint=yes
-       extra_headers="arm_neon.h"
+       extra_headers="arm_neon.h arm_acle.h"
        extra_objs="aarch64-builtins.o aarch-common.o"
+       target_gtfiles="\$(srcdir)/config/aarch64/aarch64-builtins.c"
        target_has_targetm_common=yes
        ;;
 alpha*-*-*)
        cpu_type=alpha
-       need_64bit_hwint=yes
        extra_options="${extra_options} g.opt"
        ;;
 am33_2.0-*-linux*)
@@ -329,13 +318,13 @@ arc*-*-*)
        ;;
 arm*-*-*)
        cpu_type=arm
-       extra_objs="aarch-common.o"
+       extra_objs="arm-builtins.o aarch-common.o"
        extra_headers="mmintrin.h arm_neon.h arm_acle.h"
        target_type_format_char='%'
        c_target_objs="arm-c.o"
        cxx_target_objs="arm-c.o"
-       need_64bit_hwint=yes
        extra_options="${extra_options} arm/arm-tables.opt"
+       target_gtfiles="\$(srcdir)/config/arm/arm-builtins.c"
        ;;
 avr-*-*)
        cpu_type=avr
@@ -364,7 +353,6 @@ i[34567]86-*-*)
        cpu_type=i386
        c_target_objs="i386-c.o"
        cxx_target_objs="i386-c.o"
-       need_64bit_hwint=yes
        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
@@ -376,7 +364,11 @@ i[34567]86-*-*)
                       rtmintrin.h xtestintrin.h rdseedintrin.h prfchwintrin.h
                       adxintrin.h fxsrintrin.h xsaveintrin.h xsaveoptintrin.h
                       avx512cdintrin.h avx512erintrin.h avx512pfintrin.h
-                      shaintrin.h"
+                      shaintrin.h clflushoptintrin.h xsavecintrin.h
+                      xsavesintrin.h avx512dqintrin.h avx512bwintrin.h
+                      avx512vlintrin.h avx512vlbwintrin.h avx512vldqintrin.h
+                      avx512ifmaintrin.h avx512ifmavlintrin.h avx512vbmiintrin.h
+                      avx512vbmivlintrin.h clwbintrin.h pcommitintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
@@ -393,12 +385,14 @@ x86_64-*-*)
                       rtmintrin.h xtestintrin.h rdseedintrin.h prfchwintrin.h
                       adxintrin.h fxsrintrin.h xsaveintrin.h xsaveoptintrin.h
                       avx512cdintrin.h avx512erintrin.h avx512pfintrin.h
-                      shaintrin.h"
-       need_64bit_hwint=yes
+                      shaintrin.h clflushoptintrin.h xsavecintrin.h
+                      xsavesintrin.h avx512dqintrin.h avx512bwintrin.h
+                      avx512vlintrin.h avx512vlbwintrin.h avx512vldqintrin.h
+                      avx512ifmaintrin.h avx512ifmavlintrin.h avx512vbmiintrin.h
+                      avx512vbmivlintrin.h clwbintrin.h pcommitintrin.h"
        ;;
 ia64-*-*)
        extra_headers=ia64intrin.h
-       need_64bit_hwint=yes
        extra_options="${extra_options} g.opt fused-madd.opt"
        ;;
 hppa*-*-*)
@@ -421,25 +415,24 @@ microblaze*-*-*)
         ;;
 mips*-*-*)
        cpu_type=mips
-       need_64bit_hwint=yes
        extra_headers="loongson.h"
        extra_options="${extra_options} g.opt mips/mips-tables.opt"
        ;;
 nds32*)
        cpu_type=nds32
        extra_headers="nds32_intrinsic.h"
+       extra_objs="nds32-cost.o nds32-intrinsic.o nds32-isr.o nds32-md-auxiliary.o nds32-pipelines-auxiliary.o nds32-predicates.o nds32-memory-manipulation.o nds32-fp-as-gp.o"
        ;;
 nios2-*-*)
        cpu_type=nios2
        extra_options="${extra_options} g.opt"
-       ;;      
-picochip-*-*)
-        cpu_type=picochip
-        ;;
+       ;;
+nvptx-*-*)
+       cpu_type=nvptx
+       ;;
 powerpc*-*-*)
        cpu_type=rs6000
        extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
-       need_64bit_hwint=yes
        case x$with_cpu in
            xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500)
                cpu_is_64bit=yes
@@ -448,34 +441,25 @@ powerpc*-*-*)
        extra_options="${extra_options} g.opt fused-madd.opt rs6000/rs6000-tables.opt"
        ;;
 rs6000*-*-*)
-       need_64bit_hwint=yes
        extra_options="${extra_options} g.opt fused-madd.opt rs6000/rs6000-tables.opt"
        ;;
-score*-*-*)
-       cpu_type=score
-       extra_options="${extra_options} g.opt"
-       ;;
 sparc*-*-*)
        cpu_type=sparc
        c_target_objs="sparc-c.o"
        cxx_target_objs="sparc-c.o"
        extra_headers="visintrin.h"
-       need_64bit_hwint=yes
        ;;
 spu*-*-*)
        cpu_type=spu
-       need_64bit_hwint=yes
        ;;
 s390*-*-*)
        cpu_type=s390
-       need_64bit_hwint=yes
        extra_options="${extra_options} fused-madd.opt"
        extra_headers="s390intrin.h htmintrin.h htmxlintrin.h"
        ;;
 # 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
        extra_options="${extra_options} fused-madd.opt"
        extra_objs="${extra_objs} sh_treg_combine.o sh-mem.o sh_optimize_sett_clrt.o"
        ;;
@@ -492,11 +476,9 @@ xtensa*-*-*)
        ;;
 tilegx*-*-*)
        cpu_type=tilegx
-       need_64bit_hwint=yes
        ;;
-tilepro-*-*)
+tilepro*-*-*)
        cpu_type=tilepro
-       need_64bit_hwint=yes
        ;;
 esac
 
@@ -608,7 +590,8 @@ pentium4 pentium4m pentiumpro prescott"
 x86_64_archs="amdfam10 athlon64 athlon64-sse3 barcelona bdver1 bdver2 \
 bdver3 bdver4 btver1 btver2 k8 k8-sse3 opteron opteron-sse3 nocona \
 core2 corei7 corei7-avx core-avx-i core-avx2 atom slm nehalem westmere \
-sandybridge ivybridge haswell broadwell bonnell silvermont x86-64 native"
+sandybridge ivybridge haswell broadwell bonnell silvermont knl x86-64 \
+native"
 
 # Additional x86 processors supported by --with-cpu=.  Each processor
 # MUST be separated by exactly one space.
@@ -643,6 +626,26 @@ case ${target} in
     "" | yes | posix) thread_file='posix' ;;
   esac
   ;;
+*-*-dragonfly*)
+  gas=yes
+  gnu_ld=yes
+  tmake_file="t-slibgcc"
+  case ${enable_threads} in
+    "" | yes | posix)
+      thread_file='posix'
+      ;;
+    no | single)
+      # Let these non-posix thread selections fall through if requested
+      ;;
+    *)
+      echo 'Unknown thread configuration for DragonFly BSD'
+      exit 1
+      ;;
+  esac
+  extra_options="$extra_options rpath.opt dragonfly.opt"
+  default_use_cxa_atexit=yes
+  use_gcc_stdint=wrap
+  ;;
 *-*-freebsd*)
   # This is the generic ELF configuration of FreeBSD.  Later
   # machine-specific sections may refine and add to this
@@ -684,7 +687,6 @@ case ${target} in
     *)
       default_use_cxa_atexit=yes;;
   esac
-  # need_64bit_hwint=yes # system compiler has this for all arch!
   use_gcc_stdint=wrap
   ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
@@ -791,7 +793,13 @@ case ${target} in
   ;;
 *-*-rtems*)
   case ${enable_threads} in
-    yes) thread_file='rtems' ;;
+    "" | yes | rtems) thread_file='rtems' ;;
+    posix) thread_file='posix' ;;
+    no) ;;
+    *)
+      echo 'Unknown thread configuration for RTEMS'
+      exit 1
+      ;;
   esac
   tmake_file="${tmake_file} t-rtems"
   extra_options="${extra_options} rtems.opt"
@@ -809,16 +817,10 @@ case ${target} in
 *-*-solaris2*)
   # i?86-*-solaris2* needs to insert headers between cpu default and
   # Solaris 2 specific ones.
-  sol2_tm_file="dbxelf.h elfos.h ${cpu_type}/sysv4.h sol2.h ${cpu_type}/sol2.h"
-  case ${target} in
-    *-*-solaris2.1[0-9]*)
-      sol2_tm_file="${sol2_tm_file} sol2-10.h"
-      use_gcc_stdint=wrap
-      ;;
-    *)
-      use_gcc_stdint=provide
-      ;;
-  esac
+  sol2_tm_file_head="dbxelf.h elfos.h ${cpu_type}/sysv4.h"
+  sol2_tm_file_tail="${cpu_type}/sol2.h sol2.h"
+  sol2_tm_file="${sol2_tm_file_head} ${sol2_tm_file_tail}"
+  use_gcc_stdint=wrap
   if test x$gnu_ld = xyes; then
     tm_file="usegld.h ${tm_file}"
   fi
@@ -1007,6 +1009,27 @@ arm-wrs-vxworks)
        extra_options="${extra_options} arm/vxworks.opt"
        tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
        ;;
+arm*-*-freebsd*)                # ARM FreeBSD EABI
+       tm_file="dbxelf.h elfos.h ${fbsd_tm_file} arm/elf.h"
+       case $target in
+       arm*b-*-freebsd*)
+           tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
+           ;;
+       esac
+       tmake_file="${tmake_file} arm/t-arm arm/t-bpabi"
+       tm_file="${tm_file} arm/bpabi.h arm/freebsd.h arm/aout.h arm/arm.h"
+       case $target in
+       armv6*-*-freebsd*)
+           tm_defines="${tm_defines} TARGET_FREEBSD_ARMv6=1"
+           ;;
+       esac
+       case $target in
+       arm*hf-*-freebsd*)
+           tm_defines="${tm_defines} TARGET_FREEBSD_ARM_HARD_FLOAT=1"
+           ;;
+       esac
+       with_tls=${with_tls:-gnu}
+       ;;
 arm*-*-netbsdelf*)
        tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h ${tm_file} arm/netbsd-elf.h"
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
@@ -1021,7 +1044,7 @@ arm*-*-linux-*)                   # ARM GNU/Linux with ELF
            ;;
        esac
        tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
-       tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h arm/arm.h"
+       tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h vxworks-dummy.h arm/arm.h"
        # Define multilib configuration for arm-linux-androideabi.
        case ${target} in
        *-androideabi)
@@ -1054,8 +1077,8 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
          use_gcc_stdint=wrap
          ;;
        arm*-*-rtems*)
-         tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
-         tmake_file="${tmake_file} arm/t-bpabi arm/t-rtems-eabi"
+         tm_file="${tm_file} rtems.h arm/rtems.h newlib-stdint.h"
+         tmake_file="${tmake_file} arm/t-bpabi arm/t-rtems"
          ;;
        arm*-*-symbianelf*)
          tm_file="${tm_file} arm/symbian.h"
@@ -1129,8 +1152,7 @@ cris-*-elf | cris-*-none)
        ;;
 crisv32-*-linux* | cris-*-linux*)
        tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h linux.h glibc-stdint.h cris/linux.h"
-       # We need to avoid using t-linux, so override default tmake_file
-       tmake_file="cris/t-cris cris/t-linux t-slibgcc t-linux"
+       tmake_file="${tmake_file} cris/t-cris cris/t-linux"
        extra_options="${extra_options} cris/linux.opt"
        case $target in
          cris-*-*)
@@ -1177,6 +1199,12 @@ moxie-*-rtems*)
        tmake_file="${tmake_file} moxie/t-moxie"
        tm_file="moxie/moxie.h dbxelf.h elfos.h moxie/rtems.h rtems.h newlib-stdint.h"
        ;;
+moxie-*-moxiebox*)
+       gas=yes
+       gnu_ld=yes
+       tm_file="${tm_file} dbxelf.h elfos.h moxie/moxiebox.h newlib-stdint.h"
+       tmake_file="${tmake_file} moxie/t-moxiebox"
+       ;;
 h8300-*-rtems*)
        tmake_file="${tmake_file} h8300/t-h8300 h8300/t-rtems"
        tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h h8300/rtems.h rtems.h newlib-stdint.h"
@@ -1191,7 +1219,6 @@ hppa*64*-*-linux*)
                 glibc-stdint.h pa/pa-linux.h pa/pa64-regs.h pa/pa-64.h \
                 pa/pa64-linux.h"
        gas=yes gnu_ld=yes
-       need_64bit_hwint=yes
        ;;
 hppa*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
@@ -1266,7 +1293,6 @@ hppa*64*-*-hpux11*)
        esac
        extra_options="${extra_options} pa/pa-hpux.opt \
                       pa/pa-hpux1010.opt pa/pa64-hpux.opt hpux11.opt"
-       need_64bit_hwint=yes
        tmake_file="t-slibgcc"
        case x${enable_threads} in
        x | xyes | xposix )
@@ -1352,6 +1378,14 @@ x86_64-*-rdos*)
     tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h i386/rdos.h i386/rdos64.h"
     tmake_file="i386/t-i386elf t-svr4"
     ;;
+i[34567]86-*-dragonfly*)
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h dragonfly.h dragonfly-stdint.h i386/dragonfly.h"
+       tmake_file="${tmake_file} i386/t-crtstuff"
+       ;;
+x86_64-*-dragonfly*)
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h dragonfly.h dragonfly-stdint.h i386/x86-64.h i386/dragonfly.h"
+       tmake_file="${tmake_file} i386/t-crtstuff"
+       ;;
 i[34567]86-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
        ;;
@@ -1396,8 +1430,14 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
        i[34567]86-*-linux*)
                tm_file="${tm_file} linux.h linux-android.h"
                extra_options="${extra_options} linux-android.opt"
-               # Assume modern glibc
-               default_gnu_indirect_function=yes
+               # Assume modern glibc if not targeting Android nor uclibc.
+               case ${target} in
+               *-*-*android*|*-*-*uclibc*)
+                 ;;
+               *)
+                 default_gnu_indirect_function=yes
+                 ;;
+               esac
                if test x$enable_targets = xall; then
                        tm_file="${tm_file} i386/x86-64.h i386/gnu-user-common.h i386/gnu-user64.h i386/linux-common.h i386/linux64.h"
                        tm_defines="${tm_defines} TARGET_BI_ARCH=1"
@@ -1459,8 +1499,14 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
        x86_64-*-linux*)
                tm_file="${tm_file} linux.h linux-android.h i386/linux-common.h i386/linux64.h"
                extra_options="${extra_options} linux-android.opt"
-               # Assume modern glibc
-               default_gnu_indirect_function=yes
+               # Assume modern glibc if not targeting Android nor uclibc.
+               case ${target} in
+               *-*-*android*|*-*-*uclibc*)
+                 ;;
+               *)
+                 default_gnu_indirect_function=yes
+                 ;;
+               esac
                ;;
        x86_64-*-kfreebsd*-gnu)
                tm_file="${tm_file} kfreebsd-gnu.h i386/kfreebsd-gnu64.h"
@@ -1523,55 +1569,39 @@ i[34567]86-*-rtems*)
        tmake_file="${tmake_file} i386/t-rtems"
        ;;
 i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
-       tm_file="${tm_file} i386/unix.h i386/att.h ${sol2_tm_file}"
        # 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.9*)
-               # Solaris 9/x86 cannot execute SSE/SSE2 instructions by default.
-               with_arch_32=${with_arch_32:-pentiumpro}
-               ;;
-       *)
-               with_arch_32=${with_arch_32:-pentium4}
-               ;;
-       esac
+       with_arch_32=${with_arch_32:-pentium4}
        with_tune_32=${with_tune_32:-generic}
-       case ${target} in
-       *-*-solaris2.9*)
-               tm_file="${tm_file} i386/sol2-9.h"
-               ;;
-       *-*-solaris2.1[0-9]*)
-               tm_file="${tm_file} i386/x86-64.h i386/sol2-bi.h sol2-bi.h"
-               tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-               tmake_file="$tmake_file i386/t-sol2-64"
-               need_64bit_isa=yes
-               if test x$with_cpu = x; then
-                       if test x$with_cpu_64 = x; then
-                               with_cpu_64=generic
-                       fi
-               else
-                       case " $x86_cpus $x86_archs $x86_64_archs " in
-                       *" $with_cpu "*)
-                               ;;
-                       *)
-                               echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                               echo "$x86_cpus $x86_archs $x86_64_archs" 1>&2
-                               exit 1
-                               ;;
-                       esac
+       tm_file="${tm_file} i386/unix.h i386/att.h ${sol2_tm_file_head} i386/x86-64.h ${sol2_tm_file_tail}"
+       tm_defines="${tm_defines} TARGET_BI_ARCH=1"
+       tmake_file="$tmake_file i386/t-sol2"
+       need_64bit_isa=yes
+       if test x$with_cpu = x; then
+               if test x$with_cpu_64 = x; then
+                       with_cpu_64=generic
                fi
-               ;;
-       esac
+       else
+               case " $x86_cpus $x86_archs $x86_64_archs " in
+               *" $with_cpu "*)
+                       ;;
+               *)
+                       echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
+                       echo "$x86_cpus $x86_archs $x86_64_archs" 1>&2
+                       exit 1
+                       ;;
+               esac
+       fi
        ;;
 i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
        tm_file="${tm_file} i386/unix.h i386/att.h elfos.h vx-common.h"
        case ${target} in
          *-vxworksae*)
-           tm_file="${tm_file} vxworksae.h i386/vx-common.h i386/vxworksae.h"
+           tm_file="${tm_file} vxworksae.h i386/vxworks.h i386/vxworksae.h"
            tmake_file="${tmake_file} i386/t-vxworks i386/t-vxworksae"
            ;;
          *)
-           tm_file="${tm_file} vxworks.h i386/vx-common.h i386/vxworks.h"
+           tm_file="${tm_file} vxworks.h i386/vxworks.h"
            tmake_file="${tmake_file} i386/t-vxworks"
            ;;
        esac
@@ -1581,13 +1611,14 @@ i[34567]86-*-cygwin*)
        xm_file=i386/xm-cygwin.h
        tmake_file="${tmake_file} i386/t-cygming t-slibgcc"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-       extra_options="${extra_options} i386/cygming.opt"
+       extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
        extra_objs="winnt.o winnt-stubs.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
+       default_use_cxa_atexit=yes
        use_gcc_stdint=wrap
        ;;
 x86_64-*-cygwin*)
@@ -1596,13 +1627,14 @@ x86_64-*-cygwin*)
        xm_file=i386/xm-cygwin.h
        tmake_file="${tmake_file} i386/t-cygming t-slibgcc i386/t-cygwin-w64"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-       extra_options="${extra_options} i386/cygming.opt"
+       extra_options="${extra_options} i386/cygming.opt i386/cygwin.opt"
        extra_objs="winnt.o winnt-stubs.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
+       default_use_cxa_atexit=yes
        use_gcc_stdint=wrap
        tm_defines="${tm_defines} TARGET_CYGWIN64=1"
        ;;
@@ -1949,56 +1981,79 @@ mips*-*-netbsd*)                        # NetBSD/mips, either endian.
        tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        ;;
+mips*-img-linux*)
+       tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h mips/mti-linux.h"
+       extra_options="${extra_options} linux-android.opt"
+       tmake_file="${tmake_file} mips/t-img-linux"
+       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=37 MIPS_ABI_DEFAULT=ABI_32"
+       gnu_ld=yes
+       gas=yes
+       ;;
 mips*-mti-linux*)
-       tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/gnu-user64.h mips/linux64.h mips/linux-common.h mips/mti-linux.h"
+       tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h mips/mti-linux.h"
        extra_options="${extra_options} linux-android.opt"
        tmake_file="${tmake_file} mips/t-mti-linux"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_32"
        gnu_ld=yes
        gas=yes
        ;;
-mips64*-*-linux* | mipsisa64*-*-linux*)
-       tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/gnu-user64.h mips/linux64.h mips/linux-common.h"
+mips*-*-linux*)                                # Linux MIPS, either endian.
+       tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h mips/linux-common.h"
        extra_options="${extra_options} linux-android.opt"
-       tmake_file="${tmake_file} mips/t-linux64"
-       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
        case ${target} in
+               mipsisa32r6*)
+                       default_mips_arch=mips32r6
+                       ;;
+               mipsisa32r2*)
+                       default_mips_arch=mips32r2
+                       ;;
+               mipsisa32*)
+                       default_mips_arch=mips32
+                       ;;
                mips64el-st-linux-gnu)
+                       default_mips_abi=n32
                        tm_file="${tm_file} mips/st.h"
                        tmake_file="${tmake_file} mips/t-st"
+                       enable_mips_multilibs="yes"
                        ;;
                mips64octeon*-*-linux*)
+                       default_mips_abi=n32
                        tm_defines="${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\"octeon\\\""
                        target_cpu_default=MASK_SOFT_FLOAT_ABI
+                       enable_mips_multilibs="yes"
+                       ;;
+               mipsisa64r6*-*-linux*)
+                       default_mips_abi=n32
+                       default_mips_arch=mips64r6
+                       enable_mips_multilibs="yes"
                        ;;
                mipsisa64r2*-*-linux*)
-                       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
+                       default_mips_abi=n32
+                       default_mips_arch=mips64r2
+                       enable_mips_multilibs="yes"
+                       ;;
+               mips64*-*-linux* | mipsisa64*-*-linux*)
+                       default_mips_abi=n32
+                       enable_mips_multilibs="yes"
                        ;;
        esac
-       gnu_ld=yes
-       gas=yes
-       ;;
-mips*-*-linux*)                                # Linux MIPS, either endian.
-       tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h"
-       extra_options="${extra_options} linux-android.opt"
        if test x$enable_targets = xall; then
-               tm_file="${tm_file} mips/gnu-user64.h mips/linux64.h"
+               enable_mips_multilibs="yes"
+       fi
+       if test x$enable_mips_multilibs = xyes; then
                tmake_file="${tmake_file} mips/t-linux64"
        fi
-       tm_file="${tm_file} mips/linux-common.h"
-       case ${target} in
-        mipsisa32r2*)
-               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
-                ;;
-        mipsisa32*)
-               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
-        esac
        ;;
 mips*-mti-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/n32-elf.h mips/sde.h mips/mti-elf.h"
        tmake_file="mips/t-mti-elf"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_32"
        ;;
+mips*-img-elf*)
+       tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/n32-elf.h mips/sde.h mips/mti-elf.h"
+       tmake_file="mips/t-img-elf"
+       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=37 MIPS_ABI_DEFAULT=ABI_32"
+       ;;
 mips*-sde-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/n32-elf.h mips/sde.h"
        tmake_file="mips/t-sde"
@@ -2019,12 +2074,18 @@ mips*-sde-elf*)
            ;;
        esac
        case ${target} in
+         mipsisa32r6*)
+           tm_defines="MIPS_ISA_DEFAULT=37 MIPS_ABI_DEFAULT=ABI_32"
+           ;;
          mipsisa32r2*)
            tm_defines="MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_32"
            ;;
          mipsisa32*)
            tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_32"
            ;;
+         mipsisa64r6*)
+           tm_defines="MIPS_ISA_DEFAULT=69 MIPS_ABI_DEFAULT=ABI_N32"
+           ;;
          mipsisa64r2*)
            tm_defines="MIPS_ISA_DEFAULT=65 MIPS_ABI_DEFAULT=ABI_N32"
            ;;
@@ -2035,17 +2096,25 @@ mips*-sde-elf*)
        ;;
 mipsisa32-*-elf* | mipsisa32el-*-elf* | \
 mipsisa32r2-*-elf* | mipsisa32r2el-*-elf* | \
+mipsisa32r6-*-elf* | mipsisa32r6el-*-elf* | \
 mipsisa64-*-elf* | mipsisa64el-*-elf* | \
-mipsisa64r2-*-elf* | mipsisa64r2el-*-elf*)
+mipsisa64r2-*-elf* | mipsisa64r2el-*-elf* | \
+mipsisa64r6-*-elf* | mipsisa64r6el-*-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
        tmake_file="mips/t-isa3264"
        case ${target} in
+         mipsisa32r6*)
+           tm_defines="${tm_defines} MIPS_ISA_DEFAULT=37"
+           ;;
          mipsisa32r2*)
            tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
            ;;
          mipsisa32*)
            tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
            ;;
+         mipsisa64r6*)
+           tm_defines="${tm_defines} MIPS_ISA_DEFAULT=69"
+           ;;
          mipsisa64r2*)
            tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
            ;;
@@ -2115,7 +2184,6 @@ mipstx39-*-elf* | mipstx39el-*-elf*)
        ;;
 mmix-knuth-mmixware)
        tm_file="${tm_file} newlib-stdint.h"
-       need_64bit_hwint=yes
        use_gcc_stdint=wrap
        ;;
 mn10300-*-*)
@@ -2131,20 +2199,19 @@ msp430*-*-*)
        tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        c_target_objs="msp430-c.o"
        cxx_target_objs="msp430-c.o"
-       target_has_targetm_common=no
        tmake_file="${tmake_file} msp430/t-msp430"
        ;;
 nds32le-*-*)
        target_cpu_default="0"
        tm_defines="${tm_defines}"
        tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
-       tmake_file="nds32/t-mlibs"
+       tmake_file="nds32/t-nds32 nds32/t-mlibs"
        ;;
 nds32be-*-*)
        target_cpu_default="0|MASK_BIG_ENDIAN"
        tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
        tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
-       tmake_file="nds32/t-mlibs"
+       tmake_file="nds32/t-nds32 nds32/t-mlibs"
        ;;
 nios2-*-*)
        tm_file="elfos.h ${tm_file}"
@@ -2157,17 +2224,20 @@ nios2-*-*)
                tm_file="${tm_file} newlib-stdint.h nios2/elf.h"
                extra_options="${extra_options} nios2/elf.opt"
                ;;
+       nios2-*-rtems*)
+               tm_file="${tm_file} newlib-stdint.h nios2/rtems.h rtems.h"
+               tmake_file="${tmake_file} t-rtems nios2/t-rtems"
+               ;;
         esac
        ;;
-pdp11-*-*)
+nvptx-*)
        tm_file="${tm_file} newlib-stdint.h"
-       use_gcc_stdint=wrap
+       tmake_file="nvptx/t-nvptx"
        ;;
-picochip-*)
+pdp11-*-*)
        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*)
 #      tmake_file="${tmake_file} rs6000/t-fprules"
@@ -2263,7 +2333,7 @@ powerpc-*-rtems*)
        tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-rtems rs6000/t-ppccomm"
        ;;
 powerpc*-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h rs6000/sysv4.h"
+       tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h freebsd-spec.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
        extra_objs="$extra_objs rs6000-linux.o"
@@ -2327,14 +2397,18 @@ powerpc*-*-linux*)
                tm_file="rs6000/secureplt.h ${tm_file}"
        fi
        ;;
-powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
+powerpc-wrs-vxworks|powerpc-wrs-vxworksae|powerpc-wrs-vxworksmils)
        tm_file="${tm_file} elfos.h freebsd-spec.h rs6000/sysv4.h"
        tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm rs6000/t-vxworks"
        extra_options="${extra_options} rs6000/sysv4.opt"
        extra_headers=ppc-asm.h
        case ${target} in
+          *-vxworksmils*)
+            tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/e500.h rs6000/vxworksmils.h"
+            tmake_file="${tmake_file} rs6000/t-vxworksmils"
+            ;;
          *-vxworksae*)
-           tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/e500.h"
+           tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/e500.h rs6000/vxworksae.h"
            tmake_file="${tmake_file} rs6000/t-vxworksae"
            ;;
          *-vxworks*)
@@ -2449,11 +2523,6 @@ s390x-ibm-tpf*)
         thread_file='tpf'
        extra_options="${extra_options} s390/tpf.opt"
        ;;
-score-*-elf)
-       gas=yes
-       gnu_ld=yes
-        tm_file="dbxelf.h elfos.h score/elf.h score/score.h newlib-stdint.h"
-        ;;
 sh-*-elf* | sh[12346l]*-*-elf* | \
   sh-*-linux* | sh[2346lbe]*-*-linux* | \
   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
@@ -2654,7 +2723,7 @@ sparc-*-elf*)
        ;;
 sparc-*-rtems*)
        tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
-       tmake_file="${tmake_file} sparc/t-sparc sparc/t-elf sparc/t-rtems"
+       tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems"
        ;;
 sparc-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h"
@@ -2685,7 +2754,7 @@ sparc-*-netbsdelf*)
        tmake_file="${tmake_file} sparc/t-sparc"
        ;;
 sparc*-*-solaris2*)
-       tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sol2-bi.h sparc/tso.h"
+       tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sparc/tso.h"
        case ${target} in
            sparc64-*-* | sparcv9-*-*)
                tm_file="sparc/default-64.h ${tm_file}"
@@ -2694,7 +2763,7 @@ sparc*-*-solaris2*)
                test x$with_cpu != x || with_cpu=v9
                ;;
        esac
-       tmake_file="${tmake_file} sparc/t-sparc sparc/t-sol2-64"
+       tmake_file="${tmake_file} sparc/t-sparc sparc/t-sol2"
        ;;
 sparc-wrs-vxworks)
        tm_file="${tm_file} elfos.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h"
@@ -2764,15 +2833,20 @@ tic6x-*-uclinux)
        tmake_file="${tmake_file} c6x/t-c6x c6x/t-c6x-elf c6x/t-c6x-uclinux"
        use_collect2=no
        ;;
-tilegx-*-linux*)
+tilegx*-*-linux*)
        tm_file="elfos.h gnu-user.h linux.h glibc-stdint.h tilegx/linux.h ${tm_file}"
         tmake_file="${tmake_file} tilegx/t-tilegx"
        extra_objs="${extra_objs} mul-tables.o"
        c_target_objs="${c_target_objs} tilegx-c.o"
        cxx_target_objs="${cxx_target_objs} tilegx-c.o"
        extra_headers="feedback.h"
+       case $target in
+       tilegxbe-*)
+               tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
+               ;;
+       esac
        ;;
-tilepro-*-linux*)
+tilepro*-*-linux*)
        tm_file="elfos.h gnu-user.h linux.h glibc-stdint.h tilepro/linux.h ${tm_file}"
         tmake_file="${tmake_file} tilepro/t-tilepro"
        extra_objs="${extra_objs} mul-tables.o"
@@ -2834,6 +2908,10 @@ vax-*-openbsd*)
        extra_options="${extra_options} openbsd.opt"
        use_collect2=yes
        ;;
+visium-*-elf*)
+       tm_file="dbxelf.h elfos.h ${tm_file} visium/elf.h newlib-stdint.h"
+       tmake_file="visium/t-visium visium/t-crtstuff"
+       ;;
 xstormy16-*-elf)
        # For historical reasons, the target files omit the 'x'.
        tm_file="dbxelf.h elfos.h newlib-stdint.h stormy16/stormy16.h"
@@ -2883,6 +2961,13 @@ powerpc*-*-* | rs6000-*-*)
        tm_file="${tm_file} rs6000/option-defaults.h"
 esac
 
+# Build mkoffload tool
+case ${target} in
+*-intelmic-* | *-intelmicemul-*)
+       tmake_file="${tmake_file} i386/t-intelmic"
+       ;;
+esac
+
 if [ "$target_has_targetcm" = "no" ]; then
   c_target_objs="$c_target_objs default-c.o"
   cxx_target_objs="$cxx_target_objs default-c.o"
@@ -3192,6 +3277,9 @@ if test x$with_cpu = x ; then
        *-leon[3-9]*)
          with_cpu=leon3
          ;;
+       *-leon[3-9]v7*)
+         with_cpu=leon3v7
+         ;;
        *)
          with_cpu="`echo ${target} | sed 's/-.*$//'`"
          ;;
@@ -3391,6 +3479,11 @@ case "${target}" in
                                  ${srcdir}/config/aarch64/$def | \
                                  sed -e 's/^[^,]*,[    ]*//' | \
                                  sed -e 's/,.*$//'`
+                               # Extract the architecture flags from aarch64-arches.def
+                               ext_mask=`grep "^$pattern(\"$base_val\"," \
+                                  ${srcdir}/config/aarch64/$def | \
+                                  sed -e 's/)$//' | \
+                                  sed -e 's/^.*,//'`
                          else
                                base_id=`grep "^$pattern(\"$base_val\"," \
                                  ${srcdir}/config/aarch64/$def | \
@@ -3522,20 +3615,17 @@ case "${target}" in
                        ;;
                esac
 
-               case "$with_fpu" in
-               "" \
-               | vfp | vfp3 | vfpv3 \
-               | vfpv3-fp16 | vfpv3-d16 | vfpv3-d16-fp16 | vfpv3xd \
-               | vfpv3xd-fp16 | neon | neon-fp16 | vfpv4 | vfpv4-d16 \
-               | fpv4-sp-d16 | neon-vfpv4 | fp-arm-v8 | neon-fp-armv8 \
-                | crypto-neon-fp-armv8)
-                       # OK
-                       ;;
-               *)
-                       echo "Unknown fpu used in --with-fpu=$with_fpu" 2>&1
-                       exit 1
-                       ;;
-               esac
+               # see if it matches any of the entries in arm-fpus.def
+               if [ x"$with_fpu" = x ] \
+                   || grep "^ARM_FPU(\"$with_fpu\"," \
+                           ${srcdir}/config/arm/arm-fpus.def \
+                           > /dev/null; then
+                 # OK
+                 true
+               else
+                 echo "Unknown fpu used in --with-fpu=$with_fpu" 1>&2
+                 exit 1
+               fi
 
                case "$with_abi" in
                "" \
@@ -3571,7 +3661,13 @@ case "${target}" in
                esac
 
                if test "x$with_arch" != x && test "x$with_cpu" != x; then
-                       echo "Warning: --with-arch overrides --with-cpu=$with_cpu" 1>&2
+                       echo "Switch \"--with-arch\" may not be used with switch \"--with-cpu\""  1>&2
+                       exit 1
+               fi
+
+               if test "x$with_cpu" != x && test "x$with_tune" != x; then
+                       echo "Switch \"--with-tune\" may not be used with switch \"--with-cpu\""  1>&2
+                       exit 1
                fi
 
                # Add extra multilibs
@@ -3742,7 +3838,7 @@ case "${target}" in
                ;;
 
        mips*-*-*)
-               supported_defaults="abi arch arch_32 arch_64 float fpu nan tune tune_32 tune_64 divide llsc mips-plt synci"
+               supported_defaults="abi arch arch_32 arch_64 float fpu nan fp_32 odd_spreg_32 tune tune_32 tune_64 divide llsc mips-plt synci"
 
                case ${with_float} in
                "" | soft | hard)
@@ -3774,6 +3870,32 @@ case "${target}" in
                        ;;
                esac
 
+               case ${with_fp_32} in
+               "" | 32 | xx | 64)
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown FP mode used in --with-fp-32=$with_fp_32" 1>&2
+                       exit 1
+                       ;;
+               esac
+
+               case ${with_odd_spreg_32} in
+               yes)
+                       with_odd_spreg_32="odd-spreg"
+                       ;;
+               no)
+                       with_odd_spreg_32="no-odd-spreg"
+                       ;;
+               "")
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown odd-spreg-32 type used in --with-odd-spreg-32=$with_odd_spreg_32" 1>&2
+                       exit 1
+                       ;;
+               esac
+
                case ${with_abi} in
                "" | 32 | o64 | n32 | 64 | eabi)
                        # OK
@@ -3978,7 +4100,7 @@ case "${target}" in
                        case ${val} in
                        "" | sparc | sparcv9 | sparc64 \
                        | v7 | cypress \
-                       | v8 | supersparc | hypersparc | leon | leon3 \
+                       | v8 | supersparc | hypersparc | leon | leon3 | leon3v7 \
                        | sparclite | f930 | f934 | sparclite86x \
                        | sparclet | tsc701 \
                        | v9 | ultrasparc | ultrasparc3 | niagara | niagara2 \
@@ -4052,10 +4174,8 @@ esac
 target_cpu_default2=
 case ${target} in
        aarch64*-*-*)
-               if test x$target_cpu_cname = x
+               if test x"$target_cpu_cname" != x
                then
-                       target_cpu_default2=TARGET_CPU_generic
-               else
                        target_cpu_default2=$target_cpu_cname
                fi
                ;;
@@ -4072,7 +4192,7 @@ case ${target} in
        hppa*-*-*)
                if test x$gas = xyes
                then
-                       target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
+                       target_cpu_default2="MASK_GAS"
                fi
                ;;
 
@@ -4101,6 +4221,8 @@ case ${target} in
                ;;
        i[34567]86-*-mingw* | x86_64-*-mingw*)
                ;;
+       i[34567]86-*-dragonfly* | x86_64-*-dragonfly*)
+               ;;
        i[34567]86-*-freebsd* | x86_64-*-freebsd*)
                ;;
        ia64*-*-linux*)
@@ -4116,6 +4238,31 @@ case ${target} in
                                tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
                                ;;
                esac
+               if test x$with_arch != x; then
+                       default_mips_arch=$with_arch
+               fi
+               if test x$with_abi != x; then
+                       default_mips_abi=$with_abi
+               fi
+               case ${default_mips_arch} in
+                   mips1)    tm_defines="$tm_defines MIPS_ISA_DEFAULT=1" ;;
+                   mips2)    tm_defines="$tm_defines MIPS_ISA_DEFAULT=2" ;;
+                   mips3)    tm_defines="$tm_defines MIPS_ISA_DEFAULT=3" ;;
+                   mips4)    tm_defines="$tm_defines MIPS_ISA_DEFAULT=4" ;;
+                   mips32)   tm_defines="$tm_defines MIPS_ISA_DEFAULT=32" ;;
+                   mips32r2) tm_defines="$tm_defines MIPS_ISA_DEFAULT=33" ;;
+                   mips32r6) tm_defines="$tm_defines MIPS_ISA_DEFAULT=37" ;;
+                   mips64)   tm_defines="$tm_defines MIPS_ISA_DEFAULT=64" ;;
+                   mips64r2) tm_defines="$tm_defines MIPS_ISA_DEFAULT=65" ;;
+                   mips64r6) tm_defines="$tm_defines MIPS_ISA_DEFAULT=69" ;;
+               esac
+               case ${default_mips_abi} in
+                   32)   tm_defines="$tm_defines MIPS_ABI_DEFAULT=ABI_32" ;;
+                   o64)  tm_defines="$tm_defines MIPS_ABI_DEFAULT=ABI_O64" ;;
+                   n32)  tm_defines="$tm_defines MIPS_ABI_DEFAULT=ABI_N32" ;;
+                   64)   tm_defines="$tm_defines MIPS_ABI_DEFAULT=ABI_64" ;;
+                   eabi) tm_defines="$tm_defines MIPS_ABI_DEFAULT=ABI_EABI" ;;
+               esac
                tmake_file="mips/t-mips $tmake_file"
                ;;
 
@@ -4178,7 +4325,7 @@ case ${target} in
 esac
 
 t=
-all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu nan divide llsc mips-plt synci tls"
+all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu nan fp_32 odd_spreg_32 divide llsc mips-plt synci tls"
 for option in $all_defaults
 do
        eval "val=\$with_"`echo $option | sed s/-/_/g`
@@ -4218,3 +4365,11 @@ then
                target_cpu_default=$target_cpu_default2
        fi
 fi
+
+case ${target} in
+i[34567]86-*-* | x86_64-*-*)
+       if test x$enable_as_accelerator = xyes; then
+               extra_programs="mkoffload\$(exeext)"
+       fi
+       ;;
+esac