From Eli Zaretskii <eliz@gnu.org>:

[deliverable/binutils-gdb.git] / binutils / configure.in

diff --git a/binutils/configure.in b/binutils/configure.in
index c4ee803d054185aa0ced962a31f8a152df310d1b..5c777d2e48f0f4923eb24d063394a239ad274db0 100644 (file)
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -65,6 +65,13 @@ AC_PROG_INSTALL
 
 BFD_CC_FOR_BUILD
 
+DEMANGLER_NAME=c++filt
+case "${host}" in
+  *-*-go32* | *-*-msdos*)
+    DEMANGLER_NAME=cxxfilt
+esac
+AC_SUBST(DEMANGLER_NAME)
+
 AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h)
 AC_HEADER_SYS_WAIT
 AC_FUNC_ALLOCA
@@ -179,12 +186,12 @@ changequote([,])dnl
          BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
          DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
          BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-        ;;
+         ;;
        thumb-*pe*)
          BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
          DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
          BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-        ;;
+         ;;
 changequote(,)dnl
        i[3-6]86-*pe* | i[3-6]86-*-cygwin* | i[3-6]86-*-mingw32*)
 changequote([,])dnl
@@ -192,21 +199,25 @@ changequote([,])dnl
          DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
          BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
          BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
-        ;;
+         ;;
+       i[3-6]86-*-interix)
+         BUILD_DLLTOOL='$(DLLTOOL_PROG)'
+         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_I386"
+         ;;
        powerpc*-*-*pe* | powerpc*-*-cygwin*)
          BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
          DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_PPC"
          BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-        ;;
+         ;;
        mcore-*pe)
          BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
          DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE"
          BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-        ;;
+         ;;
        mcore-*elf)
          BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
          DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_MCORE_ELF"
-        ;;
+         ;;
        esac
     fi
 done