Tidy binutils configure

Separate out some of the defines from the block handling windows
support, so they don't get lost.  Delete an unused variable.

diff --git a/binutils/configure b/binutils/configure
index c9641f3c7f97780f1062849ebb218281cb44d9b8..2b7462b40223bd45d715509404d7764d42be16d7 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -14542,7 +14542,6 @@ _ACEOF
   fi
 
 
-all_targets=false
 BUILD_SRCONV=
 BUILD_DLLTOOL=
 DLLTOOL_DEFS=
@@ -14559,141 +14558,137 @@ od_vectors=
 
 for targ in $target $canon_targets
 do
-    if test "x$targ" = "xall"; then
-        all_targets=true
+    case $targ in
+    all | *-*-hms*)
        BUILD_SRCONV='$(SRCONV_PROG)'
-       BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)'
-       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
+    esac
+
+    case $targ in
+    all | spu-*-*)
+       BUILD_MISC='bin2c$(EXEEXT_FOR_BUILD)'
+       ;;
+    esac
+
+    case $targ in
+    powerpc*-*-linux* | powerpc*-*-elf* | powerpc*-*-eabi*)
+       BUILD_INSTALL_MISC=embedspu
+       ;;
+    esac
+
+    case $targ in
+    mep-*)
+       OBJDUMP_DEFS="-DSKIP_ZEROES=256 -DSKIP_ZEROES_AT_END=0"
+       ;;
+    powerpc*-aix5.[01])
+       ;;
+    powerpc*-aix[5-9].*)
+       OBJDUMP_DEFS="-DAIX_WEAK_SUPPORT"
+       ;;
+    esac
+
+    case $targ in
+    aarch64-*-mingw*)
        BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
        if test -z "$DLLTOOL_DEFAULT"; then
-         DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_AARCH64"
        fi
-       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_AARCH64"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
        BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-       od_vectors="objdump_private_desc_elf32_avr objdump_private_desc_xcoff\
-                   objdump_private_desc_pe objdump_private_desc_mach_o"
-    else
-       case $targ in
-       *-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;;
-       esac
-
-       case $targ in
-       aarch64-*-mingw*)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
-           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_AARCH64"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_AARCH64"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-         ;;
-       arm-wince-pe* | arm-*-wince | arm*-*-cegcc* | arm*-*-mingw32ce*)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       ;;
+    arm-wince-pe* | arm-*-wince | arm*-*-cegcc* | arm*-*-mingw32ce*)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM_WINCE"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM_WINCE -DDLLTOOL_ARM"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         ;;
-       arm-*-pe*)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM_WINCE -DDLLTOOL_ARM"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
+    arm-*-pe*)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         ;;
-       x86_64-*-mingw* | x86_64-*-cygwin*)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
-           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MX86_64"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MX86_64"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-         ;;
-       i[3-7]86-*-pe* | i[3-7]86-*-cygwin* | i[3-7]86-*-mingw32**)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
+    i[3-7]86-*-pe* | i[3-7]86-*-cygwin* | i[3-7]86-*-mingw32** | all)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-         ;;
-       i[3-7]86-*-interix)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+       ;;
+    i[3-7]86-*-interix)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
-         ;;
-       powerpc*-aix5.[01])
-         ;;
-       powerpc*-aix[5-9].*)
-         OBJDUMP_DEFS="-DAIX_WEAK_SUPPORT"
-         ;;
-       powerpc*-*-linux* | powerpc*-*-elf* | powerpc*-*-eabi*)
-         case "$BUILD_INSTALL_MISC" in
-           *embedspu*) ;;
-           *) BUILD_INSTALL_MISC="${BUILD_INSTALL_MISC} embedspu"
-         esac
-         ;;
-       sh*-*-pe)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
-           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_SH"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_SH"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         ;;
-       spu-*-*)
-         BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)'
-         ;;
-       mcore-*-pe)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+       ;;
+    mcore-*-pe)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MCORE"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         ;;
-       mcore-*-elf)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
+    mcore-*-elf)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MCORE_ELF"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
-         ;;
-       mep-*)
-         OBJDUMP_DEFS="-DSKIP_ZEROES=256 -DSKIP_ZEROES_AT_END=0"
-         ;;
-       esac
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
+       ;;
+    sh*-*-pe)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
+           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_SH"
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_SH"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
+    x86_64-*-mingw* | x86_64-*-cygwin*)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
+           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MX86_64"
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MX86_64"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+       ;;
+    esac
 
-       # Add objdump private vectors.
-       case $targ in
-       avr-*-*)
-         od_vectors="$od_vectors objdump_private_desc_elf32_avr"
-         ;;
-       powerpc*-*-aix* | rs6000-*-aix*)
-         od_vectors="$od_vectors objdump_private_desc_xcoff"
-         ;;
-       *-*-pe* | *-*-cygwin* | *-*-mingw*)
-         od_vectors="$od_vectors objdump_private_desc_pe"
-         ;;
-        *-*-darwin*)
-         od_vectors="$od_vectors objdump_private_desc_mach_o"
-         ;;
-       esac
-    fi
+    # Add objdump private vectors.
+    case $targ in
+    all)
+       od_vectors="objdump_private_desc_elf32_avr objdump_private_desc_xcoff\
+                   objdump_private_desc_pe objdump_private_desc_mach_o"
+       ;;
+    avr-*-*)
+       od_vectors="$od_vectors objdump_private_desc_elf32_avr"
+       ;;
+    powerpc*-*-aix* | rs6000-*-aix*)
+       od_vectors="$od_vectors objdump_private_desc_xcoff"
+       ;;
+    *-*-pe* | *-*-cygwin* | *-*-mingw*)
+        od_vectors="$od_vectors objdump_private_desc_pe"
+        ;;
+    *-*-darwin*)
+       od_vectors="$od_vectors objdump_private_desc_mach_o"
+       ;;
+    esac
 done
 
 # Uniq objdump private vector, build objdump target ofiles.

diff --git a/binutils/configure.ac b/binutils/configure.ac
index 92a23ae7df8f7a03aea837af127490d1575c5cac..30cd7b9ed1ed577f128019063bae38727d00e8c3 100644 (file)
--- a/binutils/configure.ac
+++ b/binutils/configure.ac
@@ -319,7 +319,6 @@ fi
 AC_CHECK_HEADER(iconv.h)
 AM_ICONV
 
-all_targets=false
 BUILD_SRCONV=
 BUILD_DLLTOOL=
 DLLTOOL_DEFS=
@@ -336,149 +335,143 @@ od_vectors=
 
 for targ in $target $canon_targets
 do
-    if test "x$targ" = "xall"; then
-        all_targets=true
+    case $targ in
+    all | *-*-hms*)
        BUILD_SRCONV='$(SRCONV_PROG)'
-       BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)'
-       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
+    esac
+
+    case $targ in
+    all | spu-*-*)
+       BUILD_MISC='bin2c$(EXEEXT_FOR_BUILD)'
+       ;;
+    esac
+
+    case $targ in
+    powerpc*-*-linux* | powerpc*-*-elf* | powerpc*-*-eabi*)
+       BUILD_INSTALL_MISC=embedspu
+       ;;
+    esac
+
+    case $targ in
+    mep-*)
+       OBJDUMP_DEFS="-DSKIP_ZEROES=256 -DSKIP_ZEROES_AT_END=0"
+       ;;
+changequote(,)dnl
+    powerpc*-aix5.[01])
+       ;;
+    powerpc*-aix[5-9].*)
+changequote([,])dnl
+       OBJDUMP_DEFS="-DAIX_WEAK_SUPPORT"
+       ;;
+    esac
+
+    case $targ in
+    aarch64-*-mingw*)
        BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
        if test -z "$DLLTOOL_DEFAULT"; then
-         DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_AARCH64"
        fi
-       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_AARCH64"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
        BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-       od_vectors="objdump_private_desc_elf32_avr objdump_private_desc_xcoff\
-                   objdump_private_desc_pe objdump_private_desc_mach_o"
-    else
-       case $targ in
-       *-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;;
-       esac
-
-       case $targ in
-       aarch64-*-mingw*)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
-           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_AARCH64"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_AARCH64"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-         ;;
-       arm-wince-pe* | arm-*-wince | arm*-*-cegcc* | arm*-*-mingw32ce*)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       ;;
+    arm-wince-pe* | arm-*-wince | arm*-*-cegcc* | arm*-*-mingw32ce*)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM_WINCE"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM_WINCE -DDLLTOOL_ARM"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         ;;
-       arm-*-pe*)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM_WINCE -DDLLTOOL_ARM"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
+    arm-*-pe*)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         ;;
-       x86_64-*-mingw* | x86_64-*-cygwin*)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
-           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MX86_64"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MX86_64"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-         ;;
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
 changequote(,)dnl
-       i[3-7]86-*-pe* | i[3-7]86-*-cygwin* | i[3-7]86-*-mingw32**)
+    i[3-7]86-*-pe* | i[3-7]86-*-cygwin* | i[3-7]86-*-mingw32** | all)
 changequote([,])dnl
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-         ;;
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+       ;;
 changequote(,)dnl
-       i[3-7]86-*-interix)
+    i[3-7]86-*-interix)
 changequote([,])dnl
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
-         ;;
-changequote(,)dnl
-       powerpc*-aix5.[01])
-changequote([,])dnl
-         ;;
-changequote(,)dnl
-       powerpc*-aix[5-9].*)
-changequote([,])dnl
-         OBJDUMP_DEFS="-DAIX_WEAK_SUPPORT"
-         ;;
-       powerpc*-*-linux* | powerpc*-*-elf* | powerpc*-*-eabi*)
-         case "$BUILD_INSTALL_MISC" in
-           *embedspu*) ;;
-           *) BUILD_INSTALL_MISC="${BUILD_INSTALL_MISC} embedspu"
-         esac
-         ;;
-       sh*-*-pe)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
-           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_SH"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_SH"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         ;;
-       spu-*-*)
-         BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)'
-         ;;
-       mcore-*-pe)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+       ;;
+    mcore-*-pe)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MCORE"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE"
-         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-         BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-         ;;
-       mcore-*-elf)
-         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-         if test -z "$DLLTOOL_DEFAULT"; then
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
+    mcore-*-elf)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
            DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MCORE_ELF"
-         fi
-         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
-         ;;
-       mep-*)
-         OBJDUMP_DEFS="-DSKIP_ZEROES=256 -DSKIP_ZEROES_AT_END=0"
-         ;;
-       esac
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
+       ;;
+    sh*-*-pe)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
+           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_SH"
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_SH"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       ;;
+    x86_64-*-mingw* | x86_64-*-cygwin*)
+       BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+       if test -z "$DLLTOOL_DEFAULT"; then
+           DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_MX86_64"
+       fi
+       DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MX86_64"
+       BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+       BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+       BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+       ;;
+    esac
 
-       # Add objdump private vectors.
-       case $targ in
-       avr-*-*)
-         od_vectors="$od_vectors objdump_private_desc_elf32_avr"
-         ;;
-       powerpc*-*-aix* | rs6000-*-aix*)
-         od_vectors="$od_vectors objdump_private_desc_xcoff"
-         ;;
-       *-*-pe* | *-*-cygwin* | *-*-mingw*)
-         od_vectors="$od_vectors objdump_private_desc_pe"
-         ;;
-        *-*-darwin*)
-         od_vectors="$od_vectors objdump_private_desc_mach_o"
-         ;;
-       esac
-    fi
+    # Add objdump private vectors.
+    case $targ in
+    all)
+       od_vectors="objdump_private_desc_elf32_avr objdump_private_desc_xcoff\
+                   objdump_private_desc_pe objdump_private_desc_mach_o"
+       ;;
+    avr-*-*)
+       od_vectors="$od_vectors objdump_private_desc_elf32_avr"
+       ;;
+    powerpc*-*-aix* | rs6000-*-aix*)
+       od_vectors="$od_vectors objdump_private_desc_xcoff"
+       ;;
+    *-*-pe* | *-*-cygwin* | *-*-mingw*)
+        od_vectors="$od_vectors objdump_private_desc_pe"
+        ;;
+    *-*-darwin*)
+       od_vectors="$od_vectors objdump_private_desc_mach_o"
+       ;;
+    esac
 done
 
 # Uniq objdump private vector, build objdump target ofiles.