* configure (package_makefile_frag): Move inserting the

[binutils.git] / configure.in

diff --git a/configure.in b/configure.in
index 6ba93b1e31e31a2a70834f2632d72ca7d5a2bf70..1eb815ef69b181e668994b90609ebc3104c03566 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@
 ## For more information on these two systems, check out the documentation
 ## for 'Autoconf' (autoconf.texi) and 'Configure' (configure.texi).  
 
 ## For more information on these two systems, check out the documentation
 ## for 'Autoconf' (autoconf.texi) and 'Configure' (configure.texi).  
 

-#   Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.

 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by


@@ -41,20 +41,22 @@
 
 # these libraries are used by various programs built for the host environment
 #
 
 # these libraries are used by various programs built for the host environment
 #

-host_libs="mmalloc libiberty opcodes bfd readline gash tcl tk tclX"
+host_libs="mmalloc libiberty opcodes bfd readline gash db tcl tk tclX itcl tix libgui"
+# start-sanitize-ide
+host_libs="${host_libs} libide"
+# end-sanitize-ide

 
 if [ "${enable_gdbgui}" = "yes" ] ; then
        host_libs="${host_libs} libgui"
 fi
 
 # these tools are built for the host environment
 
 if [ "${enable_gdbgui}" = "yes" ] ; then
        host_libs="${host_libs} libgui"
 fi
 
 # these tools are built for the host environment

-#
-host_tools="texinfo byacc flex bison binutils ld gas gcc gdb make patch
-           prms send-pr gprof gdbtest tgas etc expect dejagnu sim bash
-            m4 autoconf ispell grep diff rcs cvs fileutils shellutils time
-           textutils wdiff find emacs emacs19 uudecode hello tar gzip indent
-           recode release sed utils guile perl apache inet gawk"
-
+# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
+# know that we are building the simulator.
+host_tools="texinfo byacc flex bison binutils ld gas gcc sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu bash m4 autoconf automake ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find emacs emacs19 uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils sn"
+# start-sanitize-ide
+host_tools="${host_tools} ilu vmake jstools"
+# end-sanitize-ide

 
 # these libraries are built for the target environment, and are built after
 # the host libraries and the host tools (which may be a cross compiler)
 
 # these libraries are built for the target environment, and are built after
 # the host libraries and the host tools (which may be a cross compiler)


@@ -69,7 +71,7 @@ target_libs="target-libiberty target-libgloss target-newlib target-libio target-
 # list belongs in this list.  those programs are also very likely
 # candidates for the "native_only" list which follows
 #
 # list belongs in this list.  those programs are also very likely
 # candidates for the "native_only" list which follows
 #

-target_tools="target-examples target-groff"
+target_tools="target-examples target-groff target-gperf"

 
 ################################################################################
 
 
 ################################################################################
 


@@ -81,14 +83,13 @@ target_tools="target-examples target-groff"
 
 # directories to be built in the native environment only
 #
 
 # directories to be built in the native environment only
 #

-native_only="autoconf cvs emacs emacs19 fileutils find gawk grep gzip hello
-            indent ispell m4 rcs recode sed shellutils tar textutils gash
-            uudecode wdiff gprof target-groff guile perl apache inet time
-            bash prms"
+# This must be a single line because of the way it is searched by grep in
+# the code below.
+native_only="autoconf automake cvssrc emacs emacs19 fileutils find gawk grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils gash uudecode wdiff gprof target-groff guile perl apache inet time bash prms sn gnuserv target-gperf"

 
 # directories to be built in a cross environment only
 #
 
 # directories to be built in a cross environment only
 #

-cross_only="target-libiberty target-libgloss target-newlib"
+cross_only="target-libgloss target-newlib target-cygmon target-opcodes"

 
 ## All tools belong in one of the four categories, and are assigned above
 ## We assign ${configdirs} this way to remove all embedded newlines.  This
 
 ## All tools belong in one of the four categories, and are assigned above
 ## We assign ${configdirs} this way to remove all embedded newlines.  This


@@ -112,42 +113,117 @@ appdirs=""
 # Work in distributions that contain no compiler tools, like Autoconf.
 if [ -d ${srcdir}/config ]; then
 case "${host}" in
 # Work in distributions that contain no compiler tools, like Autoconf.
 if [ -d ${srcdir}/config ]; then
 case "${host}" in

-  m68k-hp-hpux*)         host_makefile_frag=config/mh-hp300 ;;
-  m68k-apollo-sysv*)      host_makefile_frag=config/mh-apollo68 ;;
-  m68k-apollo-bsd*)       host_makefile_frag=config/mh-a68bsd ;;
-  m68k-*-linux*)         host_makefile_frag=config/mh-linux ;;
-  m88k-dg-dgux*)         host_makefile_frag=config/mh-dgux ;;
-  m88k-harris-cxux*)     host_makefile_frag=config/mh-cxux ;;
-  m88k-motorola-sysv*)    host_makefile_frag=config/mh-delta88;;
-  mips*-dec-ultrix*)      host_makefile_frag=config/mh-decstation ;;
-  mips*-nec-sysv4*)      host_makefile_frag=config/mh-necv4 ;;
-  mips*-sgi-irix6*)      host_makefile_frag=config/mh-irix6 ;;
-  mips*-sgi-irix5*)      host_makefile_frag=config/mh-irix5 ;;
-  mips*-sgi-irix4*)       host_makefile_frag=config/mh-irix4 ;;
-  mips*-sgi-irix3*)       host_makefile_frag=config/mh-sysv ;;
-  mips*-*-sysv4*)        host_makefile_frag=config/mh-sysv4 ;;
-  mips*-*-sysv*)         host_makefile_frag=config/mh-riscos ;;
-  i[3456]86-*-dgux*)     host_makefile_frag=config/mh-sysv4 ;;
-  i[3456]86-ncr-sysv4.3)  host_makefile_frag=config/mh-ncrsvr43 ;;
-  i[3456]86-ncr-sysv4*)   host_makefile_frag=config/mh-ncr3000 ;;
-  i[3456]86-*-sco3.2v5*)  host_makefile_frag=config/mh-sysv ;;
-  i[3456]86-*-sco*)       host_makefile_frag=config/mh-sco ;;
-  i[3456]86-*-isc*)      host_makefile_frag=config/mh-sysv ;;
-  i[3456]86-*-linux*)     host_makefile_frag=config/mh-linux ;;
-  i[3456]86-*-solaris2*)  host_makefile_frag=config/mh-sysv4 ;;
-  i[3456]86-*-aix*)      host_makefile_frag=config/mh-aix386 ;;
-  i[3456]86-*-go32*)     host_makefile_frag=config/mh-go32 ;;
-  *-cygwin32*)           host_makefile_frag=config/mh-cygwin32 ;;
-  vax-*-ultrix2*)         host_makefile_frag=config/mh-vaxult2 ;;
-  *-*-solaris2*)          host_makefile_frag=config/mh-solaris ;;
-  m68k-sun-sunos*)       host_makefile_frag=config/mh-sun3 ;;
-  *-hp-hpux[78]*)         host_makefile_frag=config/mh-hpux8 ;;
-  *-hp-hpux*)             host_makefile_frag=config/mh-hpux ;;
-  *-*-hiux*)              host_makefile_frag=config/mh-hpux ;;
-  rs6000-*-lynxos*)      host_makefile_frag=config/mh-lynxrs6k ;;
-  *-*-lynxos*)           host_makefile_frag=config/mh-lynxos ;;
-  *-*-sysv4*)             host_makefile_frag=config/mh-sysv4 ;;
-  *-*-sysv*)              host_makefile_frag=config/mh-sysv ;;
+  m68k-hp-hpux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-hp300"
+    ;;
+  m68k-apollo-sysv*)
+    host_makefile_frag="${host_makefile_frag} config/mh-apollo68"
+    ;;
+  m68k-apollo-bsd*)
+    host_makefile_frag="${host_makefile_frag} config/mh-a68bsd"
+    ;;
+  m88k-dg-dgux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-dgux"
+    ;;
+  m88k-harris-cxux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-cxux"
+    ;;
+  m88k-motorola-sysv*)
+    host_makefile_frag="${host_makefile_frag} config/mh-delta88"
+    ;;
+  mips*-dec-ultrix*)
+    host_makefile_frag="${host_makefile_frag} config/mh-decstation"
+    ;;
+  mips*-nec-sysv4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-necv4"
+    ;;
+  mips*-sgi-irix6*)
+    host_makefile_frag="${host_makefile_frag} config/mh-irix6"
+    ;;
+  mips*-sgi-irix5*)
+    host_makefile_frag="${host_makefile_frag} config/mh-irix5"
+    ;;
+  mips*-sgi-irix4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-irix4"
+    ;;
+  mips*-sgi-irix3*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    ;;
+  mips*-*-sysv4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
+    ;;
+  mips*-*-sysv*)
+    host_makefile_frag="${host_makefile_frag} config/mh-riscos"
+    ;;
+  i[3456]86-*-dgux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-dgux386"
+    ;;
+  i[3456]86-ncr-sysv4.3*)
+    host_makefile_frag="${host_makefile_frag} config/mh-ncrsvr43"
+    ;;
+  i[3456]86-ncr-sysv4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-ncr3000"
+    ;;
+  i[3456]86-*-sco3.2v5*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    ;;
+  i[3456]86-*-sco*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sco"
+    ;;
+  i[3456]86-*-isc*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    ;;
+  i[3456]86-*-solaris2*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
+    ;;
+  i[3456]86-*-aix*)
+    host_makefile_frag="${host_makefile_frag} config/mh-aix386"
+    ;;
+  i[3456]86-*-go32*)
+    host_makefile_frag="${host_makefile_frag} config/mh-go32"
+    ;;
+  i[3456]86-*-msdosdjgpp*)
+    host_makefile_frag="${host_makefile_frag} config/mh-go32"
+    ;;
+  *-cygwin32*)
+    host_makefile_frag="${host_makefile_frag} config/mh-cygwin32"
+    ;;
+  *-mingw32*)
+    host_makefile_frag="${host_makefile_frag} config/mh-mingw32"
+    ;;
+  *-windows*)
+    host_makefile_frag="${host_makefile_frag} config/mh-windows"
+    ;;
+  vax-*-ultrix2*)
+    host_makefile_frag="${host_makefile_frag} config/mh-vaxult2"
+    ;;
+  *-*-solaris2*)
+    host_makefile_frag="${host_makefile_frag} config/mh-solaris"
+    ;;
+  m68k-sun-sunos*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sun3"
+    ;;
+  *-hp-hpux[78]*)
+    host_makefile_frag="${host_makefile_frag} config/mh-hpux8"
+    ;;
+  *-hp-hpux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-hpux"
+    ;;
+  *-*-hiux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-hpux"
+    ;;
+  rs6000-*-lynxos*)
+    host_makefile_frag="${host_makefile_frag} config/mh-lynxrs6k"
+    ;;
+  *-*-lynxos*)
+    host_makefile_frag="${host_makefile_frag} config/mh-lynxos"
+    ;;
+  *-*-sysv4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
+    ;;
+  *-*-sysv*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    ;;

 esac
 fi
 
 esac
 fi
 


@@ -191,36 +267,59 @@ case "${enable_shared}" in
 esac
 
 if [ x${shared} = xyes ]; then
 esac
 
 if [ x${shared} = xyes ]; then

-  waugh=

   case "${host}" in
   case "${host}" in

-    hppa*)             waugh=config/mh-papic ;;
-    i[3456]86-*)       waugh=config/mh-x86pic ;;
-    sparc64-*)         waugh=config/mh-sparcpic ;;
-    *)                 waugh=config/mh-${host_cpu}pic ;;
+    hppa*)
+      host_makefile_frag="${host_makefile_frag} config/mh-papic"
+      ;;
+    i[3456]86-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-x86pic"
+      ;;
+    sparc64-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-sparcpic"
+      ;;
+    powerpc*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-ppcpic"
+      ;;
+    alpha-*-linux*)
+      host_makefile_frag="${host_makefile_frag} config/mh-elfalphapic"
+      ;;
+    *)
+      if test -f ${srcdir}/config/mh-${host_cpu}pic; then
+        host_makefile_frag="${host_makefile_frag} config/mh-${host_cpu}pic"
+      fi
+      ;;

   esac
   esac

-  if [ -f ${srcdir}/${waugh} ]; then
-    if [ -n "${host_makefile_frag}" ] ; then
-      cat ${srcdir}/${host_makefile_frag} > mh-frag
-      cat ${srcdir}/${waugh} >> mh-frag
-      host_makefile_frag=mh-frag
-    else
-      host_makefile_frag=${waugh}
-    fi
-  fi
+fi
+
+rm -f mh-frag
+if [ -n "${host_makefile_frag}" ] ; then
+  for f in ${host_makefile_frag}
+  do
+    cat ${srcdir}/$f >> mh-frag
+  done
+  host_makefile_frag=mh-frag

 fi
 
 # per-target:
 
 case "${target}" in
 fi
 
 # per-target:
 
 case "${target}" in

-  v810*)               target_makefile_frag=config/mt-v810 ;;
-  i[3456]86-*-netware*) target_makefile_frag=config/mt-netware ;;
-  powerpc-*-netware*)   target_makefile_frag=config/mt-netware ;;
-  powerpc*-*-eabi* | \
-  powerpc*-*-elf* | \
-  powerpc*-*-linux* | \
-  powerpc*-*-rtem* | \
-  powerpc*-*-sysv* | \
-  powerpc*-*-solaris*) target_makefile_frag=config/mt-ppc ;;
+  v810*)
+    target_makefile_frag="${target_makefile_frag} config/mt-v810"
+    ;;
+  i[3456]86-*-netware*)
+    target_makefile_frag="${target_makefile_frag} config/mt-netware"
+    ;;
+  powerpc-*-netware*)
+    target_makefile_frag="${target_makefile_frag} config/mt-netware"
+    ;;
+# start-sanitize-r5900
+  mips64r59*)
+    target_makefile_frag="${target_makefile_frag} config/mt-r5900"
+    ;;
+# end-sanitize-r5900
+  *-*-linux-gnu)
+    target_makefile_frag="${target_makefile_frag} config/mt-linux"
+    ;;

 esac
 
 skipdirs=
 esac
 
 skipdirs=


@@ -235,7 +334,10 @@ case ${with_x} in
   yes | "")  # the default value for this tree is that X11 is available
        ;;
   no)
   yes | "")  # the default value for this tree is that X11 is available
        ;;
   no)

-       skipdirs="${skipdirs} tk gash"
+       skipdirs="${skipdirs} tk libgui gash"
+# start-sanitize-ide
+       skipdirs="${skipdirs} libide vmake jstools"
+# end-sanitize-ide

        ;;
   *)
        echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2
        ;;
   *)
        echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2


@@ -255,21 +357,27 @@ if [ x"${host}" = x"${target}" ] ; then
        skipdirs="${skipdirs} ${cross_only}"
        is_cross_compiler=no
        target_subdir=.
        skipdirs="${skipdirs} ${cross_only}"
        is_cross_compiler=no
        target_subdir=.

+       case "${host}" in
+          # We need multilib support for irix6, to get libiberty built
+         #  properly for o32 and n32.
+          mips-sgi-irix6*) target_subdir=${host} ;;
+       esac

 else
        # similarly, don't build the targets in the 'native only' 
        # list when building a cross compiler
        skipdirs="${skipdirs} ${native_only}"
        is_cross_compiler=yes
        target_subdir=${target_alias}
 else
        # similarly, don't build the targets in the 'native only' 
        # list when building a cross compiler
        skipdirs="${skipdirs} ${native_only}"
        is_cross_compiler=yes
        target_subdir=${target_alias}

-       if [ ! -d ${target_subdir} ] ; then
-           if mkdir ${target_subdir} ; then true
-           else
-               echo "'*** could not make ${PWD=`pwd`}/${target_subdir}" 1>&2
-                exit 1
-           fi
-       fi

 fi     
 
 fi     
 

+if [ ! -d ${target_subdir} ] ; then
+  if mkdir ${target_subdir} ; then true
+  else
+    echo "'*** could not make ${PWD=`pwd`}/${target_subdir}" 1>&2
+    exit 1
+  fi
+fi
+

 copy_dirs=
 
 # Handle --with-headers=XXX.  The contents of the named directory are
 copy_dirs=
 
 # Handle --with-headers=XXX.  The contents of the named directory are


@@ -322,6 +430,8 @@ fi
 # Default to using --with-stabs for certain targets.
 if [ x${with_stabs} = x ]; then
   case "${target}" in
 # Default to using --with-stabs for certain targets.
 if [ x${with_stabs} = x ]; then
   case "${target}" in

+  mips*-*-irix6*)
+    ;;

   mips*-*-* | alpha*-*-osf* | i[3456]86*-*-sysv4* | i[3456]86*-*-unixware*)
     with_stabs=yes;
     withoptions="${withoptions} --with-stabs"
   mips*-*-* | alpha*-*-osf* | i[3456]86*-*-sysv4* | i[3456]86*-*-unixware*)
     with_stabs=yes;
     withoptions="${withoptions} --with-stabs"


@@ -344,7 +454,7 @@ while [ $# != 0 ]; do
       :
     else
       echo >config.temp
       :
     else
       echo >config.temp

-      ${srcdir}/install.sh -c -m 644 config.temp $2/COPIED
+      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED

     fi
 
     # Copy the directory, assuming we have tar.
     fi
 
     # Copy the directory, assuming we have tar.


@@ -365,6 +475,8 @@ done
 case "${host}" in
        i[3456]86-*-go32*)
          configdirs="$configdirs dosrel" ;;
 case "${host}" in
        i[3456]86-*-go32*)
          configdirs="$configdirs dosrel" ;;

+       i[3456]86-*-mingw32*)
+         configdirs="$configdirs dosrel" ;;

        *-cygwin32*)
          configdirs="$configdirs dosrel" ;;
 esac
        *-cygwin32*)
          configdirs="$configdirs dosrel" ;;
 esac


@@ -377,16 +489,38 @@ noconfigdirs=""
 
 case "${host}" in
   i[3456]86-*-vsta)
 
 case "${host}" in
   i[3456]86-*-vsta)

-    noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet"
+    noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl tix db sn gnuserv"
+# start-sanitize-ide
+    noconfigdirs="$noconfigdirs libide vmake jstools"
+# end-sanitize-ide

     ;;
     ;;

-  i[3456]86-*-go32)
-    noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet"
+  i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*)
+    noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db sn gnuserv"
+# start-sanitize-ide
+    noconfigdirs="$noconfigdirs libide vmake jstools"
+# end-sanitize-ide

        ;;
        ;;

-  *-*-cygwin32 | *-*-windows*)
-     noconfigdirs="tk tcl expect dejagnu cvs autoconf bison send-pr gprof rcs guile perl texinfo apache inet"
+  i[3456]86-*-mingw32*)
+    # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db sn gnuserv"
+     noconfigdirs="expect dejagnu cvs autoconf automake send-pr gprof rcs guile perl texinfo apache inet"
+       ;;
+  *-*-cygwin32)
+     noconfigdirs="expect dejagnu cvssrc autoconf automake send-pr gprof rcs guile perl texinfo apache inet"
+    ;;
+  *-*-windows*)
+# This is only used to build WinGDB...
+# note that powerpc-eabi depends on sim configured before gdb.
+     configdirs="bfd libiberty opcodes readline sim gdb"
+     target_configdirs=
+    ;;
+  *-*-netbsd*)
+    noconfigdirs="rcs"

     ;;
   ppc*-*-pe)
     ;;
   ppc*-*-pe)

-     noconfigdirs="patch diff make tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs guile perl apache inet"
+     noconfigdirs="patch diff make tk tcl expect dejagnu cvssrc autoconf automake texinfo bison send-pr gprof rcs guile perl apache inet itcl tix db sn gnuserv"
+# start-sanitize-ide
+     noconfigdirs="$noconfigdirs libide vmake jstools"
+# end-sanitize-ide

     ;;
 esac
 
     ;;
 esac
 


@@ -395,38 +529,53 @@ case "${target}" in
   *-*-netware)
     noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-librx target-newlib target-libiberty target-libgloss"
     ;;
   *-*-netware)
     noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-librx target-newlib target-libiberty target-libgloss"
     ;;

+  *-*-rtems*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;

   *-*-vxworks*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
   alpha-dec-osf*)
     # ld works, but does not support shared libraries.  emacs doesn't
   *-*-vxworks*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
   alpha-dec-osf*)
     # ld works, but does not support shared libraries.  emacs doesn't

-    # work.  newlib is not 64 bit ready.  I'm not sure about fileutils or grep.
+    # work.  newlib is not 64 bit ready.  I'm not sure about fileutils.

     # gas doesn't generate exception information.
     # gas doesn't generate exception information.

-    noconfigdirs="$noconfigdirs gas ld emacs fileutils grep target-newlib target-libgloss"
+    noconfigdirs="$noconfigdirs gas ld emacs fileutils target-newlib target-libgloss"

     ;;
   alpha*-*-*vms*)
     noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss"
     ;;
     ;;
   alpha*-*-*vms*)
     noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss"
     ;;

+  alpha-*-linux*)
+    # newlib is not 64 bit ready
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    # linux has rx in libc
+    skipdirs="$skipdirs target-librx"
+    ;;

   alpha*-*-*)
     # newlib is not 64 bit ready
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
   alpha*-*-*)
     # newlib is not 64 bit ready
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;

-# start-sanitize-arc

   arc-*-*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
   arc-*-*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;

-# end-sanitize-arc

   arm-*-pe*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
   arm-*-pe*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;

+  arm-*-coff*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  thumb-*-coff) # CYGNUS LOCAL nickc/thumb
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;

   arm-*-riscix*)
     noconfigdirs="$noconfigdirs ld target-libgloss"
     ;;
   arm-*-riscix*)
     noconfigdirs="$noconfigdirs ld target-libgloss"
     ;;

-# start-sanitize-d10v

   d10v-*-*)
   d10v-*-*)

-    noconfigdirs="$noconfigdirs target-libgloss"
+    noconfigdirs="$noconfigdirs target-librx target-libg++ target-libstdc++ target-libio target-libgloss"

     ;;
     ;;

-# end-sanitize-d10v
+# start-sanitize-d30v
+  d30v-*-*)
+    ;;
+# end-sanitize-d30v

   h8300*-*-* | \
   h8500-*-*)
     noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss"
   h8300*-*-* | \
   h8500-*-*)
     noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss"


@@ -445,20 +594,35 @@ case "${target}" in
     esac
     noconfigdirs="$noconfigdirs ld shellutils"
     ;;
     esac
     noconfigdirs="$noconfigdirs ld shellutils"
     ;;

-  i[3456]86-*-go32)
+  i[3456]86-*-go32* | i[3456]-*-msdosdjgpp*)

     # but don't build gdb
     noconfigdirs="$noconfigdirs gdb target-libg++ target-libstdc++ target-libio target-librx"
     ;;
     # but don't build gdb
     noconfigdirs="$noconfigdirs gdb target-libg++ target-libstdc++ target-libio target-librx"
     ;;

+  i[3456]86-*-mingw32*)
+    target_configdirs="$target_configdirs target-mingw"
+    noconfigdirs="$noconfigdirs expect target-libgloss"
+
+    # Can't build gdb for cygwin32 if not native.
+    case "${host}" in
+      i[3456]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
+      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix db sn gnuserv"
+         ;;
+    esac
+    ;;    

   *-*-cygwin32)
     target_configdirs="$target_configdirs target-winsup"
   *-*-cygwin32)
     target_configdirs="$target_configdirs target-winsup"

-    noconfigdirs="$noconfigdirs tcl tk expect target-libgloss"
+    noconfigdirs="$noconfigdirs expect target-libgloss"

     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
 
     # Can't build gdb for cygwin32 if not native.
     case "${host}" in
     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
 
     # Can't build gdb for cygwin32 if not native.
     case "${host}" in

-      *-*-cygwin32) ;; # keep gdb
-      *) noconfigdirs="$noconfigdirs gdb"
+      *-*-cygwin32) ;; # keep gdb tcl tk expect etc.
+      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix db sn gnuserv"
+# start-sanitize-ide
+         noconfigdirs="$noconfigdirs libide vmake jstools"
+# end-sanitize-ide
+         ;;

     esac
     ;;    
   i[3456]86-*-pe)
     esac
     ;;    
   i[3456]86-*-pe)


@@ -487,26 +651,38 @@ case "${target}" in
     # but that's okay since emacs doesn't work anyway
     noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss"
     ;;
     # but that's okay since emacs doesn't work anyway
     noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss"
     ;;

+  mn10200-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+  mn10300-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;

   powerpc-*-aix*)
     # copied from rs6000-*-* entry
   powerpc-*-aix*)
     # copied from rs6000-*-* entry

-    noconfigdirs="$noconfigdirs gprof cvs target-libgloss"
+    noconfigdirs="$noconfigdirs gprof cvssrc target-libgloss"

     # This is needed until gcc and ld are fixed to work together.
     use_gnu_ld=no
     ;;
   powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
     target_configdirs="$target_configdirs target-winsup"
     # This is needed until gcc and ld are fixed to work together.
     use_gnu_ld=no
     ;;
   powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
     target_configdirs="$target_configdirs target-winsup"

-    noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss"
+    noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix db sn gnuserv"
+# start-sanitize-ide
+    noconfigdirs="$noconfigdirs libide vmake jstools"
+# end-sanitize-ide

     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     ;;
     # This is temporary until we can link against shared libraries
   powerpcle-*-solaris*)
     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     ;;
     # This is temporary until we can link against shared libraries
   powerpcle-*-solaris*)

-    noconfigdirs="$noconfigdirs gdb sim make tcl tk expect"
+    noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix db sn gnuserv"
+# start-sanitize-ide
+    noconfigdirs="$noconfigdirs libide vmake jstools"
+# end-sanitize-ide

     ;;
   rs6000-*-lynxos*)
     # The CVS server code doesn't work on the RS/6000
     # Newlib makes problems for libg++ in crosses.
     ;;
   rs6000-*-lynxos*)
     # The CVS server code doesn't work on the RS/6000
     # Newlib makes problems for libg++ in crosses.

-    noconfigdirs="$noconfigdirs target-newlib gprof cvs"
+    noconfigdirs="$noconfigdirs target-newlib gprof cvssrc"

     ;;
   rs6000-*-aix*)
     noconfigdirs="$noconfigdirs gprof"
     ;;
   rs6000-*-aix*)
     noconfigdirs="$noconfigdirs gprof"


@@ -525,10 +701,9 @@ case "${target}" in
     noconfigdirs="$noconfigdirs ld gprof emacs target-libgloss"
     ;;
   mips*-*-irix6*)
     noconfigdirs="$noconfigdirs ld gprof emacs target-libgloss"
     ;;
   mips*-*-irix6*)

-    # The GNU linker does not support shared libraries.
+    # The GNU assembler and linker do not support IRIX 6.

     # emacs is emacs 18, which does not work on Irix 5 (emacs19 does work)
     # emacs is emacs 18, which does not work on Irix 5 (emacs19 does work)

-    # BFD does not have Irix 6 support yet.
-    noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb readline mmalloc sim gprof emacs target-libgloss"
+    noconfigdirs="$noconfigdirs ld gas gprof emacs target-libgloss"

     ;;
   mips*-dec-bsd*)
     noconfigdirs="$noconfigdirs gprof target-libgloss"
     ;;
   mips*-dec-bsd*)
     noconfigdirs="$noconfigdirs gprof target-libgloss"


@@ -545,11 +720,27 @@ case "${target}" in
   sh-*-*)
     case "${host}" in
       i[3456]86-*-vsta) ;; # don't add gprof back in
   sh-*-*)
     case "${host}" in
       i[3456]86-*-vsta) ;; # don't add gprof back in

-      i[3456]86-*-go32) ;; # don't add gprof back in
+      i[3456]86-*-go32*) ;; # don't add gprof back in
+      i[3456]86-*-msdosdjgpp*) ;; # don't add gprof back in

       *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
     esac
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
       *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
     esac
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;

+  sparc-*-elf*)
+    if [ x${is_cross_compiler} != xno ] ; then
+          target_configdirs="${target_configdirs} target-cygmon"
+    fi
+    ;;
+  sparc64-*-elf*)
+    if [ x${is_cross_compiler} != xno ] ; then
+          target_configdirs="${target_configdirs} target-cygmon"
+    fi
+    ;;
+  sparclite-*-aout*)
+    if [ x${is_cross_compiler} != xno ] ; then
+          target_configdirs="${target_configdirs} target-cygmon"
+    fi
+    ;;

   sparc-*-sunos4*)
     if [ x${is_cross_compiler} != xno ] ; then
            noconfigdirs="$noconfigdirs gdb gdbtest target-newlib target-libgloss"
   sparc-*-sunos4*)
     if [ x${is_cross_compiler} != xno ] ; then
            noconfigdirs="$noconfigdirs gdb gdbtest target-newlib target-libgloss"


@@ -557,14 +748,27 @@ case "${target}" in
            use_gnu_ld=no
     fi
     ;;
            use_gnu_ld=no
     fi
     ;;

+# start-sanitize-sky
+  txvu-*-elf*)
+    noconfigdirs="$noconfigdirs gcc"
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty"
+    noconfigdirs="$noconfigdirs target-librx target-libg++ target-libstdc++ target-libio"
+    ;;
+# end-sanitize-sky

   v810-*-*)
     noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libio target-libg++ target-libstdc++ opcodes target-libgloss"
     ;;
   v810-*-*)
     noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libio target-libg++ target-libstdc++ opcodes target-libgloss"
     ;;

-# start-sanitize-v850

   v850-*-*)
   v850-*-*)

-    noconfigdirs="$noconfigdirs gdb target-libgloss"
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+# start-sanitize-v850e
+  v850e-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"

     ;;
     ;;

-# end-sanitize-v850
+  v850ea-*-*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+# end-sanitize-v850e

   vax-*-vms)
     noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss"
     ;;
   vax-*-vms)
     noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss"
     ;;


@@ -582,13 +786,6 @@ case "${target}" in
     ;;    
 esac
 
     ;;    
 esac
 

-# targets that need a second pass
-case "${target}" in
-  *-gm-magic*)
-    noconfigdirs="$noconfigdirs target-libgloss"
-    ;;
-esac
-

 # If we aren't building newlib, then don't build libgloss, since libgloss
 # depends upon some newlib header files.
 case "${noconfigdirs}" in
 # If we aren't building newlib, then don't build libgloss, since libgloss
 # depends upon some newlib header files.
 case "${noconfigdirs}" in


@@ -599,7 +796,7 @@ esac
 # If we are building a Canadian Cross, discard tools that can not be built
 # using a cross compiler.  FIXME: These tools should be fixed.
 if [ "${build}" != "${host}" ]; then
 # If we are building a Canadian Cross, discard tools that can not be built
 # using a cross compiler.  FIXME: These tools should be fixed.
 if [ "${build}" != "${host}" ]; then

-  noconfigdirs="$noconfigdirs tcl tk expect dejagnu"
+  noconfigdirs="$noconfigdirs expect dejagnu"

 fi
 
 # Make sure we don't let GNU ld be added if we didn't want it.
 fi
 
 # Make sure we don't let GNU ld be added if we didn't want it.


@@ -738,14 +935,45 @@ if [ x${use_gnu_ld} = x ] ; then
   fi
 fi
 
   fi
 fi
 

+# If using newlib, add --with-newlib to the withoptions so that gcc/configure
+# can detect this case.
+
+if [ x${with_newlib} != xno ] && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 && [ -d ${srcdir}/newlib ] ; then
+  with_newlib=yes
+  withoptions="$withoptions --with-newlib"
+fi
+

 if [ x${shared} = xyes ]; then
   case "${target}" in
 if [ x${shared} = xyes ]; then
   case "${target}" in

-    hppa*)             target_makefile_frag=config/mt-papic ;;
-    i[3456]86-*)               target_makefile_frag=config/mt-x86pic ;;
-    *)                 target_makefile_frag=config/mt-${target_cpu}pic ;;
+    hppa*)
+      target_makefile_frag="${target_makefile_frag} config/mt-papic"
+      ;;
+    i[3456]86-*)
+      target_makefile_frag="${target_makefile_frag} config/mt-x86pic"
+      ;;
+    powerpc*-*)
+      target_makefile_frag="${target_makefile_frag} config/mt-ppcpic"
+      ;;
+    alpha-*-linux*)
+      target_makefile_frag="${target_makefile_frag} config/mt-elfalphapic"
+      ;;
+    *)
+      if test -f ${srcdir}/config/mt-${target_cpu}pic; then
+        target_makefile_frag="${target_makefile_frag} config/mt-${target_cpu}pic"
+      fi
+      ;;

   esac
 fi
 
   esac
 fi
 

+rm -f mt-frag
+if [ -n "${target_makefile_frag}" ] ; then
+  for f in ${target_makefile_frag}
+  do
+    cat ${srcdir}/$f >> mt-frag
+  done
+  target_makefile_frag=mt-frag
+fi
+

 # post-target:
 
 # Make sure that the compiler is able to generate an executable.  If it
 # post-target:
 
 # Make sure that the compiler is able to generate an executable.  If it


@@ -802,7 +1030,7 @@ if [ "${shared}" = "yes" ]; then
 
   case "${host}" in
   *-*-hpux*)
 
   case "${host}" in
   *-*-hpux*)

-    sed -e 's/RPATH_ENVVAR[    ]*=.*$/RPATH_ENVVAR = SHLIB_PATH/' \
+    sed -e 's/^RPATH_ENVVAR[   ]*=.*$/RPATH_ENVVAR = SHLIB_PATH/' \

        Makefile > Makefile.tem
     rm -f Makefile
     mv -f Makefile.tem Makefile
        Makefile > Makefile.tem
     rm -f Makefile
     mv -f Makefile.tem Makefile


@@ -810,12 +1038,24 @@ if [ "${shared}" = "yes" ]; then
   esac
 fi
 
   esac
 fi
 

+# If we are building for a win32 host, then set INSTALL_PROGRAM_ARGS to
+# -x.  This will cause programs to be installed with .exe extensions.
+case "${host}" in
+*-*-cygwin32* | i[3456]86-*-mingw32)
+    sed -e 's/^INSTALL_PROGRAM_ARGS[   ]*=.*$/INSTALL_PROGRAM_ARGS = -x/' \
+       Makefile > Makefile.tem
+    rm -f Makefile
+    mv -f Makefile.tem Makefile
+    ;;
+esac
+

 # Record target_configdirs and the configure arguments in Makefile.
 target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
 targargs=`echo "${arguments}" | \
        sed -e 's/--norecursion//' \
            -e 's/--cache[a-z-]*=[^     ]*//' \
            -e 's/--ho[a-z-]*=[^        ]*//' \
 # Record target_configdirs and the configure arguments in Makefile.
 target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
 targargs=`echo "${arguments}" | \
        sed -e 's/--norecursion//' \
            -e 's/--cache[a-z-]*=[^     ]*//' \
            -e 's/--ho[a-z-]*=[^        ]*//' \

+           -e 's/--bu[a-z-]*=[^        ]*//' \

            -e 's/--ta[a-z-]*=[^        ]*//'`
 
 # Passing a --with-cross-host argument lets the target libraries know
            -e 's/--ta[a-z-]*=[^        ]*//'`
 
 # Passing a --with-cross-host argument lets the target libraries know


@@ -827,7 +1067,12 @@ if [ x${is_cross_compiler} = xyes ]; then
   targargs="--with-cross-host=${host_alias} ${targargs}"
 fi
 
   targargs="--with-cross-host=${host_alias} ${targargs}"
 fi
 

-targargs="--host=${target_alias} ${targargs}"
+# Default to --enable-multilib.
+if [ x${enable_multilib} = x ]; then
+  targargs="--enable-multilib ${targargs}"
+fi
+
+targargs="--host=${target_alias} --build=${build_alias} ${targargs}"

 sed -e "s:^TARGET_CONFIGDIRS[  ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
     -e "s%^CONFIG_ARGUMENTS[   ]*=.*$%CONFIG_ARGUMENTS = ${targargs}%" \
     -e "s%^TARGET_SUBDIR[      ]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \
 sed -e "s:^TARGET_CONFIGDIRS[  ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
     -e "s%^CONFIG_ARGUMENTS[   ]*=.*$%CONFIG_ARGUMENTS = ${targargs}%" \
     -e "s%^TARGET_SUBDIR[      ]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \