OSDN Git Service

* config/m68k/m68k.c, config/m68k/m68k.md (SGS, SGS_CMP_ORDER): Remove
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index b870523..aee81cf 100644 (file)
@@ -1,5 +1,5 @@
 # GCC target-specific configuration file.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -58,7 +58,7 @@
 #                      tm_file="${tm_file} dbxelf.h elfos.h svr4.h ${cpu_type.h}/elf.h"
 #                      Note that the preferred order is:
 #                      - specific target header "${cpu_type}/${cpu_type.h}"
-#                      - generic headers like dbxelf.h elfos.h, netware.h, etc.
+#                      - generic headers like dbxelf.h elfos.h, etc.
 #                      - specializing target headers like ${cpu_type.h}/elf.h
 #                      This helps to keep OS specific stuff out of the CPU
 #                      defining header ${cpu_type}/${cpu_type.h}.
 #                      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 iff
-#                      MAX_LONG_TYPE_SIZE is 64.  (The code which
-#                      determines the underlying integral type for
-#                      HOST_WIDE_INT cannot see the definition of
-#                      MAX_LONG_TYPE_SIZE.)
+#                      for this target.  This is true iff this target
+#                      supports "long" or "wchar_t" wider than 32 bits.
 #
 #  configure_default_options
 #                      Set to an initializer for configure_default_options
@@ -182,23 +179,7 @@ md_file=
 
 # Obsolete configurations.
 case ${target} in
- d30v-* | \
- dsp16xx-* | \
- i370-* | \
- i960-* | \
- i?86-moss-msdos | i?86-*-moss* | \
- i?86-ncr-sysv4* | \
- i?86-*-netware | \
- i?86-*-freebsd2* | i?86-*-freebsd*aout* | \
- i?86-*-linux*aout* | \
- i?86-*-linux*libc1* | \
- i?86-*-interix | \
- i?86-*-mach* | \
- i?86-*-udk* | \
- i?86-*-sysv[123]* | \
- i386-*-vsta | \
- m68k-hp-hpux* | m68000-hp-hpux* | \
- m68k-*-sysv4*)
+ dummy*)
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration ${target} is obsolete." >&2
       echo "*** Specify --enable-obsolete to build it anyway." >&2
@@ -279,6 +260,9 @@ ia64-*-*)
 hppa*-*-* | parisc*-*-*)
        cpu_type=pa
        ;;
+m32r*-*-*)
+        cpu_type=m32r
+        ;;
 m680[012]0-*-*)
        cpu_type=m68k
        extra_headers=math-68881.h
@@ -659,7 +643,7 @@ arm*-*-netbsd*)
        use_collect2=yes
        ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
-       tm_file="dbxelf.h elfos.h linux.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h"
+       tm_file="dbxelf.h elfos.h linux.h arm/elf.h  arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h"
        tmake_file="t-slibgcc-elf-ver t-linux arm/t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -723,12 +707,6 @@ cris-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
        tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
        ;;
-d30v-*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-       ;;
-dsp16xx-*)
-       use_fixproto=yes
-       ;;
 fr30-*-elf)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
        tmake_file=fr30/t-fr30
@@ -868,27 +846,6 @@ hppa1.0-*-hpux11*)
        esac
        use_collect2=yes
        ;;
-i370-*-opened*)                         # IBM 360/370/390 Architecture
-       xm_defines='FATAL_EXIT_CODE=12'
-       tm_file="i370/oe.h i370/i370.h"
-       tmake_file="i370/t-i370"
-       c_target_objs="i370-c.o"
-       cxx_target_objs="i370-c.o"
-       # Don't bother fixing up header files; they're weird.
-       ;;
-i370-*-mvs*)
-       xm_defines='FATAL_EXIT_CODE=12'
-       tm_file="i370/mvs.h i370/i370.h"
-       tmake_file="i370/t-i370"
-       c_target_objs="i370-c.o"
-       cxx_target_objs="i370-c.o"
-       use_fixproto=yes
-       ;;
-i370-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h linux.h i370/linux.h i370/i370.h"
-       tmake_file="t-slibgcc-elf-ver t-linux"
-       # broken_install=yes
-       ;;
 i[34567]86-*-darwin*)
        tm_file="${tm_file} i386/darwin.h"
        ;;
@@ -897,16 +854,6 @@ i[34567]86-*-elf*)
        tmake_file="i386/t-i386elf t-svr4"
        use_fixproto=yes
        ;;
-i[34567]86-ncr-sysv4*)         # NCR 3000 - ix86 running system V.4
-       xm_defines="SMALL_ARG_MAX"
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv4-cpp.h"
-       extra_parts="crtbegin.o crtend.o"
-       tmake_file=i386/t-crtpic
-       use_fixproto=yes
-       ;;
-i[34567]86-*-netware)          # Intel 80386's running netware
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h netware.h i386/netware.h"
-       ;;
 i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        if test x$gas = xyes
        then
@@ -927,10 +874,6 @@ i[34567]86-*-beoself* | i[34567]86-*-beos*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/beos-elf.h"
        extra_parts='crtbegin.o crtend.o'
        ;;
-i[34567]86-*-freebsd2 | i[34567]86-*-freebsd2.* | i[34567]86-*-freebsd*aout*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/freebsd-aout.h"
-       tmake_file=t-freebsd
-       ;;
 i[34567]86-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
        ;;
@@ -960,23 +903,6 @@ i[34567]86-*-coff*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
        use_fixproto=yes
        ;;
-i[34567]86-*-linux*aout*)      # Intel 80386's running GNU/Linux
-                               # with a.out format
-       tmake_file="i386/t-crtstuff"
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h linux-aout.h i386/linux-aout.h"
-       gnu_ld=yes
-       ;;
-i[34567]86-*-linux*libc1)      # Intel 80386's running GNU/Linux
-                               # with ELF format using the
-                               # GNU/Linux C library 5
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h"
-       tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 i386/t-crtstuff"
-       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-       gnu_ld=yes
-       if test x$enable_threads = xyes; then
-               thread_file='single'
-       fi
-       ;;
 i[34567]86-*-linux*)   # Intel 80386's running GNU/Linux
                        # with ELF format using glibc 2
                        # aka GNU/Linux C library 6
@@ -1003,13 +929,6 @@ i[34567]86-pc-msdosdjgpp*)
        gnu_ld=yes
        gas=yes
        ;;
-i[34567]86-moss-msdos* | i[34567]86-*-moss*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h i386/moss.h"
-       tmake_file=t-libc-ok
-       gnu_ld=yes
-       gas=yes
-       use_fixproto=yes
-       ;;
 i[34567]86-*-lynxos*)
        if test x$gas = xyes
        then
@@ -1019,12 +938,6 @@ i[34567]86-*-lynxos*)
        fi
        use_fixproto=yes
        ;;
-i[34567]86-*-mach*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/mach.h"
-#      tmake_file=t-libc-ok
-       use_collect2=yes
-       use_fixproto=yes
-       ;;
 i[34567]86-*-nto-qnx*)
        tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h svr4.h i386/unix.h i386/nto.h"
        tmake_file=i386/t-nto
@@ -1094,38 +1007,6 @@ i[34567]86-*-sysv4*)             # Intel 80386's running system V.4
        extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
-i[34567]86-*-udk*)      # Intel x86 on SCO UW/OSR5 Dev Kit
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h i386/udk.h"
-       tmake_file="i386/t-crtpic i386/t-udk t-svr4"
-       extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
-       ;;
-i[34567]86-*-sysv*)            # Intel 80386's running system V
-       if test x$gas = xyes
-       then
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/svr3gas.h i386/svr3dbx.h"
-                       tmake_file=i386/t-svr3dbx
-                       extra_parts="svr3.ifile svr3z.ifile"
-               else
-                       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/svr3gas.h"
-                       extra_parts="crtbegin.o crtend.o"
-                       tmake_file=i386/t-crtstuff
-               fi
-       else
-               tm_file="${tm_file} svr3.h i386/unix.h i386/att.h i386/sysv3.h"
-               extra_parts="crtbegin.o crtend.o"
-               tmake_file=i386/t-crtstuff
-       fi
-       tmake_file="$tmake_file i386/t-crtpic"
-       use_fixproto=yes
-       ;;
-i386-*-vsta)                   # Intel 80386's running VSTa kernel
-       xm_file="i386/xm-vsta.h"
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/vsta.h"
-       use_fixproto=yes
-       ;;
 i[4567]86-wrs-vxworks)
        tm_file="${tm_file} i386/sysv4.h i386/unix.h i386/vxworks.h"
        tmake_file="${tmake_file} i386/t-vxworks"
@@ -1177,17 +1058,6 @@ i[34567]86-*-interix3*)
                tm_file="${tm_file} dbxcoff.h"
        fi
        ;;
-i[34567]86-*-interix*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h interix.h"
-       tmake_file="i386/t-interix"
-       extra_objs=winnt.o
-       if test x$enable_threads = xyes ; then
-               thread_file='posix'
-       fi
-       if test x$stabs = xyes ; then
-               tm_file="${tm_file} dbxcoff.h"
-       fi
-       ;;
 i[34567]86-*-kaos*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h kaos.h i386/kaos-i386.h"
        tmake_file="i386/t-i386elf t-svr4"
@@ -1198,25 +1068,6 @@ i860-*-sysv4*)
         extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
         ;;
-i960-*-coff*)
-       tm_file="${tm_file} dbxcoff.h i960/i960-coff.h libgloss.h"
-       tmake_file=i960/t-960bare
-       c_target_objs="i960-c.o"
-       cxx_target_objs="i960-c.o"
-       ;;
-i960-*-rtems)
-       tmake_file="i960/t-960bare t-rtems"
-       tm_file="${tm_file} dbxcoff.h i960/i960-coff.h i960/rtems.h rtems.h"
-       c_target_objs="i960-c.o"
-       cxx_target_objs="i960-c.o"
-       ;;
-i960-*-*)                      # Default i960 environment.
-       use_collect2=yes
-       tmake_file=i960/t-960bare
-       c_target_objs="i960-c.o"
-       cxx_target_objs="i960-c.o"
-       use_fixproto=yes
-       ;;
 ia64*-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/elf.h"
        tmake_file="ia64/t-ia64"
@@ -1279,6 +1130,31 @@ m32r-*-elf*)
        extra_parts="crtinit.o crtfini.o"
        use_fixproto=yes
        ;;
+m32rle-*-elf*)
+       tm_file="dbxelf.h elfos.h svr4.h m32r/little.h ${tm_file}"
+       extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
+       use_fixproto=yes
+       ;;
+m32r-*-linux*)
+       tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} m32r/linux.h"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       tmake_file="m32r/t-linux"
+       gnu_ld=yes
+       use_fixproto=yes
+       if test x$enable_threads = xyes; then
+               thread_file='posix'
+       fi
+       ;;
+m32rle-*-linux*)
+       tm_file="dbxelf.h elfos.h svr4.h linux.h m32r/little.h ${tm_file} m32r/linux.h"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       tmake_file="m32r/t-linux"
+       gnu_ld=yes
+       use_fixproto=yes
+       if test x$enable_threads = xyes; then
+               thread_file='posix'
+       fi
+       ;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
        tm_file="dbxelf.h elfos.h m68hc11/m68hc11.h"
@@ -1296,37 +1172,6 @@ m68hc12-*-*|m6812-*-*)
        tmake_file="m68hc11/t-m68hc11-gas"
        use_fixproto=yes
         ;;
-m68000-hp-hpux*)               # HP 9000 series 300
-       tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h m68k/hp310.h"
-       tm_defines="TARGET_DEFAULT=0" # 68000, no 68881, no bitfield ops
-       if test x$gas = xyes
-       then
-               tm_defines="${tm_defines} DBX_DEBUGGING_INFO=1 USE_GAS"
-       fi
-       tmake_file=m68k/t-hp320
-       use_collect2=yes
-       use_fixproto=yes
-       ;;
-m68k-hp-hpux7*)        # HP 9000 series 300 running HPUX version 7.
-       tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h"
-       if test x$gas = xyes
-       then
-               tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS"
-       else
-               tm_defines="NO_DOT_IN_LABEL NO_BUGS"
-       fi
-       use_collect2=yes
-       use_fixproto=yes
-       ;;
-m68k-hp-hpux*) # HP 9000 series 300
-       tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h"
-       if test x$gas = xyes
-       then
-               tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS"
-       fi
-       use_collect2=yes
-       use_fixproto=yes
-       ;;
 m68k-*-aout*)
        tmake_file=m68k/t-m68kbare
        tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h"
@@ -1356,34 +1201,6 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
                ;;
        esac
        ;;
-m68k*-*-netbsd*)
-    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
-       tm_file="m68k/m68k.h netbsd.h netbsd-aout.h m68k/netbsd.h"
-       tmake_file=t-netbsd
-       extra_parts=""
-       use_collect2=yes
-       ;;
-m68k*-*-openbsd*)
-       # needed to unconfuse gdb
-       tm_defines="OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68881|MASK_BITFIELD)"
-       tm_file="m68k/m68k.h openbsd.h m68k/openbsd.h"
-       tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
-       # we need collect2 until our bug is fixed...
-       use_collect2=yes
-       ;;
-m68k-*-sysv4*)                 # Motorola m68k's running system V.4
-       tm_file="m68k/m68k.h m68k/sgs.h dbxelf.h elfos.h svr4.h m68k/m68kv4.h"
-       tm_defines="MOTOROLA SGS SGS_CMP_ORDER SGS_SWITCH_TABLES"
-       tmake_file=t-svr4
-       extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
-       ;;
 m68k-*-uclinux*)               # Motorola m68k/ColdFire running uClinux with uClibc
        tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux.h"
        tm_defines="MOTOROLA USE_GAS"
@@ -1413,34 +1230,6 @@ mcore-*-pe*)
        tmake_file=mcore/t-mcore-pe
        use_fixproto=yes
        ;;
-mips-sgi-irix6*o32)            # SGI System V.4., IRIX 6, O32 ABI
-       tm_file="${tm_file} mips/iris5.h"
-       if test x$gas = xyes
-       then
-               tm_file="${tm_file} mips/sdb.h mips/iris5gas.h mips/iris6-o32-gas.h"
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
-               fi
-               tmake_file=mips/t-iris5-gas
-       else
-               tm_file="${tm_file} mips/iris6-o32-as.h"
-               tmake_file=mips/t-iris5-as
-       fi
-       tm_file="${tm_file} mips/iris6-o32.h"
-       tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
-       target_cpu_default="MASK_ABICALLS"
-       # mips-tfile doesn't work yet
-       # See comment in mips/iris5.h file.
-       if test x$gas = xno
-       then
-               use_collect2=yes
-       fi
-#      if test x$enable_threads = xyes; then
-#              thread_file='irix'
-#      fi
-       use_fixproto=yes
-       ;;
 mips-sgi-irix6*)               # SGI System V.4., IRIX 6
        tm_file="${tm_file} mips/iris5.h mips/iris6.h"
        tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
@@ -1681,8 +1470,6 @@ powerpc-*-darwin*)
        tm_file="${tm_file} rs6000/darwin.h"
        tmake_file="t-darwin t-slibgcc-darwin rs6000/t-darwin"
        extra_headers=altivec.h
-       # override ppc default
-       need_64bit_hwint=
        ;;
 powerpc*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
@@ -1855,7 +1642,7 @@ s390x-ibm-tpf*)
 sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-kaos*)
        tmake_file="sh/t-sh sh/t-elf"
        case ${target} in
-       shl* | sh64l*)
+       shl* | sh[234]l* | sh64l*)
                tm_file="sh/little.h ${tm_file}"
                tmake_file="${tmake_file} sh/t-le"
                ;;
@@ -1977,7 +1764,7 @@ sparc-*-openbsd*)
        use_collect2=yes
        ;;
 sparc64-*-openbsd*)
-       tm_file="sparc/openbsd1-64.h sparc/sparc.h elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
+       tm_file="sparc/openbsd1-64.h sparc/sparc.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
        gas=yes gnu_ld=yes
        with_cpu=ultrasparc
        ;;
@@ -2216,16 +2003,6 @@ vax-*-ultrix*)                   # VAXen running ultrix
        tm_file="${tm_file} vax/ultrix.h"
        use_fixproto=yes
        ;;
-vax-*-*)                       # VAX default entry
-    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
-       use_fixproto=yes
-       ;;
 xscale-*-elf)
        tm_file="arm/xscale-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-xscale-elf
@@ -2314,7 +2091,7 @@ if test x$with_cpu = x ; then
       ;;
     i686-*-* | i786-*-*)
       case ${target_noncanonical} in
-        k8-*)
+        k8-*|opteron-*|athlon_64-*)
           with_cpu=k8
           ;;
         athlon_xp-*|athlon_mp-*|athlon_4-*)
@@ -2401,7 +2178,7 @@ fi
                ;;
 
        arm*-*-*)
-               supported_defaults="arch cpu float tune"
+               supported_defaults="arch cpu float tune fpu"
                for which in cpu tune; do
                        eval "val=\$with_$which"
                        case "$val" in
@@ -2428,7 +2205,7 @@ fi
 
                case "$with_arch" in
                "" \
-               | armv[2345] | armv2a | armv3m | armv4t | armv5t \
+               | armv[23456] | armv2a | armv3m | armv4t | armv5t \
                | armv5te | armv6j | ep9312)
                        # OK
                        ;;
@@ -2440,7 +2217,7 @@ fi
 
                case "$with_float" in
                "" \
-               | soft | hard)
+               | soft | hard | softfp)
                        # OK
                        ;;
                *)
@@ -2449,6 +2226,17 @@ fi
                        ;;
                esac
 
+               case "$with_fpu" in
+               "" \
+               | fpa | fpe2 | fpe3 | maverick | vfp )
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown fpu used in --with-fpu=$fpu" 2>&1
+                       exit 1
+                       ;;
+               esac
+
                if test "x$with_arch" != x && test "x$with_cpu" != x; then
                        echo "Warning: --with-arch overrides --with-cpu" 1>&2
                fi
@@ -2487,7 +2275,8 @@ fi
                        | i586 | pentium | pentium-mmx | winchip-c6 | winchip2 \
                        | c3 | c3-2 | i686 | pentiumpro | pentium2 | pentium3 \
                        | pentium4 | k6 | k6-2 | k6-3 | athlon | athlon-tbird \
-                       | athlon-4 | athlon-xp | athlon-mp | k8)
+                       | athlon-4 | athlon-xp | athlon-mp | k8 | opteron \
+                       | athlon64 | athlon-fx)
                                # OK
                                ;;
                        *)
@@ -2528,7 +2317,11 @@ fi
                for which in cpu tune; do
                        eval "val=\$with_$which"
                        case ${val} in
-                       "" | default32 | default64 | common \
+                       default32 | default64)
+                               with_which="with_$which"
+                               eval $with_which=
+                               ;;
+                       "" | common \
                        | power | power2 | power3 | power4 \
                        | powerpc | powerpc64 \
                        | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
@@ -2734,7 +2527,7 @@ fi
        esac
 
        t=
-       all_defaults="abi cpu arch tune schedule float mode"
+       all_defaults="abi cpu arch tune schedule float mode fpu"
        for option in $all_defaults
        do
                eval "val=\$with_$option"