This commit was manufactured by cvs2svn to create tag 'newlib-csl-newlib-csl-arm-2005-q1a

arm-2005-q1a'.

Sprout from newlib-csl-20060320-branch 2006-03-21 00:57:35 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'newlib-'
Cherrypick from master 2005-04-05 08:16:33 UTC Paolo Bonzini <pbonzini@redhat.com> '2005-04-05  Paolo Bonzini  <bonzini@gnu.org>':
    COPYING.LIBGLOSS
    COPYING.NEWLIB
    ChangeLog
    MAINTAINERS
    Makefile.def
    Makefile.in
    Makefile.tpl
    config-ml.in
    config.guess
    config.sub
    config/ChangeLog
    config/accross.m4
    config/acx.m4
    config/mt-gnu
    config/no-executables.m4
    config/warnings.m4
    configure
    configure.in
    etc/ChangeLog
    etc/Makefile.in
    etc/configure.texi
    etc/standards.texi
    etc/texi2pod.pl
    install-sh
    libgloss/ChangeLog
    libgloss/arm/Makefile.in
    libgloss/arm/configure
    libgloss/arm/configure.in
    libgloss/arm/crt0.S
    libgloss/arm/elf-redboot.ld
    libgloss/arm/libcfunc.c
    libgloss/arm/redboot-crt0.S
    libgloss/arm/swi.h
    libgloss/arm/syscalls.c
    libgloss/arm/trap.S
    libgloss/configure
    libgloss/configure.in
    libgloss/iq2000/sim.ld
    libgloss/libnosys/Makefile.in
    libgloss/m68hc11/sim-valid-m68hc11.ld
    libgloss/m68hc11/sim-valid-m68hc12.ld
    libgloss/m68k/Makefile.in
    libgloss/m68k/bcc.ld
    libgloss/m68k/crt0.S
    libgloss/m68k/idp.ld
    libgloss/m68k/idpgdb.ld
    libgloss/m68k/mvme135.ld
    libgloss/m68k/mvme162.ld
    libgloss/m68k/sbc5204.ld
    libgloss/m68k/sbc5206.ld
    libgloss/m68k/sim.ld
    libgloss/mcore/elf-cmb.ld
    libgloss/mips/array.ld
    libgloss/mips/cfe.ld
    libgloss/mips/ddb-kseg0.ld
    libgloss/mips/ddb.ld
    libgloss/mips/dve.ld
    libgloss/mips/idt.ld
    libgloss/mips/idt32.ld
    libgloss/mips/idt64.ld
    libgloss/mips/idtecoff.ld
    libgloss/mips/jmr3904app-java.ld
    libgloss/mips/jmr3904app.ld
    libgloss/mips/jmr3904dram-java.ld
    libgloss/mips/jmr3904dram.ld
    libgloss/mips/lsi.ld
    libgloss/mips/nullmon.ld
    libgloss/mips/pmon.ld
    libgloss/mips/regs.S
    libgloss/mn10200/eval.ld
    libgloss/mn10200/sim.ld
    libgloss/mn10300/asb2303.ld
    libgloss/mn10300/asb2305.ld
    libgloss/mn10300/eval.ld
    libgloss/mn10300/sim.ld
    libgloss/rs6000/Makefile.in
    libgloss/rs6000/ads.ld
    libgloss/rs6000/mbx.ld
    libgloss/rs6000/simulator.S
    libgloss/rs6000/yellowknife.ld
    libgloss/sh/sh1lcevb.ld
    libgloss/sh/sh2lcevb.ld
    libgloss/sh/sh3bb.ld
    libgloss/sh/sh3lcevb.ld
    libgloss/sparc/elfsim.ld
    libgloss/sparc/ex930.ld
    libgloss/sparc/ex931.ld
    libgloss/sparc/ex934.ld
    libgloss/sparc/sparc86x.ld
    libgloss/xstormy16/eva_app.ld
    libgloss/xstormy16/eva_stub.ld
    libgloss/xstormy16/sim_high.ld
    libgloss/xstormy16/sim_rom.ld
    libtool.m4
    ltcf-c.sh
    ltcf-cxx.sh
    ltcf-gcj.sh
    ltconfig
    ltmain.sh
    missing
    mkinstalldirs
    newlib/ChangeLog
    newlib/MAINTAINERS
    newlib/Makefile.am
    newlib/Makefile.in
    newlib/NEWS
    newlib/README
    newlib/acinclude.m4
    newlib/aclocal.m4
    newlib/configure
    newlib/configure.host
    newlib/configure.in
    newlib/doc/aclocal.m4
    newlib/doc/configure
    newlib/iconvdata/aclocal.m4
    newlib/iconvdata/configure
    newlib/iconvdata/jis0208.h
    newlib/libc/Makefile.am
    newlib/libc/Makefile.in
    newlib/libc/aclocal.m4
    newlib/libc/argz/argz_insert.c
    newlib/libc/configure
    newlib/libc/configure.in
    newlib/libc/ctype/ctype.tex
    newlib/libc/ctype/islower.c
    newlib/libc/ctype/isupper.c
    newlib/libc/ctype/iswalnum.c
    newlib/libc/ctype/iswalpha.c
    newlib/libc/ctype/iswblank.c
    newlib/libc/ctype/iswcntrl.c
    newlib/libc/ctype/iswdigit.c
    newlib/libc/ctype/iswgraph.c
    newlib/libc/ctype/iswlower.c
    newlib/libc/ctype/iswprint.c
    newlib/libc/ctype/iswpunct.c
    newlib/libc/ctype/iswspace.c
    newlib/libc/ctype/iswupper.c
    newlib/libc/ctype/iswxdigit.c
    newlib/libc/ctype/tolower.c
    newlib/libc/ctype/toupper.c
    newlib/libc/ctype/towctrans.c
    newlib/libc/ctype/towlower.c
    newlib/libc/ctype/towupper.c
    newlib/libc/include/_syslist.h
    newlib/libc/include/ieeefp.h
    newlib/libc/include/machine/ieeefp.h
    newlib/libc/include/machine/setjmp.h
    newlib/libc/include/math.h
    newlib/libc/include/stdio.h
    newlib/libc/include/stdlib.h
    newlib/libc/include/string.h
    newlib/libc/include/sys/config.h
    newlib/libc/include/sys/dirent.h
    newlib/libc/include/sys/fcntl.h
    newlib/libc/include/sys/features.h
    newlib/libc/include/sys/time.h
    newlib/libc/include/sys/types.h
    newlib/libc/include/sys/unistd.h
    newlib/libc/include/time.h
    newlib/libc/libc.texinfo
    newlib/libc/machine/a29k/aclocal.m4
    newlib/libc/machine/a29k/configure
    newlib/libc/machine/aclocal.m4
    newlib/libc/machine/arm/aclocal.m4
    newlib/libc/machine/arm/configure
    newlib/libc/machine/arm/setjmp.S
    newlib/libc/machine/configure
    newlib/libc/machine/d10v/aclocal.m4
    newlib/libc/machine/d10v/configure
    newlib/libc/machine/d30v/aclocal.m4
    newlib/libc/machine/d30v/configure
    newlib/libc/machine/fr30/aclocal.m4
    newlib/libc/machine/fr30/configure
    newlib/libc/machine/frv/aclocal.m4
    newlib/libc/machine/frv/configure
    newlib/libc/machine/h8300/aclocal.m4
    newlib/libc/machine/h8300/configure
    newlib/libc/machine/h8500/aclocal.m4
    newlib/libc/machine/h8500/configure
    newlib/libc/machine/hppa/aclocal.m4
    newlib/libc/machine/hppa/configure
    newlib/libc/machine/i386/aclocal.m4
    newlib/libc/machine/i386/configure
    newlib/libc/machine/i960/aclocal.m4
    newlib/libc/machine/i960/configure
    newlib/libc/machine/iq2000/aclocal.m4
    newlib/libc/machine/iq2000/configure
    newlib/libc/machine/m32r/aclocal.m4
    newlib/libc/machine/m32r/configure
    newlib/libc/machine/m68hc11/aclocal.m4
    newlib/libc/machine/m68hc11/configure
    newlib/libc/machine/m68k/aclocal.m4
    newlib/libc/machine/m68k/configure
    newlib/libc/machine/m88k/aclocal.m4
    newlib/libc/machine/m88k/configure
    newlib/libc/machine/mips/aclocal.m4
    newlib/libc/machine/mips/configure
    newlib/libc/machine/mn10200/aclocal.m4
    newlib/libc/machine/mn10200/configure
    newlib/libc/machine/mn10300/aclocal.m4
    newlib/libc/machine/mn10300/configure
    newlib/libc/machine/necv70/aclocal.m4
    newlib/libc/machine/necv70/configure
    newlib/libc/machine/powerpc/aclocal.m4
    newlib/libc/machine/powerpc/configure
    newlib/libc/machine/sh/Makefile.in
    newlib/libc/machine/sh/aclocal.m4
    newlib/libc/machine/sh/configure
    newlib/libc/machine/sparc/aclocal.m4
    newlib/libc/machine/sparc/configure
    newlib/libc/machine/tic4x/aclocal.m4
    newlib/libc/machine/tic4x/configure
    newlib/libc/machine/tic80/aclocal.m4
    newlib/libc/machine/tic80/configure
    newlib/libc/machine/v850/aclocal.m4
    newlib/libc/machine/v850/configure
    newlib/libc/machine/w65/aclocal.m4
    newlib/libc/machine/w65/configure
    newlib/libc/machine/xscale/aclocal.m4
    newlib/libc/machine/xscale/configure
    newlib/libc/machine/xstormy16/aclocal.m4
    newlib/libc/machine/xstormy16/configure
    newlib/libc/machine/z8k/aclocal.m4
    newlib/libc/machine/z8k/configure
    newlib/libc/misc/unctrl.c
    newlib/libc/posix/scandir.c
    newlib/libc/reent/reent.tex
    newlib/libc/signal/signal.c
    newlib/libc/stdio/Makefile.am
    newlib/libc/stdio/Makefile.in
    newlib/libc/stdio/fflush.c
    newlib/libc/stdio/freopen.c
    newlib/libc/stdio/fseek.c
    newlib/libc/stdio/getdelim.c
    newlib/libc/stdio/getw.c
    newlib/libc/stdio/putw.c
    newlib/libc/stdio/siprintf.c
    newlib/libc/stdio/siscanf.c
    newlib/libc/stdio/sprintf.c
    newlib/libc/stdio/sscanf.c
    newlib/libc/stdio/stdio.tex
    newlib/libc/stdio/vfprintf.c
    newlib/libc/stdio/vfscanf.c
    newlib/libc/stdio/viprintf.c
    newlib/libc/stdio/viscanf.c
    newlib/libc/stdio/wsetup.c
    newlib/libc/stdio64/freopen64.c
    newlib/libc/stdlib/__atexit.c
    newlib/libc/stdlib/__call_atexit.c
    newlib/libc/stdlib/a64l.c
    newlib/libc/stdlib/assert.c
    newlib/libc/stdlib/efgcvt.c
    newlib/libc/stdlib/envlock.c
    newlib/libc/stdlib/getopt.c
    newlib/libc/stdlib/ldtoa.c
    newlib/libc/stdlib/mallocr.c
    newlib/libc/stdlib/mlock.c
    newlib/libc/stdlib/mstats.c
    newlib/libc/stdlib/rand.c
    newlib/libc/stdlib/rand48.c
    newlib/libc/string/bcmp.c
    newlib/libc/string/memchr.c
    newlib/libc/string/strcasecmp.c
    newlib/libc/string/strcoll.c
    newlib/libc/string/strcspn.c
    newlib/libc/string/strerror_r.c
    newlib/libc/string/strings.tex
    newlib/libc/string/strlwr.c
    newlib/libc/string/strncasecmp.c
    newlib/libc/string/strncat.c
    newlib/libc/string/strndup_r.c
    newlib/libc/string/strnlen.c
    newlib/libc/string/strpbrk.c
    newlib/libc/string/strtok.c
    newlib/libc/string/strupr.c
    newlib/libc/string/wcscat.c
    newlib/libc/string/wcschr.c
    newlib/libc/string/wcscmp.c
    newlib/libc/string/wcscoll.c
    newlib/libc/string/wcscpy.c
    newlib/libc/string/wcscspn.c
    newlib/libc/string/wcslcat.c
    newlib/libc/string/wcslcpy.c
    newlib/libc/string/wcslen.c
    newlib/libc/string/wcsncat.c
    newlib/libc/string/wcsncmp.c
    newlib/libc/string/wcsncpy.c
    newlib/libc/string/wcsnlen.c
    newlib/libc/string/wcspbrk.c
    newlib/libc/string/wcsrchr.c
    newlib/libc/string/wcsspn.c
    newlib/libc/string/wcsstr.c
    newlib/libc/string/wcstrings.tex
    newlib/libc/string/wcswidth.c
    newlib/libc/string/wcwidth.c
    newlib/libc/string/wmemchr.c
    newlib/libc/string/wmemcmp.c
    newlib/libc/string/wmemcpy.c
    newlib/libc/string/wmemmove.c
    newlib/libc/string/wmemset.c
    newlib/libc/sys.tex
    newlib/libc/sys/a29khif/aclocal.m4
    newlib/libc/sys/a29khif/configure
    newlib/libc/sys/aclocal.m4
    newlib/libc/sys/arc/aclocal.m4
    newlib/libc/sys/arc/configure
    newlib/libc/sys/arm/Makefile.am
    newlib/libc/sys/arm/Makefile.in
    newlib/libc/sys/arm/aclocal.m4
    newlib/libc/sys/arm/configure
    newlib/libc/sys/arm/crt0.S
    newlib/libc/sys/arm/libcfunc.c
    newlib/libc/sys/arm/swi.h
    newlib/libc/sys/arm/syscalls.c
    newlib/libc/sys/arm/trap.S
    newlib/libc/sys/configure
    newlib/libc/sys/configure.in
    newlib/libc/sys/d10v/aclocal.m4
    newlib/libc/sys/d10v/configure
    newlib/libc/sys/decstation/aclocal.m4
    newlib/libc/sys/decstation/configure
    newlib/libc/sys/h8300hms/aclocal.m4
    newlib/libc/sys/h8300hms/configure
    newlib/libc/sys/h8500hms/aclocal.m4
    newlib/libc/sys/h8500hms/configure
    newlib/libc/sys/linux/Makefile.am
    newlib/libc/sys/linux/Makefile.in
    newlib/libc/sys/linux/aclocal.m4
    newlib/libc/sys/linux/aio.c
    newlib/libc/sys/linux/argp/argp-fs-xinl.c
    newlib/libc/sys/linux/argp/argp-xinl.c
    newlib/libc/sys/linux/configure
    newlib/libc/sys/linux/dl/dl-cache.c
    newlib/libc/sys/linux/dl/dl-load.c
    newlib/libc/sys/linux/dl/dl-open.c
    newlib/libc/sys/linux/dl/dl-reloc.c
    newlib/libc/sys/linux/dl/dl-runtime.c
    newlib/libc/sys/linux/dl/dlfcn.h
    newlib/libc/sys/linux/dl/do-rel.h
    newlib/libc/sys/linux/dl/dynamic-link.h
    newlib/libc/sys/linux/dl/ldsodefs.h
    newlib/libc/sys/linux/getpwnam.c
    newlib/libc/sys/linux/getpwuid.c
    newlib/libc/sys/linux/iconv/gconv_open.c
    newlib/libc/sys/linux/iconv/gconv_simple.c
    newlib/libc/sys/linux/include/dlfcn.h
    newlib/libc/sys/linux/include/getopt.h
    newlib/libc/sys/linux/include/stdint.h
    newlib/libc/sys/linux/include/unistd.h
    newlib/libc/sys/linux/inode.c
    newlib/libc/sys/linux/linuxthreads/aclocal.m4
    newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h
    newlib/libc/sys/linux/linuxthreads/config.h
    newlib/libc/sys/linux/linuxthreads/configure
    newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4
    newlib/libc/sys/linux/linuxthreads/machine/configure
    newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4
    newlib/libc/sys/linux/linuxthreads/machine/i386/configure
    newlib/libc/sys/linux/machine/aclocal.m4
    newlib/libc/sys/linux/machine/configure
    newlib/libc/sys/linux/machine/i386/aclocal.m4
    newlib/libc/sys/linux/machine/i386/configure
    newlib/libc/sys/linux/machine/i386/dl-machine.h
    newlib/libc/sys/linux/machine/i386/weakalias.h
    newlib/libc/sys/linux/net/gethostbydns.c
    newlib/libc/sys/linux/net/ns_ntoa.c
    newlib/libc/sys/linux/shared.ld
    newlib/libc/sys/linux/sys/cdefs.h
    newlib/libc/sys/linux/sys/dirent.h
    newlib/libc/sys/linux/sys/lock.h
    newlib/libc/sys/linux/sys/stat.h
    newlib/libc/sys/linux/sys/types.h
    newlib/libc/sys/linux/sys/unistd.h
    newlib/libc/sys/m88kbug/aclocal.m4
    newlib/libc/sys/m88kbug/configure
    newlib/libc/sys/mmixware/aclocal.m4
    newlib/libc/sys/mmixware/configure
    newlib/libc/sys/netware/aclocal.m4
    newlib/libc/sys/netware/configure
    newlib/libc/sys/rtems/aclocal.m4
    newlib/libc/sys/rtems/configure
    newlib/libc/sys/rtems/crt0.c
    newlib/libc/sys/rtems/include/inttypes.h
    newlib/libc/sys/rtems/include/stdint.h
    newlib/libc/sys/sh/aclocal.m4
    newlib/libc/sys/sh/configure
    newlib/libc/sys/sparc64/aclocal.m4
    newlib/libc/sys/sparc64/configure
    newlib/libc/sys/sun4/aclocal.m4
    newlib/libc/sys/sun4/configure
    newlib/libc/sys/sysmec/aclocal.m4
    newlib/libc/sys/sysmec/configure
    newlib/libc/sys/sysnec810/aclocal.m4
    newlib/libc/sys/sysnec810/configure
    newlib/libc/sys/sysnecv850/aclocal.m4
    newlib/libc/sys/sysnecv850/configure
    newlib/libc/sys/sysvi386/aclocal.m4
    newlib/libc/sys/sysvi386/configure
    newlib/libc/sys/sysvnecv70/aclocal.m4
    newlib/libc/sys/sysvnecv70/configure
    newlib/libc/sys/tic80/aclocal.m4
    newlib/libc/sys/tic80/configure
    newlib/libc/sys/w65/aclocal.m4
    newlib/libc/sys/w65/configure
    newlib/libc/sys/z8ksim/aclocal.m4
    newlib/libc/sys/z8ksim/configure
    newlib/libc/time/Makefile.am
    newlib/libc/time/Makefile.in
    newlib/libc/time/strptime.c
    newlib/libc/time/tzlock.c
    newlib/libc/time/tzset_r.c
    newlib/libc/unix/Makefile.am
    newlib/libc/unix/Makefile.in
    newlib/libc/unix/getcwd.c
    newlib/libc/unix/getlogin.c
    newlib/libc/unix/getpass.c
    newlib/libc/unix/getut.c
    newlib/libc/unix/ttyname.c
    newlib/libm/aclocal.m4
    newlib/libm/common/Makefile.am
    newlib/libm/common/Makefile.in
    newlib/libm/common/common.tex
    newlib/libm/common/s_fmax.c
    newlib/libm/common/s_fmin.c
    newlib/libm/common/s_lrint.c
    newlib/libm/common/s_modf.c
    newlib/libm/common/sf_fmax.c
    newlib/libm/common/sf_fmin.c
    newlib/libm/common/sf_lrint.c
    newlib/libm/configure
    newlib/libm/libm.texinfo
    newlib/libm/machine/aclocal.m4
    newlib/libm/machine/configure
    newlib/libm/machine/i386/aclocal.m4
    newlib/libm/machine/i386/configure
    newlib/libm/math/Makefile.am
    newlib/libm/math/Makefile.in
    newlib/libm/math/ef_atan2.c
    newlib/libm/math/ef_hypot.c
    newlib/libm/math/math.tex
    newlib/libm/math/s_infconst.c
    newlib/libm/math/s_isinf.c
    newlib/libm/math/s_isnan.c
    newlib/libm/math/s_ldexp.c
    newlib/libm/math/sf_isinf.c
    newlib/libm/math/sf_isnan.c
    newlib/libm/math/w_j0.c
    newlib/libm/math/w_log.c
    newlib/libm/mathfp/Makefile.am
    newlib/libm/mathfp/Makefile.in
    newlib/libm/mathfp/mathfp.tex
    newlib/libm/mathfp/s_atangent.c
    newlib/libm/mathfp/s_frexp.c
    newlib/libm/mathfp/s_infconst.c
    newlib/libm/mathfp/s_isinf.c
    newlib/libm/mathfp/s_isnan.c
    newlib/libm/mathfp/s_ldexp.c
    newlib/libm/mathfp/s_logarithm.c
    newlib/libm/mathfp/s_mathcnst.c
    newlib/libm/mathfp/s_pow.c
    newlib/libm/mathfp/sf_atangent.c
    newlib/libm/mathfp/sf_frexp.c
    newlib/libm/mathfp/sf_isinf.c
    newlib/libm/mathfp/sf_isnan.c
    newlib/libm/mathfp/sf_pow.c
    newlib/libm/mathfp/w_jn.c
    newlib/newlib.hin
    newlib/stamp-h.in
    newlib/testsuite/lib/checkoutput.exp
    newlib/testsuite/lib/flags.exp
    newlib/testsuite/lib/newlib.exp
    newlib/testsuite/lib/passfail.exp
    src-release
    symlink-tree
    ylwrap
Cherrypick from cygnus 1999-05-03 07:29:06 UTC Richard Henderson <rth@redhat.com> '19990502 sourceware import':
    COPYING
    COPYING.LIB
    move-if-change
    setup.com
Delete:
    config/depstand.m4
    config/enable.m4
    config/lead-dot.m4
    config/mh-ppc-aix
    config/stdint.m4
    config/tls.m4
    depcomp
    libgloss/cris/Makefile.in
    libgloss/cris/configure
    libgloss/cris/configure.in
    libgloss/cris/crt0.S
    libgloss/cris/crti.c
    libgloss/cris/crtn.c
    libgloss/cris/gensyscalls
    libgloss/cris/lcrt0.c
    libgloss/cris/linunistd.h
    libgloss/cris/outbyte.c
    libgloss/cris/setup.S
    libgloss/crx/Makefile.in
    libgloss/crx/_exit.c
    libgloss/crx/_getenv.c
    libgloss/crx/_rename.c
    libgloss/crx/close.c
    libgloss/crx/configure
    libgloss/crx/configure.in
    libgloss/crx/crt0.S
    libgloss/crx/crti.S
    libgloss/crx/crtn.S
    libgloss/crx/dvz_hndl.c
    libgloss/crx/flg_hndl.c
    libgloss/crx/fstat.c
    libgloss/crx/getpid.c
    libgloss/crx/iad_hndl.c
    libgloss/crx/intable.c
    libgloss/crx/isatty.c
    libgloss/crx/kill.c
    libgloss/crx/lseek.c
    libgloss/crx/open.c
    libgloss/crx/putnum.c
    libgloss/crx/read.c
    libgloss/crx/sbrk.c
    libgloss/crx/sim.ld
    libgloss/crx/stat.c
    libgloss/crx/svc_hndl.c
    libgloss/crx/time.c
    libgloss/crx/und_hndl.c
    libgloss/crx/unlink.c
    libgloss/crx/write.c
    libgloss/libnosys/chown.c
    libgloss/libnosys/readlink.c
    libgloss/libnosys/symlink.c
    libgloss/m32c/Makefile.in
    libgloss/m32c/abort.S
    libgloss/m32c/argv.S
    libgloss/m32c/argvlen.S
    libgloss/m32c/chdir.S
    libgloss/m32c/chmod.S
    libgloss/m32c/close.S
    libgloss/m32c/configure
    libgloss/m32c/configure.in
    libgloss/m32c/crt0.S
    libgloss/m32c/crtn.S
    libgloss/m32c/exit.S
    libgloss/m32c/fstat.S
    libgloss/m32c/genscript
    libgloss/m32c/getpid.S
    libgloss/m32c/gettimeofday.S
    libgloss/m32c/heaptop.S
    libgloss/m32c/isatty.S
    libgloss/m32c/kill.S
    libgloss/m32c/link.S
    libgloss/m32c/lseek.S
    libgloss/m32c/m32c.tmpl
    libgloss/m32c/m32csys.h
    libgloss/m32c/open.S
    libgloss/m32c/read.S
    libgloss/m32c/sbrk.c
    libgloss/m32c/stat.S
    libgloss/m32c/time.S
    libgloss/m32c/times.S
    libgloss/m32c/unlink.S
    libgloss/m32c/utime.S
    libgloss/m32c/write.S
    libgloss/m68k/dbug-cf.sc
    libgloss/mt/16-002.ld
    libgloss/mt/16-003.ld
    libgloss/mt/64-001.ld
    libgloss/mt/Makefile.in
    libgloss/mt/access.c
    libgloss/mt/chmod.c
    libgloss/mt/close.c
    libgloss/mt/configure
    libgloss/mt/configure.in
    libgloss/mt/crt0-16-002.S
    libgloss/mt/crt0-16-003.S
    libgloss/mt/crt0-64-001.S
    libgloss/mt/crt0-ms2.S
    libgloss/mt/crt0.S
    libgloss/mt/exit-16-002.c
    libgloss/mt/exit-16-003.c
    libgloss/mt/exit-64-001.c
    libgloss/mt/exit-ms2.c
    libgloss/mt/exit.c
    libgloss/mt/fstat.c
    libgloss/mt/getpid.c
    libgloss/mt/gettime.c
    libgloss/mt/isatty.c
    libgloss/mt/kill.c
    libgloss/mt/lseek.c
    libgloss/mt/ms2.ld
    libgloss/mt/open.c
    libgloss/mt/read.c
    libgloss/mt/sbrk.c
    libgloss/mt/startup-16-002.S
    libgloss/mt/startup-16-003.S
    libgloss/mt/startup-64-001.S
    libgloss/mt/startup-ms2.S
    libgloss/mt/stat.c
    libgloss/mt/time.c
    libgloss/mt/times.c
    libgloss/mt/trap.S
    libgloss/mt/trap.h
    libgloss/mt/unlink.c
    libgloss/mt/utime.c
    libgloss/mt/write.c
    libgloss/rs6000/sim-getrusage.S
    newlib/acconfig.h
    newlib/libc/include/getopt.h
    newlib/libc/include/inttypes.h
    newlib/libc/include/libgen.h
    newlib/libc/include/stdint.h
    newlib/libc/machine/arm/machine/endian.h
    newlib/libc/machine/arm/machine/param.h
    newlib/libc/machine/cris/Makefile.am
    newlib/libc/machine/cris/Makefile.in
    newlib/libc/machine/cris/aclocal.m4
    newlib/libc/machine/cris/configure
    newlib/libc/machine/cris/configure.in
    newlib/libc/machine/cris/include/pthread.h
    newlib/libc/machine/cris/libcdtor.c
    newlib/libc/machine/cris/memcpy.c
    newlib/libc/machine/cris/memmove.c
    newlib/libc/machine/cris/memset.c
    newlib/libc/machine/cris/setjmp.c
    newlib/libc/machine/cris/sys/errno.h
    newlib/libc/machine/cris/sys/fcntl.h
    newlib/libc/machine/cris/sys/signal.h
    newlib/libc/machine/crx/Makefile.am
    newlib/libc/machine/crx/Makefile.in
    newlib/libc/machine/crx/aclocal.m4
    newlib/libc/machine/crx/configure
    newlib/libc/machine/crx/configure.in
    newlib/libc/machine/crx/getenv.c
    newlib/libc/machine/crx/setjmp.S
    newlib/libc/machine/crx/sys/asm.h
    newlib/libc/machine/crx/sys/libh.h
    newlib/libc/machine/crx/sys/syscall.h
    newlib/libc/machine/m32c/Makefile.am
    newlib/libc/machine/m32c/Makefile.in
    newlib/libc/machine/m32c/aclocal.m4
    newlib/libc/machine/m32c/configure
    newlib/libc/machine/m32c/configure.in
    newlib/libc/machine/m32c/setjmp.S
    newlib/libc/machine/mt/Makefile.am
    newlib/libc/machine/mt/Makefile.in
    newlib/libc/machine/mt/aclocal.m4
    newlib/libc/machine/mt/configure
    newlib/libc/machine/mt/configure.in
    newlib/libc/machine/mt/setjmp.S
    newlib/libc/stdio/dprintf.c
    newlib/libc/stdio/vdprintf.c
    newlib/libc/sys/arm/aeabi_atexit.c
    newlib/libc/sys/linux/bits/initspin.h
    newlib/libc/sys/linux/bits/libc-lock.h
    newlib/libc/sys/linux/bits/pthreadtypes.h
    newlib/libc/sys/linux/bits/typesizes.h
    newlib/libc/sys/linux/dl/dl-local.h
    newlib/libc/sys/linux/getpwent.c
    newlib/libc/sys/linux/include/ltdl.h
    newlib/libc/sys/rdos/Makefile.am
    newlib/libc/sys/rdos/Makefile.in
    newlib/libc/sys/rdos/aclocal.m4
    newlib/libc/sys/rdos/chown.c
    newlib/libc/sys/rdos/close.c
    newlib/libc/sys/rdos/config.h
    newlib/libc/sys/rdos/configure
    newlib/libc/sys/rdos/configure.in
    newlib/libc/sys/rdos/crt0.S
    newlib/libc/sys/rdos/execve.c
    newlib/libc/sys/rdos/fork.c
    newlib/libc/sys/rdos/fstat.c
    newlib/libc/sys/rdos/getenv.c
    newlib/libc/sys/rdos/getpid.c
    newlib/libc/sys/rdos/gettod.c
    newlib/libc/sys/rdos/isatty.c
    newlib/libc/sys/rdos/kill.c
    newlib/libc/sys/rdos/link.c
    newlib/libc/sys/rdos/lseek.c
    newlib/libc/sys/rdos/open.c
    newlib/libc/sys/rdos/rdos.S
    newlib/libc/sys/rdos/rdos.h
    newlib/libc/sys/rdos/rdoshelp.c
    newlib/libc/sys/rdos/read.c
    newlib/libc/sys/rdos/readlink.c
    newlib/libc/sys/rdos/sbrk.c
    newlib/libc/sys/rdos/stat.c
    newlib/libc/sys/rdos/symlink.c
    newlib/libc/sys/rdos/times.c
    newlib/libc/sys/rdos/unlink.c
    newlib/libc/sys/rdos/user.def
    newlib/libc/sys/rdos/wait.c
    newlib/libc/sys/rdos/write.c
    newlib/libc/time/tzvars.c
    newlib/libc/unix/basename.c
    newlib/libc/unix/dirname.c
    newlib/libm/common/s_infconst.c
    newlib/libm/common/s_isinf.c
    newlib/libm/common/s_isinfd.c
    newlib/libm/common/s_isnan.c
    newlib/libm/common/s_isnand.c
    newlib/libm/common/sf_isinf.c
    newlib/libm/common/sf_isinff.c
    newlib/libm/common/sf_isnan.c
    newlib/libm/common/sf_isnanf.c

698 files changed, 11495 insertions, 65088 deletions

diff --git a/COPYING b/COPYING
index 623b6258a..60549be51 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 19yy  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) 19yy name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
diff --git a/COPYING.LIB b/COPYING.LIB
index 778d0bb5b..161a3d1d4 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -464,8 +464,8 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA 02110-1301, USA
+    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+    MA 02111-1307, USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/COPYING.LIBGLOSS b/COPYING.LIBGLOSS
index d6f99e51f..741bc2fe0 100644
--- a/COPYING.LIBGLOSS
+++ b/COPYING.LIBGLOSS
@@ -126,8 +126,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
 
 (4) Advanced Micro Devices
 
diff --git a/COPYING.NEWLIB b/COPYING.NEWLIB
index 141ca017e..60b63dfac 100644
--- a/COPYING.NEWLIB
+++ b/COPYING.NEWLIB
@@ -561,8 +561,8 @@ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.
 
 (22) Xavier Leroy LGPL License (i[3456]86-*-linux* targets only)
 
@@ -731,7 +731,7 @@ files in the newlib subdirectory default to the following copyright.
 It should be noted that Red Hat Incorporated now owns copyrights
 belonging to Cygnus Solutions and Cygnus Support.
 
-Copyright (c) 1994, 1997, 2001, 2002, 2003, 2004, 2005 Red Hat Incorporated.
+Copyright (c) 1994, 1997, 2001, 2002, 2003, 2004 Red Hat Incorporated.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 
diff --git a/ChangeLog b/ChangeLog
index c0126cd14..7957983a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,630 +1,3 @@
-2006-03-14  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.in: Regenerate.
-
-2006-03-14  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync with gcc:
-	2006-03-10  Aldy Hernandez  <aldyh@redhat.com>
-
-        * configure.in: Handle --disable-<component> generically.
-        * configure: Regenerate.
-
-	2006-02-21 Rafael Avila de Espindola <rafael.espindola@gmail.com>
-        
-        * Makefile.tpl  (BUILD_CONFIGDIRS): Remove.
-        (TARGET_CONFIGDIRS): Remove.
-        * configure.in: Remove AC_SUBST(target_configdirs).
-        * Makefile.in, configure: Regenerated.
-
-
-2006-03-01  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR libgcj/17311
-	* ltmain.sh: Don't use "$finalize_rpath" for compile.
-
-2006-02-20  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/25670
-
-	* Makefile.tpl ([+compare-target+]): Print explanation messages.
-
-	* Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES): New flags_to_pass.
-	* Makefile.tpl (BASE_FLAGS_TO_PASS): Support optional flags_to_pass.
-	(EXTRA_GCC_FLAGS): Remove ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES,
-	BUILD_PREFIX, BUILD_PREFIX_1.
-	* configure.in: (BUILD_PREFIX, BUILD_PREFIX_1): Don't substitute.
-
-	* Makefile.def (bootstrap stage 1): Pass LIBCFLAGS too.
-	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Override LIBCFLAGS too.
-
-	* Makefile.tpl (configure-stage[+id+]-[+prefix+][+module+],
-	all-stage[+id+]-[+prefix+][+module+], : Use $(current_stage) instead
-	of `cat stage_current`.  Always provide the `r' and `s' variables.
-	(clean-stage[+id+]-[+prefix+][+module+]): Likewise, and make it into
-	a single shell execution.
-	(configure-[+prefix+][+module+], all-[+prefix+][+module+]): For
-	bootstrapped modules, make the stage1 module if the build was not
-	started yet, else build the current stage.
-	(all-host, all-target): Omit bootstrapped modules (if bootstrapping).
-	(all-build, all-host, all-target, [+make_target+]-host,
-	[+make_target+]-target): Do not use \-continued lines.
-	(target modules): Depend on stage_last, not all-gcc, if bootstrapping.
-	(current_stage, restrap, stage_last): New.
-
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync from gcc:
-
-	2006-01-31  Richard Guenther  <rguenther@suse.de>
-		    Paolo Bonzini  <bonzini@gnu.org>
-
-        * Makefile.def (target_modules): Add libgcc-math target module.
-        * configure.in (target_libraries): Add libgcc-math target library.
-        (--enable-libgcc-math): New configure switch.
-        * Makefile.in: Re-generate.
-        * configure: Re-generate.
-        * libgcc-math: New toplevel directory.
-
-	2006-01-18  Richard Henderson  <rth@redhat.com>
-	            Jakub Jelinek  <jakub@redhat.com>
-	            Diego Novillo  <dnovillo@redhat.com>
-
-        * libgomp: New directory.
-        * Makefile.def: Add target_module libgomp.
-        * Makefile.in: Regenerate.
-        * configure.in (target_libraries): Add target-libgomp.
-        * configure: Regenerate.
-
-2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
-	    Andreas Schwab  <schwab@suse.de>
-	 
-	* configure: Regenerate.
-
-2006-01-16  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Set with_gnu_as, with_gnu_ld, with_newlib earlier.
-	Set md_exec_prefix.  Use ACX_CHECK_INSTALLED_TARGET_TOOL to find
-	the assembler, linker and binutils.
-	* configure: Regenerate.
-
-2006-01-16  Nick Clifton  <nickc@redhat.com>
-
-        * config.sub, config.guess: Sync from config repository.
-
-2006-01-05  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.tpl (clean-stage[+id+]-[+prefix+][+module+]): Remove
-	@ from continuation.
-	* Makefile.in: Rebuilt.
-
-2006-01-04  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync from gcc:
-
-	2006-01-04  Paolo Bonzini  <bonzini@gnu.org>
-
-        PR bootstrap/24252
-
-        * Makefile.def (flags_to_pass): Add STAGE1_CFLAGS and STAGE1_LANGUAGES.
-        * Makefile.tpl (OBJDUMP): New.
-        (EXTRA_HOST_FLAGS): Add it.
-        (EXTRA_GCC_FLAGS): Remove flags already specified in flags_to_pass.
-
-        * Makefile.tpl (stage[+id+]-start, stage[+id+]-end): Do not try
-        to use symbolic links between directories.  Avoid race conditions
-        or make them harmless.
-        * configure.in: Do not try to use symbolic links between directories.
-
-        * Makefile.def (LEAN): Pass.
-        * Makefile.tpl (LEAN): Define.
-        (stage[+id+]-start): Accept that the previous directory does not
-        exist, if the bootstrap is lean.
-        (stage[+id+]-bubble): Invoke lean bootstrap commands after
-        stage[+id+]-start.  Use a makefile variable and an `if' instead of a
-        configure substitution.
-        ([+compare-target+]): Likewise.
-        ([+bootstrap-target+]-lean): New.
-        * configure.in: Remove lean bootstrap support from here.
-
-        * Makefile.in: Regenerate.
-        * configure: Regenerate.
-
-	2006-01-02  Andreas Schwab  <schwab@suse.de>
-
-        * configure.in: When reconfiguring remove Makefile in
-        all stage directories.
-        * configure: Regenerate.
-
-2005-12-27  Leif Ekblad  <leif@rdos.net>
-
-	* configure.in: Add support for RDOS target.
-	* configure: Regenerate.
-
-2005-12-27  Nick Clifton  <nickc@redhat.com>
-
-	PR binutils/1990
-	* libtool.m4: Synchronize with version in GCC sources.
-
-2005-12-20  Paolo Bonzini  <bonzini@gnu.org>
-
-        Revert Ada-related part of the previous change.
-
-        * Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, ADAFLAGS_FOR_TARGET):
-        Do not pass.
-        * Makefile.tpl (BOOT_ADAFLAGS): Do not define.
-        * Makefile.in: Regenerate.
-        * configure.in: Do not include mt-ppc-aix target fragment.
-        * configure: Regenerate.
-
-2005-12-19  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Select appropriate fragments for PowerPC/AIX.
-	* configure: Regenerate.
-
-	* Makefile.def (flags_to_pass): Add ADAFLAGS, BOOT_ADAFLAGS,
-	BOOT_CFLAGS, BOOT_LDFLAGS.
-	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Handle BOOT_ADAFLAGS,
-	BOOT_CFLAGS, BOOT_LDFLAGS.
-	(TARGET_FLAGS_TO_PASS): Handle ADAFLAGS_FOR_TARGET.
-	(stage[+id+]-bubble): Pass flags recursively to the comparison target.
-	(stage): Fail if we cannot complete the work.
-	* Makefile.in: Regenerate.
-
-2005-12-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Update copyright year for default
-	copyright.
-
-2005-12-15  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (all, do-[+make_target+], do-check, install,
-	install-host-nogcc): Don't invoke $(stage) at the end.
-	* Makefile.in: Regenerate.
-
-2005-12-14  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Flip the top-level bootstrap switch.
-	* configure: Regenerate.
-
-	Merge from gcc:
-
-	2005-12-14  Daniel Jacobowitz  <dan@codesourcery.com>
-
-        * Makefile.tpl: Throughout the file, use : $(MAKE) along with
-        $(stage) and $(unstage).
-        (EXTRA_TARGET_FLAGS): Correct double-quoting.
-        (all): Remove stray semicolon.
-        (local-distclean): Don't handle multilib.tmp and multilib.out.
-        (install.all): Set $s for consistency.
-        (configure-[+prefix+][+module+]): Instead of [+deps+], handle
-        check_multilibs setting.  Always make the install directory.
-        (configure-stage[+id+]-[+prefix+][+module+]): Likewise.
-        Correct @if/@endif.
-        (all-stage[+id+]-[+prefix+][+module+]): Correct @if/@endif.
-        ($(TARGET_SUBDIR)/[+module+]/multilib.out): Remove.
-        (stage[+id+]-start, stage[+id+]-end): Stage $(TARGET_SUBDIR).
-        (multilib.out): Remove.
-        * Makefile.in: Regenerated.
-
-2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* config.sub: Replace ms1 arch with mt.  Allow ms1 as alias.
-	* configure.in: Replace ms1 arch with mt.
-	* configure: Rebuilt.
-
-2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync with gcc:
-
-2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* config.sub: Replace ms1 arch with mt.  Allow ms1 as alias.
-	* configure.in: Replace ms1 arch with mt.
-	* configure: Rebuilt.
-
-2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync with gcc:
-
-	2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
-
-        * configure.in (CONFIGURED_BISON, CONFIGURED_YACC, CONFIGURED_M4,
-        CONFIGURED_FLEX, CONFIGURED_LEX, CONFIGURED_MAKEINFO): Remove
-        "CONFIGURED_" from the AC_CHECK_PROGS invocation.  Move below.
-        Find in-tree tools if available.
-        (EXPECT, RUNTEST, LIPO, STRIP): Find them and substitute them.
-        (CONFIGURED_*_FOR_TARGET): Don't set nor substitute.
-        (*_FOR_TARGET): Set them with GCC_TARGET_TOOL.
-        (COMPILER_*_FOR_TARGET): New.
-        * Makefile.tpl (HOST_EXPORTS): Add *_FOR_TARGET symbols that gcc needs.
-        (BASE_TARGET_EXPORTS): Use COMPILER_*_FOR_TARGET symbols.
-        (CONFIGURED_*, USUAL_*): Remove.
-        (BISON, YACC, FLEX, LEX, M4, MAKEINFO, EXPECT, RUNTEST, LIPO,
-        STRIP): Use autoconf substitutions.
-        (COMPILER_AS_FOR_TARGET, COMPILER_LD_FOR_TARGET,
-        COMPILER_NM_FOR_TARGET): New.
-        (EXTRA_HOST_FLAGS): Pass LIPO and STRIP.
-
-        (all): Make all-host and all-target in parallel.
-        (do-[+make_target+], do-check, install, [+compare-target+]): Ensure
-        that $$r and $$s are set before invoking a recursive make.
-        (stage[+id+]-bubble): Likewise, and invoke the comparison at the end.
-        ([+bootstrap-target+]): Inline most of the `all' target.
-
-	2005-11-29  Ben Elliston  <bje@au.ibm.com>
-
-        * Makefile.tpl (clean-target-libgcc): Invoke clean-target-libgcc
-        from the gcc build directory.
-        * Makefile.in: Regenerate.
-
-	2005-11-29  Ben Elliston  <bje@au.ibm.com>
-
-        * Makefile.def: Add new libdecnumber host_module.  Make all-gcc
-        depend on all-libdecnumber.
-        * configure.in (host_libs): Include libdecnumber.
-        * Makefile.in: Regenerate.
-        * configure: Likewise.
-
-	2005-11-21  Kean Johnston  <jkj@sco.com>
-
-        * config.sub, config.guess: Sync from upstream sources.
-
-2005-11-11  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* Makefile.def: Remove gdb dependencies for gdbtk.
-	* Makefile.tpl (CONFIGURE_GDB_TK, INSTALL_GDB_TK): New variables.
-	(configure-gdb, install-gdb): New rules.
-	* configure.in: Set CONFIGURE_GDB_TK and INSTALL_GDB_TK.
-	* Makefile.in, configure: Regenerated.
-
-2005-10-22  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/24297
-	* Makefile.tpl (do-[+make-target+], do-check, install,
-	stage[+id+]-bubble, [+compare-target+]): Ensure $$r and $$s
-	are set before recursing.
-	* Makefile.in: Regenerate.
-
-2005-10-20  Eric Botcazou  <ebotcazou@adacore.com>
-
-	PR bootstrap/18939
-	* Makefile.def (gcc) <target>: Fix thinko.
-	* Makefile.in: Regenerate.
-
-2005-10-17  Bernd Schmidt  <bernd.schmidt@analog.com>
-
-	* configure.in (bfin-*-*): Use test, not brackets, in if statement.
-	* configure: Regenerate.
-
-2005-10-09  Kazu Hirata  <kazu@codesourcery.com>
-
-	* configure.in (arm-*-linux-gnueabi): Add to noconfigdirs
-	target-libffi, target-qthreads, target-libjava, and
-	targetlibobjc.
-	* configure: Regenerate.
-
-2005-10-06  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* Makefile.def (flags_to_pass): Add OBJDUMP_FOR_TARGET.
-	* Makefile.tpl (BASE_TARGET_EXPORTS): Add OBJDUMP.
-	(OBJDUMP_FOR_TARGET, CONFIGURED_OBJDUMP_FOR_TARGET)
-	(USUAL_OBJDUMP_FOR_TARGET): New.
-	(EXTRA_TARGET_FLAGS): Add OBJDUMP.
-	* configure.in: Check for $OBJDUMP_FOR_TARGET.
-	* configure, Makefile.in: Regenerated.
-
-2005-10-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (all) [gcc-no-bootstrap]: Make prebootstrap packages
-	before other host packages.
-
-2005-10-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/22340
-
-	* configure.in (default_target): Remove.
-	* Makefile.tpl (all): Do not use prerequisites as subroutines
-	(all) [gcc-bootstrap]: Bootstrap gcc first if it was not done yet.
-	(do-[+make_target+], check, install, [+bootstrap_target+]): Do not
-	use prerequisites as subroutines.
-	(check-host, check-target): New.
-	(bootstrap configure & all targets): Do not use stage*-start
-	if the directory layout is already ok.
-	(non-bootstrap configure & all targets): Prepend a $(unstage).
-	(stage[+id+]-bubble): Do that here.  Do not use NOTPARALLEL.
-	(NOTPARALLEL): Remove.
-	(unstage, stage variables): New variables.
-	(unstage, stage targets): Simply expand to those variables.
-
-	* configure: Regenerate.
-	* Makefile.in: Regenerate.
-
-2005-10-04  James E Wilson  <wilson@specifix.com>
-
-	* Makefile.def (lang_env_dependencies): Add libmudflap.
-	* Makefile.in: Regenerate.
-
-2005-10-03  Catherine Moore  <clm@cm00re.com>
-
-	* configure.in (bfin-*-*): Support bfin.
-	* configure: Regenerated.
-
-2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* configure.in (*-*-darwin*): Build bfd, binutils and opcodes.
-	* configure: Regenerated.
-
-2005-09-28  Geoffrey Keating  <geoffk@apple.com>
-
-	* Makefile.tpl (BASE_TARGET_EXPORTS): Add LIPO, STRIP.
-	(LIPO_FOR_TARGET): New.
-	(CONFIGURED_LIPO_FOR_TARGET): New.
-	(USUAL_LIPO_FOR_TARGET): New.
-	(STRIP_FOR_TARGET): New.
-	(CONFIGURED_STRIP_FOR_TARGET): New.
-	(USUAL_STRIP_FOR_TARGET): New.
-	* Makefile.def (flags_to_pass): Add LIPO_FOR_TARGET and
-	STRIP_FOR_TARGET.
-	* configure.in: Set LIPO_FOR_TARGET, STRIP_FOR_TARGET,
-	CONFIGURED_LIPO_FOR_TARGET, CONFIGURED_STRIP_FOR_TARGET.
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-	
-2005-09-19  David Edelsohn  <edelsohn@gnu.org>
-
-	* configure.in (powerpc-*-aix*): Add target-libssp to noconfigdirs.
-	(rs6000-*-aix*): Same.
-	* configure: Regenerate.
-
-2005-09-14  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
-
-	* configure.in: Recognize f95 in the --enable-languages option,
-	and substitute it for fortran, issuing a warning.
-	* configure: Regenerate.
-
-2005-09-07  Ben Elliston  <bje@au.ibm.com>
-
-	Import from Autoconf sources:
-
-	2005-09-06  Paul Eggert  <eggert@cs.ucla.edu>
-	* move-if-change: Don't output "$2 is unchanged"; suggested by Ben
-	Elliston.  Handle weird characters correctly.
-
-2005-08-30  Phil Edwards  <phil@codesourcery.com>
-
-	* configure.in (*-*-vxworks*):  Add target-libstdc++-v3 to noconfigdirs.
-	* configure:  Regenerated.
-
-2005-08-20  Richard Earnshaw  <richard.earnshaw@arm.com>
-
-        * Makefile.def (libssp): Add to lang_env_dependencies.
-        * Makefile.in: Regenerate.
-
-2005-08-17  Christian Groessler  <chris@groessler.org>
-
-	* Makefile.tpl: (USUAL_CC_FOR_TARGET): Add missing trailing slash.
-	* Makefile.in: Regenerate.
-
-2005-08-12  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Replace NCN_STRICT_CHECK_TOOL with
-	NCN_STRICT_CHECK_TOOLS, and likewise for NCN_STRICT_CHECK_TARGET_TOOLS.
-	Look for alternate names of the target cc and c++
-	* configure: Regenerate.
-
-2005-08-08  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in (CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET,
-	GCC_FOR_TARGET, RAW_CXX_FOR_TARGET, GFORTRAN_FOR_TARGET): Find
-	them with NCN_STRICT_CHECK_TARGET_TOOL, like the other target
-	tools; remove code to manually set them.
-	(Target tools): Look in the environment for them.
-	* Makefile.tpl (CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET,
-	GCC_FOR_TARGET, RAW_CXX_FOR_TARGET, GFORTRAN_FOR_TARGET): Redefine.
-	(AS_FOR_TARGET, LD_FOR_TARGET, NM_FOR_TARGET): Look into gcc
-	build directory.
-	(CONFIGURED_CC_FOR_TARGET, CONFIGURED_CXX_FOR_TARGET,
-	CONFIGURED_GCJ_FOR_TARGET, CONFIGURED_GCC_FOR_TARGET,
-	CONFIGURED_GFORTRAN_FOR_TARGET, USUAL_CC_FOR_TARGET,
-	USUAL_CXX_FOR_TARGET, USUAL_GCJ_FOR_TARGET, USUAL_GCC_FOR_TARGET,
-	USUAL_RAW_CXX_FOR_TARGET, USUAL_GFORTRAN_FOR_TARGET): New.
-	(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE,
-	RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE, RECURSE_FLAGS): Delete.
-	* configure: Regenerate.
-	* Makefile.in: Regenerate.
-
-2005-07-27  Mark Mitchell  <mark@codesourcery.com>
-
-	* Makefile.tpl (EXTRA_TARGET_FLAGS): Set LDFLAGS=LDFLAGS_FOR_TARGET.
-	* Makefile.def (flags_to_pass): Add LDFLAGS_FOR_TARGET. 
-	* Makefile.in: Regenerated.
-
-2005-07-26  Mark Mitchell  <mark@codesourcery.com>
-
-	* Makefile.tpl (SYSROOT_CFLAGS_FOR_TARGET): New variable.
-	(CFLAGS_FOR_TARGET): Use it.
-	(CXXFLAGS_FOR_TARGET): Likewise.
-	* Makefile.in: Regenerated.
-	* configure.in (--with-build-sysroot): New option.
-	* configure: Regenerated.
-
-2005-07-24  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl: Wrap install between unstage and stage
-	* Makefile.in: Regenerate.
-
-2005-07-16  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* all files: Update FSF address.
-
-2005-07-14  Jim Blandy  <jimb@redhat.com>
-
-	* configure.in: Add cases for Renesas m32c.
-	* configure: Regenerated.
-	
-2005-07-14  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* COPYING, compile, config-ml.in, config.guess,
-	config.sub, install-sh, missing, mkinstalldirs,
-	symlink-tree, ylwrap: Sync from upstream sources.
-
-2005-07-13  Eric Christopher  <echristo@redhat.com>
-
-	* configure.in: Add toplevel noconfigdir support for tpf.
-	* configure: Regenerate.
-
-2005-07-11  Jakub Jelinek  <jakub@redhat.com>
-
-	* Makefile.def (target_modules): Add libssp.
-	* configure.in (target_libraries): Add target-libssp.
-	* configure: Rebuilt.
-	* Makefile.in: Rebuilt.
-
-2005-07-11  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR ada/22340
-
-	* Makefile.def: Sync with gcc.
-	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Fix pasto.
-	* Makefile.in: Regenerate.
-
-2005-07-07  Andreas Schwab  <schwab@suse.de>
-
-	* Makefile.def (flags_to_pass): Add CFLAGS_FOR_BUILD.
-	* Makefile.tpl (EXTRA_GCC_FLAGS): Don't pass CFLAGS_FOR_BUILD here.
-	* Makefile.in: Regenerated.
-
-2005-07-07  Kazu Hirata  <kazu@codesourcery.com>
-
-	* configure.in: Add --enable-libssp and --disable-libssp.
-	* configure: Regenerate with autoconf-2.13.
-
-2005-07-06  Geoffrey Keating  <geoffk@apple.com>
-
-	* configure.in: Don't build sim or rda when targetting darwin.
-	* configure: Regenerate.
-
-2005-07-04  Ben Elliston  <bje@gnu.org>
-
-	* src-release (do-proto-toplev): Remove dejagnu bits.
-	(DEJAGNU_SUPPORT_DIRS): Remove.
-	(dejagnu.tar.bz2, dejagnu.tar): Likewise.
-	(GDBD_SUPPORT_DIRS): Likewise.
-	(gdb+dejagnu.tar.bz2, gdb+dejagnu.tar): Likewise.
-	(INSIGHTD_SUPPORT_DIRS): Likewise.
-	(insight+dejagnu.tar.bz2, insight+dejagnu.tar): Likewise.
-
-2005-06-30  Ben Elliston  <bje@gnu.org>
-
-	* setup.com (mpw): Remove unused directive.
-
-2005-06-22  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (stagefeedback): Come after profile.
-	Define profiledbootstrap target.
-	* Makefile.tpl (profiledbootstrap): Remove.
-	(stageprofile-end): Zap stagefeedback.
-	(stagefeedback-start): Copy all .gcda files, not only GCC's.
-	* Makefile.in: Regenerate.
-
-2005-06-13  Zack Weinberg  <zack@codesourcery.com>
-
-	* depcomp: Update from automake CVS.  Add 'ia64hp' stanza.
-	In 'cpp' stanza, support '#line' as well as '# '.
-
-2005-06-07  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.in (unsupported_languages): New macro.
-	<mmix-knuth-mmixware>: Set unsupported_languages.  Name explicit
-	non-ported target libraries in noconfigdirs.
-	<cris-*, crisv32-*> Ditto, except for non-aout, non-elf,
-	non-linux-gnu.  Remove libgcj_ex_libffi.
- 	<lang_frag loop>: Set add_this_lang=no if the language is in
-	unsupported_languages.
-	* configure: Regenerate.
-
-2005-06-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
-
-	* configure.in: Fix typo in handling of --with-mpfr-dir.
-	* configure: Regenerate.
-
-2005-06-02  Jim Blandy  <jimb@redhat.com>
-
-	* config.sub: Add cases for the Renesas m32c.  (This patch has been
-	accepted into the master sources.)
-
-2005-06-02  Aldy Hernandez  <aldyh@redhat.com>
-            Michael Snyder  <msnyder@redhat.com>
-            Stan Cox  <scox@redhat.com>
-
-        * configure.in: Set noconfigdirs for ms1.
-
-        * configure: Regenerate.
-
-2005-05-25  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (stage[+id+]-start): Iterate over target module as well.
-	(Dependencies): Consider target modules for bootstrap dependencies.
-	Make target bootstrap modules depend on each stage's gcc.
-	* Makefile.in: Regenerate.
-
-2005-05-20  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (configure-gcc): Depend on binutils having been built.
-	(all-gcc): No need to do it here.
-	* Makefile.in: Regenerate.
-
-2005-05-19  Paul Brook  <paul@codesourcery.com>
-
-	* configure.in: Rewrite misleading error message when requested 
-	language cannot be built.
-	* configure: Regenerate.
-
-2005-05-15  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* ylwrap: Import from Automake 1.9.5.
-
-2005-05-04  Mike Stump  <mrs@apple.com>
-
-	* configure.in: Always pass --target to target configures as
-	otherwise rebuilds that do --recheck will fail.
-	* configure: Rebuilt.
-
-2005-05-04  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Rename from
-	STAGE_HOST_EXPORTS.
-	(configure, all): Add bootstrap support.
-	(Host modules, target modules): Pass post-stage1 flags and exports.
-	(Top-level bootstrap): Remove bootstrap rules, expanded elsewhere.
-	* Makefile.in: Regenerate.
-
-2005-04-29  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync from gcc:
-
-	2005-04-22  Bernd Schmidt  <bernd.schmidt@analog.com>
-
-        * config.sub: Update from master copy.
-
-	2005-04-19  Hans-Peter Nilsson  <hp@axis.com>
-
-        * configure.in <crisv32-*-*, cris-*-*>: New local variable
-        libgcj_ex_libffi.  Have specific match for *-*-linux*.  Separate
-        matches for "*-*-aout" and "*-*-elf".  Don't disable libffi for
-        "*-*-elf" and "*-*-linux*".
-        * configure: Regenerate.
-
-2005-04-06  Paolo Bonzini  <bonzini@gnu.org>
-
-        * Makefile.tpl (BUILD_CONFIGARGS): Include --with-build-subdir.
-	(TARGET_CONFIGARGS): Include --with-target-subdir.
-	(configure, all): New macros.  Use them throughout.
-
 2005-04-05  Paolo Bonzini  <bonzini@gnu.org>
 
 	* Makefile.tpl: Sync with gcc.
diff --git a/MAINTAINERS b/MAINTAINERS
index b2077e7c2..f142edc05 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5,11 +5,7 @@ COPYING, COPYING.LIB, README
 	http://gnu.org.
 
 Makefile.*; configure; configure.in; src-release
-	Any global maintainer can approve changes to these
-	files, but they should be aware	that they need to
-	be kept in sync with their counterparts in the GCC
-	repository.  Also please notify the following of
-	any committed patches:
+	Please notify the following of any committed patches.
 		binutils@sources.redhat.com
 		gdb-patches@sources.redhat.com
 
@@ -36,6 +32,10 @@ config.guess; config.sub; readline/support/config.{sub,guess}
 		binutils@sources.redhat.com
 		gdb-patches@sources.redhat.com
 
+dejagnu/
+	dejagnu: http://www.gnu.org/software/dejagnu/
+	Patches to bug-dejagnu@gnu.org
+
 depcomp
         Send bug reports and patches to bug-automake@gnu.org.
 
@@ -98,17 +98,9 @@ winsup/
 	General discussion cygwin@sources.redhat.com.
 	See also winsup/MAINTAINERS.
 
-config-ml.in; makefile.vms; mkdep; setup.com;
-etc/; intl/; utils/;
-	Any global maintainer can approve changes to these
-	files and directories.
-
-compile; depcomp; install-sh; missing; ylwrap;
-config/
-	Any global maintainer can approve changes to these
-	files and directories, but they should be aware
-	that they need to be kept in sync with their
-	counterparts in the GCC repository.
+config-ml.in; setup.com; missing; makefile.vms; utils/; config/;
+makefile.vms; missing; ylwrap; mkdep; etc/; install-sh; intl/
+	Ask DJ Delorie <dj@redhat.com> after reading the libiberty entry.
 
 modules file
 	Obviously changes to this file should not go through
diff --git a/Makefile.def b/Makefile.def
index 3227a4456..e338aa859 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -4,7 +4,7 @@ AutoGen definitions Makefile.tpl;
 // Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
 // This file was originally written by Nathanael Nerode.
 //
-//   Copyright 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+//   Copyright 2002, 2003 Free Software Foundation
 //
 // 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
@@ -18,7 +18,7 @@ AutoGen definitions Makefile.tpl;
 // 
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
 // "missing" indicates that that module doesn't supply
@@ -60,7 +60,7 @@ host_modules= { module= fixincludes;
 host_modules= { module= flex; no_check_cross= true; };
 host_modules= { module= gas; bootstrap=true; };
 host_modules= { module= gcc; bootstrap=true; 
-		target="`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi`";
+		target="`if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi`";
 		extra_make_flags="$(EXTRA_GCC_FLAGS)"; };
 host_modules= { module= gawk; };
 host_modules= { module= gettext; };
@@ -75,7 +75,6 @@ host_modules= { module= tcl;
 host_modules= { module= itcl; };
 host_modules= { module= ld; bootstrap=true; };
 host_modules= { module= libcpp; bootstrap=true; };
-host_modules= { module= libdecnumber; bootstrap=true; };
 host_modules= { module= libgui; };
 host_modules= { module= libiberty; bootstrap=true; };
 host_modules= { module= libtool; };
@@ -116,8 +115,6 @@ host_modules= { module= gnattools; };
 
 target_modules = { module= libstdc++-v3; lib_path=.libs; raw_cxx=true; };
 target_modules = { module= libmudflap; lib_path=.libs; };
-target_modules = { module= libssp; lib_path=.libs; };
-target_modules = { module= libgcc-math; lib_path=.libs; };
 target_modules = { module= newlib; };
 target_modules = { module= libgfortran; };
 target_modules = { module= libobjc; };
@@ -138,7 +135,6 @@ target_modules = { module= boehm-gc; };
 target_modules = { module= qthreads; };
 target_modules = { module= rda; };
 target_modules = { module= libada; };
-target_modules = { module= libgomp; lib_path=.libs; };
 
 // These are (some of) the make targets to be done in each subdirectory.
 // Not all; these are the ones which don't have special options.
@@ -190,7 +186,6 @@ flags_to_pass = { flag= target_alias ; };
 // Build tools
 flags_to_pass = { flag= BISON ; };
 flags_to_pass = { flag= CC_FOR_BUILD ; };
-flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
 flags_to_pass = { flag= CXX_FOR_BUILD ; };
 flags_to_pass = { flag= EXPECT ; };
 flags_to_pass = { flag= FLEX ; };
@@ -207,18 +202,12 @@ flags_to_pass = { flag= SHELL ; };
 flags_to_pass = { flag= YACC ; };
 
 // Host tools
-flags_to_pass = { flag= ADAFLAGS ; optional=true ; };
 flags_to_pass = { flag= AR_FLAGS ; };
-flags_to_pass = { flag= BOOT_ADAFLAGS ; optional=true ; };
-flags_to_pass = { flag= BOOT_CFLAGS ; };
-flags_to_pass = { flag= BOOT_LDFLAGS ; };
 flags_to_pass = { flag= CFLAGS ; };
 flags_to_pass = { flag= CXXFLAGS ; };
 flags_to_pass = { flag= LDFLAGS ; };
 flags_to_pass = { flag= LIBCFLAGS ; };
 flags_to_pass = { flag= LIBCXXFLAGS ; };
-flags_to_pass = { flag= STAGE1_CFLAGS ; };
-flags_to_pass = { flag= STAGE1_LANGUAGES ; };
 
 // Target tools
 flags_to_pass = { flag= AR_FOR_TARGET ; };
@@ -232,20 +221,12 @@ flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; };
 flags_to_pass = { flag= GCJ_FOR_TARGET ; };
 flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
 flags_to_pass = { flag= LD_FOR_TARGET ; };
-flags_to_pass = { flag= LIPO_FOR_TARGET ; };
-flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= LIBCFLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= LIBCXXFLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= NM_FOR_TARGET ; };
-flags_to_pass = { flag= OBJDUMP_FOR_TARGET ; };
 flags_to_pass = { flag= RANLIB_FOR_TARGET ; };
-flags_to_pass = { flag= STRIP_FOR_TARGET ; };
 flags_to_pass = { flag= WINDRES_FOR_TARGET ; };
 
-// Miscellaneous
-flags_to_pass = { flag= LANGUAGES ; optional=true ; };
-flags_to_pass = { flag= LEAN ; };
-
 // Inter-module dependencies
 
 // Build modules
@@ -261,9 +242,9 @@ dependencies = { module=all-build-fixincludes; on=all-build-libiberty; };
 
 // Host modules specific to gcc.
 dependencies = { module=configure-gcc; on=configure-intl; };
-dependencies = { module=configure-gcc; on=all-binutils; };
-dependencies = { module=configure-gcc; on=all-gas; };
-dependencies = { module=configure-gcc; on=all-ld; };
+dependencies = { module=configure-gcc; on=configure-binutils; };
+dependencies = { module=configure-gcc; on=configure-gas; };
+dependencies = { module=configure-gcc; on=configure-ld; };
 dependencies = { module=all-gcc; on=all-libiberty; hard=true; };
 dependencies = { module=all-gcc; on=all-intl; };
 dependencies = { module=all-gcc; on=all-build-texinfo; };
@@ -272,9 +253,11 @@ dependencies = { module=all-gcc; on=all-build-byacc; };
 dependencies = { module=all-gcc; on=all-build-flex; };
 dependencies = { module=all-gcc; on=all-build-libiberty; };
 dependencies = { module=all-gcc; on=all-build-fixincludes; };
+dependencies = { module=all-gcc; on=all-binutils; };
+dependencies = { module=all-gcc; on=all-gas; };
+dependencies = { module=all-gcc; on=all-ld; };
 dependencies = { module=all-gcc; on=all-zlib; };
 dependencies = { module=all-gcc; on=all-libcpp; hard=true; };
-dependencies = { module=all-gcc; on=all-libdecnumber; hard=true; };
 dependencies = { module=all-gcc; on=all-libiberty; };
 dependencies = { module=all-gcc; on=all-fixincludes; };
 dependencies = { module=install-gcc ; on=install-fixincludes; };
@@ -289,6 +272,9 @@ dependencies = { module=all-fixincludes; on=all-libiberty; };
 dependencies = { module=all-gnattools; on=all-target-libada; };
 
 // Host modules specific to gdb.
+dependencies = { module=configure-gdb; on=configure-itcl; };
+dependencies = { module=configure-gdb; on=configure-tcl; };
+dependencies = { module=configure-gdb; on=configure-tk; };
 dependencies = { module=configure-gdb; on=configure-sim; };
 dependencies = { module=all-gdb; on=all-libiberty; };
 dependencies = { module=all-gdb; on=all-opcodes; };
@@ -297,6 +283,10 @@ dependencies = { module=all-gdb; on=all-readline; };
 dependencies = { module=all-gdb; on=all-build-bison; };
 dependencies = { module=all-gdb; on=all-build-byacc; };
 dependencies = { module=all-gdb; on=all-sim; };
+dependencies = { module=install-gdb; on=install-tcl; };
+dependencies = { module=install-gdb; on=install-tk; };
+dependencies = { module=install-gdb; on=install-itcl; };
+dependencies = { module=install-gdb; on=install-libgui; };
 
 dependencies = { module=configure-libgui; on=configure-tcl; };
 dependencies = { module=configure-libgui; on=configure-tk; };
@@ -426,9 +416,7 @@ lang_env_dependencies = { module=libada; };
 lang_env_dependencies = { module=libgfortran; };
 lang_env_dependencies = { module=libffi; };
 lang_env_dependencies = { module=libjava; cxx=true; };
-lang_env_dependencies = { module=libmudflap; };
 lang_env_dependencies = { module=libobjc; };
-lang_env_dependencies = { module=libssp; };
 lang_env_dependencies = { module=libstdc++-v3; };
 lang_env_dependencies = { module=zlib; };
 
@@ -464,7 +452,7 @@ bootstrap_stage = {
 	id=1 ;
 	stage_configure_flags='--disable-intermodule \
 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
-	stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"' ; };
+	stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; };
 bootstrap_stage = {
 	id=2 ; prev=1 ;
 	bootstrap_target=bootstrap2 ;
@@ -488,7 +476,6 @@ bootstrap_stage = {
 	stage_configure_flags="@stage2_werror_flag@" ;
 	stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"' ; };
 bootstrap_stage = {
-	id=feedback ; prev=profile ;
-	bootstrap_target=profiledbootstrap ;
+	id=feedback ; prev=1 ;
 	stage_configure_flags="@stage2_werror_flag@" ;
 	stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-use"' ; };
diff --git a/Makefile.in b/Makefile.in
index eae74a72e..51c0596d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+#   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
 #
 # 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
@@ -17,7 +17,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
 # -------------------------------
@@ -84,11 +84,13 @@ GDB_NLM_DEPS =
 # the libraries.
 RPATH_ENVVAR = @RPATH_ENVVAR@
 
+# This is the list of directories to be built for the build system.
+BUILD_CONFIGDIRS = libiberty
 # Build programs are put under this directory.
 BUILD_SUBDIR = @build_subdir@
 # This is set by the configure script to the arguments to use when configuring
 # directories built for the build system.
-BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)"
+BUILD_CONFIGARGS = @build_configargs@
 
 # This is the list of variables to export in the environment when
 # configuring any subdirectory.  It must also be exported whenever
@@ -131,8 +133,7 @@ HOST_CONFIGARGS = @host_configargs@
 # with srcdir=..
 HOST_SUBDIR = @host_subdir@
 # This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.  We need to pass
-# some to the GCC configure because of its hybrid host/target nature.
+# configuring subdirectories for the host system.
 HOST_EXPORTS = \
 	$(BASE_EXPORTS) \
 	CC="$(CC)"; export CC; \
@@ -151,23 +152,14 @@ HOST_EXPORTS = \
 	WINDRES="$(WINDRES)"; export WINDRES; \
 	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
 	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
-	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
-	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
-	LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
-	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
-	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
-	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
-@if gcc-bootstrap
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-@endif gcc-bootstrap
 	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
 
 # Similar, for later GCC stages.
-POSTSTAGE1_HOST_EXPORTS = \
+STAGE_HOST_EXPORTS = \
+	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 	$(HOST_EXPORTS) \
 	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
@@ -176,17 +168,20 @@ POSTSTAGE1_HOST_EXPORTS = \
 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
 	  -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
 
+# This is set by the configure script to the list of directories which
+# should be built using the target tools.
+TARGET_CONFIGDIRS = @target_configdirs@
 # Target libraries are put under this directory:
 TARGET_SUBDIR = @target_subdir@
 # This is set by the configure script to the arguments to use when configuring
 # directories built for the target.
-TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
+TARGET_CONFIGARGS = @target_configargs@
 # This is the list of variables to export in the environment when
 # configuring subdirectories for the host system.
 BASE_TARGET_EXPORTS = \
 	$(BASE_EXPORTS) \
 	AR="$(AR_FOR_TARGET)"; export AR; \
-	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+	AS="$(AS_FOR_TARGET)"; export AS; \
 	CC="$(CC_FOR_TARGET)"; export CC; \
 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
@@ -195,13 +190,10 @@ BASE_TARGET_EXPORTS = \
 	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
 	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
+	LD="$(LD_FOR_TARGET)"; export LD; \
 	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-	LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
-	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
-	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
+	NM="$(NM_FOR_TARGET)"; export NM; \
 	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
 	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
 
@@ -247,16 +239,48 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 # Flags to pass to stage2 and later makes.  They are defined
 # here so that they can be overridden by Makefile fragments.
 BOOT_CFLAGS= -g -O2
-BOOT_LDFLAGS=
 
-BISON = @BISON@
-YACC = @YACC@
-FLEX = @FLEX@
-LEX = @LEX@
-M4 = @M4@
-MAKEINFO = @MAKEINFO@
-EXPECT = @EXPECT@
-RUNTEST = @RUNTEST@
+CONFIGURED_BISON = @CONFIGURED_BISON@
+BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+	    echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \
+	 else \
+	    echo ${CONFIGURED_BISON} ; \
+	 fi`
+
+CONFIGURED_YACC = @CONFIGURED_YACC@
+YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+	    echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \
+	elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \
+	    echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \
+	else \
+	    echo ${CONFIGURED_YACC} ; \
+	fi`
+
+CONFIGURED_FLEX = @CONFIGURED_FLEX@
+FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+	then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+	else echo ${CONFIGURED_FLEX} ; fi`
+
+CONFIGURED_LEX = @CONFIGURED_LEX@
+LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+	then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+	else echo ${CONFIGURED_LEX} ; fi`
+
+CONFIGURED_M4 = @CONFIGURED_M4@
+M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
+	then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
+	else echo ${CONFIGURED_M4} ; fi`
+
+# For an installed makeinfo, we require it to be from texinfo 4.2 or
+# higher, else we use the "missing" dummy.  We also pass the subdirectory
+# makeinfo even if only the Makefile is there, because Texinfo builds its
+# manual when made, and it requires its own version.
+CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
+MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
+	then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
+	else if (${CONFIGURED_MAKEINFO} --version \
+	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
+        then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
@@ -264,29 +288,43 @@ RUNTEST = @RUNTEST@
 # (Default to avoid splitting info files by setting the threshold high.)
 MAKEINFOFLAGS = --split-size=5000000
 
+# FIXME: expect may become a build tool?
+EXPECT = `if [ -f $$r/$(HOST_SUBDIR)/expect/expect ] ; \
+	then echo $$r/$(HOST_SUBDIR)/expect/expect ; \
+	else echo expect ; fi`
+
+RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
+	then echo $$s/dejagnu/runtest ; \
+	else echo runtest ; fi`
+
 # ---------------------------------------------
 # Programs producing files for the HOST machine
 # ---------------------------------------------
 
 AS = @AS@
+
 AR = @AR@
 AR_FLAGS = rc
+
 CC = @CC@
+CFLAGS = @CFLAGS@
+LIBCFLAGS = $(CFLAGS)
+
 CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+
 DLLTOOL = @DLLTOOL@
-LD = @LD@
-LIPO = @LIPO@
+
 NM = @NM@
-OBJDUMP = @OBJDUMP@
+
+LD = @LD@
+LDFLAGS = 
+
 RANLIB = @RANLIB@
-STRIP = @STRIP@
+
 WINDRES = @WINDRES@
 
-CFLAGS = @CFLAGS@
-LDFLAGS = 
-LIBCFLAGS = $(CFLAGS)
-CXXFLAGS = @CXXFLAGS@
-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 PICFLAG = 
 
 # -----------------------------------------------
@@ -296,42 +334,133 @@ PICFLAG =
 FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
 
 AR_FOR_TARGET=@AR_FOR_TARGET@
-AS_FOR_TARGET=@AS_FOR_TARGET@
-CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
+CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@
+USUAL_AR_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/ar ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/ar ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(AR); \
+    else \
+      echo $(CONFIGURED_AR_FOR_TARGET) ; \
+    fi; \
+  fi`
 
+AS_FOR_TARGET=@AS_FOR_TARGET@
+CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@
+USUAL_AS_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/gas/as-new ] ; then \
+    echo $$r/$(HOST_SUBDIR)/gas/as-new ; \
+  elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=as ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(AS); \
+    else \
+      echo $(CONFIGURED_AS_FOR_TARGET) ; \
+    fi; \
+  fi`
+
+CC_FOR_TARGET = @CC_FOR_TARGET@
+# During gcc bootstrap, if we use some random cc for stage1 then
+# CFLAGS will be just -g.  We want to ensure that TARGET libraries
+# (which we know are built with gcc) are built with optimizations so
+# prepend -O2 when setting CFLAGS_FOR_TARGET.
+CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
 # If GCC_FOR_TARGET is not overriden on the command line, then this
 # variable is passed down to the gcc Makefile, where it is used to
 # build libgcc2.a.  We define it here so that it can itself be
 # overridden on the command line.
-GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET)
+GCC_FOR_TARGET=@GCC_FOR_TARGET@
+USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) \
+  $$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/ $(FLAGS_FOR_TARGET)
+LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+
+CXX_FOR_TARGET = @CXX_FOR_TARGET@
+RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
+CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
+LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@
+USUAL_DLLTOOL_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/dlltool ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/dlltool ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(DLLTOOL); \
+    else \
+      echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \
+    fi; \
+  fi`
+
+GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
+GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@
+
 LD_FOR_TARGET=@LD_FOR_TARGET@
+CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@
+USUAL_LD_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/ld/ld-new ] ; then \
+    echo $$r/$(HOST_SUBDIR)/ld/ld-new ; \
+  elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=ld ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(LD); \
+    else \
+      echo $(CONFIGURED_LD_FOR_TARGET) ; \
+    fi; \
+  fi`
+
+LDFLAGS_FOR_TARGET = 
 
-LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
 NM_FOR_TARGET=@NM_FOR_TARGET@
-OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
+CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
+USUAL_NM_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/nm-new ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/nm-new ; \
+  elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=nm ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(NM); \
+    else \
+      echo $(CONFIGURED_NM_FOR_TARGET) ; \
+    fi; \
+  fi`
+
 RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
-STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
-WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
+USUAL_RANLIB_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/ranlib ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/ranlib ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      if [ x'$(RANLIB)' != x ]; then \
+         echo $(RANLIB); \
+      else \
+         echo ranlib; \
+      fi; \
+    else \
+      echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \
+    fi; \
+  fi`
 
-COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
-COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
-COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
+WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
+USUAL_WINDRES_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/windres ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/windres ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(WINDRES); \
+    else \
+      echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \
+    fi; \
+  fi`
 
-# During gcc bootstrap, if we use some random cc for stage1 then
-# CFLAGS will be just -g.  We want to ensure that TARGET libraries
-# (which we know are built with gcc) are built with optimizations so
-# prepend -O2 when setting CFLAGS_FOR_TARGET.
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
-LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-LDFLAGS_FOR_TARGET = 
 PICFLAG_FOR_TARGET = 
 
 # ------------------------------------
@@ -340,7 +469,7 @@ PICFLAG_FOR_TARGET =
 
 # The first rule in the file had better be this one.  Don't put any above it.
 # This lives here to allow makefile fragments to contain dependencies.
-all:
+@default_target@:
 
 #### host and target specific makefile fragments come in here.
 @target_makefile_frag@
@@ -351,7 +480,7 @@ all:
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that prorgams built for the target machine work.
-TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgcc-math)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc)
+TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(HOST_LIB_PATH_gcc)
 
 @if target-libstdc++-v3
 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/.libs:
@@ -361,18 +490,6 @@ TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/.libs:
 TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs:
 @endif target-libmudflap
 
-@if target-libssp
-TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
-@endif target-libssp
-
-@if target-libgcc-math
-TARGET_LIB_PATH_libgcc-math = $$r/$(TARGET_SUBDIR)/libgcc-math/.libs:
-@endif target-libgcc-math
-
-@if target-libgomp
-TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs:
-@endif target-libgomp
-
 
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
@@ -421,7 +538,6 @@ BASE_FLAGS_TO_PASS = \
 	"target_alias=$(target_alias)" \
 	"BISON=$(BISON)" \
 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
 	"EXPECT=$(EXPECT)" \
 	"FLEX=$(FLEX)" \
@@ -436,18 +552,12 @@ BASE_FLAGS_TO_PASS = \
 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
 	"SHELL=$(SHELL)" \
 	"YACC=$(YACC)" \
-	"`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"AR_FLAGS=$(AR_FLAGS)" \
-	"`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"BOOT_CFLAGS=$(BOOT_CFLAGS)" \
-	"BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \
 	"CFLAGS=$(CFLAGS)" \
 	"CXXFLAGS=$(CXXFLAGS)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"LIBCFLAGS=$(LIBCFLAGS)" \
 	"LIBCXXFLAGS=$(LIBCXXFLAGS)" \
-	"STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
-	"STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
 	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
 	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
@@ -459,22 +569,24 @@ BASE_FLAGS_TO_PASS = \
 	"GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
 	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
 	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
-	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
-	"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
 	"LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
-	"OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \
 	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
-	"STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
 	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
-	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"LEAN=$(LEAN)" \
 	"CONFIG_SHELL=$(SHELL)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
 
-# We leave this in just in case, but it is not needed anymore.
-RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
+# For any flags above that may contain shell code that varies from one
+# target library to another.  When doing recursive invocations of the
+# top-level Makefile, we don't want the outer make to evaluate them,
+# so we pass these variables down unchanged.  They must not contain
+# single nor double quotes.
+RECURSE_FLAGS = \
+	CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
+	RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
+
+RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS)
 
 # Flags to pass down to most sub-makes, in which we're building with
 # the host environment.
@@ -485,11 +597,8 @@ EXTRA_HOST_FLAGS = \
 	'CXX=$(CXX)' \
 	'DLLTOOL=$(DLLTOOL)' \
 	'LD=$(LD)' \
-	'LIPO=$(LIPO)' \
 	'NM=$(NM)' \
-	'OBJDUMP=$(OBJDUMP)' \
 	'RANLIB=$(RANLIB)' \
-	'STRIP=$(STRIP)' \
 	'WINDRES=$(WINDRES)'
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
@@ -507,23 +616,20 @@ X11_FLAGS_TO_PASS = \
 	'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)'
 
 # Flags to pass down to makes which are built with the target environment.
-# The double $ decreases the length of the command line; those variables
-# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
-# COMPILER_ prefixed variables are not passed down so we expand them here.
+# The double $ decreases the length of the command line; the variables
+# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.
 EXTRA_TARGET_FLAGS = \
 	'AR=$$(AR_FOR_TARGET)' \
-	'AS=$(COMPILER_AS_FOR_TARGET)' \
+	'AS=$$(AS_FOR_TARGET)' \
 	'CC=$$(CC_FOR_TARGET)' \
 	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
 	'CXX=$$(CXX_FOR_TARGET)' \
 	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-	'LD=$(COMPILER_LD_FOR_TARGET)' \
-	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
+	'LD=$$(LD_FOR_TARGET)' \
 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
 	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-	'NM=$(COMPILER_NM_FOR_TARGET)' \
-	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
+	'NM=$$(NM_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)'
 
@@ -536,12 +642,19 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # The BUILD_* variables are a special case, which are used for the gcc
 # cross-building scheme.
 EXTRA_GCC_FLAGS = \
+	'BUILD_PREFIX=$(BUILD_PREFIX)' \
+	'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
+	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
@@ -581,7 +694,6 @@ configure-host:  \
     maybe-configure-itcl \
     maybe-configure-ld \
     maybe-configure-libcpp \
-    maybe-configure-libdecnumber \
     maybe-configure-libgui \
     maybe-configure-libiberty \
     maybe-configure-libtool \
@@ -619,8 +731,6 @@ configure-host:  \
 configure-target:  \
     maybe-configure-target-libstdc++-v3 \
     maybe-configure-target-libmudflap \
-    maybe-configure-target-libssp \
-    maybe-configure-target-libgcc-math \
     maybe-configure-target-newlib \
     maybe-configure-target-libgfortran \
     maybe-configure-target-libobjc \
@@ -636,153 +746,110 @@ configure-target:  \
     maybe-configure-target-boehm-gc \
     maybe-configure-target-qthreads \
     maybe-configure-target-rda \
-    maybe-configure-target-libada \
-    maybe-configure-target-libgomp
+    maybe-configure-target-libada
 
 # The target built for a native non-bootstrap build.
 .PHONY: all
-all:
-@if gcc-bootstrap
-	[ -f stage_final ] || echo stage3 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble
-@endif gcc-bootstrap
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if [ -f stage_last ]; then \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
-	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
-	fi
+all: unstage all-host all-target stage
 
 .PHONY: all-build
-
-all-build: maybe-all-build-libiberty
-all-build: maybe-all-build-bison
-all-build: maybe-all-build-byacc
-all-build: maybe-all-build-flex
-all-build: maybe-all-build-m4
-all-build: maybe-all-build-texinfo
-all-build: maybe-all-build-fixincludes
-
+all-build:  \
+    maybe-all-build-libiberty \
+    maybe-all-build-bison \
+    maybe-all-build-byacc \
+    maybe-all-build-flex \
+    maybe-all-build-m4 \
+    maybe-all-build-texinfo \
+    maybe-all-build-fixincludes
 .PHONY: all-host
-
-all-host: maybe-all-ash
-all-host: maybe-all-autoconf
-all-host: maybe-all-automake
-all-host: maybe-all-bash
-@if bfd-no-bootstrap
-all-host: maybe-all-bfd
-@endif bfd-no-bootstrap
-@if opcodes-no-bootstrap
-all-host: maybe-all-opcodes
-@endif opcodes-no-bootstrap
-@if binutils-no-bootstrap
-all-host: maybe-all-binutils
-@endif binutils-no-bootstrap
-all-host: maybe-all-bison
-all-host: maybe-all-byacc
-all-host: maybe-all-bzip2
-all-host: maybe-all-dejagnu
-all-host: maybe-all-diff
-all-host: maybe-all-dosutils
-all-host: maybe-all-etc
-all-host: maybe-all-fastjar
-all-host: maybe-all-fileutils
-all-host: maybe-all-findutils
-all-host: maybe-all-find
-all-host: maybe-all-fixincludes
-all-host: maybe-all-flex
-@if gas-no-bootstrap
-all-host: maybe-all-gas
-@endif gas-no-bootstrap
-@if gcc-no-bootstrap
-all-host: maybe-all-gcc
-@endif gcc-no-bootstrap
-all-host: maybe-all-gawk
-all-host: maybe-all-gettext
-all-host: maybe-all-gnuserv
-all-host: maybe-all-gprof
-all-host: maybe-all-gzip
-all-host: maybe-all-hello
-all-host: maybe-all-indent
-@if intl-no-bootstrap
-all-host: maybe-all-intl
-@endif intl-no-bootstrap
-all-host: maybe-all-tcl
-all-host: maybe-all-itcl
-@if ld-no-bootstrap
-all-host: maybe-all-ld
-@endif ld-no-bootstrap
-@if libcpp-no-bootstrap
-all-host: maybe-all-libcpp
-@endif libcpp-no-bootstrap
-@if libdecnumber-no-bootstrap
-all-host: maybe-all-libdecnumber
-@endif libdecnumber-no-bootstrap
-all-host: maybe-all-libgui
-@if libiberty-no-bootstrap
-all-host: maybe-all-libiberty
-@endif libiberty-no-bootstrap
-all-host: maybe-all-libtool
-all-host: maybe-all-m4
-all-host: maybe-all-make
-all-host: maybe-all-mmalloc
-all-host: maybe-all-patch
-all-host: maybe-all-perl
-all-host: maybe-all-prms
-all-host: maybe-all-rcs
-all-host: maybe-all-readline
-all-host: maybe-all-release
-all-host: maybe-all-recode
-all-host: maybe-all-sed
-all-host: maybe-all-send-pr
-all-host: maybe-all-shellutils
-all-host: maybe-all-sid
-all-host: maybe-all-sim
-all-host: maybe-all-tar
-all-host: maybe-all-texinfo
-all-host: maybe-all-textutils
-all-host: maybe-all-time
-all-host: maybe-all-uudecode
-all-host: maybe-all-wdiff
-all-host: maybe-all-zip
-@if zlib-no-bootstrap
-all-host: maybe-all-zlib
-@endif zlib-no-bootstrap
-all-host: maybe-all-gdb
-all-host: maybe-all-expect
-all-host: maybe-all-guile
-all-host: maybe-all-tk
-all-host: maybe-all-libtermcap
-all-host: maybe-all-utils
-all-host: maybe-all-gnattools
-
+all-host:  \
+    maybe-all-ash \
+    maybe-all-autoconf \
+    maybe-all-automake \
+    maybe-all-bash \
+    maybe-all-bfd \
+    maybe-all-opcodes \
+    maybe-all-binutils \
+    maybe-all-bison \
+    maybe-all-byacc \
+    maybe-all-bzip2 \
+    maybe-all-dejagnu \
+    maybe-all-diff \
+    maybe-all-dosutils \
+    maybe-all-etc \
+    maybe-all-fastjar \
+    maybe-all-fileutils \
+    maybe-all-findutils \
+    maybe-all-find \
+    maybe-all-fixincludes \
+    maybe-all-flex \
+    maybe-all-gas \
+    maybe-all-gcc \
+    maybe-all-gawk \
+    maybe-all-gettext \
+    maybe-all-gnuserv \
+    maybe-all-gprof \
+    maybe-all-gzip \
+    maybe-all-hello \
+    maybe-all-indent \
+    maybe-all-intl \
+    maybe-all-tcl \
+    maybe-all-itcl \
+    maybe-all-ld \
+    maybe-all-libcpp \
+    maybe-all-libgui \
+    maybe-all-libiberty \
+    maybe-all-libtool \
+    maybe-all-m4 \
+    maybe-all-make \
+    maybe-all-mmalloc \
+    maybe-all-patch \
+    maybe-all-perl \
+    maybe-all-prms \
+    maybe-all-rcs \
+    maybe-all-readline \
+    maybe-all-release \
+    maybe-all-recode \
+    maybe-all-sed \
+    maybe-all-send-pr \
+    maybe-all-shellutils \
+    maybe-all-sid \
+    maybe-all-sim \
+    maybe-all-tar \
+    maybe-all-texinfo \
+    maybe-all-textutils \
+    maybe-all-time \
+    maybe-all-uudecode \
+    maybe-all-wdiff \
+    maybe-all-zip \
+    maybe-all-zlib \
+    maybe-all-gdb \
+    maybe-all-expect \
+    maybe-all-guile \
+    maybe-all-tk \
+    maybe-all-libtermcap \
+    maybe-all-utils \
+    maybe-all-gnattools
 .PHONY: all-target
-
-all-target: maybe-all-target-libstdc++-v3
-all-target: maybe-all-target-libmudflap
-all-target: maybe-all-target-libssp
-all-target: maybe-all-target-libgcc-math
-all-target: maybe-all-target-newlib
-all-target: maybe-all-target-libgfortran
-all-target: maybe-all-target-libobjc
-all-target: maybe-all-target-libtermcap
-all-target: maybe-all-target-winsup
-all-target: maybe-all-target-libgloss
-all-target: maybe-all-target-libiberty
-all-target: maybe-all-target-gperf
-all-target: maybe-all-target-examples
-all-target: maybe-all-target-libffi
-all-target: maybe-all-target-libjava
-all-target: maybe-all-target-zlib
-all-target: maybe-all-target-boehm-gc
-all-target: maybe-all-target-qthreads
-all-target: maybe-all-target-rda
-all-target: maybe-all-target-libada
-all-target: maybe-all-target-libgomp
+all-target:  \
+    maybe-all-target-libstdc++-v3 \
+    maybe-all-target-libmudflap \
+    maybe-all-target-newlib \
+    maybe-all-target-libgfortran \
+    maybe-all-target-libobjc \
+    maybe-all-target-libtermcap \
+    maybe-all-target-winsup \
+    maybe-all-target-libgloss \
+    maybe-all-target-libiberty \
+    maybe-all-target-gperf \
+    maybe-all-target-examples \
+    maybe-all-target-libffi \
+    maybe-all-target-libjava \
+    maybe-all-target-zlib \
+    maybe-all-target-boehm-gc \
+    maybe-all-target-qthreads \
+    maybe-all-target-rda \
+    maybe-all-target-libada
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
@@ -790,1044 +857,944 @@ all-target: maybe-all-target-libgomp
 # but it may do additional work as well).
 
 .PHONY: do-info
-do-info:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
-	  info-target
-
+do-info: unstage info-host info-target stage
 
 .PHONY: info-host
-
-info-host: maybe-info-ash
-info-host: maybe-info-autoconf
-info-host: maybe-info-automake
-info-host: maybe-info-bash
-info-host: maybe-info-bfd
-info-host: maybe-info-opcodes
-info-host: maybe-info-binutils
-info-host: maybe-info-bison
-info-host: maybe-info-byacc
-info-host: maybe-info-bzip2
-info-host: maybe-info-dejagnu
-info-host: maybe-info-diff
-info-host: maybe-info-dosutils
-info-host: maybe-info-etc
-info-host: maybe-info-fastjar
-info-host: maybe-info-fileutils
-info-host: maybe-info-findutils
-info-host: maybe-info-find
-info-host: maybe-info-fixincludes
-info-host: maybe-info-flex
-info-host: maybe-info-gas
-info-host: maybe-info-gcc
-info-host: maybe-info-gawk
-info-host: maybe-info-gettext
-info-host: maybe-info-gnuserv
-info-host: maybe-info-gprof
-info-host: maybe-info-gzip
-info-host: maybe-info-hello
-info-host: maybe-info-indent
-info-host: maybe-info-intl
-info-host: maybe-info-tcl
-info-host: maybe-info-itcl
-info-host: maybe-info-ld
-info-host: maybe-info-libcpp
-info-host: maybe-info-libdecnumber
-info-host: maybe-info-libgui
-info-host: maybe-info-libiberty
-info-host: maybe-info-libtool
-info-host: maybe-info-m4
-info-host: maybe-info-make
-info-host: maybe-info-mmalloc
-info-host: maybe-info-patch
-info-host: maybe-info-perl
-info-host: maybe-info-prms
-info-host: maybe-info-rcs
-info-host: maybe-info-readline
-info-host: maybe-info-release
-info-host: maybe-info-recode
-info-host: maybe-info-sed
-info-host: maybe-info-send-pr
-info-host: maybe-info-shellutils
-info-host: maybe-info-sid
-info-host: maybe-info-sim
-info-host: maybe-info-tar
-info-host: maybe-info-texinfo
-info-host: maybe-info-textutils
-info-host: maybe-info-time
-info-host: maybe-info-uudecode
-info-host: maybe-info-wdiff
-info-host: maybe-info-zip
-info-host: maybe-info-zlib
-info-host: maybe-info-gdb
-info-host: maybe-info-expect
-info-host: maybe-info-guile
-info-host: maybe-info-tk
-info-host: maybe-info-libtermcap
-info-host: maybe-info-utils
-info-host: maybe-info-gnattools
+info-host:  \
+    maybe-info-ash \
+    maybe-info-autoconf \
+    maybe-info-automake \
+    maybe-info-bash \
+    maybe-info-bfd \
+    maybe-info-opcodes \
+    maybe-info-binutils \
+    maybe-info-bison \
+    maybe-info-byacc \
+    maybe-info-bzip2 \
+    maybe-info-dejagnu \
+    maybe-info-diff \
+    maybe-info-dosutils \
+    maybe-info-etc \
+    maybe-info-fastjar \
+    maybe-info-fileutils \
+    maybe-info-findutils \
+    maybe-info-find \
+    maybe-info-fixincludes \
+    maybe-info-flex \
+    maybe-info-gas \
+    maybe-info-gcc \
+    maybe-info-gawk \
+    maybe-info-gettext \
+    maybe-info-gnuserv \
+    maybe-info-gprof \
+    maybe-info-gzip \
+    maybe-info-hello \
+    maybe-info-indent \
+    maybe-info-intl \
+    maybe-info-tcl \
+    maybe-info-itcl \
+    maybe-info-ld \
+    maybe-info-libcpp \
+    maybe-info-libgui \
+    maybe-info-libiberty \
+    maybe-info-libtool \
+    maybe-info-m4 \
+    maybe-info-make \
+    maybe-info-mmalloc \
+    maybe-info-patch \
+    maybe-info-perl \
+    maybe-info-prms \
+    maybe-info-rcs \
+    maybe-info-readline \
+    maybe-info-release \
+    maybe-info-recode \
+    maybe-info-sed \
+    maybe-info-send-pr \
+    maybe-info-shellutils \
+    maybe-info-sid \
+    maybe-info-sim \
+    maybe-info-tar \
+    maybe-info-texinfo \
+    maybe-info-textutils \
+    maybe-info-time \
+    maybe-info-uudecode \
+    maybe-info-wdiff \
+    maybe-info-zip \
+    maybe-info-zlib \
+    maybe-info-gdb \
+    maybe-info-expect \
+    maybe-info-guile \
+    maybe-info-tk \
+    maybe-info-libtermcap \
+    maybe-info-utils \
+    maybe-info-gnattools
 
 .PHONY: info-target
-
-info-target: maybe-info-target-libstdc++-v3
-info-target: maybe-info-target-libmudflap
-info-target: maybe-info-target-libssp
-info-target: maybe-info-target-libgcc-math
-info-target: maybe-info-target-newlib
-info-target: maybe-info-target-libgfortran
-info-target: maybe-info-target-libobjc
-info-target: maybe-info-target-libtermcap
-info-target: maybe-info-target-winsup
-info-target: maybe-info-target-libgloss
-info-target: maybe-info-target-libiberty
-info-target: maybe-info-target-gperf
-info-target: maybe-info-target-examples
-info-target: maybe-info-target-libffi
-info-target: maybe-info-target-libjava
-info-target: maybe-info-target-zlib
-info-target: maybe-info-target-boehm-gc
-info-target: maybe-info-target-qthreads
-info-target: maybe-info-target-rda
-info-target: maybe-info-target-libada
-info-target: maybe-info-target-libgomp
+info-target:  \
+    maybe-info-target-libstdc++-v3 \
+    maybe-info-target-libmudflap \
+    maybe-info-target-newlib \
+    maybe-info-target-libgfortran \
+    maybe-info-target-libobjc \
+    maybe-info-target-libtermcap \
+    maybe-info-target-winsup \
+    maybe-info-target-libgloss \
+    maybe-info-target-libiberty \
+    maybe-info-target-gperf \
+    maybe-info-target-examples \
+    maybe-info-target-libffi \
+    maybe-info-target-libjava \
+    maybe-info-target-zlib \
+    maybe-info-target-boehm-gc \
+    maybe-info-target-qthreads \
+    maybe-info-target-rda \
+    maybe-info-target-libada
 
 .PHONY: do-dvi
-do-dvi:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
-	  dvi-target
-
+do-dvi: unstage dvi-host dvi-target stage
 
 .PHONY: dvi-host
-
-dvi-host: maybe-dvi-ash
-dvi-host: maybe-dvi-autoconf
-dvi-host: maybe-dvi-automake
-dvi-host: maybe-dvi-bash
-dvi-host: maybe-dvi-bfd
-dvi-host: maybe-dvi-opcodes
-dvi-host: maybe-dvi-binutils
-dvi-host: maybe-dvi-bison
-dvi-host: maybe-dvi-byacc
-dvi-host: maybe-dvi-bzip2
-dvi-host: maybe-dvi-dejagnu
-dvi-host: maybe-dvi-diff
-dvi-host: maybe-dvi-dosutils
-dvi-host: maybe-dvi-etc
-dvi-host: maybe-dvi-fastjar
-dvi-host: maybe-dvi-fileutils
-dvi-host: maybe-dvi-findutils
-dvi-host: maybe-dvi-find
-dvi-host: maybe-dvi-fixincludes
-dvi-host: maybe-dvi-flex
-dvi-host: maybe-dvi-gas
-dvi-host: maybe-dvi-gcc
-dvi-host: maybe-dvi-gawk
-dvi-host: maybe-dvi-gettext
-dvi-host: maybe-dvi-gnuserv
-dvi-host: maybe-dvi-gprof
-dvi-host: maybe-dvi-gzip
-dvi-host: maybe-dvi-hello
-dvi-host: maybe-dvi-indent
-dvi-host: maybe-dvi-intl
-dvi-host: maybe-dvi-tcl
-dvi-host: maybe-dvi-itcl
-dvi-host: maybe-dvi-ld
-dvi-host: maybe-dvi-libcpp
-dvi-host: maybe-dvi-libdecnumber
-dvi-host: maybe-dvi-libgui
-dvi-host: maybe-dvi-libiberty
-dvi-host: maybe-dvi-libtool
-dvi-host: maybe-dvi-m4
-dvi-host: maybe-dvi-make
-dvi-host: maybe-dvi-mmalloc
-dvi-host: maybe-dvi-patch
-dvi-host: maybe-dvi-perl
-dvi-host: maybe-dvi-prms
-dvi-host: maybe-dvi-rcs
-dvi-host: maybe-dvi-readline
-dvi-host: maybe-dvi-release
-dvi-host: maybe-dvi-recode
-dvi-host: maybe-dvi-sed
-dvi-host: maybe-dvi-send-pr
-dvi-host: maybe-dvi-shellutils
-dvi-host: maybe-dvi-sid
-dvi-host: maybe-dvi-sim
-dvi-host: maybe-dvi-tar
-dvi-host: maybe-dvi-texinfo
-dvi-host: maybe-dvi-textutils
-dvi-host: maybe-dvi-time
-dvi-host: maybe-dvi-uudecode
-dvi-host: maybe-dvi-wdiff
-dvi-host: maybe-dvi-zip
-dvi-host: maybe-dvi-zlib
-dvi-host: maybe-dvi-gdb
-dvi-host: maybe-dvi-expect
-dvi-host: maybe-dvi-guile
-dvi-host: maybe-dvi-tk
-dvi-host: maybe-dvi-libtermcap
-dvi-host: maybe-dvi-utils
-dvi-host: maybe-dvi-gnattools
+dvi-host:  \
+    maybe-dvi-ash \
+    maybe-dvi-autoconf \
+    maybe-dvi-automake \
+    maybe-dvi-bash \
+    maybe-dvi-bfd \
+    maybe-dvi-opcodes \
+    maybe-dvi-binutils \
+    maybe-dvi-bison \
+    maybe-dvi-byacc \
+    maybe-dvi-bzip2 \
+    maybe-dvi-dejagnu \
+    maybe-dvi-diff \
+    maybe-dvi-dosutils \
+    maybe-dvi-etc \
+    maybe-dvi-fastjar \
+    maybe-dvi-fileutils \
+    maybe-dvi-findutils \
+    maybe-dvi-find \
+    maybe-dvi-fixincludes \
+    maybe-dvi-flex \
+    maybe-dvi-gas \
+    maybe-dvi-gcc \
+    maybe-dvi-gawk \
+    maybe-dvi-gettext \
+    maybe-dvi-gnuserv \
+    maybe-dvi-gprof \
+    maybe-dvi-gzip \
+    maybe-dvi-hello \
+    maybe-dvi-indent \
+    maybe-dvi-intl \
+    maybe-dvi-tcl \
+    maybe-dvi-itcl \
+    maybe-dvi-ld \
+    maybe-dvi-libcpp \
+    maybe-dvi-libgui \
+    maybe-dvi-libiberty \
+    maybe-dvi-libtool \
+    maybe-dvi-m4 \
+    maybe-dvi-make \
+    maybe-dvi-mmalloc \
+    maybe-dvi-patch \
+    maybe-dvi-perl \
+    maybe-dvi-prms \
+    maybe-dvi-rcs \
+    maybe-dvi-readline \
+    maybe-dvi-release \
+    maybe-dvi-recode \
+    maybe-dvi-sed \
+    maybe-dvi-send-pr \
+    maybe-dvi-shellutils \
+    maybe-dvi-sid \
+    maybe-dvi-sim \
+    maybe-dvi-tar \
+    maybe-dvi-texinfo \
+    maybe-dvi-textutils \
+    maybe-dvi-time \
+    maybe-dvi-uudecode \
+    maybe-dvi-wdiff \
+    maybe-dvi-zip \
+    maybe-dvi-zlib \
+    maybe-dvi-gdb \
+    maybe-dvi-expect \
+    maybe-dvi-guile \
+    maybe-dvi-tk \
+    maybe-dvi-libtermcap \
+    maybe-dvi-utils \
+    maybe-dvi-gnattools
 
 .PHONY: dvi-target
-
-dvi-target: maybe-dvi-target-libstdc++-v3
-dvi-target: maybe-dvi-target-libmudflap
-dvi-target: maybe-dvi-target-libssp
-dvi-target: maybe-dvi-target-libgcc-math
-dvi-target: maybe-dvi-target-newlib
-dvi-target: maybe-dvi-target-libgfortran
-dvi-target: maybe-dvi-target-libobjc
-dvi-target: maybe-dvi-target-libtermcap
-dvi-target: maybe-dvi-target-winsup
-dvi-target: maybe-dvi-target-libgloss
-dvi-target: maybe-dvi-target-libiberty
-dvi-target: maybe-dvi-target-gperf
-dvi-target: maybe-dvi-target-examples
-dvi-target: maybe-dvi-target-libffi
-dvi-target: maybe-dvi-target-libjava
-dvi-target: maybe-dvi-target-zlib
-dvi-target: maybe-dvi-target-boehm-gc
-dvi-target: maybe-dvi-target-qthreads
-dvi-target: maybe-dvi-target-rda
-dvi-target: maybe-dvi-target-libada
-dvi-target: maybe-dvi-target-libgomp
+dvi-target:  \
+    maybe-dvi-target-libstdc++-v3 \
+    maybe-dvi-target-libmudflap \
+    maybe-dvi-target-newlib \
+    maybe-dvi-target-libgfortran \
+    maybe-dvi-target-libobjc \
+    maybe-dvi-target-libtermcap \
+    maybe-dvi-target-winsup \
+    maybe-dvi-target-libgloss \
+    maybe-dvi-target-libiberty \
+    maybe-dvi-target-gperf \
+    maybe-dvi-target-examples \
+    maybe-dvi-target-libffi \
+    maybe-dvi-target-libjava \
+    maybe-dvi-target-zlib \
+    maybe-dvi-target-boehm-gc \
+    maybe-dvi-target-qthreads \
+    maybe-dvi-target-rda \
+    maybe-dvi-target-libada
 
 .PHONY: do-html
-do-html:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
-	  html-target
-
+do-html: unstage html-host html-target stage
 
 .PHONY: html-host
-
-html-host: maybe-html-ash
-html-host: maybe-html-autoconf
-html-host: maybe-html-automake
-html-host: maybe-html-bash
-html-host: maybe-html-bfd
-html-host: maybe-html-opcodes
-html-host: maybe-html-binutils
-html-host: maybe-html-bison
-html-host: maybe-html-byacc
-html-host: maybe-html-bzip2
-html-host: maybe-html-dejagnu
-html-host: maybe-html-diff
-html-host: maybe-html-dosutils
-html-host: maybe-html-etc
-html-host: maybe-html-fastjar
-html-host: maybe-html-fileutils
-html-host: maybe-html-findutils
-html-host: maybe-html-find
-html-host: maybe-html-fixincludes
-html-host: maybe-html-flex
-html-host: maybe-html-gas
-html-host: maybe-html-gcc
-html-host: maybe-html-gawk
-html-host: maybe-html-gettext
-html-host: maybe-html-gnuserv
-html-host: maybe-html-gprof
-html-host: maybe-html-gzip
-html-host: maybe-html-hello
-html-host: maybe-html-indent
-html-host: maybe-html-intl
-html-host: maybe-html-tcl
-html-host: maybe-html-itcl
-html-host: maybe-html-ld
-html-host: maybe-html-libcpp
-html-host: maybe-html-libdecnumber
-html-host: maybe-html-libgui
-html-host: maybe-html-libiberty
-html-host: maybe-html-libtool
-html-host: maybe-html-m4
-html-host: maybe-html-make
-html-host: maybe-html-mmalloc
-html-host: maybe-html-patch
-html-host: maybe-html-perl
-html-host: maybe-html-prms
-html-host: maybe-html-rcs
-html-host: maybe-html-readline
-html-host: maybe-html-release
-html-host: maybe-html-recode
-html-host: maybe-html-sed
-html-host: maybe-html-send-pr
-html-host: maybe-html-shellutils
-html-host: maybe-html-sid
-html-host: maybe-html-sim
-html-host: maybe-html-tar
-html-host: maybe-html-texinfo
-html-host: maybe-html-textutils
-html-host: maybe-html-time
-html-host: maybe-html-uudecode
-html-host: maybe-html-wdiff
-html-host: maybe-html-zip
-html-host: maybe-html-zlib
-html-host: maybe-html-gdb
-html-host: maybe-html-expect
-html-host: maybe-html-guile
-html-host: maybe-html-tk
-html-host: maybe-html-libtermcap
-html-host: maybe-html-utils
-html-host: maybe-html-gnattools
+html-host:  \
+    maybe-html-ash \
+    maybe-html-autoconf \
+    maybe-html-automake \
+    maybe-html-bash \
+    maybe-html-bfd \
+    maybe-html-opcodes \
+    maybe-html-binutils \
+    maybe-html-bison \
+    maybe-html-byacc \
+    maybe-html-bzip2 \
+    maybe-html-dejagnu \
+    maybe-html-diff \
+    maybe-html-dosutils \
+    maybe-html-etc \
+    maybe-html-fastjar \
+    maybe-html-fileutils \
+    maybe-html-findutils \
+    maybe-html-find \
+    maybe-html-fixincludes \
+    maybe-html-flex \
+    maybe-html-gas \
+    maybe-html-gcc \
+    maybe-html-gawk \
+    maybe-html-gettext \
+    maybe-html-gnuserv \
+    maybe-html-gprof \
+    maybe-html-gzip \
+    maybe-html-hello \
+    maybe-html-indent \
+    maybe-html-intl \
+    maybe-html-tcl \
+    maybe-html-itcl \
+    maybe-html-ld \
+    maybe-html-libcpp \
+    maybe-html-libgui \
+    maybe-html-libiberty \
+    maybe-html-libtool \
+    maybe-html-m4 \
+    maybe-html-make \
+    maybe-html-mmalloc \
+    maybe-html-patch \
+    maybe-html-perl \
+    maybe-html-prms \
+    maybe-html-rcs \
+    maybe-html-readline \
+    maybe-html-release \
+    maybe-html-recode \
+    maybe-html-sed \
+    maybe-html-send-pr \
+    maybe-html-shellutils \
+    maybe-html-sid \
+    maybe-html-sim \
+    maybe-html-tar \
+    maybe-html-texinfo \
+    maybe-html-textutils \
+    maybe-html-time \
+    maybe-html-uudecode \
+    maybe-html-wdiff \
+    maybe-html-zip \
+    maybe-html-zlib \
+    maybe-html-gdb \
+    maybe-html-expect \
+    maybe-html-guile \
+    maybe-html-tk \
+    maybe-html-libtermcap \
+    maybe-html-utils \
+    maybe-html-gnattools
 
 .PHONY: html-target
-
-html-target: maybe-html-target-libstdc++-v3
-html-target: maybe-html-target-libmudflap
-html-target: maybe-html-target-libssp
-html-target: maybe-html-target-libgcc-math
-html-target: maybe-html-target-newlib
-html-target: maybe-html-target-libgfortran
-html-target: maybe-html-target-libobjc
-html-target: maybe-html-target-libtermcap
-html-target: maybe-html-target-winsup
-html-target: maybe-html-target-libgloss
-html-target: maybe-html-target-libiberty
-html-target: maybe-html-target-gperf
-html-target: maybe-html-target-examples
-html-target: maybe-html-target-libffi
-html-target: maybe-html-target-libjava
-html-target: maybe-html-target-zlib
-html-target: maybe-html-target-boehm-gc
-html-target: maybe-html-target-qthreads
-html-target: maybe-html-target-rda
-html-target: maybe-html-target-libada
-html-target: maybe-html-target-libgomp
+html-target:  \
+    maybe-html-target-libstdc++-v3 \
+    maybe-html-target-libmudflap \
+    maybe-html-target-newlib \
+    maybe-html-target-libgfortran \
+    maybe-html-target-libobjc \
+    maybe-html-target-libtermcap \
+    maybe-html-target-winsup \
+    maybe-html-target-libgloss \
+    maybe-html-target-libiberty \
+    maybe-html-target-gperf \
+    maybe-html-target-examples \
+    maybe-html-target-libffi \
+    maybe-html-target-libjava \
+    maybe-html-target-zlib \
+    maybe-html-target-boehm-gc \
+    maybe-html-target-qthreads \
+    maybe-html-target-rda \
+    maybe-html-target-libada
 
 .PHONY: do-TAGS
-do-TAGS:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
-	  TAGS-target
-
+do-TAGS: unstage TAGS-host TAGS-target stage
 
 .PHONY: TAGS-host
-
-TAGS-host: maybe-TAGS-ash
-TAGS-host: maybe-TAGS-autoconf
-TAGS-host: maybe-TAGS-automake
-TAGS-host: maybe-TAGS-bash
-TAGS-host: maybe-TAGS-bfd
-TAGS-host: maybe-TAGS-opcodes
-TAGS-host: maybe-TAGS-binutils
-TAGS-host: maybe-TAGS-bison
-TAGS-host: maybe-TAGS-byacc
-TAGS-host: maybe-TAGS-bzip2
-TAGS-host: maybe-TAGS-dejagnu
-TAGS-host: maybe-TAGS-diff
-TAGS-host: maybe-TAGS-dosutils
-TAGS-host: maybe-TAGS-etc
-TAGS-host: maybe-TAGS-fastjar
-TAGS-host: maybe-TAGS-fileutils
-TAGS-host: maybe-TAGS-findutils
-TAGS-host: maybe-TAGS-find
-TAGS-host: maybe-TAGS-fixincludes
-TAGS-host: maybe-TAGS-flex
-TAGS-host: maybe-TAGS-gas
-TAGS-host: maybe-TAGS-gcc
-TAGS-host: maybe-TAGS-gawk
-TAGS-host: maybe-TAGS-gettext
-TAGS-host: maybe-TAGS-gnuserv
-TAGS-host: maybe-TAGS-gprof
-TAGS-host: maybe-TAGS-gzip
-TAGS-host: maybe-TAGS-hello
-TAGS-host: maybe-TAGS-indent
-TAGS-host: maybe-TAGS-intl
-TAGS-host: maybe-TAGS-tcl
-TAGS-host: maybe-TAGS-itcl
-TAGS-host: maybe-TAGS-ld
-TAGS-host: maybe-TAGS-libcpp
-TAGS-host: maybe-TAGS-libdecnumber
-TAGS-host: maybe-TAGS-libgui
-TAGS-host: maybe-TAGS-libiberty
-TAGS-host: maybe-TAGS-libtool
-TAGS-host: maybe-TAGS-m4
-TAGS-host: maybe-TAGS-make
-TAGS-host: maybe-TAGS-mmalloc
-TAGS-host: maybe-TAGS-patch
-TAGS-host: maybe-TAGS-perl
-TAGS-host: maybe-TAGS-prms
-TAGS-host: maybe-TAGS-rcs
-TAGS-host: maybe-TAGS-readline
-TAGS-host: maybe-TAGS-release
-TAGS-host: maybe-TAGS-recode
-TAGS-host: maybe-TAGS-sed
-TAGS-host: maybe-TAGS-send-pr
-TAGS-host: maybe-TAGS-shellutils
-TAGS-host: maybe-TAGS-sid
-TAGS-host: maybe-TAGS-sim
-TAGS-host: maybe-TAGS-tar
-TAGS-host: maybe-TAGS-texinfo
-TAGS-host: maybe-TAGS-textutils
-TAGS-host: maybe-TAGS-time
-TAGS-host: maybe-TAGS-uudecode
-TAGS-host: maybe-TAGS-wdiff
-TAGS-host: maybe-TAGS-zip
-TAGS-host: maybe-TAGS-zlib
-TAGS-host: maybe-TAGS-gdb
-TAGS-host: maybe-TAGS-expect
-TAGS-host: maybe-TAGS-guile
-TAGS-host: maybe-TAGS-tk
-TAGS-host: maybe-TAGS-libtermcap
-TAGS-host: maybe-TAGS-utils
-TAGS-host: maybe-TAGS-gnattools
+TAGS-host:  \
+    maybe-TAGS-ash \
+    maybe-TAGS-autoconf \
+    maybe-TAGS-automake \
+    maybe-TAGS-bash \
+    maybe-TAGS-bfd \
+    maybe-TAGS-opcodes \
+    maybe-TAGS-binutils \
+    maybe-TAGS-bison \
+    maybe-TAGS-byacc \
+    maybe-TAGS-bzip2 \
+    maybe-TAGS-dejagnu \
+    maybe-TAGS-diff \
+    maybe-TAGS-dosutils \
+    maybe-TAGS-etc \
+    maybe-TAGS-fastjar \
+    maybe-TAGS-fileutils \
+    maybe-TAGS-findutils \
+    maybe-TAGS-find \
+    maybe-TAGS-fixincludes \
+    maybe-TAGS-flex \
+    maybe-TAGS-gas \
+    maybe-TAGS-gcc \
+    maybe-TAGS-gawk \
+    maybe-TAGS-gettext \
+    maybe-TAGS-gnuserv \
+    maybe-TAGS-gprof \
+    maybe-TAGS-gzip \
+    maybe-TAGS-hello \
+    maybe-TAGS-indent \
+    maybe-TAGS-intl \
+    maybe-TAGS-tcl \
+    maybe-TAGS-itcl \
+    maybe-TAGS-ld \
+    maybe-TAGS-libcpp \
+    maybe-TAGS-libgui \
+    maybe-TAGS-libiberty \
+    maybe-TAGS-libtool \
+    maybe-TAGS-m4 \
+    maybe-TAGS-make \
+    maybe-TAGS-mmalloc \
+    maybe-TAGS-patch \
+    maybe-TAGS-perl \
+    maybe-TAGS-prms \
+    maybe-TAGS-rcs \
+    maybe-TAGS-readline \
+    maybe-TAGS-release \
+    maybe-TAGS-recode \
+    maybe-TAGS-sed \
+    maybe-TAGS-send-pr \
+    maybe-TAGS-shellutils \
+    maybe-TAGS-sid \
+    maybe-TAGS-sim \
+    maybe-TAGS-tar \
+    maybe-TAGS-texinfo \
+    maybe-TAGS-textutils \
+    maybe-TAGS-time \
+    maybe-TAGS-uudecode \
+    maybe-TAGS-wdiff \
+    maybe-TAGS-zip \
+    maybe-TAGS-zlib \
+    maybe-TAGS-gdb \
+    maybe-TAGS-expect \
+    maybe-TAGS-guile \
+    maybe-TAGS-tk \
+    maybe-TAGS-libtermcap \
+    maybe-TAGS-utils \
+    maybe-TAGS-gnattools
 
 .PHONY: TAGS-target
-
-TAGS-target: maybe-TAGS-target-libstdc++-v3
-TAGS-target: maybe-TAGS-target-libmudflap
-TAGS-target: maybe-TAGS-target-libssp
-TAGS-target: maybe-TAGS-target-libgcc-math
-TAGS-target: maybe-TAGS-target-newlib
-TAGS-target: maybe-TAGS-target-libgfortran
-TAGS-target: maybe-TAGS-target-libobjc
-TAGS-target: maybe-TAGS-target-libtermcap
-TAGS-target: maybe-TAGS-target-winsup
-TAGS-target: maybe-TAGS-target-libgloss
-TAGS-target: maybe-TAGS-target-libiberty
-TAGS-target: maybe-TAGS-target-gperf
-TAGS-target: maybe-TAGS-target-examples
-TAGS-target: maybe-TAGS-target-libffi
-TAGS-target: maybe-TAGS-target-libjava
-TAGS-target: maybe-TAGS-target-zlib
-TAGS-target: maybe-TAGS-target-boehm-gc
-TAGS-target: maybe-TAGS-target-qthreads
-TAGS-target: maybe-TAGS-target-rda
-TAGS-target: maybe-TAGS-target-libada
-TAGS-target: maybe-TAGS-target-libgomp
+TAGS-target:  \
+    maybe-TAGS-target-libstdc++-v3 \
+    maybe-TAGS-target-libmudflap \
+    maybe-TAGS-target-newlib \
+    maybe-TAGS-target-libgfortran \
+    maybe-TAGS-target-libobjc \
+    maybe-TAGS-target-libtermcap \
+    maybe-TAGS-target-winsup \
+    maybe-TAGS-target-libgloss \
+    maybe-TAGS-target-libiberty \
+    maybe-TAGS-target-gperf \
+    maybe-TAGS-target-examples \
+    maybe-TAGS-target-libffi \
+    maybe-TAGS-target-libjava \
+    maybe-TAGS-target-zlib \
+    maybe-TAGS-target-boehm-gc \
+    maybe-TAGS-target-qthreads \
+    maybe-TAGS-target-rda \
+    maybe-TAGS-target-libada
 
 .PHONY: do-install-info
-do-install-info:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \
-	  install-info-target
-
+do-install-info: unstage install-info-host install-info-target stage
 
 .PHONY: install-info-host
-
-install-info-host: maybe-install-info-ash
-install-info-host: maybe-install-info-autoconf
-install-info-host: maybe-install-info-automake
-install-info-host: maybe-install-info-bash
-install-info-host: maybe-install-info-bfd
-install-info-host: maybe-install-info-opcodes
-install-info-host: maybe-install-info-binutils
-install-info-host: maybe-install-info-bison
-install-info-host: maybe-install-info-byacc
-install-info-host: maybe-install-info-bzip2
-install-info-host: maybe-install-info-dejagnu
-install-info-host: maybe-install-info-diff
-install-info-host: maybe-install-info-dosutils
-install-info-host: maybe-install-info-etc
-install-info-host: maybe-install-info-fastjar
-install-info-host: maybe-install-info-fileutils
-install-info-host: maybe-install-info-findutils
-install-info-host: maybe-install-info-find
-install-info-host: maybe-install-info-fixincludes
-install-info-host: maybe-install-info-flex
-install-info-host: maybe-install-info-gas
-install-info-host: maybe-install-info-gcc
-install-info-host: maybe-install-info-gawk
-install-info-host: maybe-install-info-gettext
-install-info-host: maybe-install-info-gnuserv
-install-info-host: maybe-install-info-gprof
-install-info-host: maybe-install-info-gzip
-install-info-host: maybe-install-info-hello
-install-info-host: maybe-install-info-indent
-install-info-host: maybe-install-info-intl
-install-info-host: maybe-install-info-tcl
-install-info-host: maybe-install-info-itcl
-install-info-host: maybe-install-info-ld
-install-info-host: maybe-install-info-libcpp
-install-info-host: maybe-install-info-libdecnumber
-install-info-host: maybe-install-info-libgui
-install-info-host: maybe-install-info-libiberty
-install-info-host: maybe-install-info-libtool
-install-info-host: maybe-install-info-m4
-install-info-host: maybe-install-info-make
-install-info-host: maybe-install-info-mmalloc
-install-info-host: maybe-install-info-patch
-install-info-host: maybe-install-info-perl
-install-info-host: maybe-install-info-prms
-install-info-host: maybe-install-info-rcs
-install-info-host: maybe-install-info-readline
-install-info-host: maybe-install-info-release
-install-info-host: maybe-install-info-recode
-install-info-host: maybe-install-info-sed
-install-info-host: maybe-install-info-send-pr
-install-info-host: maybe-install-info-shellutils
-install-info-host: maybe-install-info-sid
-install-info-host: maybe-install-info-sim
-install-info-host: maybe-install-info-tar
-install-info-host: maybe-install-info-texinfo
-install-info-host: maybe-install-info-textutils
-install-info-host: maybe-install-info-time
-install-info-host: maybe-install-info-uudecode
-install-info-host: maybe-install-info-wdiff
-install-info-host: maybe-install-info-zip
-install-info-host: maybe-install-info-zlib
-install-info-host: maybe-install-info-gdb
-install-info-host: maybe-install-info-expect
-install-info-host: maybe-install-info-guile
-install-info-host: maybe-install-info-tk
-install-info-host: maybe-install-info-libtermcap
-install-info-host: maybe-install-info-utils
-install-info-host: maybe-install-info-gnattools
+install-info-host:  \
+    maybe-install-info-ash \
+    maybe-install-info-autoconf \
+    maybe-install-info-automake \
+    maybe-install-info-bash \
+    maybe-install-info-bfd \
+    maybe-install-info-opcodes \
+    maybe-install-info-binutils \
+    maybe-install-info-bison \
+    maybe-install-info-byacc \
+    maybe-install-info-bzip2 \
+    maybe-install-info-dejagnu \
+    maybe-install-info-diff \
+    maybe-install-info-dosutils \
+    maybe-install-info-etc \
+    maybe-install-info-fastjar \
+    maybe-install-info-fileutils \
+    maybe-install-info-findutils \
+    maybe-install-info-find \
+    maybe-install-info-fixincludes \
+    maybe-install-info-flex \
+    maybe-install-info-gas \
+    maybe-install-info-gcc \
+    maybe-install-info-gawk \
+    maybe-install-info-gettext \
+    maybe-install-info-gnuserv \
+    maybe-install-info-gprof \
+    maybe-install-info-gzip \
+    maybe-install-info-hello \
+    maybe-install-info-indent \
+    maybe-install-info-intl \
+    maybe-install-info-tcl \
+    maybe-install-info-itcl \
+    maybe-install-info-ld \
+    maybe-install-info-libcpp \
+    maybe-install-info-libgui \
+    maybe-install-info-libiberty \
+    maybe-install-info-libtool \
+    maybe-install-info-m4 \
+    maybe-install-info-make \
+    maybe-install-info-mmalloc \
+    maybe-install-info-patch \
+    maybe-install-info-perl \
+    maybe-install-info-prms \
+    maybe-install-info-rcs \
+    maybe-install-info-readline \
+    maybe-install-info-release \
+    maybe-install-info-recode \
+    maybe-install-info-sed \
+    maybe-install-info-send-pr \
+    maybe-install-info-shellutils \
+    maybe-install-info-sid \
+    maybe-install-info-sim \
+    maybe-install-info-tar \
+    maybe-install-info-texinfo \
+    maybe-install-info-textutils \
+    maybe-install-info-time \
+    maybe-install-info-uudecode \
+    maybe-install-info-wdiff \
+    maybe-install-info-zip \
+    maybe-install-info-zlib \
+    maybe-install-info-gdb \
+    maybe-install-info-expect \
+    maybe-install-info-guile \
+    maybe-install-info-tk \
+    maybe-install-info-libtermcap \
+    maybe-install-info-utils \
+    maybe-install-info-gnattools
 
 .PHONY: install-info-target
-
-install-info-target: maybe-install-info-target-libstdc++-v3
-install-info-target: maybe-install-info-target-libmudflap
-install-info-target: maybe-install-info-target-libssp
-install-info-target: maybe-install-info-target-libgcc-math
-install-info-target: maybe-install-info-target-newlib
-install-info-target: maybe-install-info-target-libgfortran
-install-info-target: maybe-install-info-target-libobjc
-install-info-target: maybe-install-info-target-libtermcap
-install-info-target: maybe-install-info-target-winsup
-install-info-target: maybe-install-info-target-libgloss
-install-info-target: maybe-install-info-target-libiberty
-install-info-target: maybe-install-info-target-gperf
-install-info-target: maybe-install-info-target-examples
-install-info-target: maybe-install-info-target-libffi
-install-info-target: maybe-install-info-target-libjava
-install-info-target: maybe-install-info-target-zlib
-install-info-target: maybe-install-info-target-boehm-gc
-install-info-target: maybe-install-info-target-qthreads
-install-info-target: maybe-install-info-target-rda
-install-info-target: maybe-install-info-target-libada
-install-info-target: maybe-install-info-target-libgomp
+install-info-target:  \
+    maybe-install-info-target-libstdc++-v3 \
+    maybe-install-info-target-libmudflap \
+    maybe-install-info-target-newlib \
+    maybe-install-info-target-libgfortran \
+    maybe-install-info-target-libobjc \
+    maybe-install-info-target-libtermcap \
+    maybe-install-info-target-winsup \
+    maybe-install-info-target-libgloss \
+    maybe-install-info-target-libiberty \
+    maybe-install-info-target-gperf \
+    maybe-install-info-target-examples \
+    maybe-install-info-target-libffi \
+    maybe-install-info-target-libjava \
+    maybe-install-info-target-zlib \
+    maybe-install-info-target-boehm-gc \
+    maybe-install-info-target-qthreads \
+    maybe-install-info-target-rda \
+    maybe-install-info-target-libada
 
 .PHONY: do-installcheck
-do-installcheck:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
-	  installcheck-target
-
+do-installcheck: unstage installcheck-host installcheck-target stage
 
 .PHONY: installcheck-host
-
-installcheck-host: maybe-installcheck-ash
-installcheck-host: maybe-installcheck-autoconf
-installcheck-host: maybe-installcheck-automake
-installcheck-host: maybe-installcheck-bash
-installcheck-host: maybe-installcheck-bfd
-installcheck-host: maybe-installcheck-opcodes
-installcheck-host: maybe-installcheck-binutils
-installcheck-host: maybe-installcheck-bison
-installcheck-host: maybe-installcheck-byacc
-installcheck-host: maybe-installcheck-bzip2
-installcheck-host: maybe-installcheck-dejagnu
-installcheck-host: maybe-installcheck-diff
-installcheck-host: maybe-installcheck-dosutils
-installcheck-host: maybe-installcheck-etc
-installcheck-host: maybe-installcheck-fastjar
-installcheck-host: maybe-installcheck-fileutils
-installcheck-host: maybe-installcheck-findutils
-installcheck-host: maybe-installcheck-find
-installcheck-host: maybe-installcheck-fixincludes
-installcheck-host: maybe-installcheck-flex
-installcheck-host: maybe-installcheck-gas
-installcheck-host: maybe-installcheck-gcc
-installcheck-host: maybe-installcheck-gawk
-installcheck-host: maybe-installcheck-gettext
-installcheck-host: maybe-installcheck-gnuserv
-installcheck-host: maybe-installcheck-gprof
-installcheck-host: maybe-installcheck-gzip
-installcheck-host: maybe-installcheck-hello
-installcheck-host: maybe-installcheck-indent
-installcheck-host: maybe-installcheck-intl
-installcheck-host: maybe-installcheck-tcl
-installcheck-host: maybe-installcheck-itcl
-installcheck-host: maybe-installcheck-ld
-installcheck-host: maybe-installcheck-libcpp
-installcheck-host: maybe-installcheck-libdecnumber
-installcheck-host: maybe-installcheck-libgui
-installcheck-host: maybe-installcheck-libiberty
-installcheck-host: maybe-installcheck-libtool
-installcheck-host: maybe-installcheck-m4
-installcheck-host: maybe-installcheck-make
-installcheck-host: maybe-installcheck-mmalloc
-installcheck-host: maybe-installcheck-patch
-installcheck-host: maybe-installcheck-perl
-installcheck-host: maybe-installcheck-prms
-installcheck-host: maybe-installcheck-rcs
-installcheck-host: maybe-installcheck-readline
-installcheck-host: maybe-installcheck-release
-installcheck-host: maybe-installcheck-recode
-installcheck-host: maybe-installcheck-sed
-installcheck-host: maybe-installcheck-send-pr
-installcheck-host: maybe-installcheck-shellutils
-installcheck-host: maybe-installcheck-sid
-installcheck-host: maybe-installcheck-sim
-installcheck-host: maybe-installcheck-tar
-installcheck-host: maybe-installcheck-texinfo
-installcheck-host: maybe-installcheck-textutils
-installcheck-host: maybe-installcheck-time
-installcheck-host: maybe-installcheck-uudecode
-installcheck-host: maybe-installcheck-wdiff
-installcheck-host: maybe-installcheck-zip
-installcheck-host: maybe-installcheck-zlib
-installcheck-host: maybe-installcheck-gdb
-installcheck-host: maybe-installcheck-expect
-installcheck-host: maybe-installcheck-guile
-installcheck-host: maybe-installcheck-tk
-installcheck-host: maybe-installcheck-libtermcap
-installcheck-host: maybe-installcheck-utils
-installcheck-host: maybe-installcheck-gnattools
+installcheck-host:  \
+    maybe-installcheck-ash \
+    maybe-installcheck-autoconf \
+    maybe-installcheck-automake \
+    maybe-installcheck-bash \
+    maybe-installcheck-bfd \
+    maybe-installcheck-opcodes \
+    maybe-installcheck-binutils \
+    maybe-installcheck-bison \
+    maybe-installcheck-byacc \
+    maybe-installcheck-bzip2 \
+    maybe-installcheck-dejagnu \
+    maybe-installcheck-diff \
+    maybe-installcheck-dosutils \
+    maybe-installcheck-etc \
+    maybe-installcheck-fastjar \
+    maybe-installcheck-fileutils \
+    maybe-installcheck-findutils \
+    maybe-installcheck-find \
+    maybe-installcheck-fixincludes \
+    maybe-installcheck-flex \
+    maybe-installcheck-gas \
+    maybe-installcheck-gcc \
+    maybe-installcheck-gawk \
+    maybe-installcheck-gettext \
+    maybe-installcheck-gnuserv \
+    maybe-installcheck-gprof \
+    maybe-installcheck-gzip \
+    maybe-installcheck-hello \
+    maybe-installcheck-indent \
+    maybe-installcheck-intl \
+    maybe-installcheck-tcl \
+    maybe-installcheck-itcl \
+    maybe-installcheck-ld \
+    maybe-installcheck-libcpp \
+    maybe-installcheck-libgui \
+    maybe-installcheck-libiberty \
+    maybe-installcheck-libtool \
+    maybe-installcheck-m4 \
+    maybe-installcheck-make \
+    maybe-installcheck-mmalloc \
+    maybe-installcheck-patch \
+    maybe-installcheck-perl \
+    maybe-installcheck-prms \
+    maybe-installcheck-rcs \
+    maybe-installcheck-readline \
+    maybe-installcheck-release \
+    maybe-installcheck-recode \
+    maybe-installcheck-sed \
+    maybe-installcheck-send-pr \
+    maybe-installcheck-shellutils \
+    maybe-installcheck-sid \
+    maybe-installcheck-sim \
+    maybe-installcheck-tar \
+    maybe-installcheck-texinfo \
+    maybe-installcheck-textutils \
+    maybe-installcheck-time \
+    maybe-installcheck-uudecode \
+    maybe-installcheck-wdiff \
+    maybe-installcheck-zip \
+    maybe-installcheck-zlib \
+    maybe-installcheck-gdb \
+    maybe-installcheck-expect \
+    maybe-installcheck-guile \
+    maybe-installcheck-tk \
+    maybe-installcheck-libtermcap \
+    maybe-installcheck-utils \
+    maybe-installcheck-gnattools
 
 .PHONY: installcheck-target
-
-installcheck-target: maybe-installcheck-target-libstdc++-v3
-installcheck-target: maybe-installcheck-target-libmudflap
-installcheck-target: maybe-installcheck-target-libssp
-installcheck-target: maybe-installcheck-target-libgcc-math
-installcheck-target: maybe-installcheck-target-newlib
-installcheck-target: maybe-installcheck-target-libgfortran
-installcheck-target: maybe-installcheck-target-libobjc
-installcheck-target: maybe-installcheck-target-libtermcap
-installcheck-target: maybe-installcheck-target-winsup
-installcheck-target: maybe-installcheck-target-libgloss
-installcheck-target: maybe-installcheck-target-libiberty
-installcheck-target: maybe-installcheck-target-gperf
-installcheck-target: maybe-installcheck-target-examples
-installcheck-target: maybe-installcheck-target-libffi
-installcheck-target: maybe-installcheck-target-libjava
-installcheck-target: maybe-installcheck-target-zlib
-installcheck-target: maybe-installcheck-target-boehm-gc
-installcheck-target: maybe-installcheck-target-qthreads
-installcheck-target: maybe-installcheck-target-rda
-installcheck-target: maybe-installcheck-target-libada
-installcheck-target: maybe-installcheck-target-libgomp
+installcheck-target:  \
+    maybe-installcheck-target-libstdc++-v3 \
+    maybe-installcheck-target-libmudflap \
+    maybe-installcheck-target-newlib \
+    maybe-installcheck-target-libgfortran \
+    maybe-installcheck-target-libobjc \
+    maybe-installcheck-target-libtermcap \
+    maybe-installcheck-target-winsup \
+    maybe-installcheck-target-libgloss \
+    maybe-installcheck-target-libiberty \
+    maybe-installcheck-target-gperf \
+    maybe-installcheck-target-examples \
+    maybe-installcheck-target-libffi \
+    maybe-installcheck-target-libjava \
+    maybe-installcheck-target-zlib \
+    maybe-installcheck-target-boehm-gc \
+    maybe-installcheck-target-qthreads \
+    maybe-installcheck-target-rda \
+    maybe-installcheck-target-libada
 
 .PHONY: do-mostlyclean
-do-mostlyclean:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
-	  mostlyclean-target
-
+do-mostlyclean: unstage mostlyclean-host mostlyclean-target stage
 
 .PHONY: mostlyclean-host
-
-mostlyclean-host: maybe-mostlyclean-ash
-mostlyclean-host: maybe-mostlyclean-autoconf
-mostlyclean-host: maybe-mostlyclean-automake
-mostlyclean-host: maybe-mostlyclean-bash
-mostlyclean-host: maybe-mostlyclean-bfd
-mostlyclean-host: maybe-mostlyclean-opcodes
-mostlyclean-host: maybe-mostlyclean-binutils
-mostlyclean-host: maybe-mostlyclean-bison
-mostlyclean-host: maybe-mostlyclean-byacc
-mostlyclean-host: maybe-mostlyclean-bzip2
-mostlyclean-host: maybe-mostlyclean-dejagnu
-mostlyclean-host: maybe-mostlyclean-diff
-mostlyclean-host: maybe-mostlyclean-dosutils
-mostlyclean-host: maybe-mostlyclean-etc
-mostlyclean-host: maybe-mostlyclean-fastjar
-mostlyclean-host: maybe-mostlyclean-fileutils
-mostlyclean-host: maybe-mostlyclean-findutils
-mostlyclean-host: maybe-mostlyclean-find
-mostlyclean-host: maybe-mostlyclean-fixincludes
-mostlyclean-host: maybe-mostlyclean-flex
-mostlyclean-host: maybe-mostlyclean-gas
-mostlyclean-host: maybe-mostlyclean-gcc
-mostlyclean-host: maybe-mostlyclean-gawk
-mostlyclean-host: maybe-mostlyclean-gettext
-mostlyclean-host: maybe-mostlyclean-gnuserv
-mostlyclean-host: maybe-mostlyclean-gprof
-mostlyclean-host: maybe-mostlyclean-gzip
-mostlyclean-host: maybe-mostlyclean-hello
-mostlyclean-host: maybe-mostlyclean-indent
-mostlyclean-host: maybe-mostlyclean-intl
-mostlyclean-host: maybe-mostlyclean-tcl
-mostlyclean-host: maybe-mostlyclean-itcl
-mostlyclean-host: maybe-mostlyclean-ld
-mostlyclean-host: maybe-mostlyclean-libcpp
-mostlyclean-host: maybe-mostlyclean-libdecnumber
-mostlyclean-host: maybe-mostlyclean-libgui
-mostlyclean-host: maybe-mostlyclean-libiberty
-mostlyclean-host: maybe-mostlyclean-libtool
-mostlyclean-host: maybe-mostlyclean-m4
-mostlyclean-host: maybe-mostlyclean-make
-mostlyclean-host: maybe-mostlyclean-mmalloc
-mostlyclean-host: maybe-mostlyclean-patch
-mostlyclean-host: maybe-mostlyclean-perl
-mostlyclean-host: maybe-mostlyclean-prms
-mostlyclean-host: maybe-mostlyclean-rcs
-mostlyclean-host: maybe-mostlyclean-readline
-mostlyclean-host: maybe-mostlyclean-release
-mostlyclean-host: maybe-mostlyclean-recode
-mostlyclean-host: maybe-mostlyclean-sed
-mostlyclean-host: maybe-mostlyclean-send-pr
-mostlyclean-host: maybe-mostlyclean-shellutils
-mostlyclean-host: maybe-mostlyclean-sid
-mostlyclean-host: maybe-mostlyclean-sim
-mostlyclean-host: maybe-mostlyclean-tar
-mostlyclean-host: maybe-mostlyclean-texinfo
-mostlyclean-host: maybe-mostlyclean-textutils
-mostlyclean-host: maybe-mostlyclean-time
-mostlyclean-host: maybe-mostlyclean-uudecode
-mostlyclean-host: maybe-mostlyclean-wdiff
-mostlyclean-host: maybe-mostlyclean-zip
-mostlyclean-host: maybe-mostlyclean-zlib
-mostlyclean-host: maybe-mostlyclean-gdb
-mostlyclean-host: maybe-mostlyclean-expect
-mostlyclean-host: maybe-mostlyclean-guile
-mostlyclean-host: maybe-mostlyclean-tk
-mostlyclean-host: maybe-mostlyclean-libtermcap
-mostlyclean-host: maybe-mostlyclean-utils
-mostlyclean-host: maybe-mostlyclean-gnattools
+mostlyclean-host:  \
+    maybe-mostlyclean-ash \
+    maybe-mostlyclean-autoconf \
+    maybe-mostlyclean-automake \
+    maybe-mostlyclean-bash \
+    maybe-mostlyclean-bfd \
+    maybe-mostlyclean-opcodes \
+    maybe-mostlyclean-binutils \
+    maybe-mostlyclean-bison \
+    maybe-mostlyclean-byacc \
+    maybe-mostlyclean-bzip2 \
+    maybe-mostlyclean-dejagnu \
+    maybe-mostlyclean-diff \
+    maybe-mostlyclean-dosutils \
+    maybe-mostlyclean-etc \
+    maybe-mostlyclean-fastjar \
+    maybe-mostlyclean-fileutils \
+    maybe-mostlyclean-findutils \
+    maybe-mostlyclean-find \
+    maybe-mostlyclean-fixincludes \
+    maybe-mostlyclean-flex \
+    maybe-mostlyclean-gas \
+    maybe-mostlyclean-gcc \
+    maybe-mostlyclean-gawk \
+    maybe-mostlyclean-gettext \
+    maybe-mostlyclean-gnuserv \
+    maybe-mostlyclean-gprof \
+    maybe-mostlyclean-gzip \
+    maybe-mostlyclean-hello \
+    maybe-mostlyclean-indent \
+    maybe-mostlyclean-intl \
+    maybe-mostlyclean-tcl \
+    maybe-mostlyclean-itcl \
+    maybe-mostlyclean-ld \
+    maybe-mostlyclean-libcpp \
+    maybe-mostlyclean-libgui \
+    maybe-mostlyclean-libiberty \
+    maybe-mostlyclean-libtool \
+    maybe-mostlyclean-m4 \
+    maybe-mostlyclean-make \
+    maybe-mostlyclean-mmalloc \
+    maybe-mostlyclean-patch \
+    maybe-mostlyclean-perl \
+    maybe-mostlyclean-prms \
+    maybe-mostlyclean-rcs \
+    maybe-mostlyclean-readline \
+    maybe-mostlyclean-release \
+    maybe-mostlyclean-recode \
+    maybe-mostlyclean-sed \
+    maybe-mostlyclean-send-pr \
+    maybe-mostlyclean-shellutils \
+    maybe-mostlyclean-sid \
+    maybe-mostlyclean-sim \
+    maybe-mostlyclean-tar \
+    maybe-mostlyclean-texinfo \
+    maybe-mostlyclean-textutils \
+    maybe-mostlyclean-time \
+    maybe-mostlyclean-uudecode \
+    maybe-mostlyclean-wdiff \
+    maybe-mostlyclean-zip \
+    maybe-mostlyclean-zlib \
+    maybe-mostlyclean-gdb \
+    maybe-mostlyclean-expect \
+    maybe-mostlyclean-guile \
+    maybe-mostlyclean-tk \
+    maybe-mostlyclean-libtermcap \
+    maybe-mostlyclean-utils \
+    maybe-mostlyclean-gnattools
 
 .PHONY: mostlyclean-target
-
-mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
-mostlyclean-target: maybe-mostlyclean-target-libmudflap
-mostlyclean-target: maybe-mostlyclean-target-libssp
-mostlyclean-target: maybe-mostlyclean-target-libgcc-math
-mostlyclean-target: maybe-mostlyclean-target-newlib
-mostlyclean-target: maybe-mostlyclean-target-libgfortran
-mostlyclean-target: maybe-mostlyclean-target-libobjc
-mostlyclean-target: maybe-mostlyclean-target-libtermcap
-mostlyclean-target: maybe-mostlyclean-target-winsup
-mostlyclean-target: maybe-mostlyclean-target-libgloss
-mostlyclean-target: maybe-mostlyclean-target-libiberty
-mostlyclean-target: maybe-mostlyclean-target-gperf
-mostlyclean-target: maybe-mostlyclean-target-examples
-mostlyclean-target: maybe-mostlyclean-target-libffi
-mostlyclean-target: maybe-mostlyclean-target-libjava
-mostlyclean-target: maybe-mostlyclean-target-zlib
-mostlyclean-target: maybe-mostlyclean-target-boehm-gc
-mostlyclean-target: maybe-mostlyclean-target-qthreads
-mostlyclean-target: maybe-mostlyclean-target-rda
-mostlyclean-target: maybe-mostlyclean-target-libada
-mostlyclean-target: maybe-mostlyclean-target-libgomp
+mostlyclean-target:  \
+    maybe-mostlyclean-target-libstdc++-v3 \
+    maybe-mostlyclean-target-libmudflap \
+    maybe-mostlyclean-target-newlib \
+    maybe-mostlyclean-target-libgfortran \
+    maybe-mostlyclean-target-libobjc \
+    maybe-mostlyclean-target-libtermcap \
+    maybe-mostlyclean-target-winsup \
+    maybe-mostlyclean-target-libgloss \
+    maybe-mostlyclean-target-libiberty \
+    maybe-mostlyclean-target-gperf \
+    maybe-mostlyclean-target-examples \
+    maybe-mostlyclean-target-libffi \
+    maybe-mostlyclean-target-libjava \
+    maybe-mostlyclean-target-zlib \
+    maybe-mostlyclean-target-boehm-gc \
+    maybe-mostlyclean-target-qthreads \
+    maybe-mostlyclean-target-rda \
+    maybe-mostlyclean-target-libada
 
 .PHONY: do-clean
-do-clean:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
-	  clean-target
-
+do-clean: unstage clean-host clean-target stage
 
 .PHONY: clean-host
-
-clean-host: maybe-clean-ash
-clean-host: maybe-clean-autoconf
-clean-host: maybe-clean-automake
-clean-host: maybe-clean-bash
-clean-host: maybe-clean-bfd
-clean-host: maybe-clean-opcodes
-clean-host: maybe-clean-binutils
-clean-host: maybe-clean-bison
-clean-host: maybe-clean-byacc
-clean-host: maybe-clean-bzip2
-clean-host: maybe-clean-dejagnu
-clean-host: maybe-clean-diff
-clean-host: maybe-clean-dosutils
-clean-host: maybe-clean-etc
-clean-host: maybe-clean-fastjar
-clean-host: maybe-clean-fileutils
-clean-host: maybe-clean-findutils
-clean-host: maybe-clean-find
-clean-host: maybe-clean-fixincludes
-clean-host: maybe-clean-flex
-clean-host: maybe-clean-gas
-clean-host: maybe-clean-gcc
-clean-host: maybe-clean-gawk
-clean-host: maybe-clean-gettext
-clean-host: maybe-clean-gnuserv
-clean-host: maybe-clean-gprof
-clean-host: maybe-clean-gzip
-clean-host: maybe-clean-hello
-clean-host: maybe-clean-indent
-clean-host: maybe-clean-intl
-clean-host: maybe-clean-tcl
-clean-host: maybe-clean-itcl
-clean-host: maybe-clean-ld
-clean-host: maybe-clean-libcpp
-clean-host: maybe-clean-libdecnumber
-clean-host: maybe-clean-libgui
-clean-host: maybe-clean-libiberty
-clean-host: maybe-clean-libtool
-clean-host: maybe-clean-m4
-clean-host: maybe-clean-make
-clean-host: maybe-clean-mmalloc
-clean-host: maybe-clean-patch
-clean-host: maybe-clean-perl
-clean-host: maybe-clean-prms
-clean-host: maybe-clean-rcs
-clean-host: maybe-clean-readline
-clean-host: maybe-clean-release
-clean-host: maybe-clean-recode
-clean-host: maybe-clean-sed
-clean-host: maybe-clean-send-pr
-clean-host: maybe-clean-shellutils
-clean-host: maybe-clean-sid
-clean-host: maybe-clean-sim
-clean-host: maybe-clean-tar
-clean-host: maybe-clean-texinfo
-clean-host: maybe-clean-textutils
-clean-host: maybe-clean-time
-clean-host: maybe-clean-uudecode
-clean-host: maybe-clean-wdiff
-clean-host: maybe-clean-zip
-clean-host: maybe-clean-zlib
-clean-host: maybe-clean-gdb
-clean-host: maybe-clean-expect
-clean-host: maybe-clean-guile
-clean-host: maybe-clean-tk
-clean-host: maybe-clean-libtermcap
-clean-host: maybe-clean-utils
-clean-host: maybe-clean-gnattools
+clean-host:  \
+    maybe-clean-ash \
+    maybe-clean-autoconf \
+    maybe-clean-automake \
+    maybe-clean-bash \
+    maybe-clean-bfd \
+    maybe-clean-opcodes \
+    maybe-clean-binutils \
+    maybe-clean-bison \
+    maybe-clean-byacc \
+    maybe-clean-bzip2 \
+    maybe-clean-dejagnu \
+    maybe-clean-diff \
+    maybe-clean-dosutils \
+    maybe-clean-etc \
+    maybe-clean-fastjar \
+    maybe-clean-fileutils \
+    maybe-clean-findutils \
+    maybe-clean-find \
+    maybe-clean-fixincludes \
+    maybe-clean-flex \
+    maybe-clean-gas \
+    maybe-clean-gcc \
+    maybe-clean-gawk \
+    maybe-clean-gettext \
+    maybe-clean-gnuserv \
+    maybe-clean-gprof \
+    maybe-clean-gzip \
+    maybe-clean-hello \
+    maybe-clean-indent \
+    maybe-clean-intl \
+    maybe-clean-tcl \
+    maybe-clean-itcl \
+    maybe-clean-ld \
+    maybe-clean-libcpp \
+    maybe-clean-libgui \
+    maybe-clean-libiberty \
+    maybe-clean-libtool \
+    maybe-clean-m4 \
+    maybe-clean-make \
+    maybe-clean-mmalloc \
+    maybe-clean-patch \
+    maybe-clean-perl \
+    maybe-clean-prms \
+    maybe-clean-rcs \
+    maybe-clean-readline \
+    maybe-clean-release \
+    maybe-clean-recode \
+    maybe-clean-sed \
+    maybe-clean-send-pr \
+    maybe-clean-shellutils \
+    maybe-clean-sid \
+    maybe-clean-sim \
+    maybe-clean-tar \
+    maybe-clean-texinfo \
+    maybe-clean-textutils \
+    maybe-clean-time \
+    maybe-clean-uudecode \
+    maybe-clean-wdiff \
+    maybe-clean-zip \
+    maybe-clean-zlib \
+    maybe-clean-gdb \
+    maybe-clean-expect \
+    maybe-clean-guile \
+    maybe-clean-tk \
+    maybe-clean-libtermcap \
+    maybe-clean-utils \
+    maybe-clean-gnattools
 
 .PHONY: clean-target
-
-clean-target: maybe-clean-target-libstdc++-v3
-clean-target: maybe-clean-target-libmudflap
-clean-target: maybe-clean-target-libssp
-clean-target: maybe-clean-target-libgcc-math
-clean-target: maybe-clean-target-newlib
-clean-target: maybe-clean-target-libgfortran
-clean-target: maybe-clean-target-libobjc
-clean-target: maybe-clean-target-libtermcap
-clean-target: maybe-clean-target-winsup
-clean-target: maybe-clean-target-libgloss
-clean-target: maybe-clean-target-libiberty
-clean-target: maybe-clean-target-gperf
-clean-target: maybe-clean-target-examples
-clean-target: maybe-clean-target-libffi
-clean-target: maybe-clean-target-libjava
-clean-target: maybe-clean-target-zlib
-clean-target: maybe-clean-target-boehm-gc
-clean-target: maybe-clean-target-qthreads
-clean-target: maybe-clean-target-rda
-clean-target: maybe-clean-target-libada
-clean-target: maybe-clean-target-libgomp
+clean-target:  \
+    maybe-clean-target-libstdc++-v3 \
+    maybe-clean-target-libmudflap \
+    maybe-clean-target-newlib \
+    maybe-clean-target-libgfortran \
+    maybe-clean-target-libobjc \
+    maybe-clean-target-libtermcap \
+    maybe-clean-target-winsup \
+    maybe-clean-target-libgloss \
+    maybe-clean-target-libiberty \
+    maybe-clean-target-gperf \
+    maybe-clean-target-examples \
+    maybe-clean-target-libffi \
+    maybe-clean-target-libjava \
+    maybe-clean-target-zlib \
+    maybe-clean-target-boehm-gc \
+    maybe-clean-target-qthreads \
+    maybe-clean-target-rda \
+    maybe-clean-target-libada
 
 .PHONY: do-distclean
-do-distclean:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
-	  distclean-target
-
+do-distclean: unstage distclean-host distclean-target stage
 
 .PHONY: distclean-host
-
-distclean-host: maybe-distclean-ash
-distclean-host: maybe-distclean-autoconf
-distclean-host: maybe-distclean-automake
-distclean-host: maybe-distclean-bash
-distclean-host: maybe-distclean-bfd
-distclean-host: maybe-distclean-opcodes
-distclean-host: maybe-distclean-binutils
-distclean-host: maybe-distclean-bison
-distclean-host: maybe-distclean-byacc
-distclean-host: maybe-distclean-bzip2
-distclean-host: maybe-distclean-dejagnu
-distclean-host: maybe-distclean-diff
-distclean-host: maybe-distclean-dosutils
-distclean-host: maybe-distclean-etc
-distclean-host: maybe-distclean-fastjar
-distclean-host: maybe-distclean-fileutils
-distclean-host: maybe-distclean-findutils
-distclean-host: maybe-distclean-find
-distclean-host: maybe-distclean-fixincludes
-distclean-host: maybe-distclean-flex
-distclean-host: maybe-distclean-gas
-distclean-host: maybe-distclean-gcc
-distclean-host: maybe-distclean-gawk
-distclean-host: maybe-distclean-gettext
-distclean-host: maybe-distclean-gnuserv
-distclean-host: maybe-distclean-gprof
-distclean-host: maybe-distclean-gzip
-distclean-host: maybe-distclean-hello
-distclean-host: maybe-distclean-indent
-distclean-host: maybe-distclean-intl
-distclean-host: maybe-distclean-tcl
-distclean-host: maybe-distclean-itcl
-distclean-host: maybe-distclean-ld
-distclean-host: maybe-distclean-libcpp
-distclean-host: maybe-distclean-libdecnumber
-distclean-host: maybe-distclean-libgui
-distclean-host: maybe-distclean-libiberty
-distclean-host: maybe-distclean-libtool
-distclean-host: maybe-distclean-m4
-distclean-host: maybe-distclean-make
-distclean-host: maybe-distclean-mmalloc
-distclean-host: maybe-distclean-patch
-distclean-host: maybe-distclean-perl
-distclean-host: maybe-distclean-prms
-distclean-host: maybe-distclean-rcs
-distclean-host: maybe-distclean-readline
-distclean-host: maybe-distclean-release
-distclean-host: maybe-distclean-recode
-distclean-host: maybe-distclean-sed
-distclean-host: maybe-distclean-send-pr
-distclean-host: maybe-distclean-shellutils
-distclean-host: maybe-distclean-sid
-distclean-host: maybe-distclean-sim
-distclean-host: maybe-distclean-tar
-distclean-host: maybe-distclean-texinfo
-distclean-host: maybe-distclean-textutils
-distclean-host: maybe-distclean-time
-distclean-host: maybe-distclean-uudecode
-distclean-host: maybe-distclean-wdiff
-distclean-host: maybe-distclean-zip
-distclean-host: maybe-distclean-zlib
-distclean-host: maybe-distclean-gdb
-distclean-host: maybe-distclean-expect
-distclean-host: maybe-distclean-guile
-distclean-host: maybe-distclean-tk
-distclean-host: maybe-distclean-libtermcap
-distclean-host: maybe-distclean-utils
-distclean-host: maybe-distclean-gnattools
+distclean-host:  \
+    maybe-distclean-ash \
+    maybe-distclean-autoconf \
+    maybe-distclean-automake \
+    maybe-distclean-bash \
+    maybe-distclean-bfd \
+    maybe-distclean-opcodes \
+    maybe-distclean-binutils \
+    maybe-distclean-bison \
+    maybe-distclean-byacc \
+    maybe-distclean-bzip2 \
+    maybe-distclean-dejagnu \
+    maybe-distclean-diff \
+    maybe-distclean-dosutils \
+    maybe-distclean-etc \
+    maybe-distclean-fastjar \
+    maybe-distclean-fileutils \
+    maybe-distclean-findutils \
+    maybe-distclean-find \
+    maybe-distclean-fixincludes \
+    maybe-distclean-flex \
+    maybe-distclean-gas \
+    maybe-distclean-gcc \
+    maybe-distclean-gawk \
+    maybe-distclean-gettext \
+    maybe-distclean-gnuserv \
+    maybe-distclean-gprof \
+    maybe-distclean-gzip \
+    maybe-distclean-hello \
+    maybe-distclean-indent \
+    maybe-distclean-intl \
+    maybe-distclean-tcl \
+    maybe-distclean-itcl \
+    maybe-distclean-ld \
+    maybe-distclean-libcpp \
+    maybe-distclean-libgui \
+    maybe-distclean-libiberty \
+    maybe-distclean-libtool \
+    maybe-distclean-m4 \
+    maybe-distclean-make \
+    maybe-distclean-mmalloc \
+    maybe-distclean-patch \
+    maybe-distclean-perl \
+    maybe-distclean-prms \
+    maybe-distclean-rcs \
+    maybe-distclean-readline \
+    maybe-distclean-release \
+    maybe-distclean-recode \
+    maybe-distclean-sed \
+    maybe-distclean-send-pr \
+    maybe-distclean-shellutils \
+    maybe-distclean-sid \
+    maybe-distclean-sim \
+    maybe-distclean-tar \
+    maybe-distclean-texinfo \
+    maybe-distclean-textutils \
+    maybe-distclean-time \
+    maybe-distclean-uudecode \
+    maybe-distclean-wdiff \
+    maybe-distclean-zip \
+    maybe-distclean-zlib \
+    maybe-distclean-gdb \
+    maybe-distclean-expect \
+    maybe-distclean-guile \
+    maybe-distclean-tk \
+    maybe-distclean-libtermcap \
+    maybe-distclean-utils \
+    maybe-distclean-gnattools
 
 .PHONY: distclean-target
-
-distclean-target: maybe-distclean-target-libstdc++-v3
-distclean-target: maybe-distclean-target-libmudflap
-distclean-target: maybe-distclean-target-libssp
-distclean-target: maybe-distclean-target-libgcc-math
-distclean-target: maybe-distclean-target-newlib
-distclean-target: maybe-distclean-target-libgfortran
-distclean-target: maybe-distclean-target-libobjc
-distclean-target: maybe-distclean-target-libtermcap
-distclean-target: maybe-distclean-target-winsup
-distclean-target: maybe-distclean-target-libgloss
-distclean-target: maybe-distclean-target-libiberty
-distclean-target: maybe-distclean-target-gperf
-distclean-target: maybe-distclean-target-examples
-distclean-target: maybe-distclean-target-libffi
-distclean-target: maybe-distclean-target-libjava
-distclean-target: maybe-distclean-target-zlib
-distclean-target: maybe-distclean-target-boehm-gc
-distclean-target: maybe-distclean-target-qthreads
-distclean-target: maybe-distclean-target-rda
-distclean-target: maybe-distclean-target-libada
-distclean-target: maybe-distclean-target-libgomp
+distclean-target:  \
+    maybe-distclean-target-libstdc++-v3 \
+    maybe-distclean-target-libmudflap \
+    maybe-distclean-target-newlib \
+    maybe-distclean-target-libgfortran \
+    maybe-distclean-target-libobjc \
+    maybe-distclean-target-libtermcap \
+    maybe-distclean-target-winsup \
+    maybe-distclean-target-libgloss \
+    maybe-distclean-target-libiberty \
+    maybe-distclean-target-gperf \
+    maybe-distclean-target-examples \
+    maybe-distclean-target-libffi \
+    maybe-distclean-target-libjava \
+    maybe-distclean-target-zlib \
+    maybe-distclean-target-boehm-gc \
+    maybe-distclean-target-qthreads \
+    maybe-distclean-target-rda \
+    maybe-distclean-target-libada
 
 .PHONY: do-maintainer-clean
-do-maintainer-clean:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \
-	  maintainer-clean-target
-
+do-maintainer-clean: unstage maintainer-clean-host maintainer-clean-target stage
 
 .PHONY: maintainer-clean-host
-
-maintainer-clean-host: maybe-maintainer-clean-ash
-maintainer-clean-host: maybe-maintainer-clean-autoconf
-maintainer-clean-host: maybe-maintainer-clean-automake
-maintainer-clean-host: maybe-maintainer-clean-bash
-maintainer-clean-host: maybe-maintainer-clean-bfd
-maintainer-clean-host: maybe-maintainer-clean-opcodes
-maintainer-clean-host: maybe-maintainer-clean-binutils
-maintainer-clean-host: maybe-maintainer-clean-bison
-maintainer-clean-host: maybe-maintainer-clean-byacc
-maintainer-clean-host: maybe-maintainer-clean-bzip2
-maintainer-clean-host: maybe-maintainer-clean-dejagnu
-maintainer-clean-host: maybe-maintainer-clean-diff
-maintainer-clean-host: maybe-maintainer-clean-dosutils
-maintainer-clean-host: maybe-maintainer-clean-etc
-maintainer-clean-host: maybe-maintainer-clean-fastjar
-maintainer-clean-host: maybe-maintainer-clean-fileutils
-maintainer-clean-host: maybe-maintainer-clean-findutils
-maintainer-clean-host: maybe-maintainer-clean-find
-maintainer-clean-host: maybe-maintainer-clean-fixincludes
-maintainer-clean-host: maybe-maintainer-clean-flex
-maintainer-clean-host: maybe-maintainer-clean-gas
-maintainer-clean-host: maybe-maintainer-clean-gcc
-maintainer-clean-host: maybe-maintainer-clean-gawk
-maintainer-clean-host: maybe-maintainer-clean-gettext
-maintainer-clean-host: maybe-maintainer-clean-gnuserv
-maintainer-clean-host: maybe-maintainer-clean-gprof
-maintainer-clean-host: maybe-maintainer-clean-gzip
-maintainer-clean-host: maybe-maintainer-clean-hello
-maintainer-clean-host: maybe-maintainer-clean-indent
-maintainer-clean-host: maybe-maintainer-clean-intl
-maintainer-clean-host: maybe-maintainer-clean-tcl
-maintainer-clean-host: maybe-maintainer-clean-itcl
-maintainer-clean-host: maybe-maintainer-clean-ld
-maintainer-clean-host: maybe-maintainer-clean-libcpp
-maintainer-clean-host: maybe-maintainer-clean-libdecnumber
-maintainer-clean-host: maybe-maintainer-clean-libgui
-maintainer-clean-host: maybe-maintainer-clean-libiberty
-maintainer-clean-host: maybe-maintainer-clean-libtool
-maintainer-clean-host: maybe-maintainer-clean-m4
-maintainer-clean-host: maybe-maintainer-clean-make
-maintainer-clean-host: maybe-maintainer-clean-mmalloc
-maintainer-clean-host: maybe-maintainer-clean-patch
-maintainer-clean-host: maybe-maintainer-clean-perl
-maintainer-clean-host: maybe-maintainer-clean-prms
-maintainer-clean-host: maybe-maintainer-clean-rcs
-maintainer-clean-host: maybe-maintainer-clean-readline
-maintainer-clean-host: maybe-maintainer-clean-release
-maintainer-clean-host: maybe-maintainer-clean-recode
-maintainer-clean-host: maybe-maintainer-clean-sed
-maintainer-clean-host: maybe-maintainer-clean-send-pr
-maintainer-clean-host: maybe-maintainer-clean-shellutils
-maintainer-clean-host: maybe-maintainer-clean-sid
-maintainer-clean-host: maybe-maintainer-clean-sim
-maintainer-clean-host: maybe-maintainer-clean-tar
-maintainer-clean-host: maybe-maintainer-clean-texinfo
-maintainer-clean-host: maybe-maintainer-clean-textutils
-maintainer-clean-host: maybe-maintainer-clean-time
-maintainer-clean-host: maybe-maintainer-clean-uudecode
-maintainer-clean-host: maybe-maintainer-clean-wdiff
-maintainer-clean-host: maybe-maintainer-clean-zip
-maintainer-clean-host: maybe-maintainer-clean-zlib
-maintainer-clean-host: maybe-maintainer-clean-gdb
-maintainer-clean-host: maybe-maintainer-clean-expect
-maintainer-clean-host: maybe-maintainer-clean-guile
-maintainer-clean-host: maybe-maintainer-clean-tk
-maintainer-clean-host: maybe-maintainer-clean-libtermcap
-maintainer-clean-host: maybe-maintainer-clean-utils
-maintainer-clean-host: maybe-maintainer-clean-gnattools
+maintainer-clean-host:  \
+    maybe-maintainer-clean-ash \
+    maybe-maintainer-clean-autoconf \
+    maybe-maintainer-clean-automake \
+    maybe-maintainer-clean-bash \
+    maybe-maintainer-clean-bfd \
+    maybe-maintainer-clean-opcodes \
+    maybe-maintainer-clean-binutils \
+    maybe-maintainer-clean-bison \
+    maybe-maintainer-clean-byacc \
+    maybe-maintainer-clean-bzip2 \
+    maybe-maintainer-clean-dejagnu \
+    maybe-maintainer-clean-diff \
+    maybe-maintainer-clean-dosutils \
+    maybe-maintainer-clean-etc \
+    maybe-maintainer-clean-fastjar \
+    maybe-maintainer-clean-fileutils \
+    maybe-maintainer-clean-findutils \
+    maybe-maintainer-clean-find \
+    maybe-maintainer-clean-fixincludes \
+    maybe-maintainer-clean-flex \
+    maybe-maintainer-clean-gas \
+    maybe-maintainer-clean-gcc \
+    maybe-maintainer-clean-gawk \
+    maybe-maintainer-clean-gettext \
+    maybe-maintainer-clean-gnuserv \
+    maybe-maintainer-clean-gprof \
+    maybe-maintainer-clean-gzip \
+    maybe-maintainer-clean-hello \
+    maybe-maintainer-clean-indent \
+    maybe-maintainer-clean-intl \
+    maybe-maintainer-clean-tcl \
+    maybe-maintainer-clean-itcl \
+    maybe-maintainer-clean-ld \
+    maybe-maintainer-clean-libcpp \
+    maybe-maintainer-clean-libgui \
+    maybe-maintainer-clean-libiberty \
+    maybe-maintainer-clean-libtool \
+    maybe-maintainer-clean-m4 \
+    maybe-maintainer-clean-make \
+    maybe-maintainer-clean-mmalloc \
+    maybe-maintainer-clean-patch \
+    maybe-maintainer-clean-perl \
+    maybe-maintainer-clean-prms \
+    maybe-maintainer-clean-rcs \
+    maybe-maintainer-clean-readline \
+    maybe-maintainer-clean-release \
+    maybe-maintainer-clean-recode \
+    maybe-maintainer-clean-sed \
+    maybe-maintainer-clean-send-pr \
+    maybe-maintainer-clean-shellutils \
+    maybe-maintainer-clean-sid \
+    maybe-maintainer-clean-sim \
+    maybe-maintainer-clean-tar \
+    maybe-maintainer-clean-texinfo \
+    maybe-maintainer-clean-textutils \
+    maybe-maintainer-clean-time \
+    maybe-maintainer-clean-uudecode \
+    maybe-maintainer-clean-wdiff \
+    maybe-maintainer-clean-zip \
+    maybe-maintainer-clean-zlib \
+    maybe-maintainer-clean-gdb \
+    maybe-maintainer-clean-expect \
+    maybe-maintainer-clean-guile \
+    maybe-maintainer-clean-tk \
+    maybe-maintainer-clean-libtermcap \
+    maybe-maintainer-clean-utils \
+    maybe-maintainer-clean-gnattools
 
 .PHONY: maintainer-clean-target
-
-maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
-maintainer-clean-target: maybe-maintainer-clean-target-libmudflap
-maintainer-clean-target: maybe-maintainer-clean-target-libssp
-maintainer-clean-target: maybe-maintainer-clean-target-libgcc-math
-maintainer-clean-target: maybe-maintainer-clean-target-newlib
-maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
-maintainer-clean-target: maybe-maintainer-clean-target-libobjc
-maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
-maintainer-clean-target: maybe-maintainer-clean-target-winsup
-maintainer-clean-target: maybe-maintainer-clean-target-libgloss
-maintainer-clean-target: maybe-maintainer-clean-target-libiberty
-maintainer-clean-target: maybe-maintainer-clean-target-gperf
-maintainer-clean-target: maybe-maintainer-clean-target-examples
-maintainer-clean-target: maybe-maintainer-clean-target-libffi
-maintainer-clean-target: maybe-maintainer-clean-target-libjava
-maintainer-clean-target: maybe-maintainer-clean-target-zlib
-maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
-maintainer-clean-target: maybe-maintainer-clean-target-qthreads
-maintainer-clean-target: maybe-maintainer-clean-target-rda
-maintainer-clean-target: maybe-maintainer-clean-target-libada
-maintainer-clean-target: maybe-maintainer-clean-target-libgomp
+maintainer-clean-target:  \
+    maybe-maintainer-clean-target-libstdc++-v3 \
+    maybe-maintainer-clean-target-libmudflap \
+    maybe-maintainer-clean-target-newlib \
+    maybe-maintainer-clean-target-libgfortran \
+    maybe-maintainer-clean-target-libobjc \
+    maybe-maintainer-clean-target-libtermcap \
+    maybe-maintainer-clean-target-winsup \
+    maybe-maintainer-clean-target-libgloss \
+    maybe-maintainer-clean-target-libiberty \
+    maybe-maintainer-clean-target-gperf \
+    maybe-maintainer-clean-target-examples \
+    maybe-maintainer-clean-target-libffi \
+    maybe-maintainer-clean-target-libjava \
+    maybe-maintainer-clean-target-zlib \
+    maybe-maintainer-clean-target-boehm-gc \
+    maybe-maintainer-clean-target-qthreads \
+    maybe-maintainer-clean-target-rda \
+    maybe-maintainer-clean-target-libada
 
 
 # Here are the targets which correspond to the do-X targets.
@@ -1855,7 +1822,7 @@ local-clean:
 
 local-distclean:
 	-rm -f Makefile config.status config.cache mh-frag mt-frag
-	-rm -f maybedep.tmp serdep.tmp
+	-rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
 	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
 	  rm -rf $(TARGET_SUBDIR); \
 	else true; fi
@@ -1880,10 +1847,14 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
 maintainer-clean: local-distclean
 realclean: maintainer-clean
 
-# Extra dependency for clean-target, owing to the mixed nature of gcc.
+# Extra dependency for clean-target, owing to the mixed nature of gcc
 clean-target: clean-target-libgcc
 clean-target-libgcc:
-	test ! -d gcc || (cd gcc && $(MAKE) $@)
+	test ! -d gcc/libgcc || \
+	(cd gcc/libgcc && find . -type d -print) | \
+	while read d; do rm -f gcc/$$d/libgcc.a || : ; done
+	-rm -rf gcc/libgcc
+	-rm -f gcc/stmp-dirs
 
 # Check target.
 
@@ -1891,8 +1862,7 @@ clean-target-libgcc:
 check: do-check
 
 # Only include modules actually being configured and built.
-.PHONY: check-host
-check-host:  \
+do-check: unstage  \
     maybe-check-ash \
     maybe-check-autoconf \
     maybe-check-automake \
@@ -1927,7 +1897,6 @@ check-host:  \
     maybe-check-itcl \
     maybe-check-ld \
     maybe-check-libcpp \
-    maybe-check-libdecnumber \
     maybe-check-libgui \
     maybe-check-libiberty \
     maybe-check-libtool \
@@ -1960,14 +1929,9 @@ check-host:  \
     maybe-check-tk \
     maybe-check-libtermcap \
     maybe-check-utils \
-    maybe-check-gnattools
-
-.PHONY: check-target
-check-target:  \
+    maybe-check-gnattools \
     maybe-check-target-libstdc++-v3 \
     maybe-check-target-libmudflap \
-    maybe-check-target-libssp \
-    maybe-check-target-libgcc-math \
     maybe-check-target-newlib \
     maybe-check-target-libgfortran \
     maybe-check-target-libobjc \
@@ -1983,14 +1947,7 @@ check-target:  \
     maybe-check-target-boehm-gc \
     maybe-check-target-qthreads \
     maybe-check-target-rda \
-    maybe-check-target-libada \
-    maybe-check-target-libgomp
-
-do-check:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
+    maybe-check-target-libada stage
 
 # Automated reporting of test results.
 
@@ -2016,11 +1973,7 @@ mail-report-with-warnings.log: warning.log
 # Installation targets.
 
 .PHONY: install uninstall
-install:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
+install: installdirs install-host install-target
 
 .PHONY: install-host-nogcc
 install-host-nogcc:  \
@@ -2057,7 +2010,6 @@ install-host-nogcc:  \
     maybe-install-itcl \
     maybe-install-ld \
     maybe-install-libcpp \
-    maybe-install-libdecnumber \
     maybe-install-libgui \
     maybe-install-libiberty \
     maybe-install-libtool \
@@ -2128,7 +2080,6 @@ install-host:  \
     maybe-install-itcl \
     maybe-install-ld \
     maybe-install-libcpp \
-    maybe-install-libdecnumber \
     maybe-install-libgui \
     maybe-install-libiberty \
     maybe-install-libtool \
@@ -2167,8 +2118,6 @@ install-host:  \
 install-target:  \
     maybe-install-target-libstdc++-v3 \
     maybe-install-target-libmudflap \
-    maybe-install-target-libssp \
-    maybe-install-target-libgcc-math \
     maybe-install-target-newlib \
     maybe-install-target-libgfortran \
     maybe-install-target-libobjc \
@@ -2184,8 +2133,7 @@ install-target:  \
     maybe-install-target-boehm-gc \
     maybe-install-target-qthreads \
     maybe-install-target-rda \
-    maybe-install-target-libada \
-    maybe-install-target-libgomp
+    maybe-install-target-libada
 
 uninstall:
 	@echo "the uninstall target is not supported in this tree"
@@ -2194,7 +2142,6 @@ uninstall:
 install.all: install-no-fixedincludes
 	@if [ -f ./gcc/Makefile ] ; then \
 		r=`${PWD_COMMAND}` ; export r ; \
-		s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 		$(HOST_EXPORTS) \
 		(cd ./gcc && \
 		$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
@@ -2238,29 +2185,19 @@ etags tags: TAGS
 # built are.
 TAGS: do-TAGS
 
-# ------------------------------------
-# Macros for configure and all targets
-# ------------------------------------
-
-
-
-
-
 # --------------------------------------
 # Modules which run on the build machine
 # --------------------------------------
 
-
 .PHONY: configure-build-libiberty maybe-configure-build-libiberty
 maybe-configure-build-libiberty:
 @if build-libiberty
 maybe-configure-build-libiberty: configure-build-libiberty
-configure-build-libiberty: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
+configure-build-libiberty:
+	@test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/libiberty; \
 	cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
@@ -2273,42 +2210,33 @@ configure-build-libiberty:
 	libsrcdir="$$s/libiberty"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
+	  $(BUILD_CONFIGARGS) $${srcdiroption} \
+	  --with-build-subdir="$(BUILD_SUBDIR)"  \
 	  || exit 1
 @endif build-libiberty
 
-
-
-
-
 .PHONY: all-build-libiberty maybe-all-build-libiberty
 maybe-all-build-libiberty:
 @if build-libiberty
 TARGET-build-libiberty=all
 maybe-all-build-libiberty: all-build-libiberty
 all-build-libiberty: configure-build-libiberty
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/libiberty && \
-	  $(MAKE)   $(TARGET-build-libiberty))
+	  $(MAKE)  $(TARGET-build-libiberty))
 @endif build-libiberty
 
-
-
-
-
 .PHONY: configure-build-bison maybe-configure-build-bison
 maybe-configure-build-bison:
 @if build-bison
 maybe-configure-build-bison: configure-build-bison
-configure-build-bison: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
+configure-build-bison:
+	@test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/bison; \
 	cd "$(BUILD_SUBDIR)/bison" || exit 1; \
@@ -2321,42 +2249,33 @@ configure-build-bison:
 	libsrcdir="$$s/bison"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
+	  $(BUILD_CONFIGARGS) $${srcdiroption} \
+	  --with-build-subdir="$(BUILD_SUBDIR)"  \
 	  || exit 1
 @endif build-bison
 
-
-
-
-
 .PHONY: all-build-bison maybe-all-build-bison
 maybe-all-build-bison:
 @if build-bison
 TARGET-build-bison=all
 maybe-all-build-bison: all-build-bison
 all-build-bison: configure-build-bison
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/bison && \
-	  $(MAKE)   $(TARGET-build-bison))
+	  $(MAKE)  $(TARGET-build-bison))
 @endif build-bison
 
-
-
-
-
 .PHONY: configure-build-byacc maybe-configure-build-byacc
 maybe-configure-build-byacc:
 @if build-byacc
 maybe-configure-build-byacc: configure-build-byacc
-configure-build-byacc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
+configure-build-byacc:
+	@test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/byacc; \
 	cd "$(BUILD_SUBDIR)/byacc" || exit 1; \
@@ -2369,42 +2288,33 @@ configure-build-byacc:
 	libsrcdir="$$s/byacc"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
+	  $(BUILD_CONFIGARGS) $${srcdiroption} \
+	  --with-build-subdir="$(BUILD_SUBDIR)"  \
 	  || exit 1
 @endif build-byacc
 
-
-
-
-
 .PHONY: all-build-byacc maybe-all-build-byacc
 maybe-all-build-byacc:
 @if build-byacc
 TARGET-build-byacc=all
 maybe-all-build-byacc: all-build-byacc
 all-build-byacc: configure-build-byacc
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/byacc && \
-	  $(MAKE)   $(TARGET-build-byacc))
+	  $(MAKE)  $(TARGET-build-byacc))
 @endif build-byacc
 
-
-
-
-
 .PHONY: configure-build-flex maybe-configure-build-flex
 maybe-configure-build-flex:
 @if build-flex
 maybe-configure-build-flex: configure-build-flex
-configure-build-flex: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
+configure-build-flex:
+	@test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/flex; \
 	cd "$(BUILD_SUBDIR)/flex" || exit 1; \
@@ -2417,42 +2327,33 @@ configure-build-flex:
 	libsrcdir="$$s/flex"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
+	  $(BUILD_CONFIGARGS) $${srcdiroption} \
+	  --with-build-subdir="$(BUILD_SUBDIR)"  \
 	  || exit 1
 @endif build-flex
 
-
-
-
-
 .PHONY: all-build-flex maybe-all-build-flex
 maybe-all-build-flex:
 @if build-flex
 TARGET-build-flex=all
 maybe-all-build-flex: all-build-flex
 all-build-flex: configure-build-flex
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/flex && \
-	  $(MAKE)   $(TARGET-build-flex))
+	  $(MAKE)  $(TARGET-build-flex))
 @endif build-flex
 
-
-
-
-
 .PHONY: configure-build-m4 maybe-configure-build-m4
 maybe-configure-build-m4:
 @if build-m4
 maybe-configure-build-m4: configure-build-m4
-configure-build-m4: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
+configure-build-m4:
+	@test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/m4; \
 	cd "$(BUILD_SUBDIR)/m4" || exit 1; \
@@ -2465,42 +2366,33 @@ configure-build-m4:
 	libsrcdir="$$s/m4"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
+	  $(BUILD_CONFIGARGS) $${srcdiroption} \
+	  --with-build-subdir="$(BUILD_SUBDIR)"  \
 	  || exit 1
 @endif build-m4
 
-
-
-
-
 .PHONY: all-build-m4 maybe-all-build-m4
 maybe-all-build-m4:
 @if build-m4
 TARGET-build-m4=all
 maybe-all-build-m4: all-build-m4
 all-build-m4: configure-build-m4
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/m4 && \
-	  $(MAKE)   $(TARGET-build-m4))
+	  $(MAKE)  $(TARGET-build-m4))
 @endif build-m4
 
-
-
-
-
 .PHONY: configure-build-texinfo maybe-configure-build-texinfo
 maybe-configure-build-texinfo:
 @if build-texinfo
 maybe-configure-build-texinfo: configure-build-texinfo
-configure-build-texinfo: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
+configure-build-texinfo:
+	@test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/texinfo; \
 	cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \
@@ -2513,42 +2405,33 @@ configure-build-texinfo:
 	libsrcdir="$$s/texinfo"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
+	  $(BUILD_CONFIGARGS) $${srcdiroption} \
+	  --with-build-subdir="$(BUILD_SUBDIR)"  \
 	  || exit 1
 @endif build-texinfo
 
-
-
-
-
 .PHONY: all-build-texinfo maybe-all-build-texinfo
 maybe-all-build-texinfo:
 @if build-texinfo
 TARGET-build-texinfo=all
 maybe-all-build-texinfo: all-build-texinfo
 all-build-texinfo: configure-build-texinfo
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/texinfo && \
-	  $(MAKE)   $(TARGET-build-texinfo))
+	  $(MAKE)  $(TARGET-build-texinfo))
 @endif build-texinfo
 
-
-
-
-
 .PHONY: configure-build-fixincludes maybe-configure-build-fixincludes
 maybe-configure-build-fixincludes:
 @if build-fixincludes
 maybe-configure-build-fixincludes: configure-build-fixincludes
-configure-build-fixincludes: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
+configure-build-fixincludes:
+	@test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
 	cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
@@ -2561,50 +2444,41 @@ configure-build-fixincludes:
 	libsrcdir="$$s/fixincludes"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
+	  $(BUILD_CONFIGARGS) $${srcdiroption} \
+	  --with-build-subdir="$(BUILD_SUBDIR)"  \
 	  || exit 1
 @endif build-fixincludes
 
-
-
-
-
 .PHONY: all-build-fixincludes maybe-all-build-fixincludes
 maybe-all-build-fixincludes:
 @if build-fixincludes
 TARGET-build-fixincludes=all
 maybe-all-build-fixincludes: all-build-fixincludes
 all-build-fixincludes: configure-build-fixincludes
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
 	(cd $(BUILD_SUBDIR)/fixincludes && \
-	  $(MAKE)   $(TARGET-build-fixincludes))
+	  $(MAKE)  $(TARGET-build-fixincludes))
 @endif build-fixincludes
 
 
-
-
-
 # --------------------------------------
 # Modules which run on the host machine
 # --------------------------------------
 
-
 .PHONY: configure-ash maybe-configure-ash
 maybe-configure-ash:
 @if ash
 maybe-configure-ash: configure-ash
-configure-ash: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
+configure-ash:
+	@test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/ash; \
-	cd "$(HOST_SUBDIR)/ash" || exit 1; \
+	echo Configuring in ash; \
+	cd $(HOST_SUBDIR)/ash || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/ash/ | \
@@ -2617,17 +2491,12 @@ configure-ash:
 	  || exit 1
 @endif ash
 
-
-
-
-
 .PHONY: all-ash maybe-all-ash
 maybe-all-ash:
 @if ash
 TARGET-ash=all
 maybe-all-ash: all-ash
 all-ash: configure-ash
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2635,16 +2504,12 @@ all-ash: configure-ash
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ash))
 @endif ash
 
-
-
-
 .PHONY: check-ash maybe-check-ash
 maybe-check-ash:
 @if ash
 maybe-check-ash: check-ash
 
 check-ash:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2659,7 +2524,6 @@ maybe-install-ash:
 maybe-install-ash: install-ash
 
 install-ash: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2677,7 +2541,6 @@ maybe-info-ash: info-ash
 
 info-ash: \
     configure-ash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2703,7 +2566,6 @@ maybe-dvi-ash: dvi-ash
 
 dvi-ash: \
     configure-ash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2729,7 +2591,6 @@ maybe-html-ash: html-ash
 
 html-ash: \
     configure-ash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2755,7 +2616,6 @@ maybe-TAGS-ash: TAGS-ash
 
 TAGS-ash: \
     configure-ash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2782,7 +2642,6 @@ maybe-install-info-ash: install-info-ash
 install-info-ash: \
     configure-ash \
     info-ash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2808,7 +2667,6 @@ maybe-installcheck-ash: installcheck-ash
 
 installcheck-ash: \
     configure-ash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2833,7 +2691,6 @@ maybe-mostlyclean-ash:
 maybe-mostlyclean-ash: mostlyclean-ash
 
 mostlyclean-ash: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2858,7 +2715,6 @@ maybe-clean-ash:
 maybe-clean-ash: clean-ash
 
 clean-ash: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2883,7 +2739,6 @@ maybe-distclean-ash:
 maybe-distclean-ash: distclean-ash
 
 distclean-ash: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2908,7 +2763,6 @@ maybe-maintainer-clean-ash:
 maybe-maintainer-clean-ash: maintainer-clean-ash
 
 maintainer-clean-ash: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2928,20 +2782,18 @@ maintainer-clean-ash:
 @endif ash
 
 
-
 .PHONY: configure-autoconf maybe-configure-autoconf
 maybe-configure-autoconf:
 @if autoconf
 maybe-configure-autoconf: configure-autoconf
-configure-autoconf: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
+configure-autoconf:
+	@test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/autoconf; \
-	cd "$(HOST_SUBDIR)/autoconf" || exit 1; \
+	echo Configuring in autoconf; \
+	cd $(HOST_SUBDIR)/autoconf || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/autoconf/ | \
@@ -2954,17 +2806,12 @@ configure-autoconf:
 	  || exit 1
 @endif autoconf
 
-
-
-
-
 .PHONY: all-autoconf maybe-all-autoconf
 maybe-all-autoconf:
 @if autoconf
 TARGET-autoconf=all
 maybe-all-autoconf: all-autoconf
 all-autoconf: configure-autoconf
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2972,16 +2819,12 @@ all-autoconf: configure-autoconf
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-autoconf))
 @endif autoconf
 
-
-
-
 .PHONY: check-autoconf maybe-check-autoconf
 maybe-check-autoconf:
 @if autoconf
 maybe-check-autoconf: check-autoconf
 
 check-autoconf:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2996,7 +2839,6 @@ maybe-install-autoconf:
 maybe-install-autoconf: install-autoconf
 
 install-autoconf: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3014,7 +2856,6 @@ maybe-info-autoconf: info-autoconf
 
 info-autoconf: \
     configure-autoconf 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3040,7 +2881,6 @@ maybe-dvi-autoconf: dvi-autoconf
 
 dvi-autoconf: \
     configure-autoconf 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3066,7 +2906,6 @@ maybe-html-autoconf: html-autoconf
 
 html-autoconf: \
     configure-autoconf 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3092,7 +2931,6 @@ maybe-TAGS-autoconf: TAGS-autoconf
 
 TAGS-autoconf: \
     configure-autoconf 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3119,7 +2957,6 @@ maybe-install-info-autoconf: install-info-autoconf
 install-info-autoconf: \
     configure-autoconf \
     info-autoconf 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3145,7 +2982,6 @@ maybe-installcheck-autoconf: installcheck-autoconf
 
 installcheck-autoconf: \
     configure-autoconf 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3170,7 +3006,6 @@ maybe-mostlyclean-autoconf:
 maybe-mostlyclean-autoconf: mostlyclean-autoconf
 
 mostlyclean-autoconf: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3195,7 +3030,6 @@ maybe-clean-autoconf:
 maybe-clean-autoconf: clean-autoconf
 
 clean-autoconf: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3220,7 +3054,6 @@ maybe-distclean-autoconf:
 maybe-distclean-autoconf: distclean-autoconf
 
 distclean-autoconf: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3245,7 +3078,6 @@ maybe-maintainer-clean-autoconf:
 maybe-maintainer-clean-autoconf: maintainer-clean-autoconf
 
 maintainer-clean-autoconf: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3265,20 +3097,18 @@ maintainer-clean-autoconf:
 @endif autoconf
 
 
-
 .PHONY: configure-automake maybe-configure-automake
 maybe-configure-automake:
 @if automake
 maybe-configure-automake: configure-automake
-configure-automake: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
+configure-automake:
+	@test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/automake; \
-	cd "$(HOST_SUBDIR)/automake" || exit 1; \
+	echo Configuring in automake; \
+	cd $(HOST_SUBDIR)/automake || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/automake/ | \
@@ -3291,17 +3121,12 @@ configure-automake:
 	  || exit 1
 @endif automake
 
-
-
-
-
 .PHONY: all-automake maybe-all-automake
 maybe-all-automake:
 @if automake
 TARGET-automake=all
 maybe-all-automake: all-automake
 all-automake: configure-automake
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3309,16 +3134,12 @@ all-automake: configure-automake
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-automake))
 @endif automake
 
-
-
-
 .PHONY: check-automake maybe-check-automake
 maybe-check-automake:
 @if automake
 maybe-check-automake: check-automake
 
 check-automake:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3333,7 +3154,6 @@ maybe-install-automake:
 maybe-install-automake: install-automake
 
 install-automake: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3351,7 +3171,6 @@ maybe-info-automake: info-automake
 
 info-automake: \
     configure-automake 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3377,7 +3196,6 @@ maybe-dvi-automake: dvi-automake
 
 dvi-automake: \
     configure-automake 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3403,7 +3221,6 @@ maybe-html-automake: html-automake
 
 html-automake: \
     configure-automake 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3429,7 +3246,6 @@ maybe-TAGS-automake: TAGS-automake
 
 TAGS-automake: \
     configure-automake 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3456,7 +3272,6 @@ maybe-install-info-automake: install-info-automake
 install-info-automake: \
     configure-automake \
     info-automake 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3482,7 +3297,6 @@ maybe-installcheck-automake: installcheck-automake
 
 installcheck-automake: \
     configure-automake 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3507,7 +3321,6 @@ maybe-mostlyclean-automake:
 maybe-mostlyclean-automake: mostlyclean-automake
 
 mostlyclean-automake: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3532,7 +3345,6 @@ maybe-clean-automake:
 maybe-clean-automake: clean-automake
 
 clean-automake: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3557,7 +3369,6 @@ maybe-distclean-automake:
 maybe-distclean-automake: distclean-automake
 
 distclean-automake: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3582,7 +3393,6 @@ maybe-maintainer-clean-automake:
 maybe-maintainer-clean-automake: maintainer-clean-automake
 
 maintainer-clean-automake: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3602,20 +3412,18 @@ maintainer-clean-automake:
 @endif automake
 
 
-
 .PHONY: configure-bash maybe-configure-bash
 maybe-configure-bash:
 @if bash
 maybe-configure-bash: configure-bash
-configure-bash: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
+configure-bash:
+	@test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/bash; \
-	cd "$(HOST_SUBDIR)/bash" || exit 1; \
+	echo Configuring in bash; \
+	cd $(HOST_SUBDIR)/bash || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/bash/ | \
@@ -3628,17 +3436,12 @@ configure-bash:
 	  || exit 1
 @endif bash
 
-
-
-
-
 .PHONY: all-bash maybe-all-bash
 maybe-all-bash:
 @if bash
 TARGET-bash=all
 maybe-all-bash: all-bash
 all-bash: configure-bash
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3646,16 +3449,12 @@ all-bash: configure-bash
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bash))
 @endif bash
 
-
-
-
 .PHONY: check-bash maybe-check-bash
 maybe-check-bash:
 @if bash
 maybe-check-bash: check-bash
 
 check-bash:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3670,7 +3469,6 @@ maybe-install-bash:
 maybe-install-bash: install-bash
 
 install-bash: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3688,7 +3486,6 @@ maybe-info-bash: info-bash
 
 info-bash: \
     configure-bash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3714,7 +3511,6 @@ maybe-dvi-bash: dvi-bash
 
 dvi-bash: \
     configure-bash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3740,7 +3536,6 @@ maybe-html-bash: html-bash
 
 html-bash: \
     configure-bash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3766,7 +3561,6 @@ maybe-TAGS-bash: TAGS-bash
 
 TAGS-bash: \
     configure-bash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3793,7 +3587,6 @@ maybe-install-info-bash: install-info-bash
 install-info-bash: \
     configure-bash \
     info-bash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3819,7 +3612,6 @@ maybe-installcheck-bash: installcheck-bash
 
 installcheck-bash: \
     configure-bash 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3844,7 +3636,6 @@ maybe-mostlyclean-bash:
 maybe-mostlyclean-bash: mostlyclean-bash
 
 mostlyclean-bash: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3869,7 +3660,6 @@ maybe-clean-bash:
 maybe-clean-bash: clean-bash
 
 clean-bash: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3894,7 +3684,6 @@ maybe-distclean-bash:
 maybe-distclean-bash: distclean-bash
 
 distclean-bash: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3919,7 +3708,6 @@ maybe-maintainer-clean-bash:
 maybe-maintainer-clean-bash: maintainer-clean-bash
 
 maintainer-clean-bash: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3939,24 +3727,19 @@ maintainer-clean-bash:
 @endif bash
 
 
-
 .PHONY: configure-bfd maybe-configure-bfd
 maybe-configure-bfd:
 @if bfd
 maybe-configure-bfd: configure-bfd
-configure-bfd: 
-@endif bfd
-@if bfd-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif bfd-bootstrap
-@if bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-bfd:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/bfd; \
-	cd "$(HOST_SUBDIR)/bfd" || exit 1; \
+	echo Configuring in bfd; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
@@ -3969,387 +3752,26 @@ configure-bfd:
 	  || exit 1
 @endif bfd
 
-
-
-.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
-maybe-configure-stage1-bfd:
-@if bfd-bootstrap
-maybe-configure-stage1-bfd: configure-stage1-bfd
-configure-stage1-bfd:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif bfd-bootstrap
-
-.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
-maybe-configure-stage2-bfd:
-@if bfd-bootstrap
-maybe-configure-stage2-bfd: configure-stage2-bfd
-configure-stage2-bfd:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
-maybe-configure-stage3-bfd:
-@if bfd-bootstrap
-maybe-configure-stage3-bfd: configure-stage3-bfd
-configure-stage3-bfd:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
-maybe-configure-stage4-bfd:
-@if bfd-bootstrap
-maybe-configure-stage4-bfd: configure-stage4-bfd
-configure-stage4-bfd:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
-maybe-configure-stageprofile-bfd:
-@if bfd-bootstrap
-maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
-configure-stageprofile-bfd:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
-maybe-configure-stagefeedback-bfd:
-@if bfd-bootstrap
-maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
-configure-stagefeedback-bfd:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-
-
-
-
 .PHONY: all-bfd maybe-all-bfd
 maybe-all-bfd:
 @if bfd
 TARGET-bfd=all
 maybe-all-bfd: all-bfd
 all-bfd: configure-bfd
-@endif bfd
-@if bfd-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif bfd-bootstrap
-@if bfd
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/bfd && \
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bfd))
 @endif bfd
 
-
-
-.PHONY: all-stage1-bfd maybe-all-stage1-bfd
-.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
-maybe-all-stage1-bfd:
-maybe-clean-stage1-bfd:
-@if bfd-bootstrap
-maybe-all-stage1-bfd: all-stage1-bfd
-all-stage1: all-stage1-bfd
-TARGET-stage1-bfd = $(TARGET-bfd)
-all-stage1-bfd: configure-stage1-bfd
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-bfd)
-
-maybe-clean-stage1-bfd: clean-stage1-bfd
-clean-stage1: clean-stage1-bfd
-clean-stage1-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stage2-bfd maybe-all-stage2-bfd
-.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
-maybe-all-stage2-bfd:
-maybe-clean-stage2-bfd:
-@if bfd-bootstrap
-maybe-all-stage2-bfd: all-stage2-bfd
-all-stage2: all-stage2-bfd
-TARGET-stage2-bfd = $(TARGET-bfd)
-all-stage2-bfd: configure-stage2-bfd
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-bfd)
-
-maybe-clean-stage2-bfd: clean-stage2-bfd
-clean-stage2: clean-stage2-bfd
-clean-stage2-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stage3-bfd maybe-all-stage3-bfd
-.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
-maybe-all-stage3-bfd:
-maybe-clean-stage3-bfd:
-@if bfd-bootstrap
-maybe-all-stage3-bfd: all-stage3-bfd
-all-stage3: all-stage3-bfd
-TARGET-stage3-bfd = $(TARGET-bfd)
-all-stage3-bfd: configure-stage3-bfd
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-bfd)
-
-maybe-clean-stage3-bfd: clean-stage3-bfd
-clean-stage3: clean-stage3-bfd
-clean-stage3-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stage4-bfd maybe-all-stage4-bfd
-.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
-maybe-all-stage4-bfd:
-maybe-clean-stage4-bfd:
-@if bfd-bootstrap
-maybe-all-stage4-bfd: all-stage4-bfd
-all-stage4: all-stage4-bfd
-TARGET-stage4-bfd = $(TARGET-bfd)
-all-stage4-bfd: configure-stage4-bfd
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-bfd)
-
-maybe-clean-stage4-bfd: clean-stage4-bfd
-clean-stage4: clean-stage4-bfd
-clean-stage4-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
-.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
-maybe-all-stageprofile-bfd:
-maybe-clean-stageprofile-bfd:
-@if bfd-bootstrap
-maybe-all-stageprofile-bfd: all-stageprofile-bfd
-all-stageprofile: all-stageprofile-bfd
-TARGET-stageprofile-bfd = $(TARGET-bfd)
-all-stageprofile-bfd: configure-stageprofile-bfd
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-bfd)
-
-maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
-clean-stageprofile: clean-stageprofile-bfd
-clean-stageprofile-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
-.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
-maybe-all-stagefeedback-bfd:
-maybe-clean-stagefeedback-bfd:
-@if bfd-bootstrap
-maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
-all-stagefeedback: all-stagefeedback-bfd
-TARGET-stagefeedback-bfd = $(TARGET-bfd)
-all-stagefeedback-bfd: configure-stagefeedback-bfd
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-bfd)
-
-maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
-clean-stagefeedback: clean-stagefeedback-bfd
-clean-stagefeedback-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif bfd-bootstrap
-
-
-
-
-
 .PHONY: check-bfd maybe-check-bfd
 maybe-check-bfd:
 @if bfd
 maybe-check-bfd: check-bfd
 
 check-bfd:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4364,7 +3786,6 @@ maybe-install-bfd:
 maybe-install-bfd: install-bfd
 
 install-bfd: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4623,24 +4044,19 @@ maintainer-clean-bfd:
 @endif bfd
 
 
-
 .PHONY: configure-opcodes maybe-configure-opcodes
 maybe-configure-opcodes:
 @if opcodes
 maybe-configure-opcodes: configure-opcodes
-configure-opcodes: 
-@endif opcodes
-@if opcodes-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif opcodes-bootstrap
-@if opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-opcodes:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/opcodes; \
-	cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
+	echo Configuring in opcodes; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
@@ -4653,387 +4069,26 @@ configure-opcodes:
 	  || exit 1
 @endif opcodes
 
-
-
-.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
-maybe-configure-stage1-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage1-opcodes: configure-stage1-opcodes
-configure-stage1-opcodes:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
-maybe-configure-stage2-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage2-opcodes: configure-stage2-opcodes
-configure-stage2-opcodes:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
-maybe-configure-stage3-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage3-opcodes: configure-stage3-opcodes
-configure-stage3-opcodes:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
-maybe-configure-stage4-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage4-opcodes: configure-stage4-opcodes
-configure-stage4-opcodes:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
-maybe-configure-stageprofile-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
-configure-stageprofile-opcodes:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
-maybe-configure-stagefeedback-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
-configure-stagefeedback-opcodes:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-
-
-
-
 .PHONY: all-opcodes maybe-all-opcodes
 maybe-all-opcodes:
 @if opcodes
 TARGET-opcodes=all
 maybe-all-opcodes: all-opcodes
 all-opcodes: configure-opcodes
-@endif opcodes
-@if opcodes-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif opcodes-bootstrap
-@if opcodes
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/opcodes && \
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-opcodes))
 @endif opcodes
 
-
-
-.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
-.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
-maybe-all-stage1-opcodes:
-maybe-clean-stage1-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage1-opcodes: all-stage1-opcodes
-all-stage1: all-stage1-opcodes
-TARGET-stage1-opcodes = $(TARGET-opcodes)
-all-stage1-opcodes: configure-stage1-opcodes
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-opcodes)
-
-maybe-clean-stage1-opcodes: clean-stage1-opcodes
-clean-stage1: clean-stage1-opcodes
-clean-stage1-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
-.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
-maybe-all-stage2-opcodes:
-maybe-clean-stage2-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage2-opcodes: all-stage2-opcodes
-all-stage2: all-stage2-opcodes
-TARGET-stage2-opcodes = $(TARGET-opcodes)
-all-stage2-opcodes: configure-stage2-opcodes
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-opcodes)
-
-maybe-clean-stage2-opcodes: clean-stage2-opcodes
-clean-stage2: clean-stage2-opcodes
-clean-stage2-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
-.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
-maybe-all-stage3-opcodes:
-maybe-clean-stage3-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage3-opcodes: all-stage3-opcodes
-all-stage3: all-stage3-opcodes
-TARGET-stage3-opcodes = $(TARGET-opcodes)
-all-stage3-opcodes: configure-stage3-opcodes
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-opcodes)
-
-maybe-clean-stage3-opcodes: clean-stage3-opcodes
-clean-stage3: clean-stage3-opcodes
-clean-stage3-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
-.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
-maybe-all-stage4-opcodes:
-maybe-clean-stage4-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage4-opcodes: all-stage4-opcodes
-all-stage4: all-stage4-opcodes
-TARGET-stage4-opcodes = $(TARGET-opcodes)
-all-stage4-opcodes: configure-stage4-opcodes
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-opcodes)
-
-maybe-clean-stage4-opcodes: clean-stage4-opcodes
-clean-stage4: clean-stage4-opcodes
-clean-stage4-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
-.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
-maybe-all-stageprofile-opcodes:
-maybe-clean-stageprofile-opcodes:
-@if opcodes-bootstrap
-maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
-all-stageprofile: all-stageprofile-opcodes
-TARGET-stageprofile-opcodes = $(TARGET-opcodes)
-all-stageprofile-opcodes: configure-stageprofile-opcodes
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-opcodes)
-
-maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
-clean-stageprofile: clean-stageprofile-opcodes
-clean-stageprofile-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
-.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
-maybe-all-stagefeedback-opcodes:
-maybe-clean-stagefeedback-opcodes:
-@if opcodes-bootstrap
-maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
-all-stagefeedback: all-stagefeedback-opcodes
-TARGET-stagefeedback-opcodes = $(TARGET-opcodes)
-all-stagefeedback-opcodes: configure-stagefeedback-opcodes
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-opcodes)
-
-maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
-clean-stagefeedback: clean-stagefeedback-opcodes
-clean-stagefeedback-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif opcodes-bootstrap
-
-
-
-
-
 .PHONY: check-opcodes maybe-check-opcodes
 maybe-check-opcodes:
 @if opcodes
 maybe-check-opcodes: check-opcodes
 
 check-opcodes:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5048,7 +4103,6 @@ maybe-install-opcodes:
 maybe-install-opcodes: install-opcodes
 
 install-opcodes: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5307,24 +4361,19 @@ maintainer-clean-opcodes:
 @endif opcodes
 
 
-
 .PHONY: configure-binutils maybe-configure-binutils
 maybe-configure-binutils:
 @if binutils
 maybe-configure-binutils: configure-binutils
-configure-binutils: 
-@endif binutils
-@if binutils-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif binutils-bootstrap
-@if binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-binutils:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/binutils; \
-	cd "$(HOST_SUBDIR)/binutils" || exit 1; \
+	echo Configuring in binutils; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
@@ -5337,387 +4386,26 @@ configure-binutils:
 	  || exit 1
 @endif binutils
 
-
-
-.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
-maybe-configure-stage1-binutils:
-@if binutils-bootstrap
-maybe-configure-stage1-binutils: configure-stage1-binutils
-configure-stage1-binutils:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif binutils-bootstrap
-
-.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
-maybe-configure-stage2-binutils:
-@if binutils-bootstrap
-maybe-configure-stage2-binutils: configure-stage2-binutils
-configure-stage2-binutils:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
-maybe-configure-stage3-binutils:
-@if binutils-bootstrap
-maybe-configure-stage3-binutils: configure-stage3-binutils
-configure-stage3-binutils:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
-maybe-configure-stage4-binutils:
-@if binutils-bootstrap
-maybe-configure-stage4-binutils: configure-stage4-binutils
-configure-stage4-binutils:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
-maybe-configure-stageprofile-binutils:
-@if binutils-bootstrap
-maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
-configure-stageprofile-binutils:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
-maybe-configure-stagefeedback-binutils:
-@if binutils-bootstrap
-maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
-configure-stagefeedback-binutils:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-
-
-
-
 .PHONY: all-binutils maybe-all-binutils
 maybe-all-binutils:
 @if binutils
 TARGET-binutils=all
 maybe-all-binutils: all-binutils
 all-binutils: configure-binutils
-@endif binutils
-@if binutils-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif binutils-bootstrap
-@if binutils
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/binutils && \
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-binutils))
 @endif binutils
 
-
-
-.PHONY: all-stage1-binutils maybe-all-stage1-binutils
-.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
-maybe-all-stage1-binutils:
-maybe-clean-stage1-binutils:
-@if binutils-bootstrap
-maybe-all-stage1-binutils: all-stage1-binutils
-all-stage1: all-stage1-binutils
-TARGET-stage1-binutils = $(TARGET-binutils)
-all-stage1-binutils: configure-stage1-binutils
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-binutils)
-
-maybe-clean-stage1-binutils: clean-stage1-binutils
-clean-stage1: clean-stage1-binutils
-clean-stage1-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stage2-binutils maybe-all-stage2-binutils
-.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
-maybe-all-stage2-binutils:
-maybe-clean-stage2-binutils:
-@if binutils-bootstrap
-maybe-all-stage2-binutils: all-stage2-binutils
-all-stage2: all-stage2-binutils
-TARGET-stage2-binutils = $(TARGET-binutils)
-all-stage2-binutils: configure-stage2-binutils
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-binutils)
-
-maybe-clean-stage2-binutils: clean-stage2-binutils
-clean-stage2: clean-stage2-binutils
-clean-stage2-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stage3-binutils maybe-all-stage3-binutils
-.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
-maybe-all-stage3-binutils:
-maybe-clean-stage3-binutils:
-@if binutils-bootstrap
-maybe-all-stage3-binutils: all-stage3-binutils
-all-stage3: all-stage3-binutils
-TARGET-stage3-binutils = $(TARGET-binutils)
-all-stage3-binutils: configure-stage3-binutils
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-binutils)
-
-maybe-clean-stage3-binutils: clean-stage3-binutils
-clean-stage3: clean-stage3-binutils
-clean-stage3-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stage4-binutils maybe-all-stage4-binutils
-.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
-maybe-all-stage4-binutils:
-maybe-clean-stage4-binutils:
-@if binutils-bootstrap
-maybe-all-stage4-binutils: all-stage4-binutils
-all-stage4: all-stage4-binutils
-TARGET-stage4-binutils = $(TARGET-binutils)
-all-stage4-binutils: configure-stage4-binutils
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-binutils)
-
-maybe-clean-stage4-binutils: clean-stage4-binutils
-clean-stage4: clean-stage4-binutils
-clean-stage4-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
-.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
-maybe-all-stageprofile-binutils:
-maybe-clean-stageprofile-binutils:
-@if binutils-bootstrap
-maybe-all-stageprofile-binutils: all-stageprofile-binutils
-all-stageprofile: all-stageprofile-binutils
-TARGET-stageprofile-binutils = $(TARGET-binutils)
-all-stageprofile-binutils: configure-stageprofile-binutils
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-binutils)
-
-maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
-clean-stageprofile: clean-stageprofile-binutils
-clean-stageprofile-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
-.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
-maybe-all-stagefeedback-binutils:
-maybe-clean-stagefeedback-binutils:
-@if binutils-bootstrap
-maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
-all-stagefeedback: all-stagefeedback-binutils
-TARGET-stagefeedback-binutils = $(TARGET-binutils)
-all-stagefeedback-binutils: configure-stagefeedback-binutils
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-binutils)
-
-maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
-clean-stagefeedback: clean-stagefeedback-binutils
-clean-stagefeedback-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif binutils-bootstrap
-
-
-
-
-
 .PHONY: check-binutils maybe-check-binutils
 maybe-check-binutils:
 @if binutils
 maybe-check-binutils: check-binutils
 
 check-binutils:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5732,7 +4420,6 @@ maybe-install-binutils:
 maybe-install-binutils: install-binutils
 
 install-binutils: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5991,20 +4678,18 @@ maintainer-clean-binutils:
 @endif binutils
 
 
-
 .PHONY: configure-bison maybe-configure-bison
 maybe-configure-bison:
 @if bison
 maybe-configure-bison: configure-bison
-configure-bison: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
+configure-bison:
+	@test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/bison; \
-	cd "$(HOST_SUBDIR)/bison" || exit 1; \
+	echo Configuring in bison; \
+	cd $(HOST_SUBDIR)/bison || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
@@ -6017,17 +4702,12 @@ configure-bison:
 	  || exit 1
 @endif bison
 
-
-
-
-
 .PHONY: all-bison maybe-all-bison
 maybe-all-bison:
 @if bison
 TARGET-bison=all
 maybe-all-bison: all-bison
 all-bison: configure-bison
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6035,9 +4715,6 @@ all-bison: configure-bison
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bison))
 @endif bison
 
-
-
-
 .PHONY: check-bison maybe-check-bison
 maybe-check-bison:
 @if bison
@@ -6045,7 +4722,6 @@ maybe-check-bison: check-bison
 
 # This module is only tested in a native toolchain.
 check-bison:
-	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6062,7 +4738,6 @@ maybe-install-bison:
 maybe-install-bison: install-bison
 
 install-bison: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6080,7 +4755,6 @@ maybe-info-bison: info-bison
 
 info-bison: \
     configure-bison 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6106,7 +4780,6 @@ maybe-dvi-bison: dvi-bison
 
 dvi-bison: \
     configure-bison 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6132,7 +4805,6 @@ maybe-html-bison: html-bison
 
 html-bison: \
     configure-bison 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6158,7 +4830,6 @@ maybe-TAGS-bison: TAGS-bison
 
 TAGS-bison: \
     configure-bison 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6185,7 +4856,6 @@ maybe-install-info-bison: install-info-bison
 install-info-bison: \
     configure-bison \
     info-bison 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6211,7 +4881,6 @@ maybe-installcheck-bison: installcheck-bison
 
 installcheck-bison: \
     configure-bison 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6236,7 +4905,6 @@ maybe-mostlyclean-bison:
 maybe-mostlyclean-bison: mostlyclean-bison
 
 mostlyclean-bison: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6261,7 +4929,6 @@ maybe-clean-bison:
 maybe-clean-bison: clean-bison
 
 clean-bison: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6286,7 +4953,6 @@ maybe-distclean-bison:
 maybe-distclean-bison: distclean-bison
 
 distclean-bison: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6311,7 +4977,6 @@ maybe-maintainer-clean-bison:
 maybe-maintainer-clean-bison: maintainer-clean-bison
 
 maintainer-clean-bison: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6331,20 +4996,18 @@ maintainer-clean-bison:
 @endif bison
 
 
-
 .PHONY: configure-byacc maybe-configure-byacc
 maybe-configure-byacc:
 @if byacc
 maybe-configure-byacc: configure-byacc
-configure-byacc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
+configure-byacc:
+	@test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/byacc; \
-	cd "$(HOST_SUBDIR)/byacc" || exit 1; \
+	echo Configuring in byacc; \
+	cd $(HOST_SUBDIR)/byacc || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/byacc/ | \
@@ -6357,17 +5020,12 @@ configure-byacc:
 	  || exit 1
 @endif byacc
 
-
-
-
-
 .PHONY: all-byacc maybe-all-byacc
 maybe-all-byacc:
 @if byacc
 TARGET-byacc=all
 maybe-all-byacc: all-byacc
 all-byacc: configure-byacc
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6375,9 +5033,6 @@ all-byacc: configure-byacc
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-byacc))
 @endif byacc
 
-
-
-
 .PHONY: check-byacc maybe-check-byacc
 maybe-check-byacc:
 @if byacc
@@ -6385,7 +5040,6 @@ maybe-check-byacc: check-byacc
 
 # This module is only tested in a native toolchain.
 check-byacc:
-	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6402,7 +5056,6 @@ maybe-install-byacc:
 maybe-install-byacc: install-byacc
 
 install-byacc: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6420,7 +5073,6 @@ maybe-info-byacc: info-byacc
 
 info-byacc: \
     configure-byacc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6446,7 +5098,6 @@ maybe-dvi-byacc: dvi-byacc
 
 dvi-byacc: \
     configure-byacc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6472,7 +5123,6 @@ maybe-html-byacc: html-byacc
 
 html-byacc: \
     configure-byacc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6498,7 +5148,6 @@ maybe-TAGS-byacc: TAGS-byacc
 
 TAGS-byacc: \
     configure-byacc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6525,7 +5174,6 @@ maybe-install-info-byacc: install-info-byacc
 install-info-byacc: \
     configure-byacc \
     info-byacc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6551,7 +5199,6 @@ maybe-installcheck-byacc: installcheck-byacc
 
 installcheck-byacc: \
     configure-byacc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6576,7 +5223,6 @@ maybe-mostlyclean-byacc:
 maybe-mostlyclean-byacc: mostlyclean-byacc
 
 mostlyclean-byacc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6601,7 +5247,6 @@ maybe-clean-byacc:
 maybe-clean-byacc: clean-byacc
 
 clean-byacc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6626,7 +5271,6 @@ maybe-distclean-byacc:
 maybe-distclean-byacc: distclean-byacc
 
 distclean-byacc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6651,7 +5295,6 @@ maybe-maintainer-clean-byacc:
 maybe-maintainer-clean-byacc: maintainer-clean-byacc
 
 maintainer-clean-byacc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6671,20 +5314,18 @@ maintainer-clean-byacc:
 @endif byacc
 
 
-
 .PHONY: configure-bzip2 maybe-configure-bzip2
 maybe-configure-bzip2:
 @if bzip2
 maybe-configure-bzip2: configure-bzip2
-configure-bzip2: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
+configure-bzip2:
+	@test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/bzip2; \
-	cd "$(HOST_SUBDIR)/bzip2" || exit 1; \
+	echo Configuring in bzip2; \
+	cd $(HOST_SUBDIR)/bzip2 || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/bzip2/ | \
@@ -6697,17 +5338,12 @@ configure-bzip2:
 	  || exit 1
 @endif bzip2
 
-
-
-
-
 .PHONY: all-bzip2 maybe-all-bzip2
 maybe-all-bzip2:
 @if bzip2
 TARGET-bzip2=all
 maybe-all-bzip2: all-bzip2
 all-bzip2: configure-bzip2
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6715,16 +5351,12 @@ all-bzip2: configure-bzip2
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bzip2))
 @endif bzip2
 
-
-
-
 .PHONY: check-bzip2 maybe-check-bzip2
 maybe-check-bzip2:
 @if bzip2
 maybe-check-bzip2: check-bzip2
 
 check-bzip2:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6739,7 +5371,6 @@ maybe-install-bzip2:
 maybe-install-bzip2: install-bzip2
 
 install-bzip2: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6757,7 +5388,6 @@ maybe-info-bzip2: info-bzip2
 
 info-bzip2: \
     configure-bzip2 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6783,7 +5413,6 @@ maybe-dvi-bzip2: dvi-bzip2
 
 dvi-bzip2: \
     configure-bzip2 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6809,7 +5438,6 @@ maybe-html-bzip2: html-bzip2
 
 html-bzip2: \
     configure-bzip2 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6835,7 +5463,6 @@ maybe-TAGS-bzip2: TAGS-bzip2
 
 TAGS-bzip2: \
     configure-bzip2 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6862,7 +5489,6 @@ maybe-install-info-bzip2: install-info-bzip2
 install-info-bzip2: \
     configure-bzip2 \
     info-bzip2 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6888,7 +5514,6 @@ maybe-installcheck-bzip2: installcheck-bzip2
 
 installcheck-bzip2: \
     configure-bzip2 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6913,7 +5538,6 @@ maybe-mostlyclean-bzip2:
 maybe-mostlyclean-bzip2: mostlyclean-bzip2
 
 mostlyclean-bzip2: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6938,7 +5562,6 @@ maybe-clean-bzip2:
 maybe-clean-bzip2: clean-bzip2
 
 clean-bzip2: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6963,7 +5586,6 @@ maybe-distclean-bzip2:
 maybe-distclean-bzip2: distclean-bzip2
 
 distclean-bzip2: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6988,7 +5610,6 @@ maybe-maintainer-clean-bzip2:
 maybe-maintainer-clean-bzip2: maintainer-clean-bzip2
 
 maintainer-clean-bzip2: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7008,20 +5629,18 @@ maintainer-clean-bzip2:
 @endif bzip2
 
 
-
 .PHONY: configure-dejagnu maybe-configure-dejagnu
 maybe-configure-dejagnu:
 @if dejagnu
 maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
+configure-dejagnu:
+	@test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/dejagnu; \
-	cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
+	echo Configuring in dejagnu; \
+	cd $(HOST_SUBDIR)/dejagnu || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
@@ -7034,17 +5653,12 @@ configure-dejagnu:
 	  || exit 1
 @endif dejagnu
 
-
-
-
-
 .PHONY: all-dejagnu maybe-all-dejagnu
 maybe-all-dejagnu:
 @if dejagnu
 TARGET-dejagnu=all
 maybe-all-dejagnu: all-dejagnu
 all-dejagnu: configure-dejagnu
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7052,16 +5666,12 @@ all-dejagnu: configure-dejagnu
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dejagnu))
 @endif dejagnu
 
-
-
-
 .PHONY: check-dejagnu maybe-check-dejagnu
 maybe-check-dejagnu:
 @if dejagnu
 maybe-check-dejagnu: check-dejagnu
 
 check-dejagnu:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7076,7 +5686,6 @@ maybe-install-dejagnu:
 maybe-install-dejagnu: install-dejagnu
 
 install-dejagnu: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7094,7 +5703,6 @@ maybe-info-dejagnu: info-dejagnu
 
 info-dejagnu: \
     configure-dejagnu 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7120,7 +5728,6 @@ maybe-dvi-dejagnu: dvi-dejagnu
 
 dvi-dejagnu: \
     configure-dejagnu 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7146,7 +5753,6 @@ maybe-html-dejagnu: html-dejagnu
 
 html-dejagnu: \
     configure-dejagnu 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7172,7 +5778,6 @@ maybe-TAGS-dejagnu: TAGS-dejagnu
 
 TAGS-dejagnu: \
     configure-dejagnu 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7199,7 +5804,6 @@ maybe-install-info-dejagnu: install-info-dejagnu
 install-info-dejagnu: \
     configure-dejagnu \
     info-dejagnu 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7225,7 +5829,6 @@ maybe-installcheck-dejagnu: installcheck-dejagnu
 
 installcheck-dejagnu: \
     configure-dejagnu 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7250,7 +5853,6 @@ maybe-mostlyclean-dejagnu:
 maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
 
 mostlyclean-dejagnu: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7275,7 +5877,6 @@ maybe-clean-dejagnu:
 maybe-clean-dejagnu: clean-dejagnu
 
 clean-dejagnu: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7300,7 +5901,6 @@ maybe-distclean-dejagnu:
 maybe-distclean-dejagnu: distclean-dejagnu
 
 distclean-dejagnu: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7325,7 +5925,6 @@ maybe-maintainer-clean-dejagnu:
 maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
 
 maintainer-clean-dejagnu: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7345,20 +5944,18 @@ maintainer-clean-dejagnu:
 @endif dejagnu
 
 
-
 .PHONY: configure-diff maybe-configure-diff
 maybe-configure-diff:
 @if diff
 maybe-configure-diff: configure-diff
-configure-diff: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
+configure-diff:
+	@test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/diff; \
-	cd "$(HOST_SUBDIR)/diff" || exit 1; \
+	echo Configuring in diff; \
+	cd $(HOST_SUBDIR)/diff || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/diff/ | \
@@ -7371,17 +5968,12 @@ configure-diff:
 	  || exit 1
 @endif diff
 
-
-
-
-
 .PHONY: all-diff maybe-all-diff
 maybe-all-diff:
 @if diff
 TARGET-diff=all
 maybe-all-diff: all-diff
 all-diff: configure-diff
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7389,16 +5981,12 @@ all-diff: configure-diff
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-diff))
 @endif diff
 
-
-
-
 .PHONY: check-diff maybe-check-diff
 maybe-check-diff:
 @if diff
 maybe-check-diff: check-diff
 
 check-diff:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7413,7 +6001,6 @@ maybe-install-diff:
 maybe-install-diff: install-diff
 
 install-diff: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7431,7 +6018,6 @@ maybe-info-diff: info-diff
 
 info-diff: \
     configure-diff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7457,7 +6043,6 @@ maybe-dvi-diff: dvi-diff
 
 dvi-diff: \
     configure-diff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7483,7 +6068,6 @@ maybe-html-diff: html-diff
 
 html-diff: \
     configure-diff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7509,7 +6093,6 @@ maybe-TAGS-diff: TAGS-diff
 
 TAGS-diff: \
     configure-diff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7536,7 +6119,6 @@ maybe-install-info-diff: install-info-diff
 install-info-diff: \
     configure-diff \
     info-diff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7562,7 +6144,6 @@ maybe-installcheck-diff: installcheck-diff
 
 installcheck-diff: \
     configure-diff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7587,7 +6168,6 @@ maybe-mostlyclean-diff:
 maybe-mostlyclean-diff: mostlyclean-diff
 
 mostlyclean-diff: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7612,7 +6192,6 @@ maybe-clean-diff:
 maybe-clean-diff: clean-diff
 
 clean-diff: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7637,7 +6216,6 @@ maybe-distclean-diff:
 maybe-distclean-diff: distclean-diff
 
 distclean-diff: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7662,7 +6240,6 @@ maybe-maintainer-clean-diff:
 maybe-maintainer-clean-diff: maintainer-clean-diff
 
 maintainer-clean-diff: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7682,20 +6259,18 @@ maintainer-clean-diff:
 @endif diff
 
 
-
 .PHONY: configure-dosutils maybe-configure-dosutils
 maybe-configure-dosutils:
 @if dosutils
 maybe-configure-dosutils: configure-dosutils
-configure-dosutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
+configure-dosutils:
+	@test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/dosutils; \
-	cd "$(HOST_SUBDIR)/dosutils" || exit 1; \
+	echo Configuring in dosutils; \
+	cd $(HOST_SUBDIR)/dosutils || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/dosutils/ | \
@@ -7708,17 +6283,12 @@ configure-dosutils:
 	  || exit 1
 @endif dosutils
 
-
-
-
-
 .PHONY: all-dosutils maybe-all-dosutils
 maybe-all-dosutils:
 @if dosutils
 TARGET-dosutils=all
 maybe-all-dosutils: all-dosutils
 all-dosutils: configure-dosutils
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7726,9 +6296,6 @@ all-dosutils: configure-dosutils
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dosutils))
 @endif dosutils
 
-
-
-
 .PHONY: check-dosutils maybe-check-dosutils
 maybe-check-dosutils:
 @if dosutils
@@ -7744,7 +6311,6 @@ maybe-install-dosutils:
 maybe-install-dosutils: install-dosutils
 
 install-dosutils: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7762,7 +6328,6 @@ maybe-info-dosutils: info-dosutils
 
 info-dosutils: \
     configure-dosutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7788,7 +6353,6 @@ maybe-dvi-dosutils: dvi-dosutils
 
 dvi-dosutils: \
     configure-dosutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7814,7 +6378,6 @@ maybe-html-dosutils: html-dosutils
 
 html-dosutils: \
     configure-dosutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7840,7 +6403,6 @@ maybe-TAGS-dosutils: TAGS-dosutils
 
 TAGS-dosutils: \
     configure-dosutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7867,7 +6429,6 @@ maybe-install-info-dosutils: install-info-dosutils
 install-info-dosutils: \
     configure-dosutils \
     info-dosutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7893,7 +6454,6 @@ maybe-installcheck-dosutils: installcheck-dosutils
 
 installcheck-dosutils: \
     configure-dosutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7918,7 +6478,6 @@ maybe-mostlyclean-dosutils:
 maybe-mostlyclean-dosutils: mostlyclean-dosutils
 
 mostlyclean-dosutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7943,7 +6502,6 @@ maybe-clean-dosutils:
 maybe-clean-dosutils: clean-dosutils
 
 clean-dosutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7968,7 +6526,6 @@ maybe-distclean-dosutils:
 maybe-distclean-dosutils: distclean-dosutils
 
 distclean-dosutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7993,7 +6550,6 @@ maybe-maintainer-clean-dosutils:
 maybe-maintainer-clean-dosutils: maintainer-clean-dosutils
 
 maintainer-clean-dosutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8013,20 +6569,18 @@ maintainer-clean-dosutils:
 @endif dosutils
 
 
-
 .PHONY: configure-etc maybe-configure-etc
 maybe-configure-etc:
 @if etc
 maybe-configure-etc: configure-etc
-configure-etc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
+configure-etc:
+	@test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/etc; \
-	cd "$(HOST_SUBDIR)/etc" || exit 1; \
+	echo Configuring in etc; \
+	cd $(HOST_SUBDIR)/etc || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
@@ -8039,17 +6593,12 @@ configure-etc:
 	  || exit 1
 @endif etc
 
-
-
-
-
 .PHONY: all-etc maybe-all-etc
 maybe-all-etc:
 @if etc
 TARGET-etc=all
 maybe-all-etc: all-etc
 all-etc: configure-etc
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8057,16 +6606,12 @@ all-etc: configure-etc
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-etc))
 @endif etc
 
-
-
-
 .PHONY: check-etc maybe-check-etc
 maybe-check-etc:
 @if etc
 maybe-check-etc: check-etc
 
 check-etc:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8081,7 +6626,6 @@ maybe-install-etc:
 maybe-install-etc: install-etc
 
 install-etc: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8099,7 +6643,6 @@ maybe-info-etc: info-etc
 
 info-etc: \
     configure-etc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8125,7 +6668,6 @@ maybe-dvi-etc: dvi-etc
 
 dvi-etc: \
     configure-etc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8151,7 +6693,6 @@ maybe-html-etc: html-etc
 
 html-etc: \
     configure-etc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8177,7 +6718,6 @@ maybe-TAGS-etc: TAGS-etc
 
 TAGS-etc: \
     configure-etc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8204,7 +6744,6 @@ maybe-install-info-etc: install-info-etc
 install-info-etc: \
     configure-etc \
     info-etc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8230,7 +6769,6 @@ maybe-installcheck-etc: installcheck-etc
 
 installcheck-etc: \
     configure-etc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8255,7 +6793,6 @@ maybe-mostlyclean-etc:
 maybe-mostlyclean-etc: mostlyclean-etc
 
 mostlyclean-etc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8280,7 +6817,6 @@ maybe-clean-etc:
 maybe-clean-etc: clean-etc
 
 clean-etc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8305,7 +6841,6 @@ maybe-distclean-etc:
 maybe-distclean-etc: distclean-etc
 
 distclean-etc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8330,7 +6865,6 @@ maybe-maintainer-clean-etc:
 maybe-maintainer-clean-etc: maintainer-clean-etc
 
 maintainer-clean-etc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8350,20 +6884,18 @@ maintainer-clean-etc:
 @endif etc
 
 
-
 .PHONY: configure-fastjar maybe-configure-fastjar
 maybe-configure-fastjar:
 @if fastjar
 maybe-configure-fastjar: configure-fastjar
-configure-fastjar: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
+configure-fastjar:
+	@test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/fastjar; \
-	cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
+	echo Configuring in fastjar; \
+	cd $(HOST_SUBDIR)/fastjar || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
@@ -8376,17 +6908,12 @@ configure-fastjar:
 	  || exit 1
 @endif fastjar
 
-
-
-
-
 .PHONY: all-fastjar maybe-all-fastjar
 maybe-all-fastjar:
 @if fastjar
 TARGET-fastjar=all
 maybe-all-fastjar: all-fastjar
 all-fastjar: configure-fastjar
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8394,9 +6921,6 @@ all-fastjar: configure-fastjar
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fastjar))
 @endif fastjar
 
-
-
-
 .PHONY: check-fastjar maybe-check-fastjar
 maybe-check-fastjar:
 @if fastjar
@@ -8404,7 +6928,6 @@ maybe-check-fastjar: check-fastjar
 
 # This module is only tested in a native toolchain.
 check-fastjar:
-	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8421,7 +6944,6 @@ maybe-install-fastjar:
 maybe-install-fastjar: install-fastjar
 
 install-fastjar: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8439,7 +6961,6 @@ maybe-info-fastjar: info-fastjar
 
 info-fastjar: \
     configure-fastjar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8465,7 +6986,6 @@ maybe-dvi-fastjar: dvi-fastjar
 
 dvi-fastjar: \
     configure-fastjar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8491,7 +7011,6 @@ maybe-html-fastjar: html-fastjar
 
 html-fastjar: \
     configure-fastjar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8517,7 +7036,6 @@ maybe-TAGS-fastjar: TAGS-fastjar
 
 TAGS-fastjar: \
     configure-fastjar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8544,7 +7062,6 @@ maybe-install-info-fastjar: install-info-fastjar
 install-info-fastjar: \
     configure-fastjar \
     info-fastjar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8570,7 +7087,6 @@ maybe-installcheck-fastjar: installcheck-fastjar
 
 installcheck-fastjar: \
     configure-fastjar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8595,7 +7111,6 @@ maybe-mostlyclean-fastjar:
 maybe-mostlyclean-fastjar: mostlyclean-fastjar
 
 mostlyclean-fastjar: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8620,7 +7135,6 @@ maybe-clean-fastjar:
 maybe-clean-fastjar: clean-fastjar
 
 clean-fastjar: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8645,7 +7159,6 @@ maybe-distclean-fastjar:
 maybe-distclean-fastjar: distclean-fastjar
 
 distclean-fastjar: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8670,7 +7183,6 @@ maybe-maintainer-clean-fastjar:
 maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
 
 maintainer-clean-fastjar: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8690,20 +7202,18 @@ maintainer-clean-fastjar:
 @endif fastjar
 
 
-
 .PHONY: configure-fileutils maybe-configure-fileutils
 maybe-configure-fileutils:
 @if fileutils
 maybe-configure-fileutils: configure-fileutils
-configure-fileutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
+configure-fileutils:
+	@test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/fileutils; \
-	cd "$(HOST_SUBDIR)/fileutils" || exit 1; \
+	echo Configuring in fileutils; \
+	cd $(HOST_SUBDIR)/fileutils || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/fileutils/ | \
@@ -8716,17 +7226,12 @@ configure-fileutils:
 	  || exit 1
 @endif fileutils
 
-
-
-
-
 .PHONY: all-fileutils maybe-all-fileutils
 maybe-all-fileutils:
 @if fileutils
 TARGET-fileutils=all
 maybe-all-fileutils: all-fileutils
 all-fileutils: configure-fileutils
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8734,16 +7239,12 @@ all-fileutils: configure-fileutils
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fileutils))
 @endif fileutils
 
-
-
-
 .PHONY: check-fileutils maybe-check-fileutils
 maybe-check-fileutils:
 @if fileutils
 maybe-check-fileutils: check-fileutils
 
 check-fileutils:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8758,7 +7259,6 @@ maybe-install-fileutils:
 maybe-install-fileutils: install-fileutils
 
 install-fileutils: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8776,7 +7276,6 @@ maybe-info-fileutils: info-fileutils
 
 info-fileutils: \
     configure-fileutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8802,7 +7301,6 @@ maybe-dvi-fileutils: dvi-fileutils
 
 dvi-fileutils: \
     configure-fileutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8828,7 +7326,6 @@ maybe-html-fileutils: html-fileutils
 
 html-fileutils: \
     configure-fileutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8854,7 +7351,6 @@ maybe-TAGS-fileutils: TAGS-fileutils
 
 TAGS-fileutils: \
     configure-fileutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8881,7 +7377,6 @@ maybe-install-info-fileutils: install-info-fileutils
 install-info-fileutils: \
     configure-fileutils \
     info-fileutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8907,7 +7402,6 @@ maybe-installcheck-fileutils: installcheck-fileutils
 
 installcheck-fileutils: \
     configure-fileutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8932,7 +7426,6 @@ maybe-mostlyclean-fileutils:
 maybe-mostlyclean-fileutils: mostlyclean-fileutils
 
 mostlyclean-fileutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8957,7 +7450,6 @@ maybe-clean-fileutils:
 maybe-clean-fileutils: clean-fileutils
 
 clean-fileutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8982,7 +7474,6 @@ maybe-distclean-fileutils:
 maybe-distclean-fileutils: distclean-fileutils
 
 distclean-fileutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9007,7 +7498,6 @@ maybe-maintainer-clean-fileutils:
 maybe-maintainer-clean-fileutils: maintainer-clean-fileutils
 
 maintainer-clean-fileutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9027,20 +7517,18 @@ maintainer-clean-fileutils:
 @endif fileutils
 
 
-
 .PHONY: configure-findutils maybe-configure-findutils
 maybe-configure-findutils:
 @if findutils
 maybe-configure-findutils: configure-findutils
-configure-findutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
+configure-findutils:
+	@test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/findutils; \
-	cd "$(HOST_SUBDIR)/findutils" || exit 1; \
+	echo Configuring in findutils; \
+	cd $(HOST_SUBDIR)/findutils || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/findutils/ | \
@@ -9053,17 +7541,12 @@ configure-findutils:
 	  || exit 1
 @endif findutils
 
-
-
-
-
 .PHONY: all-findutils maybe-all-findutils
 maybe-all-findutils:
 @if findutils
 TARGET-findutils=all
 maybe-all-findutils: all-findutils
 all-findutils: configure-findutils
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9071,16 +7554,12 @@ all-findutils: configure-findutils
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-findutils))
 @endif findutils
 
-
-
-
 .PHONY: check-findutils maybe-check-findutils
 maybe-check-findutils:
 @if findutils
 maybe-check-findutils: check-findutils
 
 check-findutils:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9095,7 +7574,6 @@ maybe-install-findutils:
 maybe-install-findutils: install-findutils
 
 install-findutils: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9113,7 +7591,6 @@ maybe-info-findutils: info-findutils
 
 info-findutils: \
     configure-findutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9139,7 +7616,6 @@ maybe-dvi-findutils: dvi-findutils
 
 dvi-findutils: \
     configure-findutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9165,7 +7641,6 @@ maybe-html-findutils: html-findutils
 
 html-findutils: \
     configure-findutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9191,7 +7666,6 @@ maybe-TAGS-findutils: TAGS-findutils
 
 TAGS-findutils: \
     configure-findutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9218,7 +7692,6 @@ maybe-install-info-findutils: install-info-findutils
 install-info-findutils: \
     configure-findutils \
     info-findutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9244,7 +7717,6 @@ maybe-installcheck-findutils: installcheck-findutils
 
 installcheck-findutils: \
     configure-findutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9269,7 +7741,6 @@ maybe-mostlyclean-findutils:
 maybe-mostlyclean-findutils: mostlyclean-findutils
 
 mostlyclean-findutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9294,7 +7765,6 @@ maybe-clean-findutils:
 maybe-clean-findutils: clean-findutils
 
 clean-findutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9319,7 +7789,6 @@ maybe-distclean-findutils:
 maybe-distclean-findutils: distclean-findutils
 
 distclean-findutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9344,7 +7813,6 @@ maybe-maintainer-clean-findutils:
 maybe-maintainer-clean-findutils: maintainer-clean-findutils
 
 maintainer-clean-findutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9364,20 +7832,18 @@ maintainer-clean-findutils:
 @endif findutils
 
 
-
 .PHONY: configure-find maybe-configure-find
 maybe-configure-find:
 @if find
 maybe-configure-find: configure-find
-configure-find: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
+configure-find:
+	@test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/find; \
-	cd "$(HOST_SUBDIR)/find" || exit 1; \
+	echo Configuring in find; \
+	cd $(HOST_SUBDIR)/find || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/find/ | \
@@ -9390,17 +7856,12 @@ configure-find:
 	  || exit 1
 @endif find
 
-
-
-
-
 .PHONY: all-find maybe-all-find
 maybe-all-find:
 @if find
 TARGET-find=all
 maybe-all-find: all-find
 all-find: configure-find
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9408,16 +7869,12 @@ all-find: configure-find
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-find))
 @endif find
 
-
-
-
 .PHONY: check-find maybe-check-find
 maybe-check-find:
 @if find
 maybe-check-find: check-find
 
 check-find:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9432,7 +7889,6 @@ maybe-install-find:
 maybe-install-find: install-find
 
 install-find: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9450,7 +7906,6 @@ maybe-info-find: info-find
 
 info-find: \
     configure-find 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9476,7 +7931,6 @@ maybe-dvi-find: dvi-find
 
 dvi-find: \
     configure-find 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9502,7 +7956,6 @@ maybe-html-find: html-find
 
 html-find: \
     configure-find 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9528,7 +7981,6 @@ maybe-TAGS-find: TAGS-find
 
 TAGS-find: \
     configure-find 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9555,7 +8007,6 @@ maybe-install-info-find: install-info-find
 install-info-find: \
     configure-find \
     info-find 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9581,7 +8032,6 @@ maybe-installcheck-find: installcheck-find
 
 installcheck-find: \
     configure-find 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9606,7 +8056,6 @@ maybe-mostlyclean-find:
 maybe-mostlyclean-find: mostlyclean-find
 
 mostlyclean-find: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9631,7 +8080,6 @@ maybe-clean-find:
 maybe-clean-find: clean-find
 
 clean-find: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9656,7 +8104,6 @@ maybe-distclean-find:
 maybe-distclean-find: distclean-find
 
 distclean-find: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9681,7 +8128,6 @@ maybe-maintainer-clean-find:
 maybe-maintainer-clean-find: maintainer-clean-find
 
 maintainer-clean-find: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9701,20 +8147,18 @@ maintainer-clean-find:
 @endif find
 
 
-
 .PHONY: configure-fixincludes maybe-configure-fixincludes
 maybe-configure-fixincludes:
 @if fixincludes
 maybe-configure-fixincludes: configure-fixincludes
-configure-fixincludes: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+configure-fixincludes:
+	@test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/fixincludes; \
-	cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
+	echo Configuring in fixincludes; \
+	cd $(HOST_SUBDIR)/fixincludes || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
@@ -9727,17 +8171,12 @@ configure-fixincludes:
 	  || exit 1
 @endif fixincludes
 
-
-
-
-
 .PHONY: all-fixincludes maybe-all-fixincludes
 maybe-all-fixincludes:
 @if fixincludes
 TARGET-fixincludes=all
 maybe-all-fixincludes: all-fixincludes
 all-fixincludes: configure-fixincludes
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9745,16 +8184,12 @@ all-fixincludes: configure-fixincludes
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fixincludes))
 @endif fixincludes
 
-
-
-
 .PHONY: check-fixincludes maybe-check-fixincludes
 maybe-check-fixincludes:
 @if fixincludes
 maybe-check-fixincludes: check-fixincludes
 
 check-fixincludes:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9769,7 +8204,6 @@ maybe-install-fixincludes:
 maybe-install-fixincludes: install-fixincludes
 
 install-fixincludes: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9807,7 +8241,6 @@ maybe-html-fixincludes: html-fixincludes
 
 html-fixincludes: \
     configure-fixincludes 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9862,7 +8295,6 @@ maybe-mostlyclean-fixincludes:
 maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
 
 mostlyclean-fixincludes: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9887,7 +8319,6 @@ maybe-clean-fixincludes:
 maybe-clean-fixincludes: clean-fixincludes
 
 clean-fixincludes: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9912,7 +8343,6 @@ maybe-distclean-fixincludes:
 maybe-distclean-fixincludes: distclean-fixincludes
 
 distclean-fixincludes: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9937,7 +8367,6 @@ maybe-maintainer-clean-fixincludes:
 maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
 
 maintainer-clean-fixincludes: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9957,20 +8386,18 @@ maintainer-clean-fixincludes:
 @endif fixincludes
 
 
-
 .PHONY: configure-flex maybe-configure-flex
 maybe-configure-flex:
 @if flex
 maybe-configure-flex: configure-flex
-configure-flex: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
+configure-flex:
+	@test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/flex; \
-	cd "$(HOST_SUBDIR)/flex" || exit 1; \
+	echo Configuring in flex; \
+	cd $(HOST_SUBDIR)/flex || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
@@ -9983,17 +8410,12 @@ configure-flex:
 	  || exit 1
 @endif flex
 
-
-
-
-
 .PHONY: all-flex maybe-all-flex
 maybe-all-flex:
 @if flex
 TARGET-flex=all
 maybe-all-flex: all-flex
 all-flex: configure-flex
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10001,9 +8423,6 @@ all-flex: configure-flex
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-flex))
 @endif flex
 
-
-
-
 .PHONY: check-flex maybe-check-flex
 maybe-check-flex:
 @if flex
@@ -10011,7 +8430,6 @@ maybe-check-flex: check-flex
 
 # This module is only tested in a native toolchain.
 check-flex:
-	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10028,7 +8446,6 @@ maybe-install-flex:
 maybe-install-flex: install-flex
 
 install-flex: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10046,7 +8463,6 @@ maybe-info-flex: info-flex
 
 info-flex: \
     configure-flex 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10072,7 +8488,6 @@ maybe-dvi-flex: dvi-flex
 
 dvi-flex: \
     configure-flex 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10098,7 +8513,6 @@ maybe-html-flex: html-flex
 
 html-flex: \
     configure-flex 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10124,7 +8538,6 @@ maybe-TAGS-flex: TAGS-flex
 
 TAGS-flex: \
     configure-flex 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10151,7 +8564,6 @@ maybe-install-info-flex: install-info-flex
 install-info-flex: \
     configure-flex \
     info-flex 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10177,7 +8589,6 @@ maybe-installcheck-flex: installcheck-flex
 
 installcheck-flex: \
     configure-flex 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10202,7 +8613,6 @@ maybe-mostlyclean-flex:
 maybe-mostlyclean-flex: mostlyclean-flex
 
 mostlyclean-flex: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10227,7 +8637,6 @@ maybe-clean-flex:
 maybe-clean-flex: clean-flex
 
 clean-flex: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10252,7 +8661,6 @@ maybe-distclean-flex:
 maybe-distclean-flex: distclean-flex
 
 distclean-flex: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10277,7 +8685,6 @@ maybe-maintainer-clean-flex:
 maybe-maintainer-clean-flex: maintainer-clean-flex
 
 maintainer-clean-flex: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10297,24 +8704,19 @@ maintainer-clean-flex:
 @endif flex
 
 
-
 .PHONY: configure-gas maybe-configure-gas
 maybe-configure-gas:
 @if gas
 maybe-configure-gas: configure-gas
-configure-gas: 
-@endif gas
-@if gas-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gas-bootstrap
-@if gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-gas:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gas; \
-	cd "$(HOST_SUBDIR)/gas" || exit 1; \
+	echo Configuring in gas; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
@@ -10327,387 +8729,26 @@ configure-gas:
 	  || exit 1
 @endif gas
 
-
-
-.PHONY: configure-stage1-gas maybe-configure-stage1-gas
-maybe-configure-stage1-gas:
-@if gas-bootstrap
-maybe-configure-stage1-gas: configure-stage1-gas
-configure-stage1-gas:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif gas-bootstrap
-
-.PHONY: configure-stage2-gas maybe-configure-stage2-gas
-maybe-configure-stage2-gas:
-@if gas-bootstrap
-maybe-configure-stage2-gas: configure-stage2-gas
-configure-stage2-gas:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stage3-gas maybe-configure-stage3-gas
-maybe-configure-stage3-gas:
-@if gas-bootstrap
-maybe-configure-stage3-gas: configure-stage3-gas
-configure-stage3-gas:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stage4-gas maybe-configure-stage4-gas
-maybe-configure-stage4-gas:
-@if gas-bootstrap
-maybe-configure-stage4-gas: configure-stage4-gas
-configure-stage4-gas:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
-maybe-configure-stageprofile-gas:
-@if gas-bootstrap
-maybe-configure-stageprofile-gas: configure-stageprofile-gas
-configure-stageprofile-gas:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
-maybe-configure-stagefeedback-gas:
-@if gas-bootstrap
-maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
-configure-stagefeedback-gas:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-
-
-
-
 .PHONY: all-gas maybe-all-gas
 maybe-all-gas:
 @if gas
 TARGET-gas=all
 maybe-all-gas: all-gas
 all-gas: configure-gas
-@endif gas
-@if gas-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gas-bootstrap
-@if gas
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/gas && \
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gas))
 @endif gas
 
-
-
-.PHONY: all-stage1-gas maybe-all-stage1-gas
-.PHONY: clean-stage1-gas maybe-clean-stage1-gas
-maybe-all-stage1-gas:
-maybe-clean-stage1-gas:
-@if gas-bootstrap
-maybe-all-stage1-gas: all-stage1-gas
-all-stage1: all-stage1-gas
-TARGET-stage1-gas = $(TARGET-gas)
-all-stage1-gas: configure-stage1-gas
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-gas)
-
-maybe-clean-stage1-gas: clean-stage1-gas
-clean-stage1: clean-stage1-gas
-clean-stage1-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stage2-gas maybe-all-stage2-gas
-.PHONY: clean-stage2-gas maybe-clean-stage2-gas
-maybe-all-stage2-gas:
-maybe-clean-stage2-gas:
-@if gas-bootstrap
-maybe-all-stage2-gas: all-stage2-gas
-all-stage2: all-stage2-gas
-TARGET-stage2-gas = $(TARGET-gas)
-all-stage2-gas: configure-stage2-gas
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-gas)
-
-maybe-clean-stage2-gas: clean-stage2-gas
-clean-stage2: clean-stage2-gas
-clean-stage2-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stage3-gas maybe-all-stage3-gas
-.PHONY: clean-stage3-gas maybe-clean-stage3-gas
-maybe-all-stage3-gas:
-maybe-clean-stage3-gas:
-@if gas-bootstrap
-maybe-all-stage3-gas: all-stage3-gas
-all-stage3: all-stage3-gas
-TARGET-stage3-gas = $(TARGET-gas)
-all-stage3-gas: configure-stage3-gas
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-gas)
-
-maybe-clean-stage3-gas: clean-stage3-gas
-clean-stage3: clean-stage3-gas
-clean-stage3-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stage4-gas maybe-all-stage4-gas
-.PHONY: clean-stage4-gas maybe-clean-stage4-gas
-maybe-all-stage4-gas:
-maybe-clean-stage4-gas:
-@if gas-bootstrap
-maybe-all-stage4-gas: all-stage4-gas
-all-stage4: all-stage4-gas
-TARGET-stage4-gas = $(TARGET-gas)
-all-stage4-gas: configure-stage4-gas
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-gas)
-
-maybe-clean-stage4-gas: clean-stage4-gas
-clean-stage4: clean-stage4-gas
-clean-stage4-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
-.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
-maybe-all-stageprofile-gas:
-maybe-clean-stageprofile-gas:
-@if gas-bootstrap
-maybe-all-stageprofile-gas: all-stageprofile-gas
-all-stageprofile: all-stageprofile-gas
-TARGET-stageprofile-gas = $(TARGET-gas)
-all-stageprofile-gas: configure-stageprofile-gas
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-gas)
-
-maybe-clean-stageprofile-gas: clean-stageprofile-gas
-clean-stageprofile: clean-stageprofile-gas
-clean-stageprofile-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
-.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
-maybe-all-stagefeedback-gas:
-maybe-clean-stagefeedback-gas:
-@if gas-bootstrap
-maybe-all-stagefeedback-gas: all-stagefeedback-gas
-all-stagefeedback: all-stagefeedback-gas
-TARGET-stagefeedback-gas = $(TARGET-gas)
-all-stagefeedback-gas: configure-stagefeedback-gas
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-gas)
-
-maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
-clean-stagefeedback: clean-stagefeedback-gas
-clean-stagefeedback-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif gas-bootstrap
-
-
-
-
-
 .PHONY: check-gas maybe-check-gas
 maybe-check-gas:
 @if gas
 maybe-check-gas: check-gas
 
 check-gas:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10722,7 +8763,6 @@ maybe-install-gas:
 maybe-install-gas: install-gas
 
 install-gas: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10981,24 +9021,19 @@ maintainer-clean-gas:
 @endif gas
 
 
-
 .PHONY: configure-gcc maybe-configure-gcc
 maybe-configure-gcc:
 @if gcc
 maybe-configure-gcc: configure-gcc
-configure-gcc: 
-@endif gcc
-@if gcc-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gcc-bootstrap
-@if gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-gcc:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gcc; \
-	cd "$(HOST_SUBDIR)/gcc" || exit 1; \
+	echo Configuring in gcc; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
@@ -11011,387 +9046,26 @@ configure-gcc:
 	  || exit 1
 @endif gcc
 
-
-
-.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
-maybe-configure-stage1-gcc:
-@if gcc-bootstrap
-maybe-configure-stage1-gcc: configure-stage1-gcc
-configure-stage1-gcc:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif gcc-bootstrap
-
-.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
-maybe-configure-stage2-gcc:
-@if gcc-bootstrap
-maybe-configure-stage2-gcc: configure-stage2-gcc
-configure-stage2-gcc:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
-maybe-configure-stage3-gcc:
-@if gcc-bootstrap
-maybe-configure-stage3-gcc: configure-stage3-gcc
-configure-stage3-gcc:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
-maybe-configure-stage4-gcc:
-@if gcc-bootstrap
-maybe-configure-stage4-gcc: configure-stage4-gcc
-configure-stage4-gcc:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
-maybe-configure-stageprofile-gcc:
-@if gcc-bootstrap
-maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
-configure-stageprofile-gcc:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
-maybe-configure-stagefeedback-gcc:
-@if gcc-bootstrap
-maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
-configure-stagefeedback-gcc:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-
-
-
-
 .PHONY: all-gcc maybe-all-gcc
 maybe-all-gcc:
 @if gcc
-TARGET-gcc=`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi`
+TARGET-gcc=`if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi`
 maybe-all-gcc: all-gcc
 all-gcc: configure-gcc
-@endif gcc
-@if gcc-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gcc-bootstrap
-@if gcc
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/gcc && \
 	  $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc))
 @endif gcc
 
-
-
-.PHONY: all-stage1-gcc maybe-all-stage1-gcc
-.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
-maybe-all-stage1-gcc:
-maybe-clean-stage1-gcc:
-@if gcc-bootstrap
-maybe-all-stage1-gcc: all-stage1-gcc
-all-stage1: all-stage1-gcc
-TARGET-stage1-gcc = $(TARGET-gcc)
-all-stage1-gcc: configure-stage1-gcc
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stage1-gcc)
-
-maybe-clean-stage1-gcc: clean-stage1-gcc
-clean-stage1: clean-stage1-gcc
-clean-stage1-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stage2-gcc maybe-all-stage2-gcc
-.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
-maybe-all-stage2-gcc:
-maybe-clean-stage2-gcc:
-@if gcc-bootstrap
-maybe-all-stage2-gcc: all-stage2-gcc
-all-stage2: all-stage2-gcc
-TARGET-stage2-gcc = $(TARGET-gcc)
-all-stage2-gcc: configure-stage2-gcc
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stage2-gcc)
-
-maybe-clean-stage2-gcc: clean-stage2-gcc
-clean-stage2: clean-stage2-gcc
-clean-stage2-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stage3-gcc maybe-all-stage3-gcc
-.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
-maybe-all-stage3-gcc:
-maybe-clean-stage3-gcc:
-@if gcc-bootstrap
-maybe-all-stage3-gcc: all-stage3-gcc
-all-stage3: all-stage3-gcc
-TARGET-stage3-gcc = $(TARGET-gcc)
-all-stage3-gcc: configure-stage3-gcc
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stage3-gcc)
-
-maybe-clean-stage3-gcc: clean-stage3-gcc
-clean-stage3: clean-stage3-gcc
-clean-stage3-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stage4-gcc maybe-all-stage4-gcc
-.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
-maybe-all-stage4-gcc:
-maybe-clean-stage4-gcc:
-@if gcc-bootstrap
-maybe-all-stage4-gcc: all-stage4-gcc
-all-stage4: all-stage4-gcc
-TARGET-stage4-gcc = $(TARGET-gcc)
-all-stage4-gcc: configure-stage4-gcc
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stage4-gcc)
-
-maybe-clean-stage4-gcc: clean-stage4-gcc
-clean-stage4: clean-stage4-gcc
-clean-stage4-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
-.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
-maybe-all-stageprofile-gcc:
-maybe-clean-stageprofile-gcc:
-@if gcc-bootstrap
-maybe-all-stageprofile-gcc: all-stageprofile-gcc
-all-stageprofile: all-stageprofile-gcc
-TARGET-stageprofile-gcc = $(TARGET-gcc)
-all-stageprofile-gcc: configure-stageprofile-gcc
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stageprofile-gcc)
-
-maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
-clean-stageprofile: clean-stageprofile-gcc
-clean-stageprofile-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
-.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
-maybe-all-stagefeedback-gcc:
-maybe-clean-stagefeedback-gcc:
-@if gcc-bootstrap
-maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
-all-stagefeedback: all-stagefeedback-gcc
-TARGET-stagefeedback-gcc = $(TARGET-gcc)
-all-stagefeedback-gcc: configure-stagefeedback-gcc
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stagefeedback-gcc)
-
-maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
-clean-stagefeedback: clean-stagefeedback-gcc
-clean-stagefeedback-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-
-
-
 .PHONY: check-gcc maybe-check-gcc
 maybe-check-gcc:
 @if gcc
 maybe-check-gcc: check-gcc
 
 check-gcc:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11406,7 +9080,6 @@ maybe-install-gcc:
 maybe-install-gcc: install-gcc
 
 install-gcc: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11665,20 +9338,18 @@ maintainer-clean-gcc:
 @endif gcc
 
 
-
 .PHONY: configure-gawk maybe-configure-gawk
 maybe-configure-gawk:
 @if gawk
 maybe-configure-gawk: configure-gawk
-configure-gawk: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
+configure-gawk:
+	@test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gawk; \
-	cd "$(HOST_SUBDIR)/gawk" || exit 1; \
+	echo Configuring in gawk; \
+	cd $(HOST_SUBDIR)/gawk || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/gawk/ | \
@@ -11691,17 +9362,12 @@ configure-gawk:
 	  || exit 1
 @endif gawk
 
-
-
-
-
 .PHONY: all-gawk maybe-all-gawk
 maybe-all-gawk:
 @if gawk
 TARGET-gawk=all
 maybe-all-gawk: all-gawk
 all-gawk: configure-gawk
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11709,16 +9375,12 @@ all-gawk: configure-gawk
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gawk))
 @endif gawk
 
-
-
-
 .PHONY: check-gawk maybe-check-gawk
 maybe-check-gawk:
 @if gawk
 maybe-check-gawk: check-gawk
 
 check-gawk:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11733,7 +9395,6 @@ maybe-install-gawk:
 maybe-install-gawk: install-gawk
 
 install-gawk: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11751,7 +9412,6 @@ maybe-info-gawk: info-gawk
 
 info-gawk: \
     configure-gawk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11777,7 +9437,6 @@ maybe-dvi-gawk: dvi-gawk
 
 dvi-gawk: \
     configure-gawk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11803,7 +9462,6 @@ maybe-html-gawk: html-gawk
 
 html-gawk: \
     configure-gawk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11829,7 +9487,6 @@ maybe-TAGS-gawk: TAGS-gawk
 
 TAGS-gawk: \
     configure-gawk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11856,7 +9513,6 @@ maybe-install-info-gawk: install-info-gawk
 install-info-gawk: \
     configure-gawk \
     info-gawk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11882,7 +9538,6 @@ maybe-installcheck-gawk: installcheck-gawk
 
 installcheck-gawk: \
     configure-gawk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11907,7 +9562,6 @@ maybe-mostlyclean-gawk:
 maybe-mostlyclean-gawk: mostlyclean-gawk
 
 mostlyclean-gawk: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11932,7 +9586,6 @@ maybe-clean-gawk:
 maybe-clean-gawk: clean-gawk
 
 clean-gawk: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11957,7 +9610,6 @@ maybe-distclean-gawk:
 maybe-distclean-gawk: distclean-gawk
 
 distclean-gawk: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11982,7 +9634,6 @@ maybe-maintainer-clean-gawk:
 maybe-maintainer-clean-gawk: maintainer-clean-gawk
 
 maintainer-clean-gawk: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12002,20 +9653,18 @@ maintainer-clean-gawk:
 @endif gawk
 
 
-
 .PHONY: configure-gettext maybe-configure-gettext
 maybe-configure-gettext:
 @if gettext
 maybe-configure-gettext: configure-gettext
-configure-gettext: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
+configure-gettext:
+	@test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gettext; \
-	cd "$(HOST_SUBDIR)/gettext" || exit 1; \
+	echo Configuring in gettext; \
+	cd $(HOST_SUBDIR)/gettext || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \
@@ -12028,17 +9677,12 @@ configure-gettext:
 	  || exit 1
 @endif gettext
 
-
-
-
-
 .PHONY: all-gettext maybe-all-gettext
 maybe-all-gettext:
 @if gettext
 TARGET-gettext=all
 maybe-all-gettext: all-gettext
 all-gettext: configure-gettext
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12046,16 +9690,12 @@ all-gettext: configure-gettext
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gettext))
 @endif gettext
 
-
-
-
 .PHONY: check-gettext maybe-check-gettext
 maybe-check-gettext:
 @if gettext
 maybe-check-gettext: check-gettext
 
 check-gettext:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12070,7 +9710,6 @@ maybe-install-gettext:
 maybe-install-gettext: install-gettext
 
 install-gettext: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12088,7 +9727,6 @@ maybe-info-gettext: info-gettext
 
 info-gettext: \
     configure-gettext 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12114,7 +9752,6 @@ maybe-dvi-gettext: dvi-gettext
 
 dvi-gettext: \
     configure-gettext 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12140,7 +9777,6 @@ maybe-html-gettext: html-gettext
 
 html-gettext: \
     configure-gettext 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12166,7 +9802,6 @@ maybe-TAGS-gettext: TAGS-gettext
 
 TAGS-gettext: \
     configure-gettext 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12193,7 +9828,6 @@ maybe-install-info-gettext: install-info-gettext
 install-info-gettext: \
     configure-gettext \
     info-gettext 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12219,7 +9853,6 @@ maybe-installcheck-gettext: installcheck-gettext
 
 installcheck-gettext: \
     configure-gettext 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12244,7 +9877,6 @@ maybe-mostlyclean-gettext:
 maybe-mostlyclean-gettext: mostlyclean-gettext
 
 mostlyclean-gettext: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12269,7 +9901,6 @@ maybe-clean-gettext:
 maybe-clean-gettext: clean-gettext
 
 clean-gettext: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12294,7 +9925,6 @@ maybe-distclean-gettext:
 maybe-distclean-gettext: distclean-gettext
 
 distclean-gettext: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12319,7 +9949,6 @@ maybe-maintainer-clean-gettext:
 maybe-maintainer-clean-gettext: maintainer-clean-gettext
 
 maintainer-clean-gettext: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12339,20 +9968,18 @@ maintainer-clean-gettext:
 @endif gettext
 
 
-
 .PHONY: configure-gnuserv maybe-configure-gnuserv
 maybe-configure-gnuserv:
 @if gnuserv
 maybe-configure-gnuserv: configure-gnuserv
-configure-gnuserv: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
+configure-gnuserv:
+	@test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gnuserv; \
-	cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \
+	echo Configuring in gnuserv; \
+	cd $(HOST_SUBDIR)/gnuserv || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/gnuserv/ | \
@@ -12365,17 +9992,12 @@ configure-gnuserv:
 	  || exit 1
 @endif gnuserv
 
-
-
-
-
 .PHONY: all-gnuserv maybe-all-gnuserv
 maybe-all-gnuserv:
 @if gnuserv
 TARGET-gnuserv=all
 maybe-all-gnuserv: all-gnuserv
 all-gnuserv: configure-gnuserv
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12383,16 +10005,12 @@ all-gnuserv: configure-gnuserv
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnuserv))
 @endif gnuserv
 
-
-
-
 .PHONY: check-gnuserv maybe-check-gnuserv
 maybe-check-gnuserv:
 @if gnuserv
 maybe-check-gnuserv: check-gnuserv
 
 check-gnuserv:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12407,7 +10025,6 @@ maybe-install-gnuserv:
 maybe-install-gnuserv: install-gnuserv
 
 install-gnuserv: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12425,7 +10042,6 @@ maybe-info-gnuserv: info-gnuserv
 
 info-gnuserv: \
     configure-gnuserv 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12451,7 +10067,6 @@ maybe-dvi-gnuserv: dvi-gnuserv
 
 dvi-gnuserv: \
     configure-gnuserv 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12477,7 +10092,6 @@ maybe-html-gnuserv: html-gnuserv
 
 html-gnuserv: \
     configure-gnuserv 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12503,7 +10117,6 @@ maybe-TAGS-gnuserv: TAGS-gnuserv
 
 TAGS-gnuserv: \
     configure-gnuserv 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12530,7 +10143,6 @@ maybe-install-info-gnuserv: install-info-gnuserv
 install-info-gnuserv: \
     configure-gnuserv \
     info-gnuserv 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12556,7 +10168,6 @@ maybe-installcheck-gnuserv: installcheck-gnuserv
 
 installcheck-gnuserv: \
     configure-gnuserv 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12581,7 +10192,6 @@ maybe-mostlyclean-gnuserv:
 maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
 
 mostlyclean-gnuserv: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12606,7 +10216,6 @@ maybe-clean-gnuserv:
 maybe-clean-gnuserv: clean-gnuserv
 
 clean-gnuserv: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12631,7 +10240,6 @@ maybe-distclean-gnuserv:
 maybe-distclean-gnuserv: distclean-gnuserv
 
 distclean-gnuserv: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12656,7 +10264,6 @@ maybe-maintainer-clean-gnuserv:
 maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
 
 maintainer-clean-gnuserv: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12676,20 +10283,18 @@ maintainer-clean-gnuserv:
 @endif gnuserv
 
 
-
 .PHONY: configure-gprof maybe-configure-gprof
 maybe-configure-gprof:
 @if gprof
 maybe-configure-gprof: configure-gprof
-configure-gprof: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
+configure-gprof:
+	@test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gprof; \
-	cd "$(HOST_SUBDIR)/gprof" || exit 1; \
+	echo Configuring in gprof; \
+	cd $(HOST_SUBDIR)/gprof || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
@@ -12702,17 +10307,12 @@ configure-gprof:
 	  || exit 1
 @endif gprof
 
-
-
-
-
 .PHONY: all-gprof maybe-all-gprof
 maybe-all-gprof:
 @if gprof
 TARGET-gprof=all
 maybe-all-gprof: all-gprof
 all-gprof: configure-gprof
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12720,16 +10320,12 @@ all-gprof: configure-gprof
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gprof))
 @endif gprof
 
-
-
-
 .PHONY: check-gprof maybe-check-gprof
 maybe-check-gprof:
 @if gprof
 maybe-check-gprof: check-gprof
 
 check-gprof:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12744,7 +10340,6 @@ maybe-install-gprof:
 maybe-install-gprof: install-gprof
 
 install-gprof: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12762,7 +10357,6 @@ maybe-info-gprof: info-gprof
 
 info-gprof: \
     configure-gprof 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12788,7 +10382,6 @@ maybe-dvi-gprof: dvi-gprof
 
 dvi-gprof: \
     configure-gprof 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12814,7 +10407,6 @@ maybe-html-gprof: html-gprof
 
 html-gprof: \
     configure-gprof 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12840,7 +10432,6 @@ maybe-TAGS-gprof: TAGS-gprof
 
 TAGS-gprof: \
     configure-gprof 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12867,7 +10458,6 @@ maybe-install-info-gprof: install-info-gprof
 install-info-gprof: \
     configure-gprof \
     info-gprof 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12893,7 +10483,6 @@ maybe-installcheck-gprof: installcheck-gprof
 
 installcheck-gprof: \
     configure-gprof 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12918,7 +10507,6 @@ maybe-mostlyclean-gprof:
 maybe-mostlyclean-gprof: mostlyclean-gprof
 
 mostlyclean-gprof: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12943,7 +10531,6 @@ maybe-clean-gprof:
 maybe-clean-gprof: clean-gprof
 
 clean-gprof: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12968,7 +10555,6 @@ maybe-distclean-gprof:
 maybe-distclean-gprof: distclean-gprof
 
 distclean-gprof: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12993,7 +10579,6 @@ maybe-maintainer-clean-gprof:
 maybe-maintainer-clean-gprof: maintainer-clean-gprof
 
 maintainer-clean-gprof: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13013,20 +10598,18 @@ maintainer-clean-gprof:
 @endif gprof
 
 
-
 .PHONY: configure-gzip maybe-configure-gzip
 maybe-configure-gzip:
 @if gzip
 maybe-configure-gzip: configure-gzip
-configure-gzip: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
+configure-gzip:
+	@test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gzip; \
-	cd "$(HOST_SUBDIR)/gzip" || exit 1; \
+	echo Configuring in gzip; \
+	cd $(HOST_SUBDIR)/gzip || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/gzip/ | \
@@ -13039,17 +10622,12 @@ configure-gzip:
 	  || exit 1
 @endif gzip
 
-
-
-
-
 .PHONY: all-gzip maybe-all-gzip
 maybe-all-gzip:
 @if gzip
 TARGET-gzip=all
 maybe-all-gzip: all-gzip
 all-gzip: configure-gzip
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13057,16 +10635,12 @@ all-gzip: configure-gzip
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gzip))
 @endif gzip
 
-
-
-
 .PHONY: check-gzip maybe-check-gzip
 maybe-check-gzip:
 @if gzip
 maybe-check-gzip: check-gzip
 
 check-gzip:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13081,7 +10655,6 @@ maybe-install-gzip:
 maybe-install-gzip: install-gzip
 
 install-gzip: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13099,7 +10672,6 @@ maybe-info-gzip: info-gzip
 
 info-gzip: \
     configure-gzip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13125,7 +10697,6 @@ maybe-dvi-gzip: dvi-gzip
 
 dvi-gzip: \
     configure-gzip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13151,7 +10722,6 @@ maybe-html-gzip: html-gzip
 
 html-gzip: \
     configure-gzip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13177,7 +10747,6 @@ maybe-TAGS-gzip: TAGS-gzip
 
 TAGS-gzip: \
     configure-gzip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13204,7 +10773,6 @@ maybe-install-info-gzip: install-info-gzip
 install-info-gzip: \
     configure-gzip \
     info-gzip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13230,7 +10798,6 @@ maybe-installcheck-gzip: installcheck-gzip
 
 installcheck-gzip: \
     configure-gzip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13255,7 +10822,6 @@ maybe-mostlyclean-gzip:
 maybe-mostlyclean-gzip: mostlyclean-gzip
 
 mostlyclean-gzip: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13280,7 +10846,6 @@ maybe-clean-gzip:
 maybe-clean-gzip: clean-gzip
 
 clean-gzip: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13305,7 +10870,6 @@ maybe-distclean-gzip:
 maybe-distclean-gzip: distclean-gzip
 
 distclean-gzip: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13330,7 +10894,6 @@ maybe-maintainer-clean-gzip:
 maybe-maintainer-clean-gzip: maintainer-clean-gzip
 
 maintainer-clean-gzip: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13350,20 +10913,18 @@ maintainer-clean-gzip:
 @endif gzip
 
 
-
 .PHONY: configure-hello maybe-configure-hello
 maybe-configure-hello:
 @if hello
 maybe-configure-hello: configure-hello
-configure-hello: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
+configure-hello:
+	@test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/hello; \
-	cd "$(HOST_SUBDIR)/hello" || exit 1; \
+	echo Configuring in hello; \
+	cd $(HOST_SUBDIR)/hello || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/hello/ | \
@@ -13376,17 +10937,12 @@ configure-hello:
 	  || exit 1
 @endif hello
 
-
-
-
-
 .PHONY: all-hello maybe-all-hello
 maybe-all-hello:
 @if hello
 TARGET-hello=all
 maybe-all-hello: all-hello
 all-hello: configure-hello
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13394,16 +10950,12 @@ all-hello: configure-hello
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-hello))
 @endif hello
 
-
-
-
 .PHONY: check-hello maybe-check-hello
 maybe-check-hello:
 @if hello
 maybe-check-hello: check-hello
 
 check-hello:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13418,7 +10970,6 @@ maybe-install-hello:
 maybe-install-hello: install-hello
 
 install-hello: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13436,7 +10987,6 @@ maybe-info-hello: info-hello
 
 info-hello: \
     configure-hello 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13462,7 +11012,6 @@ maybe-dvi-hello: dvi-hello
 
 dvi-hello: \
     configure-hello 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13488,7 +11037,6 @@ maybe-html-hello: html-hello
 
 html-hello: \
     configure-hello 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13514,7 +11062,6 @@ maybe-TAGS-hello: TAGS-hello
 
 TAGS-hello: \
     configure-hello 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13541,7 +11088,6 @@ maybe-install-info-hello: install-info-hello
 install-info-hello: \
     configure-hello \
     info-hello 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13567,7 +11113,6 @@ maybe-installcheck-hello: installcheck-hello
 
 installcheck-hello: \
     configure-hello 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13592,7 +11137,6 @@ maybe-mostlyclean-hello:
 maybe-mostlyclean-hello: mostlyclean-hello
 
 mostlyclean-hello: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13617,7 +11161,6 @@ maybe-clean-hello:
 maybe-clean-hello: clean-hello
 
 clean-hello: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13642,7 +11185,6 @@ maybe-distclean-hello:
 maybe-distclean-hello: distclean-hello
 
 distclean-hello: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13667,7 +11209,6 @@ maybe-maintainer-clean-hello:
 maybe-maintainer-clean-hello: maintainer-clean-hello
 
 maintainer-clean-hello: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13687,20 +11228,18 @@ maintainer-clean-hello:
 @endif hello
 
 
-
 .PHONY: configure-indent maybe-configure-indent
 maybe-configure-indent:
 @if indent
 maybe-configure-indent: configure-indent
-configure-indent: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
+configure-indent:
+	@test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/indent; \
-	cd "$(HOST_SUBDIR)/indent" || exit 1; \
+	echo Configuring in indent; \
+	cd $(HOST_SUBDIR)/indent || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/indent/ | \
@@ -13713,17 +11252,12 @@ configure-indent:
 	  || exit 1
 @endif indent
 
-
-
-
-
 .PHONY: all-indent maybe-all-indent
 maybe-all-indent:
 @if indent
 TARGET-indent=all
 maybe-all-indent: all-indent
 all-indent: configure-indent
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13731,16 +11265,12 @@ all-indent: configure-indent
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-indent))
 @endif indent
 
-
-
-
 .PHONY: check-indent maybe-check-indent
 maybe-check-indent:
 @if indent
 maybe-check-indent: check-indent
 
 check-indent:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13755,7 +11285,6 @@ maybe-install-indent:
 maybe-install-indent: install-indent
 
 install-indent: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13773,7 +11302,6 @@ maybe-info-indent: info-indent
 
 info-indent: \
     configure-indent 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13799,7 +11327,6 @@ maybe-dvi-indent: dvi-indent
 
 dvi-indent: \
     configure-indent 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13825,7 +11352,6 @@ maybe-html-indent: html-indent
 
 html-indent: \
     configure-indent 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13851,7 +11377,6 @@ maybe-TAGS-indent: TAGS-indent
 
 TAGS-indent: \
     configure-indent 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13878,7 +11403,6 @@ maybe-install-info-indent: install-info-indent
 install-info-indent: \
     configure-indent \
     info-indent 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13904,7 +11428,6 @@ maybe-installcheck-indent: installcheck-indent
 
 installcheck-indent: \
     configure-indent 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13929,7 +11452,6 @@ maybe-mostlyclean-indent:
 maybe-mostlyclean-indent: mostlyclean-indent
 
 mostlyclean-indent: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13954,7 +11476,6 @@ maybe-clean-indent:
 maybe-clean-indent: clean-indent
 
 clean-indent: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13979,7 +11500,6 @@ maybe-distclean-indent:
 maybe-distclean-indent: distclean-indent
 
 distclean-indent: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14004,7 +11524,6 @@ maybe-maintainer-clean-indent:
 maybe-maintainer-clean-indent: maintainer-clean-indent
 
 maintainer-clean-indent: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14024,24 +11543,19 @@ maintainer-clean-indent:
 @endif indent
 
 
-
 .PHONY: configure-intl maybe-configure-intl
 maybe-configure-intl:
 @if intl
 maybe-configure-intl: configure-intl
-configure-intl: 
-@endif intl
-@if intl-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif intl-bootstrap
-@if intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-intl:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/intl; \
-	cd "$(HOST_SUBDIR)/intl" || exit 1; \
+	echo Configuring in intl; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
@@ -14054,387 +11568,26 @@ configure-intl:
 	  || exit 1
 @endif intl
 
-
-
-.PHONY: configure-stage1-intl maybe-configure-stage1-intl
-maybe-configure-stage1-intl:
-@if intl-bootstrap
-maybe-configure-stage1-intl: configure-stage1-intl
-configure-stage1-intl:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif intl-bootstrap
-
-.PHONY: configure-stage2-intl maybe-configure-stage2-intl
-maybe-configure-stage2-intl:
-@if intl-bootstrap
-maybe-configure-stage2-intl: configure-stage2-intl
-configure-stage2-intl:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stage3-intl maybe-configure-stage3-intl
-maybe-configure-stage3-intl:
-@if intl-bootstrap
-maybe-configure-stage3-intl: configure-stage3-intl
-configure-stage3-intl:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stage4-intl maybe-configure-stage4-intl
-maybe-configure-stage4-intl:
-@if intl-bootstrap
-maybe-configure-stage4-intl: configure-stage4-intl
-configure-stage4-intl:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
-maybe-configure-stageprofile-intl:
-@if intl-bootstrap
-maybe-configure-stageprofile-intl: configure-stageprofile-intl
-configure-stageprofile-intl:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
-maybe-configure-stagefeedback-intl:
-@if intl-bootstrap
-maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
-configure-stagefeedback-intl:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-
-
-
-
 .PHONY: all-intl maybe-all-intl
 maybe-all-intl:
 @if intl
 TARGET-intl=all
 maybe-all-intl: all-intl
 all-intl: configure-intl
-@endif intl
-@if intl-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif intl-bootstrap
-@if intl
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/intl && \
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-intl))
 @endif intl
 
-
-
-.PHONY: all-stage1-intl maybe-all-stage1-intl
-.PHONY: clean-stage1-intl maybe-clean-stage1-intl
-maybe-all-stage1-intl:
-maybe-clean-stage1-intl:
-@if intl-bootstrap
-maybe-all-stage1-intl: all-stage1-intl
-all-stage1: all-stage1-intl
-TARGET-stage1-intl = $(TARGET-intl)
-all-stage1-intl: configure-stage1-intl
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-intl)
-
-maybe-clean-stage1-intl: clean-stage1-intl
-clean-stage1: clean-stage1-intl
-clean-stage1-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stage2-intl maybe-all-stage2-intl
-.PHONY: clean-stage2-intl maybe-clean-stage2-intl
-maybe-all-stage2-intl:
-maybe-clean-stage2-intl:
-@if intl-bootstrap
-maybe-all-stage2-intl: all-stage2-intl
-all-stage2: all-stage2-intl
-TARGET-stage2-intl = $(TARGET-intl)
-all-stage2-intl: configure-stage2-intl
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-intl)
-
-maybe-clean-stage2-intl: clean-stage2-intl
-clean-stage2: clean-stage2-intl
-clean-stage2-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stage3-intl maybe-all-stage3-intl
-.PHONY: clean-stage3-intl maybe-clean-stage3-intl
-maybe-all-stage3-intl:
-maybe-clean-stage3-intl:
-@if intl-bootstrap
-maybe-all-stage3-intl: all-stage3-intl
-all-stage3: all-stage3-intl
-TARGET-stage3-intl = $(TARGET-intl)
-all-stage3-intl: configure-stage3-intl
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-intl)
-
-maybe-clean-stage3-intl: clean-stage3-intl
-clean-stage3: clean-stage3-intl
-clean-stage3-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stage4-intl maybe-all-stage4-intl
-.PHONY: clean-stage4-intl maybe-clean-stage4-intl
-maybe-all-stage4-intl:
-maybe-clean-stage4-intl:
-@if intl-bootstrap
-maybe-all-stage4-intl: all-stage4-intl
-all-stage4: all-stage4-intl
-TARGET-stage4-intl = $(TARGET-intl)
-all-stage4-intl: configure-stage4-intl
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-intl)
-
-maybe-clean-stage4-intl: clean-stage4-intl
-clean-stage4: clean-stage4-intl
-clean-stage4-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
-.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
-maybe-all-stageprofile-intl:
-maybe-clean-stageprofile-intl:
-@if intl-bootstrap
-maybe-all-stageprofile-intl: all-stageprofile-intl
-all-stageprofile: all-stageprofile-intl
-TARGET-stageprofile-intl = $(TARGET-intl)
-all-stageprofile-intl: configure-stageprofile-intl
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-intl)
-
-maybe-clean-stageprofile-intl: clean-stageprofile-intl
-clean-stageprofile: clean-stageprofile-intl
-clean-stageprofile-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
-.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
-maybe-all-stagefeedback-intl:
-maybe-clean-stagefeedback-intl:
-@if intl-bootstrap
-maybe-all-stagefeedback-intl: all-stagefeedback-intl
-all-stagefeedback: all-stagefeedback-intl
-TARGET-stagefeedback-intl = $(TARGET-intl)
-all-stagefeedback-intl: configure-stagefeedback-intl
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-intl)
-
-maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
-clean-stagefeedback: clean-stagefeedback-intl
-clean-stagefeedback-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif intl-bootstrap
-
-
-
-
-
 .PHONY: check-intl maybe-check-intl
 maybe-check-intl:
 @if intl
 maybe-check-intl: check-intl
 
 check-intl:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14449,7 +11602,6 @@ maybe-install-intl:
 maybe-install-intl: install-intl
 
 install-intl: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14708,20 +11860,18 @@ maintainer-clean-intl:
 @endif intl
 
 
-
 .PHONY: configure-tcl maybe-configure-tcl
 maybe-configure-tcl:
 @if tcl
 maybe-configure-tcl: configure-tcl
-configure-tcl: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
+configure-tcl:
+	@test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/tcl; \
-	cd "$(HOST_SUBDIR)/tcl" || exit 1; \
+	echo Configuring in tcl; \
+	cd $(HOST_SUBDIR)/tcl || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
@@ -14734,17 +11884,12 @@ configure-tcl:
 	  || exit 1
 @endif tcl
 
-
-
-
-
 .PHONY: all-tcl maybe-all-tcl
 maybe-all-tcl:
 @if tcl
 TARGET-tcl=all
 maybe-all-tcl: all-tcl
 all-tcl: configure-tcl
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14752,16 +11897,12 @@ all-tcl: configure-tcl
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tcl))
 @endif tcl
 
-
-
-
 .PHONY: check-tcl maybe-check-tcl
 maybe-check-tcl:
 @if tcl
 maybe-check-tcl: check-tcl
 
 check-tcl:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14776,7 +11917,6 @@ maybe-install-tcl:
 maybe-install-tcl: install-tcl
 
 install-tcl: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14794,7 +11934,6 @@ maybe-info-tcl: info-tcl
 
 info-tcl: \
     configure-tcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14820,7 +11959,6 @@ maybe-dvi-tcl: dvi-tcl
 
 dvi-tcl: \
     configure-tcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14846,7 +11984,6 @@ maybe-html-tcl: html-tcl
 
 html-tcl: \
     configure-tcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14872,7 +12009,6 @@ maybe-TAGS-tcl: TAGS-tcl
 
 TAGS-tcl: \
     configure-tcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14899,7 +12035,6 @@ maybe-install-info-tcl: install-info-tcl
 install-info-tcl: \
     configure-tcl \
     info-tcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14925,7 +12060,6 @@ maybe-installcheck-tcl: installcheck-tcl
 
 installcheck-tcl: \
     configure-tcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14960,7 +12094,6 @@ maybe-clean-tcl:
 maybe-clean-tcl: clean-tcl
 
 clean-tcl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14985,7 +12118,6 @@ maybe-distclean-tcl:
 maybe-distclean-tcl: distclean-tcl
 
 distclean-tcl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15010,7 +12142,6 @@ maybe-maintainer-clean-tcl:
 maybe-maintainer-clean-tcl: maintainer-clean-tcl
 
 maintainer-clean-tcl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15030,20 +12161,18 @@ maintainer-clean-tcl:
 @endif tcl
 
 
-
 .PHONY: configure-itcl maybe-configure-itcl
 maybe-configure-itcl:
 @if itcl
 maybe-configure-itcl: configure-itcl
-configure-itcl: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
+configure-itcl:
+	@test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/itcl; \
-	cd "$(HOST_SUBDIR)/itcl" || exit 1; \
+	echo Configuring in itcl; \
+	cd $(HOST_SUBDIR)/itcl || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
@@ -15056,17 +12185,12 @@ configure-itcl:
 	  || exit 1
 @endif itcl
 
-
-
-
-
 .PHONY: all-itcl maybe-all-itcl
 maybe-all-itcl:
 @if itcl
 TARGET-itcl=all
 maybe-all-itcl: all-itcl
 all-itcl: configure-itcl
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15074,16 +12198,12 @@ all-itcl: configure-itcl
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-itcl))
 @endif itcl
 
-
-
-
 .PHONY: check-itcl maybe-check-itcl
 maybe-check-itcl:
 @if itcl
 maybe-check-itcl: check-itcl
 
 check-itcl:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15098,7 +12218,6 @@ maybe-install-itcl:
 maybe-install-itcl: install-itcl
 
 install-itcl: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15116,7 +12235,6 @@ maybe-info-itcl: info-itcl
 
 info-itcl: \
     configure-itcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15142,7 +12260,6 @@ maybe-dvi-itcl: dvi-itcl
 
 dvi-itcl: \
     configure-itcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15168,7 +12285,6 @@ maybe-html-itcl: html-itcl
 
 html-itcl: \
     configure-itcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15194,7 +12310,6 @@ maybe-TAGS-itcl: TAGS-itcl
 
 TAGS-itcl: \
     configure-itcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15221,7 +12336,6 @@ maybe-install-info-itcl: install-info-itcl
 install-info-itcl: \
     configure-itcl \
     info-itcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15247,7 +12361,6 @@ maybe-installcheck-itcl: installcheck-itcl
 
 installcheck-itcl: \
     configure-itcl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15272,7 +12385,6 @@ maybe-mostlyclean-itcl:
 maybe-mostlyclean-itcl: mostlyclean-itcl
 
 mostlyclean-itcl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15297,7 +12409,6 @@ maybe-clean-itcl:
 maybe-clean-itcl: clean-itcl
 
 clean-itcl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15322,7 +12433,6 @@ maybe-distclean-itcl:
 maybe-distclean-itcl: distclean-itcl
 
 distclean-itcl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15347,7 +12457,6 @@ maybe-maintainer-clean-itcl:
 maybe-maintainer-clean-itcl: maintainer-clean-itcl
 
 maintainer-clean-itcl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15367,24 +12476,19 @@ maintainer-clean-itcl:
 @endif itcl
 
 
-
 .PHONY: configure-ld maybe-configure-ld
 maybe-configure-ld:
 @if ld
 maybe-configure-ld: configure-ld
-configure-ld: 
-@endif ld
-@if ld-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif ld-bootstrap
-@if ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-ld:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/ld; \
-	cd "$(HOST_SUBDIR)/ld" || exit 1; \
+	echo Configuring in ld; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
@@ -15397,387 +12501,26 @@ configure-ld:
 	  || exit 1
 @endif ld
 
-
-
-.PHONY: configure-stage1-ld maybe-configure-stage1-ld
-maybe-configure-stage1-ld:
-@if ld-bootstrap
-maybe-configure-stage1-ld: configure-stage1-ld
-configure-stage1-ld:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif ld-bootstrap
-
-.PHONY: configure-stage2-ld maybe-configure-stage2-ld
-maybe-configure-stage2-ld:
-@if ld-bootstrap
-maybe-configure-stage2-ld: configure-stage2-ld
-configure-stage2-ld:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stage3-ld maybe-configure-stage3-ld
-maybe-configure-stage3-ld:
-@if ld-bootstrap
-maybe-configure-stage3-ld: configure-stage3-ld
-configure-stage3-ld:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stage4-ld maybe-configure-stage4-ld
-maybe-configure-stage4-ld:
-@if ld-bootstrap
-maybe-configure-stage4-ld: configure-stage4-ld
-configure-stage4-ld:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
-maybe-configure-stageprofile-ld:
-@if ld-bootstrap
-maybe-configure-stageprofile-ld: configure-stageprofile-ld
-configure-stageprofile-ld:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
-maybe-configure-stagefeedback-ld:
-@if ld-bootstrap
-maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
-configure-stagefeedback-ld:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-
-
-
-
 .PHONY: all-ld maybe-all-ld
 maybe-all-ld:
 @if ld
 TARGET-ld=all
 maybe-all-ld: all-ld
 all-ld: configure-ld
-@endif ld
-@if ld-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif ld-bootstrap
-@if ld
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/ld && \
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ld))
 @endif ld
 
-
-
-.PHONY: all-stage1-ld maybe-all-stage1-ld
-.PHONY: clean-stage1-ld maybe-clean-stage1-ld
-maybe-all-stage1-ld:
-maybe-clean-stage1-ld:
-@if ld-bootstrap
-maybe-all-stage1-ld: all-stage1-ld
-all-stage1: all-stage1-ld
-TARGET-stage1-ld = $(TARGET-ld)
-all-stage1-ld: configure-stage1-ld
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-ld)
-
-maybe-clean-stage1-ld: clean-stage1-ld
-clean-stage1: clean-stage1-ld
-clean-stage1-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stage2-ld maybe-all-stage2-ld
-.PHONY: clean-stage2-ld maybe-clean-stage2-ld
-maybe-all-stage2-ld:
-maybe-clean-stage2-ld:
-@if ld-bootstrap
-maybe-all-stage2-ld: all-stage2-ld
-all-stage2: all-stage2-ld
-TARGET-stage2-ld = $(TARGET-ld)
-all-stage2-ld: configure-stage2-ld
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-ld)
-
-maybe-clean-stage2-ld: clean-stage2-ld
-clean-stage2: clean-stage2-ld
-clean-stage2-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stage3-ld maybe-all-stage3-ld
-.PHONY: clean-stage3-ld maybe-clean-stage3-ld
-maybe-all-stage3-ld:
-maybe-clean-stage3-ld:
-@if ld-bootstrap
-maybe-all-stage3-ld: all-stage3-ld
-all-stage3: all-stage3-ld
-TARGET-stage3-ld = $(TARGET-ld)
-all-stage3-ld: configure-stage3-ld
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-ld)
-
-maybe-clean-stage3-ld: clean-stage3-ld
-clean-stage3: clean-stage3-ld
-clean-stage3-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stage4-ld maybe-all-stage4-ld
-.PHONY: clean-stage4-ld maybe-clean-stage4-ld
-maybe-all-stage4-ld:
-maybe-clean-stage4-ld:
-@if ld-bootstrap
-maybe-all-stage4-ld: all-stage4-ld
-all-stage4: all-stage4-ld
-TARGET-stage4-ld = $(TARGET-ld)
-all-stage4-ld: configure-stage4-ld
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-ld)
-
-maybe-clean-stage4-ld: clean-stage4-ld
-clean-stage4: clean-stage4-ld
-clean-stage4-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
-.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
-maybe-all-stageprofile-ld:
-maybe-clean-stageprofile-ld:
-@if ld-bootstrap
-maybe-all-stageprofile-ld: all-stageprofile-ld
-all-stageprofile: all-stageprofile-ld
-TARGET-stageprofile-ld = $(TARGET-ld)
-all-stageprofile-ld: configure-stageprofile-ld
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-ld)
-
-maybe-clean-stageprofile-ld: clean-stageprofile-ld
-clean-stageprofile: clean-stageprofile-ld
-clean-stageprofile-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
-.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
-maybe-all-stagefeedback-ld:
-maybe-clean-stagefeedback-ld:
-@if ld-bootstrap
-maybe-all-stagefeedback-ld: all-stagefeedback-ld
-all-stagefeedback: all-stagefeedback-ld
-TARGET-stagefeedback-ld = $(TARGET-ld)
-all-stagefeedback-ld: configure-stagefeedback-ld
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-ld)
-
-maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
-clean-stagefeedback: clean-stagefeedback-ld
-clean-stagefeedback-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif ld-bootstrap
-
-
-
-
-
 .PHONY: check-ld maybe-check-ld
 maybe-check-ld:
 @if ld
 maybe-check-ld: check-ld
 
 check-ld:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15792,7 +12535,6 @@ maybe-install-ld:
 maybe-install-ld: install-ld
 
 install-ld: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16051,24 +12793,19 @@ maintainer-clean-ld:
 @endif ld
 
 
-
 .PHONY: configure-libcpp maybe-configure-libcpp
 maybe-configure-libcpp:
 @if libcpp
 maybe-configure-libcpp: configure-libcpp
-configure-libcpp: 
-@endif libcpp
-@if libcpp-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libcpp-bootstrap
-@if libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-libcpp:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libcpp; \
-	cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
+	echo Configuring in libcpp; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
@@ -16081,387 +12818,26 @@ configure-libcpp:
 	  || exit 1
 @endif libcpp
 
-
-
-.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
-maybe-configure-stage1-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage1-libcpp: configure-stage1-libcpp
-configure-stage1-libcpp:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
-maybe-configure-stage2-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage2-libcpp: configure-stage2-libcpp
-configure-stage2-libcpp:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
-maybe-configure-stage3-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage3-libcpp: configure-stage3-libcpp
-configure-stage3-libcpp:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
-maybe-configure-stage4-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage4-libcpp: configure-stage4-libcpp
-configure-stage4-libcpp:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
-maybe-configure-stageprofile-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
-configure-stageprofile-libcpp:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
-maybe-configure-stagefeedback-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
-configure-stagefeedback-libcpp:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-
-
-
-
 .PHONY: all-libcpp maybe-all-libcpp
 maybe-all-libcpp:
 @if libcpp
 TARGET-libcpp=all
 maybe-all-libcpp: all-libcpp
 all-libcpp: configure-libcpp
-@endif libcpp
-@if libcpp-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libcpp-bootstrap
-@if libcpp
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/libcpp && \
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libcpp))
 @endif libcpp
 
-
-
-.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
-.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
-maybe-all-stage1-libcpp:
-maybe-clean-stage1-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage1-libcpp: all-stage1-libcpp
-all-stage1: all-stage1-libcpp
-TARGET-stage1-libcpp = $(TARGET-libcpp)
-all-stage1-libcpp: configure-stage1-libcpp
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-libcpp)
-
-maybe-clean-stage1-libcpp: clean-stage1-libcpp
-clean-stage1: clean-stage1-libcpp
-clean-stage1-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
-.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
-maybe-all-stage2-libcpp:
-maybe-clean-stage2-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage2-libcpp: all-stage2-libcpp
-all-stage2: all-stage2-libcpp
-TARGET-stage2-libcpp = $(TARGET-libcpp)
-all-stage2-libcpp: configure-stage2-libcpp
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-libcpp)
-
-maybe-clean-stage2-libcpp: clean-stage2-libcpp
-clean-stage2: clean-stage2-libcpp
-clean-stage2-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
-.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
-maybe-all-stage3-libcpp:
-maybe-clean-stage3-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage3-libcpp: all-stage3-libcpp
-all-stage3: all-stage3-libcpp
-TARGET-stage3-libcpp = $(TARGET-libcpp)
-all-stage3-libcpp: configure-stage3-libcpp
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-libcpp)
-
-maybe-clean-stage3-libcpp: clean-stage3-libcpp
-clean-stage3: clean-stage3-libcpp
-clean-stage3-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
-.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
-maybe-all-stage4-libcpp:
-maybe-clean-stage4-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage4-libcpp: all-stage4-libcpp
-all-stage4: all-stage4-libcpp
-TARGET-stage4-libcpp = $(TARGET-libcpp)
-all-stage4-libcpp: configure-stage4-libcpp
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-libcpp)
-
-maybe-clean-stage4-libcpp: clean-stage4-libcpp
-clean-stage4: clean-stage4-libcpp
-clean-stage4-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
-.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
-maybe-all-stageprofile-libcpp:
-maybe-clean-stageprofile-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
-all-stageprofile: all-stageprofile-libcpp
-TARGET-stageprofile-libcpp = $(TARGET-libcpp)
-all-stageprofile-libcpp: configure-stageprofile-libcpp
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-libcpp)
-
-maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
-clean-stageprofile: clean-stageprofile-libcpp
-clean-stageprofile-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
-.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
-maybe-all-stagefeedback-libcpp:
-maybe-clean-stagefeedback-libcpp:
-@if libcpp-bootstrap
-maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
-all-stagefeedback: all-stagefeedback-libcpp
-TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
-all-stagefeedback-libcpp: configure-stagefeedback-libcpp
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-libcpp)
-
-maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
-clean-stagefeedback: clean-stagefeedback-libcpp
-clean-stagefeedback-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif libcpp-bootstrap
-
-
-
-
-
 .PHONY: check-libcpp maybe-check-libcpp
 maybe-check-libcpp:
 @if libcpp
 maybe-check-libcpp: check-libcpp
 
 check-libcpp:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16476,7 +12852,6 @@ maybe-install-libcpp:
 maybe-install-libcpp: install-libcpp
 
 install-libcpp: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16735,704 +13110,18 @@ maintainer-clean-libcpp:
 @endif libcpp
 
 
-
-.PHONY: configure-libdecnumber maybe-configure-libdecnumber
-maybe-configure-libdecnumber:
-@if libdecnumber
-maybe-configure-libdecnumber: configure-libdecnumber
-configure-libdecnumber: 
-@endif libdecnumber
-@if libdecnumber-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libdecnumber-bootstrap
-@if libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
-	cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif libdecnumber
-
-
-
-.PHONY: configure-stage1-libdecnumber maybe-configure-stage1-libdecnumber
-maybe-configure-stage1-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
-configure-stage1-libdecnumber:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
-maybe-configure-stage2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
-configure-stage2-libdecnumber:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
-maybe-configure-stage3-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
-configure-stage3-libdecnumber:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
-maybe-configure-stage4-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
-configure-stage4-libdecnumber:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
-maybe-configure-stageprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
-configure-stageprofile-libdecnumber:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
-maybe-configure-stagefeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
-configure-stagefeedback-libdecnumber:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-
-
-
-
-.PHONY: all-libdecnumber maybe-all-libdecnumber
-maybe-all-libdecnumber:
-@if libdecnumber
-TARGET-libdecnumber=all
-maybe-all-libdecnumber: all-libdecnumber
-all-libdecnumber: configure-libdecnumber
-@endif libdecnumber
-@if libdecnumber-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libdecnumber-bootstrap
-@if libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libdecnumber))
-@endif libdecnumber
-
-
-
-.PHONY: all-stage1-libdecnumber maybe-all-stage1-libdecnumber
-.PHONY: clean-stage1-libdecnumber maybe-clean-stage1-libdecnumber
-maybe-all-stage1-libdecnumber:
-maybe-clean-stage1-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage1-libdecnumber: all-stage1-libdecnumber
-all-stage1: all-stage1-libdecnumber
-TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
-all-stage1-libdecnumber: configure-stage1-libdecnumber
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-libdecnumber)
-
-maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
-clean-stage1: clean-stage1-libdecnumber
-clean-stage1-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stage2-libdecnumber maybe-all-stage2-libdecnumber
-.PHONY: clean-stage2-libdecnumber maybe-clean-stage2-libdecnumber
-maybe-all-stage2-libdecnumber:
-maybe-clean-stage2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage2-libdecnumber: all-stage2-libdecnumber
-all-stage2: all-stage2-libdecnumber
-TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
-all-stage2-libdecnumber: configure-stage2-libdecnumber
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-libdecnumber)
-
-maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
-clean-stage2: clean-stage2-libdecnumber
-clean-stage2-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber
-.PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber
-maybe-all-stage3-libdecnumber:
-maybe-clean-stage3-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage3-libdecnumber: all-stage3-libdecnumber
-all-stage3: all-stage3-libdecnumber
-TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
-all-stage3-libdecnumber: configure-stage3-libdecnumber
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-libdecnumber)
-
-maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
-clean-stage3: clean-stage3-libdecnumber
-clean-stage3-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber
-.PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber
-maybe-all-stage4-libdecnumber:
-maybe-clean-stage4-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage4-libdecnumber: all-stage4-libdecnumber
-all-stage4: all-stage4-libdecnumber
-TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
-all-stage4-libdecnumber: configure-stage4-libdecnumber
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-libdecnumber)
-
-maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
-clean-stage4: clean-stage4-libdecnumber
-clean-stage4-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stageprofile-libdecnumber maybe-all-stageprofile-libdecnumber
-.PHONY: clean-stageprofile-libdecnumber maybe-clean-stageprofile-libdecnumber
-maybe-all-stageprofile-libdecnumber:
-maybe-clean-stageprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber
-all-stageprofile: all-stageprofile-libdecnumber
-TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
-all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-libdecnumber)
-
-maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
-clean-stageprofile: clean-stageprofile-libdecnumber
-clean-stageprofile-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber
-.PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber
-maybe-all-stagefeedback-libdecnumber:
-maybe-clean-stagefeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber
-all-stagefeedback: all-stagefeedback-libdecnumber
-TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
-all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-libdecnumber)
-
-maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
-clean-stagefeedback: clean-stagefeedback-libdecnumber
-clean-stagefeedback-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif libdecnumber-bootstrap
-
-
-
-
-
-.PHONY: check-libdecnumber maybe-check-libdecnumber
-maybe-check-libdecnumber:
-@if libdecnumber
-maybe-check-libdecnumber: check-libdecnumber
-
-check-libdecnumber:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libdecnumber
-
-.PHONY: install-libdecnumber maybe-install-libdecnumber
-maybe-install-libdecnumber:
-@if libdecnumber
-maybe-install-libdecnumber: install-libdecnumber
-
-install-libdecnumber: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libdecnumber
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libdecnumber info-libdecnumber
-maybe-info-libdecnumber:
-@if libdecnumber
-maybe-info-libdecnumber: info-libdecnumber
-
-info-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
-maybe-dvi-libdecnumber:
-@if libdecnumber
-maybe-dvi-libdecnumber: dvi-libdecnumber
-
-dvi-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-html-libdecnumber html-libdecnumber
-maybe-html-libdecnumber:
-@if libdecnumber
-maybe-html-libdecnumber: html-libdecnumber
-
-html-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
-maybe-TAGS-libdecnumber:
-@if libdecnumber
-maybe-TAGS-libdecnumber: TAGS-libdecnumber
-
-TAGS-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
-maybe-install-info-libdecnumber:
-@if libdecnumber
-maybe-install-info-libdecnumber: install-info-libdecnumber
-
-install-info-libdecnumber: \
-    configure-libdecnumber \
-    info-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
-maybe-installcheck-libdecnumber:
-@if libdecnumber
-maybe-installcheck-libdecnumber: installcheck-libdecnumber
-
-installcheck-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
-maybe-mostlyclean-libdecnumber:
-@if libdecnumber
-maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
-
-mostlyclean-libdecnumber: 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-clean-libdecnumber clean-libdecnumber
-maybe-clean-libdecnumber:
-@if libdecnumber
-maybe-clean-libdecnumber: clean-libdecnumber
-
-clean-libdecnumber: 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
-maybe-distclean-libdecnumber:
-@if libdecnumber
-maybe-distclean-libdecnumber: distclean-libdecnumber
-
-distclean-libdecnumber: 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber
-maybe-maintainer-clean-libdecnumber:
-@if libdecnumber
-maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
-
-maintainer-clean-libdecnumber: 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif libdecnumber
-
-
-
 .PHONY: configure-libgui maybe-configure-libgui
 maybe-configure-libgui:
 @if libgui
 maybe-configure-libgui: configure-libgui
-configure-libgui: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
+configure-libgui:
+	@test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libgui; \
-	cd "$(HOST_SUBDIR)/libgui" || exit 1; \
+	echo Configuring in libgui; \
+	cd $(HOST_SUBDIR)/libgui || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
@@ -17445,17 +13134,12 @@ configure-libgui:
 	  || exit 1
 @endif libgui
 
-
-
-
-
 .PHONY: all-libgui maybe-all-libgui
 maybe-all-libgui:
 @if libgui
 TARGET-libgui=all
 maybe-all-libgui: all-libgui
 all-libgui: configure-libgui
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17463,16 +13147,12 @@ all-libgui: configure-libgui
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgui))
 @endif libgui
 
-
-
-
 .PHONY: check-libgui maybe-check-libgui
 maybe-check-libgui:
 @if libgui
 maybe-check-libgui: check-libgui
 
 check-libgui:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17487,7 +13167,6 @@ maybe-install-libgui:
 maybe-install-libgui: install-libgui
 
 install-libgui: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17505,7 +13184,6 @@ maybe-info-libgui: info-libgui
 
 info-libgui: \
     configure-libgui 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17531,7 +13209,6 @@ maybe-dvi-libgui: dvi-libgui
 
 dvi-libgui: \
     configure-libgui 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17557,7 +13234,6 @@ maybe-html-libgui: html-libgui
 
 html-libgui: \
     configure-libgui 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17583,7 +13259,6 @@ maybe-TAGS-libgui: TAGS-libgui
 
 TAGS-libgui: \
     configure-libgui 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17610,7 +13285,6 @@ maybe-install-info-libgui: install-info-libgui
 install-info-libgui: \
     configure-libgui \
     info-libgui 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17636,7 +13310,6 @@ maybe-installcheck-libgui: installcheck-libgui
 
 installcheck-libgui: \
     configure-libgui 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17661,7 +13334,6 @@ maybe-mostlyclean-libgui:
 maybe-mostlyclean-libgui: mostlyclean-libgui
 
 mostlyclean-libgui: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17686,7 +13358,6 @@ maybe-clean-libgui:
 maybe-clean-libgui: clean-libgui
 
 clean-libgui: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17711,7 +13382,6 @@ maybe-distclean-libgui:
 maybe-distclean-libgui: distclean-libgui
 
 distclean-libgui: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17736,7 +13406,6 @@ maybe-maintainer-clean-libgui:
 maybe-maintainer-clean-libgui: maintainer-clean-libgui
 
 maintainer-clean-libgui: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17756,24 +13425,19 @@ maintainer-clean-libgui:
 @endif libgui
 
 
-
 .PHONY: configure-libiberty maybe-configure-libiberty
 maybe-configure-libiberty:
 @if libiberty
 maybe-configure-libiberty: configure-libiberty
-configure-libiberty: 
-@endif libiberty
-@if libiberty-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libiberty-bootstrap
-@if libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-libiberty:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libiberty; \
-	cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
+	echo Configuring in libiberty; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
@@ -17786,387 +13450,26 @@ configure-libiberty:
 	  || exit 1
 @endif libiberty
 
-
-
-.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
-maybe-configure-stage1-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage1-libiberty: configure-stage1-libiberty
-configure-stage1-libiberty:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
-maybe-configure-stage2-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage2-libiberty: configure-stage2-libiberty
-configure-stage2-libiberty:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
-maybe-configure-stage3-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage3-libiberty: configure-stage3-libiberty
-configure-stage3-libiberty:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
-maybe-configure-stage4-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage4-libiberty: configure-stage4-libiberty
-configure-stage4-libiberty:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
-maybe-configure-stageprofile-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
-configure-stageprofile-libiberty:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
-maybe-configure-stagefeedback-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
-configure-stagefeedback-libiberty:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-
-
-
-
 .PHONY: all-libiberty maybe-all-libiberty
 maybe-all-libiberty:
 @if libiberty
 TARGET-libiberty=all
 maybe-all-libiberty: all-libiberty
 all-libiberty: configure-libiberty
-@endif libiberty
-@if libiberty-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libiberty-bootstrap
-@if libiberty
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/libiberty && \
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libiberty))
 @endif libiberty
 
-
-
-.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
-.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
-maybe-all-stage1-libiberty:
-maybe-clean-stage1-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage1-libiberty: all-stage1-libiberty
-all-stage1: all-stage1-libiberty
-TARGET-stage1-libiberty = $(TARGET-libiberty)
-all-stage1-libiberty: configure-stage1-libiberty
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-libiberty)
-
-maybe-clean-stage1-libiberty: clean-stage1-libiberty
-clean-stage1: clean-stage1-libiberty
-clean-stage1-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
-.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
-maybe-all-stage2-libiberty:
-maybe-clean-stage2-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage2-libiberty: all-stage2-libiberty
-all-stage2: all-stage2-libiberty
-TARGET-stage2-libiberty = $(TARGET-libiberty)
-all-stage2-libiberty: configure-stage2-libiberty
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-libiberty)
-
-maybe-clean-stage2-libiberty: clean-stage2-libiberty
-clean-stage2: clean-stage2-libiberty
-clean-stage2-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
-.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
-maybe-all-stage3-libiberty:
-maybe-clean-stage3-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage3-libiberty: all-stage3-libiberty
-all-stage3: all-stage3-libiberty
-TARGET-stage3-libiberty = $(TARGET-libiberty)
-all-stage3-libiberty: configure-stage3-libiberty
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-libiberty)
-
-maybe-clean-stage3-libiberty: clean-stage3-libiberty
-clean-stage3: clean-stage3-libiberty
-clean-stage3-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
-.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
-maybe-all-stage4-libiberty:
-maybe-clean-stage4-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage4-libiberty: all-stage4-libiberty
-all-stage4: all-stage4-libiberty
-TARGET-stage4-libiberty = $(TARGET-libiberty)
-all-stage4-libiberty: configure-stage4-libiberty
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-libiberty)
-
-maybe-clean-stage4-libiberty: clean-stage4-libiberty
-clean-stage4: clean-stage4-libiberty
-clean-stage4-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
-.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
-maybe-all-stageprofile-libiberty:
-maybe-clean-stageprofile-libiberty:
-@if libiberty-bootstrap
-maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
-all-stageprofile: all-stageprofile-libiberty
-TARGET-stageprofile-libiberty = $(TARGET-libiberty)
-all-stageprofile-libiberty: configure-stageprofile-libiberty
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-libiberty)
-
-maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
-clean-stageprofile: clean-stageprofile-libiberty
-clean-stageprofile-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
-.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
-maybe-all-stagefeedback-libiberty:
-maybe-clean-stagefeedback-libiberty:
-@if libiberty-bootstrap
-maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
-all-stagefeedback: all-stagefeedback-libiberty
-TARGET-stagefeedback-libiberty = $(TARGET-libiberty)
-all-stagefeedback-libiberty: configure-stagefeedback-libiberty
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-libiberty)
-
-maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
-clean-stagefeedback: clean-stagefeedback-libiberty
-clean-stagefeedback-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif libiberty-bootstrap
-
-
-
-
-
 .PHONY: check-libiberty maybe-check-libiberty
 maybe-check-libiberty:
 @if libiberty
 maybe-check-libiberty: check-libiberty
 
 check-libiberty:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18181,7 +13484,6 @@ maybe-install-libiberty:
 maybe-install-libiberty: install-libiberty
 
 install-libiberty: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18440,20 +13742,18 @@ maintainer-clean-libiberty:
 @endif libiberty
 
 
-
 .PHONY: configure-libtool maybe-configure-libtool
 maybe-configure-libtool:
 @if libtool
 maybe-configure-libtool: configure-libtool
-configure-libtool: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
+configure-libtool:
+	@test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libtool; \
-	cd "$(HOST_SUBDIR)/libtool" || exit 1; \
+	echo Configuring in libtool; \
+	cd $(HOST_SUBDIR)/libtool || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/libtool/ | \
@@ -18466,17 +13766,12 @@ configure-libtool:
 	  || exit 1
 @endif libtool
 
-
-
-
-
 .PHONY: all-libtool maybe-all-libtool
 maybe-all-libtool:
 @if libtool
 TARGET-libtool=all
 maybe-all-libtool: all-libtool
 all-libtool: configure-libtool
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18484,16 +13779,12 @@ all-libtool: configure-libtool
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtool))
 @endif libtool
 
-
-
-
 .PHONY: check-libtool maybe-check-libtool
 maybe-check-libtool:
 @if libtool
 maybe-check-libtool: check-libtool
 
 check-libtool:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18508,7 +13799,6 @@ maybe-install-libtool:
 maybe-install-libtool: install-libtool
 
 install-libtool: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18526,7 +13816,6 @@ maybe-info-libtool: info-libtool
 
 info-libtool: \
     configure-libtool 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18552,7 +13841,6 @@ maybe-dvi-libtool: dvi-libtool
 
 dvi-libtool: \
     configure-libtool 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18578,7 +13866,6 @@ maybe-html-libtool: html-libtool
 
 html-libtool: \
     configure-libtool 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18604,7 +13891,6 @@ maybe-TAGS-libtool: TAGS-libtool
 
 TAGS-libtool: \
     configure-libtool 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18631,7 +13917,6 @@ maybe-install-info-libtool: install-info-libtool
 install-info-libtool: \
     configure-libtool \
     info-libtool 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18657,7 +13942,6 @@ maybe-installcheck-libtool: installcheck-libtool
 
 installcheck-libtool: \
     configure-libtool 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18682,7 +13966,6 @@ maybe-mostlyclean-libtool:
 maybe-mostlyclean-libtool: mostlyclean-libtool
 
 mostlyclean-libtool: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18707,7 +13990,6 @@ maybe-clean-libtool:
 maybe-clean-libtool: clean-libtool
 
 clean-libtool: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18732,7 +14014,6 @@ maybe-distclean-libtool:
 maybe-distclean-libtool: distclean-libtool
 
 distclean-libtool: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18757,7 +14038,6 @@ maybe-maintainer-clean-libtool:
 maybe-maintainer-clean-libtool: maintainer-clean-libtool
 
 maintainer-clean-libtool: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18777,20 +14057,18 @@ maintainer-clean-libtool:
 @endif libtool
 
 
-
 .PHONY: configure-m4 maybe-configure-m4
 maybe-configure-m4:
 @if m4
 maybe-configure-m4: configure-m4
-configure-m4: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
+configure-m4:
+	@test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/m4; \
-	cd "$(HOST_SUBDIR)/m4" || exit 1; \
+	echo Configuring in m4; \
+	cd $(HOST_SUBDIR)/m4 || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
@@ -18803,17 +14081,12 @@ configure-m4:
 	  || exit 1
 @endif m4
 
-
-
-
-
 .PHONY: all-m4 maybe-all-m4
 maybe-all-m4:
 @if m4
 TARGET-m4=all
 maybe-all-m4: all-m4
 all-m4: configure-m4
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18821,16 +14094,12 @@ all-m4: configure-m4
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-m4))
 @endif m4
 
-
-
-
 .PHONY: check-m4 maybe-check-m4
 maybe-check-m4:
 @if m4
 maybe-check-m4: check-m4
 
 check-m4:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18845,7 +14114,6 @@ maybe-install-m4:
 maybe-install-m4: install-m4
 
 install-m4: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18863,7 +14131,6 @@ maybe-info-m4: info-m4
 
 info-m4: \
     configure-m4 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18889,7 +14156,6 @@ maybe-dvi-m4: dvi-m4
 
 dvi-m4: \
     configure-m4 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18915,7 +14181,6 @@ maybe-html-m4: html-m4
 
 html-m4: \
     configure-m4 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18941,7 +14206,6 @@ maybe-TAGS-m4: TAGS-m4
 
 TAGS-m4: \
     configure-m4 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18968,7 +14232,6 @@ maybe-install-info-m4: install-info-m4
 install-info-m4: \
     configure-m4 \
     info-m4 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18994,7 +14257,6 @@ maybe-installcheck-m4: installcheck-m4
 
 installcheck-m4: \
     configure-m4 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19019,7 +14281,6 @@ maybe-mostlyclean-m4:
 maybe-mostlyclean-m4: mostlyclean-m4
 
 mostlyclean-m4: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19044,7 +14305,6 @@ maybe-clean-m4:
 maybe-clean-m4: clean-m4
 
 clean-m4: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19069,7 +14329,6 @@ maybe-distclean-m4:
 maybe-distclean-m4: distclean-m4
 
 distclean-m4: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19094,7 +14353,6 @@ maybe-maintainer-clean-m4:
 maybe-maintainer-clean-m4: maintainer-clean-m4
 
 maintainer-clean-m4: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19114,20 +14372,18 @@ maintainer-clean-m4:
 @endif m4
 
 
-
 .PHONY: configure-make maybe-configure-make
 maybe-configure-make:
 @if make
 maybe-configure-make: configure-make
-configure-make: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
+configure-make:
+	@test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/make; \
-	cd "$(HOST_SUBDIR)/make" || exit 1; \
+	echo Configuring in make; \
+	cd $(HOST_SUBDIR)/make || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/make/ | \
@@ -19140,17 +14396,12 @@ configure-make:
 	  || exit 1
 @endif make
 
-
-
-
-
 .PHONY: all-make maybe-all-make
 maybe-all-make:
 @if make
 TARGET-make=all
 maybe-all-make: all-make
 all-make: configure-make
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19158,16 +14409,12 @@ all-make: configure-make
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-make))
 @endif make
 
-
-
-
 .PHONY: check-make maybe-check-make
 maybe-check-make:
 @if make
 maybe-check-make: check-make
 
 check-make:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19182,7 +14429,6 @@ maybe-install-make:
 maybe-install-make: install-make
 
 install-make: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19200,7 +14446,6 @@ maybe-info-make: info-make
 
 info-make: \
     configure-make 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19226,7 +14471,6 @@ maybe-dvi-make: dvi-make
 
 dvi-make: \
     configure-make 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19252,7 +14496,6 @@ maybe-html-make: html-make
 
 html-make: \
     configure-make 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19278,7 +14521,6 @@ maybe-TAGS-make: TAGS-make
 
 TAGS-make: \
     configure-make 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19305,7 +14547,6 @@ maybe-install-info-make: install-info-make
 install-info-make: \
     configure-make \
     info-make 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19331,7 +14572,6 @@ maybe-installcheck-make: installcheck-make
 
 installcheck-make: \
     configure-make 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19356,7 +14596,6 @@ maybe-mostlyclean-make:
 maybe-mostlyclean-make: mostlyclean-make
 
 mostlyclean-make: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19381,7 +14620,6 @@ maybe-clean-make:
 maybe-clean-make: clean-make
 
 clean-make: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19406,7 +14644,6 @@ maybe-distclean-make:
 maybe-distclean-make: distclean-make
 
 distclean-make: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19431,7 +14668,6 @@ maybe-maintainer-clean-make:
 maybe-maintainer-clean-make: maintainer-clean-make
 
 maintainer-clean-make: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19451,20 +14687,18 @@ maintainer-clean-make:
 @endif make
 
 
-
 .PHONY: configure-mmalloc maybe-configure-mmalloc
 maybe-configure-mmalloc:
 @if mmalloc
 maybe-configure-mmalloc: configure-mmalloc
-configure-mmalloc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
+configure-mmalloc:
+	@test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/mmalloc; \
-	cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \
+	echo Configuring in mmalloc; \
+	cd $(HOST_SUBDIR)/mmalloc || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/mmalloc/ | \
@@ -19477,17 +14711,12 @@ configure-mmalloc:
 	  || exit 1
 @endif mmalloc
 
-
-
-
-
 .PHONY: all-mmalloc maybe-all-mmalloc
 maybe-all-mmalloc:
 @if mmalloc
 TARGET-mmalloc=all
 maybe-all-mmalloc: all-mmalloc
 all-mmalloc: configure-mmalloc
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19495,9 +14724,6 @@ all-mmalloc: configure-mmalloc
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-mmalloc))
 @endif mmalloc
 
-
-
-
 .PHONY: check-mmalloc maybe-check-mmalloc
 maybe-check-mmalloc:
 @if mmalloc
@@ -19513,7 +14739,6 @@ maybe-install-mmalloc:
 maybe-install-mmalloc: install-mmalloc
 
 install-mmalloc: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19531,7 +14756,6 @@ maybe-info-mmalloc: info-mmalloc
 
 info-mmalloc: \
     configure-mmalloc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19557,7 +14781,6 @@ maybe-dvi-mmalloc: dvi-mmalloc
 
 dvi-mmalloc: \
     configure-mmalloc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19583,7 +14806,6 @@ maybe-html-mmalloc: html-mmalloc
 
 html-mmalloc: \
     configure-mmalloc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19609,7 +14831,6 @@ maybe-TAGS-mmalloc: TAGS-mmalloc
 
 TAGS-mmalloc: \
     configure-mmalloc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19636,7 +14857,6 @@ maybe-install-info-mmalloc: install-info-mmalloc
 install-info-mmalloc: \
     configure-mmalloc \
     info-mmalloc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19662,7 +14882,6 @@ maybe-installcheck-mmalloc: installcheck-mmalloc
 
 installcheck-mmalloc: \
     configure-mmalloc 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19687,7 +14906,6 @@ maybe-mostlyclean-mmalloc:
 maybe-mostlyclean-mmalloc: mostlyclean-mmalloc
 
 mostlyclean-mmalloc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19712,7 +14930,6 @@ maybe-clean-mmalloc:
 maybe-clean-mmalloc: clean-mmalloc
 
 clean-mmalloc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19737,7 +14954,6 @@ maybe-distclean-mmalloc:
 maybe-distclean-mmalloc: distclean-mmalloc
 
 distclean-mmalloc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19762,7 +14978,6 @@ maybe-maintainer-clean-mmalloc:
 maybe-maintainer-clean-mmalloc: maintainer-clean-mmalloc
 
 maintainer-clean-mmalloc: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19782,20 +14997,18 @@ maintainer-clean-mmalloc:
 @endif mmalloc
 
 
-
 .PHONY: configure-patch maybe-configure-patch
 maybe-configure-patch:
 @if patch
 maybe-configure-patch: configure-patch
-configure-patch: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \
+configure-patch:
+	@test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/patch; \
-	cd "$(HOST_SUBDIR)/patch" || exit 1; \
+	echo Configuring in patch; \
+	cd $(HOST_SUBDIR)/patch || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/patch/ | \
@@ -19808,17 +15021,12 @@ configure-patch:
 	  || exit 1
 @endif patch
 
-
-
-
-
 .PHONY: all-patch maybe-all-patch
 maybe-all-patch:
 @if patch
 TARGET-patch=all
 maybe-all-patch: all-patch
 all-patch: configure-patch
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19826,16 +15034,12 @@ all-patch: configure-patch
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-patch))
 @endif patch
 
-
-
-
 .PHONY: check-patch maybe-check-patch
 maybe-check-patch:
 @if patch
 maybe-check-patch: check-patch
 
 check-patch:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19850,7 +15054,6 @@ maybe-install-patch:
 maybe-install-patch: install-patch
 
 install-patch: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19868,7 +15071,6 @@ maybe-info-patch: info-patch
 
 info-patch: \
     configure-patch 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19894,7 +15096,6 @@ maybe-dvi-patch: dvi-patch
 
 dvi-patch: \
     configure-patch 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19920,7 +15121,6 @@ maybe-html-patch: html-patch
 
 html-patch: \
     configure-patch 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19946,7 +15146,6 @@ maybe-TAGS-patch: TAGS-patch
 
 TAGS-patch: \
     configure-patch 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19973,7 +15172,6 @@ maybe-install-info-patch: install-info-patch
 install-info-patch: \
     configure-patch \
     info-patch 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19999,7 +15197,6 @@ maybe-installcheck-patch: installcheck-patch
 
 installcheck-patch: \
     configure-patch 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20024,7 +15221,6 @@ maybe-mostlyclean-patch:
 maybe-mostlyclean-patch: mostlyclean-patch
 
 mostlyclean-patch: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20049,7 +15245,6 @@ maybe-clean-patch:
 maybe-clean-patch: clean-patch
 
 clean-patch: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20074,7 +15269,6 @@ maybe-distclean-patch:
 maybe-distclean-patch: distclean-patch
 
 distclean-patch: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20099,7 +15293,6 @@ maybe-maintainer-clean-patch:
 maybe-maintainer-clean-patch: maintainer-clean-patch
 
 maintainer-clean-patch: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20119,20 +15312,18 @@ maintainer-clean-patch:
 @endif patch
 
 
-
 .PHONY: configure-perl maybe-configure-perl
 maybe-configure-perl:
 @if perl
 maybe-configure-perl: configure-perl
-configure-perl: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \
+configure-perl:
+	@test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/perl; \
-	cd "$(HOST_SUBDIR)/perl" || exit 1; \
+	echo Configuring in perl; \
+	cd $(HOST_SUBDIR)/perl || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/perl/ | \
@@ -20145,17 +15336,12 @@ configure-perl:
 	  || exit 1
 @endif perl
 
-
-
-
-
 .PHONY: all-perl maybe-all-perl
 maybe-all-perl:
 @if perl
 TARGET-perl=all
 maybe-all-perl: all-perl
 all-perl: configure-perl
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20163,16 +15349,12 @@ all-perl: configure-perl
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-perl))
 @endif perl
 
-
-
-
 .PHONY: check-perl maybe-check-perl
 maybe-check-perl:
 @if perl
 maybe-check-perl: check-perl
 
 check-perl:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20187,7 +15369,6 @@ maybe-install-perl:
 maybe-install-perl: install-perl
 
 install-perl: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20205,7 +15386,6 @@ maybe-info-perl: info-perl
 
 info-perl: \
     configure-perl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20231,7 +15411,6 @@ maybe-dvi-perl: dvi-perl
 
 dvi-perl: \
     configure-perl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20257,7 +15436,6 @@ maybe-html-perl: html-perl
 
 html-perl: \
     configure-perl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20283,7 +15461,6 @@ maybe-TAGS-perl: TAGS-perl
 
 TAGS-perl: \
     configure-perl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20310,7 +15487,6 @@ maybe-install-info-perl: install-info-perl
 install-info-perl: \
     configure-perl \
     info-perl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20336,7 +15512,6 @@ maybe-installcheck-perl: installcheck-perl
 
 installcheck-perl: \
     configure-perl 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20361,7 +15536,6 @@ maybe-mostlyclean-perl:
 maybe-mostlyclean-perl: mostlyclean-perl
 
 mostlyclean-perl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20386,7 +15560,6 @@ maybe-clean-perl:
 maybe-clean-perl: clean-perl
 
 clean-perl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20411,7 +15584,6 @@ maybe-distclean-perl:
 maybe-distclean-perl: distclean-perl
 
 distclean-perl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20436,7 +15608,6 @@ maybe-maintainer-clean-perl:
 maybe-maintainer-clean-perl: maintainer-clean-perl
 
 maintainer-clean-perl: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20456,20 +15627,18 @@ maintainer-clean-perl:
 @endif perl
 
 
-
 .PHONY: configure-prms maybe-configure-prms
 maybe-configure-prms:
 @if prms
 maybe-configure-prms: configure-prms
-configure-prms: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
+configure-prms:
+	@test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/prms; \
-	cd "$(HOST_SUBDIR)/prms" || exit 1; \
+	echo Configuring in prms; \
+	cd $(HOST_SUBDIR)/prms || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/prms/ | \
@@ -20482,17 +15651,12 @@ configure-prms:
 	  || exit 1
 @endif prms
 
-
-
-
-
 .PHONY: all-prms maybe-all-prms
 maybe-all-prms:
 @if prms
 TARGET-prms=all
 maybe-all-prms: all-prms
 all-prms: configure-prms
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20500,16 +15664,12 @@ all-prms: configure-prms
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-prms))
 @endif prms
 
-
-
-
 .PHONY: check-prms maybe-check-prms
 maybe-check-prms:
 @if prms
 maybe-check-prms: check-prms
 
 check-prms:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20524,7 +15684,6 @@ maybe-install-prms:
 maybe-install-prms: install-prms
 
 install-prms: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20542,7 +15701,6 @@ maybe-info-prms: info-prms
 
 info-prms: \
     configure-prms 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20568,7 +15726,6 @@ maybe-dvi-prms: dvi-prms
 
 dvi-prms: \
     configure-prms 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20594,7 +15751,6 @@ maybe-html-prms: html-prms
 
 html-prms: \
     configure-prms 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20620,7 +15776,6 @@ maybe-TAGS-prms: TAGS-prms
 
 TAGS-prms: \
     configure-prms 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20647,7 +15802,6 @@ maybe-install-info-prms: install-info-prms
 install-info-prms: \
     configure-prms \
     info-prms 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20673,7 +15827,6 @@ maybe-installcheck-prms: installcheck-prms
 
 installcheck-prms: \
     configure-prms 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20698,7 +15851,6 @@ maybe-mostlyclean-prms:
 maybe-mostlyclean-prms: mostlyclean-prms
 
 mostlyclean-prms: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20723,7 +15875,6 @@ maybe-clean-prms:
 maybe-clean-prms: clean-prms
 
 clean-prms: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20748,7 +15899,6 @@ maybe-distclean-prms:
 maybe-distclean-prms: distclean-prms
 
 distclean-prms: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20773,7 +15923,6 @@ maybe-maintainer-clean-prms:
 maybe-maintainer-clean-prms: maintainer-clean-prms
 
 maintainer-clean-prms: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20793,20 +15942,18 @@ maintainer-clean-prms:
 @endif prms
 
 
-
 .PHONY: configure-rcs maybe-configure-rcs
 maybe-configure-rcs:
 @if rcs
 maybe-configure-rcs: configure-rcs
-configure-rcs: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
+configure-rcs:
+	@test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/rcs; \
-	cd "$(HOST_SUBDIR)/rcs" || exit 1; \
+	echo Configuring in rcs; \
+	cd $(HOST_SUBDIR)/rcs || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/rcs/ | \
@@ -20819,17 +15966,12 @@ configure-rcs:
 	  || exit 1
 @endif rcs
 
-
-
-
-
 .PHONY: all-rcs maybe-all-rcs
 maybe-all-rcs:
 @if rcs
 TARGET-rcs=all
 maybe-all-rcs: all-rcs
 all-rcs: configure-rcs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20837,16 +15979,12 @@ all-rcs: configure-rcs
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-rcs))
 @endif rcs
 
-
-
-
 .PHONY: check-rcs maybe-check-rcs
 maybe-check-rcs:
 @if rcs
 maybe-check-rcs: check-rcs
 
 check-rcs:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20861,7 +15999,6 @@ maybe-install-rcs:
 maybe-install-rcs: install-rcs
 
 install-rcs: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20879,7 +16016,6 @@ maybe-info-rcs: info-rcs
 
 info-rcs: \
     configure-rcs 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20905,7 +16041,6 @@ maybe-dvi-rcs: dvi-rcs
 
 dvi-rcs: \
     configure-rcs 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20931,7 +16066,6 @@ maybe-html-rcs: html-rcs
 
 html-rcs: \
     configure-rcs 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20957,7 +16091,6 @@ maybe-TAGS-rcs: TAGS-rcs
 
 TAGS-rcs: \
     configure-rcs 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20984,7 +16117,6 @@ maybe-install-info-rcs: install-info-rcs
 install-info-rcs: \
     configure-rcs \
     info-rcs 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21010,7 +16142,6 @@ maybe-installcheck-rcs: installcheck-rcs
 
 installcheck-rcs: \
     configure-rcs 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21035,7 +16166,6 @@ maybe-mostlyclean-rcs:
 maybe-mostlyclean-rcs: mostlyclean-rcs
 
 mostlyclean-rcs: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21060,7 +16190,6 @@ maybe-clean-rcs:
 maybe-clean-rcs: clean-rcs
 
 clean-rcs: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21085,7 +16214,6 @@ maybe-distclean-rcs:
 maybe-distclean-rcs: distclean-rcs
 
 distclean-rcs: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21110,7 +16238,6 @@ maybe-maintainer-clean-rcs:
 maybe-maintainer-clean-rcs: maintainer-clean-rcs
 
 maintainer-clean-rcs: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21130,20 +16257,18 @@ maintainer-clean-rcs:
 @endif rcs
 
 
-
 .PHONY: configure-readline maybe-configure-readline
 maybe-configure-readline:
 @if readline
 maybe-configure-readline: configure-readline
-configure-readline: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
+configure-readline:
+	@test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/readline; \
-	cd "$(HOST_SUBDIR)/readline" || exit 1; \
+	echo Configuring in readline; \
+	cd $(HOST_SUBDIR)/readline || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
@@ -21156,17 +16281,12 @@ configure-readline:
 	  || exit 1
 @endif readline
 
-
-
-
-
 .PHONY: all-readline maybe-all-readline
 maybe-all-readline:
 @if readline
 TARGET-readline=all
 maybe-all-readline: all-readline
 all-readline: configure-readline
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21174,16 +16294,12 @@ all-readline: configure-readline
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-readline))
 @endif readline
 
-
-
-
 .PHONY: check-readline maybe-check-readline
 maybe-check-readline:
 @if readline
 maybe-check-readline: check-readline
 
 check-readline:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21198,7 +16314,6 @@ maybe-install-readline:
 maybe-install-readline: install-readline
 
 install-readline: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21216,7 +16331,6 @@ maybe-info-readline: info-readline
 
 info-readline: \
     configure-readline 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21242,7 +16356,6 @@ maybe-dvi-readline: dvi-readline
 
 dvi-readline: \
     configure-readline 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21268,7 +16381,6 @@ maybe-html-readline: html-readline
 
 html-readline: \
     configure-readline 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21294,7 +16406,6 @@ maybe-TAGS-readline: TAGS-readline
 
 TAGS-readline: \
     configure-readline 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21321,7 +16432,6 @@ maybe-install-info-readline: install-info-readline
 install-info-readline: \
     configure-readline \
     info-readline 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21347,7 +16457,6 @@ maybe-installcheck-readline: installcheck-readline
 
 installcheck-readline: \
     configure-readline 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21372,7 +16481,6 @@ maybe-mostlyclean-readline:
 maybe-mostlyclean-readline: mostlyclean-readline
 
 mostlyclean-readline: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21397,7 +16505,6 @@ maybe-clean-readline:
 maybe-clean-readline: clean-readline
 
 clean-readline: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21422,7 +16529,6 @@ maybe-distclean-readline:
 maybe-distclean-readline: distclean-readline
 
 distclean-readline: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21447,7 +16553,6 @@ maybe-maintainer-clean-readline:
 maybe-maintainer-clean-readline: maintainer-clean-readline
 
 maintainer-clean-readline: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21467,20 +16572,18 @@ maintainer-clean-readline:
 @endif readline
 
 
-
 .PHONY: configure-release maybe-configure-release
 maybe-configure-release:
 @if release
 maybe-configure-release: configure-release
-configure-release: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
+configure-release:
+	@test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/release; \
-	cd "$(HOST_SUBDIR)/release" || exit 1; \
+	echo Configuring in release; \
+	cd $(HOST_SUBDIR)/release || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/release/ | \
@@ -21493,17 +16596,12 @@ configure-release:
 	  || exit 1
 @endif release
 
-
-
-
-
 .PHONY: all-release maybe-all-release
 maybe-all-release:
 @if release
 TARGET-release=all
 maybe-all-release: all-release
 all-release: configure-release
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21511,9 +16609,6 @@ all-release: configure-release
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-release))
 @endif release
 
-
-
-
 .PHONY: check-release maybe-check-release
 maybe-check-release:
 @if release
@@ -21541,7 +16636,6 @@ maybe-info-release: info-release
 
 info-release: \
     configure-release 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21567,7 +16661,6 @@ maybe-dvi-release: dvi-release
 
 dvi-release: \
     configure-release 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21593,7 +16686,6 @@ maybe-html-release: html-release
 
 html-release: \
     configure-release 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21619,7 +16711,6 @@ maybe-TAGS-release: TAGS-release
 
 TAGS-release: \
     configure-release 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21646,7 +16737,6 @@ maybe-install-info-release: install-info-release
 install-info-release: \
     configure-release \
     info-release 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21672,7 +16762,6 @@ maybe-installcheck-release: installcheck-release
 
 installcheck-release: \
     configure-release 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21697,7 +16786,6 @@ maybe-mostlyclean-release:
 maybe-mostlyclean-release: mostlyclean-release
 
 mostlyclean-release: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21722,7 +16810,6 @@ maybe-clean-release:
 maybe-clean-release: clean-release
 
 clean-release: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21747,7 +16834,6 @@ maybe-distclean-release:
 maybe-distclean-release: distclean-release
 
 distclean-release: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21772,7 +16858,6 @@ maybe-maintainer-clean-release:
 maybe-maintainer-clean-release: maintainer-clean-release
 
 maintainer-clean-release: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21792,20 +16877,18 @@ maintainer-clean-release:
 @endif release
 
 
-
 .PHONY: configure-recode maybe-configure-recode
 maybe-configure-recode:
 @if recode
 maybe-configure-recode: configure-recode
-configure-recode: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
+configure-recode:
+	@test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/recode; \
-	cd "$(HOST_SUBDIR)/recode" || exit 1; \
+	echo Configuring in recode; \
+	cd $(HOST_SUBDIR)/recode || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/recode/ | \
@@ -21818,17 +16901,12 @@ configure-recode:
 	  || exit 1
 @endif recode
 
-
-
-
-
 .PHONY: all-recode maybe-all-recode
 maybe-all-recode:
 @if recode
 TARGET-recode=all
 maybe-all-recode: all-recode
 all-recode: configure-recode
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21836,16 +16914,12 @@ all-recode: configure-recode
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-recode))
 @endif recode
 
-
-
-
 .PHONY: check-recode maybe-check-recode
 maybe-check-recode:
 @if recode
 maybe-check-recode: check-recode
 
 check-recode:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21860,7 +16934,6 @@ maybe-install-recode:
 maybe-install-recode: install-recode
 
 install-recode: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21878,7 +16951,6 @@ maybe-info-recode: info-recode
 
 info-recode: \
     configure-recode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21904,7 +16976,6 @@ maybe-dvi-recode: dvi-recode
 
 dvi-recode: \
     configure-recode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21930,7 +17001,6 @@ maybe-html-recode: html-recode
 
 html-recode: \
     configure-recode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21956,7 +17026,6 @@ maybe-TAGS-recode: TAGS-recode
 
 TAGS-recode: \
     configure-recode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21983,7 +17052,6 @@ maybe-install-info-recode: install-info-recode
 install-info-recode: \
     configure-recode \
     info-recode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22009,7 +17077,6 @@ maybe-installcheck-recode: installcheck-recode
 
 installcheck-recode: \
     configure-recode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22034,7 +17101,6 @@ maybe-mostlyclean-recode:
 maybe-mostlyclean-recode: mostlyclean-recode
 
 mostlyclean-recode: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22059,7 +17125,6 @@ maybe-clean-recode:
 maybe-clean-recode: clean-recode
 
 clean-recode: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22084,7 +17149,6 @@ maybe-distclean-recode:
 maybe-distclean-recode: distclean-recode
 
 distclean-recode: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22109,7 +17173,6 @@ maybe-maintainer-clean-recode:
 maybe-maintainer-clean-recode: maintainer-clean-recode
 
 maintainer-clean-recode: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22129,20 +17192,18 @@ maintainer-clean-recode:
 @endif recode
 
 
-
 .PHONY: configure-sed maybe-configure-sed
 maybe-configure-sed:
 @if sed
 maybe-configure-sed: configure-sed
-configure-sed: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
+configure-sed:
+	@test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/sed; \
-	cd "$(HOST_SUBDIR)/sed" || exit 1; \
+	echo Configuring in sed; \
+	cd $(HOST_SUBDIR)/sed || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/sed/ | \
@@ -22155,17 +17216,12 @@ configure-sed:
 	  || exit 1
 @endif sed
 
-
-
-
-
 .PHONY: all-sed maybe-all-sed
 maybe-all-sed:
 @if sed
 TARGET-sed=all
 maybe-all-sed: all-sed
 all-sed: configure-sed
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22173,16 +17229,12 @@ all-sed: configure-sed
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sed))
 @endif sed
 
-
-
-
 .PHONY: check-sed maybe-check-sed
 maybe-check-sed:
 @if sed
 maybe-check-sed: check-sed
 
 check-sed:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22197,7 +17249,6 @@ maybe-install-sed:
 maybe-install-sed: install-sed
 
 install-sed: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22215,7 +17266,6 @@ maybe-info-sed: info-sed
 
 info-sed: \
     configure-sed 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22241,7 +17291,6 @@ maybe-dvi-sed: dvi-sed
 
 dvi-sed: \
     configure-sed 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22267,7 +17316,6 @@ maybe-html-sed: html-sed
 
 html-sed: \
     configure-sed 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22293,7 +17341,6 @@ maybe-TAGS-sed: TAGS-sed
 
 TAGS-sed: \
     configure-sed 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22320,7 +17367,6 @@ maybe-install-info-sed: install-info-sed
 install-info-sed: \
     configure-sed \
     info-sed 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22346,7 +17392,6 @@ maybe-installcheck-sed: installcheck-sed
 
 installcheck-sed: \
     configure-sed 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22371,7 +17416,6 @@ maybe-mostlyclean-sed:
 maybe-mostlyclean-sed: mostlyclean-sed
 
 mostlyclean-sed: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22396,7 +17440,6 @@ maybe-clean-sed:
 maybe-clean-sed: clean-sed
 
 clean-sed: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22421,7 +17464,6 @@ maybe-distclean-sed:
 maybe-distclean-sed: distclean-sed
 
 distclean-sed: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22446,7 +17488,6 @@ maybe-maintainer-clean-sed:
 maybe-maintainer-clean-sed: maintainer-clean-sed
 
 maintainer-clean-sed: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22466,20 +17507,18 @@ maintainer-clean-sed:
 @endif sed
 
 
-
 .PHONY: configure-send-pr maybe-configure-send-pr
 maybe-configure-send-pr:
 @if send-pr
 maybe-configure-send-pr: configure-send-pr
-configure-send-pr: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
+configure-send-pr:
+	@test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/send-pr; \
-	cd "$(HOST_SUBDIR)/send-pr" || exit 1; \
+	echo Configuring in send-pr; \
+	cd $(HOST_SUBDIR)/send-pr || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/send-pr/ | \
@@ -22492,17 +17531,12 @@ configure-send-pr:
 	  || exit 1
 @endif send-pr
 
-
-
-
-
 .PHONY: all-send-pr maybe-all-send-pr
 maybe-all-send-pr:
 @if send-pr
 TARGET-send-pr=all
 maybe-all-send-pr: all-send-pr
 all-send-pr: configure-send-pr
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22510,16 +17544,12 @@ all-send-pr: configure-send-pr
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-send-pr))
 @endif send-pr
 
-
-
-
 .PHONY: check-send-pr maybe-check-send-pr
 maybe-check-send-pr:
 @if send-pr
 maybe-check-send-pr: check-send-pr
 
 check-send-pr:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22534,7 +17564,6 @@ maybe-install-send-pr:
 maybe-install-send-pr: install-send-pr
 
 install-send-pr: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22552,7 +17581,6 @@ maybe-info-send-pr: info-send-pr
 
 info-send-pr: \
     configure-send-pr 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22578,7 +17606,6 @@ maybe-dvi-send-pr: dvi-send-pr
 
 dvi-send-pr: \
     configure-send-pr 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22604,7 +17631,6 @@ maybe-html-send-pr: html-send-pr
 
 html-send-pr: \
     configure-send-pr 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22630,7 +17656,6 @@ maybe-TAGS-send-pr: TAGS-send-pr
 
 TAGS-send-pr: \
     configure-send-pr 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22657,7 +17682,6 @@ maybe-install-info-send-pr: install-info-send-pr
 install-info-send-pr: \
     configure-send-pr \
     info-send-pr 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22683,7 +17707,6 @@ maybe-installcheck-send-pr: installcheck-send-pr
 
 installcheck-send-pr: \
     configure-send-pr 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22708,7 +17731,6 @@ maybe-mostlyclean-send-pr:
 maybe-mostlyclean-send-pr: mostlyclean-send-pr
 
 mostlyclean-send-pr: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22733,7 +17755,6 @@ maybe-clean-send-pr:
 maybe-clean-send-pr: clean-send-pr
 
 clean-send-pr: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22758,7 +17779,6 @@ maybe-distclean-send-pr:
 maybe-distclean-send-pr: distclean-send-pr
 
 distclean-send-pr: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22783,7 +17803,6 @@ maybe-maintainer-clean-send-pr:
 maybe-maintainer-clean-send-pr: maintainer-clean-send-pr
 
 maintainer-clean-send-pr: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22803,20 +17822,18 @@ maintainer-clean-send-pr:
 @endif send-pr
 
 
-
 .PHONY: configure-shellutils maybe-configure-shellutils
 maybe-configure-shellutils:
 @if shellutils
 maybe-configure-shellutils: configure-shellutils
-configure-shellutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
+configure-shellutils:
+	@test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/shellutils; \
-	cd "$(HOST_SUBDIR)/shellutils" || exit 1; \
+	echo Configuring in shellutils; \
+	cd $(HOST_SUBDIR)/shellutils || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/shellutils/ | \
@@ -22829,17 +17846,12 @@ configure-shellutils:
 	  || exit 1
 @endif shellutils
 
-
-
-
-
 .PHONY: all-shellutils maybe-all-shellutils
 maybe-all-shellutils:
 @if shellutils
 TARGET-shellutils=all
 maybe-all-shellutils: all-shellutils
 all-shellutils: configure-shellutils
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22847,16 +17859,12 @@ all-shellutils: configure-shellutils
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-shellutils))
 @endif shellutils
 
-
-
-
 .PHONY: check-shellutils maybe-check-shellutils
 maybe-check-shellutils:
 @if shellutils
 maybe-check-shellutils: check-shellutils
 
 check-shellutils:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22871,7 +17879,6 @@ maybe-install-shellutils:
 maybe-install-shellutils: install-shellutils
 
 install-shellutils: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22889,7 +17896,6 @@ maybe-info-shellutils: info-shellutils
 
 info-shellutils: \
     configure-shellutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22915,7 +17921,6 @@ maybe-dvi-shellutils: dvi-shellutils
 
 dvi-shellutils: \
     configure-shellutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22941,7 +17946,6 @@ maybe-html-shellutils: html-shellutils
 
 html-shellutils: \
     configure-shellutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22967,7 +17971,6 @@ maybe-TAGS-shellutils: TAGS-shellutils
 
 TAGS-shellutils: \
     configure-shellutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22994,7 +17997,6 @@ maybe-install-info-shellutils: install-info-shellutils
 install-info-shellutils: \
     configure-shellutils \
     info-shellutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23020,7 +18022,6 @@ maybe-installcheck-shellutils: installcheck-shellutils
 
 installcheck-shellutils: \
     configure-shellutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23045,7 +18046,6 @@ maybe-mostlyclean-shellutils:
 maybe-mostlyclean-shellutils: mostlyclean-shellutils
 
 mostlyclean-shellutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23070,7 +18070,6 @@ maybe-clean-shellutils:
 maybe-clean-shellutils: clean-shellutils
 
 clean-shellutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23095,7 +18094,6 @@ maybe-distclean-shellutils:
 maybe-distclean-shellutils: distclean-shellutils
 
 distclean-shellutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23120,7 +18118,6 @@ maybe-maintainer-clean-shellutils:
 maybe-maintainer-clean-shellutils: maintainer-clean-shellutils
 
 maintainer-clean-shellutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23140,20 +18137,18 @@ maintainer-clean-shellutils:
 @endif shellutils
 
 
-
 .PHONY: configure-sid maybe-configure-sid
 maybe-configure-sid:
 @if sid
 maybe-configure-sid: configure-sid
-configure-sid: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
+configure-sid:
+	@test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/sid; \
-	cd "$(HOST_SUBDIR)/sid" || exit 1; \
+	echo Configuring in sid; \
+	cd $(HOST_SUBDIR)/sid || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
@@ -23166,17 +18161,12 @@ configure-sid:
 	  || exit 1
 @endif sid
 
-
-
-
-
 .PHONY: all-sid maybe-all-sid
 maybe-all-sid:
 @if sid
 TARGET-sid=all
 maybe-all-sid: all-sid
 all-sid: configure-sid
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23184,16 +18174,12 @@ all-sid: configure-sid
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sid))
 @endif sid
 
-
-
-
 .PHONY: check-sid maybe-check-sid
 maybe-check-sid:
 @if sid
 maybe-check-sid: check-sid
 
 check-sid:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23208,7 +18194,6 @@ maybe-install-sid:
 maybe-install-sid: install-sid
 
 install-sid: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23226,7 +18211,6 @@ maybe-info-sid: info-sid
 
 info-sid: \
     configure-sid 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23252,7 +18236,6 @@ maybe-dvi-sid: dvi-sid
 
 dvi-sid: \
     configure-sid 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23278,7 +18261,6 @@ maybe-html-sid: html-sid
 
 html-sid: \
     configure-sid 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23304,7 +18286,6 @@ maybe-TAGS-sid: TAGS-sid
 
 TAGS-sid: \
     configure-sid 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23331,7 +18312,6 @@ maybe-install-info-sid: install-info-sid
 install-info-sid: \
     configure-sid \
     info-sid 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23357,7 +18337,6 @@ maybe-installcheck-sid: installcheck-sid
 
 installcheck-sid: \
     configure-sid 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23382,7 +18361,6 @@ maybe-mostlyclean-sid:
 maybe-mostlyclean-sid: mostlyclean-sid
 
 mostlyclean-sid: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23407,7 +18385,6 @@ maybe-clean-sid:
 maybe-clean-sid: clean-sid
 
 clean-sid: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23432,7 +18409,6 @@ maybe-distclean-sid:
 maybe-distclean-sid: distclean-sid
 
 distclean-sid: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23457,7 +18433,6 @@ maybe-maintainer-clean-sid:
 maybe-maintainer-clean-sid: maintainer-clean-sid
 
 maintainer-clean-sid: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23477,20 +18452,18 @@ maintainer-clean-sid:
 @endif sid
 
 
-
 .PHONY: configure-sim maybe-configure-sim
 maybe-configure-sim:
 @if sim
 maybe-configure-sim: configure-sim
-configure-sim: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
+configure-sim:
+	@test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/sim; \
-	cd "$(HOST_SUBDIR)/sim" || exit 1; \
+	echo Configuring in sim; \
+	cd $(HOST_SUBDIR)/sim || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
@@ -23503,17 +18476,12 @@ configure-sim:
 	  || exit 1
 @endif sim
 
-
-
-
-
 .PHONY: all-sim maybe-all-sim
 maybe-all-sim:
 @if sim
 TARGET-sim=all
 maybe-all-sim: all-sim
 all-sim: configure-sim
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23521,16 +18489,12 @@ all-sim: configure-sim
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sim))
 @endif sim
 
-
-
-
 .PHONY: check-sim maybe-check-sim
 maybe-check-sim:
 @if sim
 maybe-check-sim: check-sim
 
 check-sim:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23545,7 +18509,6 @@ maybe-install-sim:
 maybe-install-sim: install-sim
 
 install-sim: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23563,7 +18526,6 @@ maybe-info-sim: info-sim
 
 info-sim: \
     configure-sim 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23589,7 +18551,6 @@ maybe-dvi-sim: dvi-sim
 
 dvi-sim: \
     configure-sim 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23615,7 +18576,6 @@ maybe-html-sim: html-sim
 
 html-sim: \
     configure-sim 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23641,7 +18601,6 @@ maybe-TAGS-sim: TAGS-sim
 
 TAGS-sim: \
     configure-sim 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23668,7 +18627,6 @@ maybe-install-info-sim: install-info-sim
 install-info-sim: \
     configure-sim \
     info-sim 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23694,7 +18652,6 @@ maybe-installcheck-sim: installcheck-sim
 
 installcheck-sim: \
     configure-sim 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23719,7 +18676,6 @@ maybe-mostlyclean-sim:
 maybe-mostlyclean-sim: mostlyclean-sim
 
 mostlyclean-sim: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23744,7 +18700,6 @@ maybe-clean-sim:
 maybe-clean-sim: clean-sim
 
 clean-sim: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23769,7 +18724,6 @@ maybe-distclean-sim:
 maybe-distclean-sim: distclean-sim
 
 distclean-sim: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23794,7 +18748,6 @@ maybe-maintainer-clean-sim:
 maybe-maintainer-clean-sim: maintainer-clean-sim
 
 maintainer-clean-sim: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23814,20 +18767,18 @@ maintainer-clean-sim:
 @endif sim
 
 
-
 .PHONY: configure-tar maybe-configure-tar
 maybe-configure-tar:
 @if tar
 maybe-configure-tar: configure-tar
-configure-tar: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
+configure-tar:
+	@test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/tar; \
-	cd "$(HOST_SUBDIR)/tar" || exit 1; \
+	echo Configuring in tar; \
+	cd $(HOST_SUBDIR)/tar || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/tar/ | \
@@ -23840,17 +18791,12 @@ configure-tar:
 	  || exit 1
 @endif tar
 
-
-
-
-
 .PHONY: all-tar maybe-all-tar
 maybe-all-tar:
 @if tar
 TARGET-tar=all
 maybe-all-tar: all-tar
 all-tar: configure-tar
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23858,16 +18804,12 @@ all-tar: configure-tar
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tar))
 @endif tar
 
-
-
-
 .PHONY: check-tar maybe-check-tar
 maybe-check-tar:
 @if tar
 maybe-check-tar: check-tar
 
 check-tar:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23882,7 +18824,6 @@ maybe-install-tar:
 maybe-install-tar: install-tar
 
 install-tar: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23900,7 +18841,6 @@ maybe-info-tar: info-tar
 
 info-tar: \
     configure-tar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23926,7 +18866,6 @@ maybe-dvi-tar: dvi-tar
 
 dvi-tar: \
     configure-tar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23952,7 +18891,6 @@ maybe-html-tar: html-tar
 
 html-tar: \
     configure-tar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23978,7 +18916,6 @@ maybe-TAGS-tar: TAGS-tar
 
 TAGS-tar: \
     configure-tar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24005,7 +18942,6 @@ maybe-install-info-tar: install-info-tar
 install-info-tar: \
     configure-tar \
     info-tar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24031,7 +18967,6 @@ maybe-installcheck-tar: installcheck-tar
 
 installcheck-tar: \
     configure-tar 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24056,7 +18991,6 @@ maybe-mostlyclean-tar:
 maybe-mostlyclean-tar: mostlyclean-tar
 
 mostlyclean-tar: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24081,7 +19015,6 @@ maybe-clean-tar:
 maybe-clean-tar: clean-tar
 
 clean-tar: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24106,7 +19039,6 @@ maybe-distclean-tar:
 maybe-distclean-tar: distclean-tar
 
 distclean-tar: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24131,7 +19063,6 @@ maybe-maintainer-clean-tar:
 maybe-maintainer-clean-tar: maintainer-clean-tar
 
 maintainer-clean-tar: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24151,20 +19082,18 @@ maintainer-clean-tar:
 @endif tar
 
 
-
 .PHONY: configure-texinfo maybe-configure-texinfo
 maybe-configure-texinfo:
 @if texinfo
 maybe-configure-texinfo: configure-texinfo
-configure-texinfo: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
+configure-texinfo:
+	@test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/texinfo; \
-	cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
+	echo Configuring in texinfo; \
+	cd $(HOST_SUBDIR)/texinfo || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
@@ -24177,17 +19106,12 @@ configure-texinfo:
 	  || exit 1
 @endif texinfo
 
-
-
-
-
 .PHONY: all-texinfo maybe-all-texinfo
 maybe-all-texinfo:
 @if texinfo
 TARGET-texinfo=all
 maybe-all-texinfo: all-texinfo
 all-texinfo: configure-texinfo
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24195,16 +19119,12 @@ all-texinfo: configure-texinfo
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-texinfo))
 @endif texinfo
 
-
-
-
 .PHONY: check-texinfo maybe-check-texinfo
 maybe-check-texinfo:
 @if texinfo
 maybe-check-texinfo: check-texinfo
 
 check-texinfo:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24231,7 +19151,6 @@ maybe-info-texinfo: info-texinfo
 
 info-texinfo: \
     configure-texinfo 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24257,7 +19176,6 @@ maybe-dvi-texinfo: dvi-texinfo
 
 dvi-texinfo: \
     configure-texinfo 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24283,7 +19201,6 @@ maybe-html-texinfo: html-texinfo
 
 html-texinfo: \
     configure-texinfo 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24309,7 +19226,6 @@ maybe-TAGS-texinfo: TAGS-texinfo
 
 TAGS-texinfo: \
     configure-texinfo 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24336,7 +19252,6 @@ maybe-install-info-texinfo: install-info-texinfo
 install-info-texinfo: \
     configure-texinfo \
     info-texinfo 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24362,7 +19277,6 @@ maybe-installcheck-texinfo: installcheck-texinfo
 
 installcheck-texinfo: \
     configure-texinfo 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24387,7 +19301,6 @@ maybe-mostlyclean-texinfo:
 maybe-mostlyclean-texinfo: mostlyclean-texinfo
 
 mostlyclean-texinfo: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24412,7 +19325,6 @@ maybe-clean-texinfo:
 maybe-clean-texinfo: clean-texinfo
 
 clean-texinfo: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24437,7 +19349,6 @@ maybe-distclean-texinfo:
 maybe-distclean-texinfo: distclean-texinfo
 
 distclean-texinfo: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24462,7 +19373,6 @@ maybe-maintainer-clean-texinfo:
 maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
 
 maintainer-clean-texinfo: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24482,20 +19392,18 @@ maintainer-clean-texinfo:
 @endif texinfo
 
 
-
 .PHONY: configure-textutils maybe-configure-textutils
 maybe-configure-textutils:
 @if textutils
 maybe-configure-textutils: configure-textutils
-configure-textutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
+configure-textutils:
+	@test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/textutils; \
-	cd "$(HOST_SUBDIR)/textutils" || exit 1; \
+	echo Configuring in textutils; \
+	cd $(HOST_SUBDIR)/textutils || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/textutils/ | \
@@ -24508,17 +19416,12 @@ configure-textutils:
 	  || exit 1
 @endif textutils
 
-
-
-
-
 .PHONY: all-textutils maybe-all-textutils
 maybe-all-textutils:
 @if textutils
 TARGET-textutils=all
 maybe-all-textutils: all-textutils
 all-textutils: configure-textutils
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24526,16 +19429,12 @@ all-textutils: configure-textutils
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-textutils))
 @endif textutils
 
-
-
-
 .PHONY: check-textutils maybe-check-textutils
 maybe-check-textutils:
 @if textutils
 maybe-check-textutils: check-textutils
 
 check-textutils:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24550,7 +19449,6 @@ maybe-install-textutils:
 maybe-install-textutils: install-textutils
 
 install-textutils: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24568,7 +19466,6 @@ maybe-info-textutils: info-textutils
 
 info-textutils: \
     configure-textutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24594,7 +19491,6 @@ maybe-dvi-textutils: dvi-textutils
 
 dvi-textutils: \
     configure-textutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24620,7 +19516,6 @@ maybe-html-textutils: html-textutils
 
 html-textutils: \
     configure-textutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24646,7 +19541,6 @@ maybe-TAGS-textutils: TAGS-textutils
 
 TAGS-textutils: \
     configure-textutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24673,7 +19567,6 @@ maybe-install-info-textutils: install-info-textutils
 install-info-textutils: \
     configure-textutils \
     info-textutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24699,7 +19592,6 @@ maybe-installcheck-textutils: installcheck-textutils
 
 installcheck-textutils: \
     configure-textutils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24724,7 +19616,6 @@ maybe-mostlyclean-textutils:
 maybe-mostlyclean-textutils: mostlyclean-textutils
 
 mostlyclean-textutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24749,7 +19640,6 @@ maybe-clean-textutils:
 maybe-clean-textutils: clean-textutils
 
 clean-textutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24774,7 +19664,6 @@ maybe-distclean-textutils:
 maybe-distclean-textutils: distclean-textutils
 
 distclean-textutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24799,7 +19688,6 @@ maybe-maintainer-clean-textutils:
 maybe-maintainer-clean-textutils: maintainer-clean-textutils
 
 maintainer-clean-textutils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24819,20 +19707,18 @@ maintainer-clean-textutils:
 @endif textutils
 
 
-
 .PHONY: configure-time maybe-configure-time
 maybe-configure-time:
 @if time
 maybe-configure-time: configure-time
-configure-time: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
+configure-time:
+	@test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/time; \
-	cd "$(HOST_SUBDIR)/time" || exit 1; \
+	echo Configuring in time; \
+	cd $(HOST_SUBDIR)/time || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/time/ | \
@@ -24845,17 +19731,12 @@ configure-time:
 	  || exit 1
 @endif time
 
-
-
-
-
 .PHONY: all-time maybe-all-time
 maybe-all-time:
 @if time
 TARGET-time=all
 maybe-all-time: all-time
 all-time: configure-time
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24863,16 +19744,12 @@ all-time: configure-time
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-time))
 @endif time
 
-
-
-
 .PHONY: check-time maybe-check-time
 maybe-check-time:
 @if time
 maybe-check-time: check-time
 
 check-time:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24887,7 +19764,6 @@ maybe-install-time:
 maybe-install-time: install-time
 
 install-time: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24905,7 +19781,6 @@ maybe-info-time: info-time
 
 info-time: \
     configure-time 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24931,7 +19806,6 @@ maybe-dvi-time: dvi-time
 
 dvi-time: \
     configure-time 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24957,7 +19831,6 @@ maybe-html-time: html-time
 
 html-time: \
     configure-time 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24983,7 +19856,6 @@ maybe-TAGS-time: TAGS-time
 
 TAGS-time: \
     configure-time 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25010,7 +19882,6 @@ maybe-install-info-time: install-info-time
 install-info-time: \
     configure-time \
     info-time 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25036,7 +19907,6 @@ maybe-installcheck-time: installcheck-time
 
 installcheck-time: \
     configure-time 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25061,7 +19931,6 @@ maybe-mostlyclean-time:
 maybe-mostlyclean-time: mostlyclean-time
 
 mostlyclean-time: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25086,7 +19955,6 @@ maybe-clean-time:
 maybe-clean-time: clean-time
 
 clean-time: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25111,7 +19979,6 @@ maybe-distclean-time:
 maybe-distclean-time: distclean-time
 
 distclean-time: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25136,7 +20003,6 @@ maybe-maintainer-clean-time:
 maybe-maintainer-clean-time: maintainer-clean-time
 
 maintainer-clean-time: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25156,20 +20022,18 @@ maintainer-clean-time:
 @endif time
 
 
-
 .PHONY: configure-uudecode maybe-configure-uudecode
 maybe-configure-uudecode:
 @if uudecode
 maybe-configure-uudecode: configure-uudecode
-configure-uudecode: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
+configure-uudecode:
+	@test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/uudecode; \
-	cd "$(HOST_SUBDIR)/uudecode" || exit 1; \
+	echo Configuring in uudecode; \
+	cd $(HOST_SUBDIR)/uudecode || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/uudecode/ | \
@@ -25182,17 +20046,12 @@ configure-uudecode:
 	  || exit 1
 @endif uudecode
 
-
-
-
-
 .PHONY: all-uudecode maybe-all-uudecode
 maybe-all-uudecode:
 @if uudecode
 TARGET-uudecode=all
 maybe-all-uudecode: all-uudecode
 all-uudecode: configure-uudecode
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25200,16 +20059,12 @@ all-uudecode: configure-uudecode
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-uudecode))
 @endif uudecode
 
-
-
-
 .PHONY: check-uudecode maybe-check-uudecode
 maybe-check-uudecode:
 @if uudecode
 maybe-check-uudecode: check-uudecode
 
 check-uudecode:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25224,7 +20079,6 @@ maybe-install-uudecode:
 maybe-install-uudecode: install-uudecode
 
 install-uudecode: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25242,7 +20096,6 @@ maybe-info-uudecode: info-uudecode
 
 info-uudecode: \
     configure-uudecode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25268,7 +20121,6 @@ maybe-dvi-uudecode: dvi-uudecode
 
 dvi-uudecode: \
     configure-uudecode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25294,7 +20146,6 @@ maybe-html-uudecode: html-uudecode
 
 html-uudecode: \
     configure-uudecode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25320,7 +20171,6 @@ maybe-TAGS-uudecode: TAGS-uudecode
 
 TAGS-uudecode: \
     configure-uudecode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25347,7 +20197,6 @@ maybe-install-info-uudecode: install-info-uudecode
 install-info-uudecode: \
     configure-uudecode \
     info-uudecode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25373,7 +20222,6 @@ maybe-installcheck-uudecode: installcheck-uudecode
 
 installcheck-uudecode: \
     configure-uudecode 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25398,7 +20246,6 @@ maybe-mostlyclean-uudecode:
 maybe-mostlyclean-uudecode: mostlyclean-uudecode
 
 mostlyclean-uudecode: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25423,7 +20270,6 @@ maybe-clean-uudecode:
 maybe-clean-uudecode: clean-uudecode
 
 clean-uudecode: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25448,7 +20294,6 @@ maybe-distclean-uudecode:
 maybe-distclean-uudecode: distclean-uudecode
 
 distclean-uudecode: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25473,7 +20318,6 @@ maybe-maintainer-clean-uudecode:
 maybe-maintainer-clean-uudecode: maintainer-clean-uudecode
 
 maintainer-clean-uudecode: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25493,20 +20337,18 @@ maintainer-clean-uudecode:
 @endif uudecode
 
 
-
 .PHONY: configure-wdiff maybe-configure-wdiff
 maybe-configure-wdiff:
 @if wdiff
 maybe-configure-wdiff: configure-wdiff
-configure-wdiff: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
+configure-wdiff:
+	@test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/wdiff; \
-	cd "$(HOST_SUBDIR)/wdiff" || exit 1; \
+	echo Configuring in wdiff; \
+	cd $(HOST_SUBDIR)/wdiff || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/wdiff/ | \
@@ -25519,17 +20361,12 @@ configure-wdiff:
 	  || exit 1
 @endif wdiff
 
-
-
-
-
 .PHONY: all-wdiff maybe-all-wdiff
 maybe-all-wdiff:
 @if wdiff
 TARGET-wdiff=all
 maybe-all-wdiff: all-wdiff
 all-wdiff: configure-wdiff
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25537,16 +20374,12 @@ all-wdiff: configure-wdiff
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-wdiff))
 @endif wdiff
 
-
-
-
 .PHONY: check-wdiff maybe-check-wdiff
 maybe-check-wdiff:
 @if wdiff
 maybe-check-wdiff: check-wdiff
 
 check-wdiff:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25561,7 +20394,6 @@ maybe-install-wdiff:
 maybe-install-wdiff: install-wdiff
 
 install-wdiff: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25579,7 +20411,6 @@ maybe-info-wdiff: info-wdiff
 
 info-wdiff: \
     configure-wdiff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25605,7 +20436,6 @@ maybe-dvi-wdiff: dvi-wdiff
 
 dvi-wdiff: \
     configure-wdiff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25631,7 +20461,6 @@ maybe-html-wdiff: html-wdiff
 
 html-wdiff: \
     configure-wdiff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25657,7 +20486,6 @@ maybe-TAGS-wdiff: TAGS-wdiff
 
 TAGS-wdiff: \
     configure-wdiff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25684,7 +20512,6 @@ maybe-install-info-wdiff: install-info-wdiff
 install-info-wdiff: \
     configure-wdiff \
     info-wdiff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25710,7 +20537,6 @@ maybe-installcheck-wdiff: installcheck-wdiff
 
 installcheck-wdiff: \
     configure-wdiff 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25735,7 +20561,6 @@ maybe-mostlyclean-wdiff:
 maybe-mostlyclean-wdiff: mostlyclean-wdiff
 
 mostlyclean-wdiff: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25760,7 +20585,6 @@ maybe-clean-wdiff:
 maybe-clean-wdiff: clean-wdiff
 
 clean-wdiff: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25785,7 +20609,6 @@ maybe-distclean-wdiff:
 maybe-distclean-wdiff: distclean-wdiff
 
 distclean-wdiff: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25810,7 +20633,6 @@ maybe-maintainer-clean-wdiff:
 maybe-maintainer-clean-wdiff: maintainer-clean-wdiff
 
 maintainer-clean-wdiff: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25830,20 +20652,18 @@ maintainer-clean-wdiff:
 @endif wdiff
 
 
-
 .PHONY: configure-zip maybe-configure-zip
 maybe-configure-zip:
 @if zip
 maybe-configure-zip: configure-zip
-configure-zip: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
+configure-zip:
+	@test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/zip; \
-	cd "$(HOST_SUBDIR)/zip" || exit 1; \
+	echo Configuring in zip; \
+	cd $(HOST_SUBDIR)/zip || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/zip/ | \
@@ -25856,17 +20676,12 @@ configure-zip:
 	  || exit 1
 @endif zip
 
-
-
-
-
 .PHONY: all-zip maybe-all-zip
 maybe-all-zip:
 @if zip
 TARGET-zip=all
 maybe-all-zip: all-zip
 all-zip: configure-zip
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25874,9 +20689,6 @@ all-zip: configure-zip
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zip))
 @endif zip
 
-
-
-
 .PHONY: check-zip maybe-check-zip
 maybe-check-zip:
 @if zip
@@ -25884,7 +20696,6 @@ maybe-check-zip: check-zip
 
 # This module is only tested in a native toolchain.
 check-zip:
-	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25901,7 +20712,6 @@ maybe-install-zip:
 maybe-install-zip: install-zip
 
 install-zip: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25919,7 +20729,6 @@ maybe-info-zip: info-zip
 
 info-zip: \
     configure-zip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25945,7 +20754,6 @@ maybe-dvi-zip: dvi-zip
 
 dvi-zip: \
     configure-zip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25971,7 +20779,6 @@ maybe-html-zip: html-zip
 
 html-zip: \
     configure-zip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25997,7 +20804,6 @@ maybe-TAGS-zip: TAGS-zip
 
 TAGS-zip: \
     configure-zip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26024,7 +20830,6 @@ maybe-install-info-zip: install-info-zip
 install-info-zip: \
     configure-zip \
     info-zip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26050,7 +20855,6 @@ maybe-installcheck-zip: installcheck-zip
 
 installcheck-zip: \
     configure-zip 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26075,7 +20879,6 @@ maybe-mostlyclean-zip:
 maybe-mostlyclean-zip: mostlyclean-zip
 
 mostlyclean-zip: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26100,7 +20903,6 @@ maybe-clean-zip:
 maybe-clean-zip: clean-zip
 
 clean-zip: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26125,7 +20927,6 @@ maybe-distclean-zip:
 maybe-distclean-zip: distclean-zip
 
 distclean-zip: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26150,7 +20951,6 @@ maybe-maintainer-clean-zip:
 maybe-maintainer-clean-zip: maintainer-clean-zip
 
 maintainer-clean-zip: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26170,24 +20970,19 @@ maintainer-clean-zip:
 @endif zip
 
 
-
 .PHONY: configure-zlib maybe-configure-zlib
 maybe-configure-zlib:
 @if zlib
 maybe-configure-zlib: configure-zlib
-configure-zlib: 
-@endif zlib
-@if zlib-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif zlib-bootstrap
-@if zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+configure-zlib:
+	@test -f stage_last && exit 0; \
 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/zlib; \
-	cd "$(HOST_SUBDIR)/zlib" || exit 1; \
+	echo Configuring in zlib; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
@@ -26200,380 +20995,20 @@ configure-zlib:
 	  || exit 1
 @endif zlib
 
-
-
-.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
-maybe-configure-stage1-zlib:
-@if zlib-bootstrap
-maybe-configure-stage1-zlib: configure-stage1-zlib
-configure-stage1-zlib:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif zlib-bootstrap
-
-.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
-maybe-configure-stage2-zlib:
-@if zlib-bootstrap
-maybe-configure-stage2-zlib: configure-stage2-zlib
-configure-stage2-zlib:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
-maybe-configure-stage3-zlib:
-@if zlib-bootstrap
-maybe-configure-stage3-zlib: configure-stage3-zlib
-configure-stage3-zlib:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
-maybe-configure-stage4-zlib:
-@if zlib-bootstrap
-maybe-configure-stage4-zlib: configure-stage4-zlib
-configure-stage4-zlib:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
-maybe-configure-stageprofile-zlib:
-@if zlib-bootstrap
-maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
-configure-stageprofile-zlib:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
-maybe-configure-stagefeedback-zlib:
-@if zlib-bootstrap
-maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
-configure-stagefeedback-zlib:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-
-
-
-
 .PHONY: all-zlib maybe-all-zlib
 maybe-all-zlib:
 @if zlib
 TARGET-zlib=all
 maybe-all-zlib: all-zlib
 all-zlib: configure-zlib
-@endif zlib
-@if zlib-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif zlib-bootstrap
-@if zlib
-	@r=`${PWD_COMMAND}`; export r; \
+	@test -f stage_last && exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/zlib && \
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zlib))
 @endif zlib
 
-
-
-.PHONY: all-stage1-zlib maybe-all-stage1-zlib
-.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
-maybe-all-stage1-zlib:
-maybe-clean-stage1-zlib:
-@if zlib-bootstrap
-maybe-all-stage1-zlib: all-stage1-zlib
-all-stage1: all-stage1-zlib
-TARGET-stage1-zlib = $(TARGET-zlib)
-all-stage1-zlib: configure-stage1-zlib
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-zlib)
-
-maybe-clean-stage1-zlib: clean-stage1-zlib
-clean-stage1: clean-stage1-zlib
-clean-stage1-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stage2-zlib maybe-all-stage2-zlib
-.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
-maybe-all-stage2-zlib:
-maybe-clean-stage2-zlib:
-@if zlib-bootstrap
-maybe-all-stage2-zlib: all-stage2-zlib
-all-stage2: all-stage2-zlib
-TARGET-stage2-zlib = $(TARGET-zlib)
-all-stage2-zlib: configure-stage2-zlib
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-zlib)
-
-maybe-clean-stage2-zlib: clean-stage2-zlib
-clean-stage2: clean-stage2-zlib
-clean-stage2-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stage3-zlib maybe-all-stage3-zlib
-.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
-maybe-all-stage3-zlib:
-maybe-clean-stage3-zlib:
-@if zlib-bootstrap
-maybe-all-stage3-zlib: all-stage3-zlib
-all-stage3: all-stage3-zlib
-TARGET-stage3-zlib = $(TARGET-zlib)
-all-stage3-zlib: configure-stage3-zlib
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-zlib)
-
-maybe-clean-stage3-zlib: clean-stage3-zlib
-clean-stage3: clean-stage3-zlib
-clean-stage3-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stage4-zlib maybe-all-stage4-zlib
-.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
-maybe-all-stage4-zlib:
-maybe-clean-stage4-zlib:
-@if zlib-bootstrap
-maybe-all-stage4-zlib: all-stage4-zlib
-all-stage4: all-stage4-zlib
-TARGET-stage4-zlib = $(TARGET-zlib)
-all-stage4-zlib: configure-stage4-zlib
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-zlib)
-
-maybe-clean-stage4-zlib: clean-stage4-zlib
-clean-stage4: clean-stage4-zlib
-clean-stage4-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
-.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
-maybe-all-stageprofile-zlib:
-maybe-clean-stageprofile-zlib:
-@if zlib-bootstrap
-maybe-all-stageprofile-zlib: all-stageprofile-zlib
-all-stageprofile: all-stageprofile-zlib
-TARGET-stageprofile-zlib = $(TARGET-zlib)
-all-stageprofile-zlib: configure-stageprofile-zlib
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-zlib)
-
-maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
-clean-stageprofile: clean-stageprofile-zlib
-clean-stageprofile-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
-.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
-maybe-all-stagefeedback-zlib:
-maybe-clean-stagefeedback-zlib:
-@if zlib-bootstrap
-maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
-all-stagefeedback: all-stagefeedback-zlib
-TARGET-stagefeedback-zlib = $(TARGET-zlib)
-all-stagefeedback-zlib: configure-stagefeedback-zlib
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-zlib)
-
-maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
-clean-stagefeedback: clean-stagefeedback-zlib
-clean-stagefeedback-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif zlib-bootstrap
-
-
-
-
-
 .PHONY: check-zlib maybe-check-zlib
 maybe-check-zlib:
 @if zlib
@@ -26842,20 +21277,18 @@ maintainer-clean-zlib:
 @endif zlib
 
 
-
 .PHONY: configure-gdb maybe-configure-gdb
 maybe-configure-gdb:
 @if gdb
 maybe-configure-gdb: configure-gdb
-configure-gdb: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
+configure-gdb:
+	@test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gdb; \
-	cd "$(HOST_SUBDIR)/gdb" || exit 1; \
+	echo Configuring in gdb; \
+	cd $(HOST_SUBDIR)/gdb || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
@@ -26868,17 +21301,12 @@ configure-gdb:
 	  || exit 1
 @endif gdb
 
-
-
-
-
 .PHONY: all-gdb maybe-all-gdb
 maybe-all-gdb:
 @if gdb
 TARGET-gdb=all
 maybe-all-gdb: all-gdb
 all-gdb: configure-gdb
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26886,16 +21314,12 @@ all-gdb: configure-gdb
 	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb))
 @endif gdb
 
-
-
-
 .PHONY: check-gdb maybe-check-gdb
 maybe-check-gdb:
 @if gdb
 maybe-check-gdb: check-gdb
 
 check-gdb:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26910,7 +21334,6 @@ maybe-install-gdb:
 maybe-install-gdb: install-gdb
 
 install-gdb: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26928,7 +21351,6 @@ maybe-info-gdb: info-gdb
 
 info-gdb: \
     configure-gdb 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26954,7 +21376,6 @@ maybe-dvi-gdb: dvi-gdb
 
 dvi-gdb: \
     configure-gdb 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26980,7 +21401,6 @@ maybe-html-gdb: html-gdb
 
 html-gdb: \
     configure-gdb 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27006,7 +21426,6 @@ maybe-TAGS-gdb: TAGS-gdb
 
 TAGS-gdb: \
     configure-gdb 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27033,7 +21452,6 @@ maybe-install-info-gdb: install-info-gdb
 install-info-gdb: \
     configure-gdb \
     info-gdb 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27059,7 +21477,6 @@ maybe-installcheck-gdb: installcheck-gdb
 
 installcheck-gdb: \
     configure-gdb 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27084,7 +21501,6 @@ maybe-mostlyclean-gdb:
 maybe-mostlyclean-gdb: mostlyclean-gdb
 
 mostlyclean-gdb: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27109,7 +21525,6 @@ maybe-clean-gdb:
 maybe-clean-gdb: clean-gdb
 
 clean-gdb: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27134,7 +21549,6 @@ maybe-distclean-gdb:
 maybe-distclean-gdb: distclean-gdb
 
 distclean-gdb: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27159,7 +21573,6 @@ maybe-maintainer-clean-gdb:
 maybe-maintainer-clean-gdb: maintainer-clean-gdb
 
 maintainer-clean-gdb: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27179,20 +21592,18 @@ maintainer-clean-gdb:
 @endif gdb
 
 
-
 .PHONY: configure-expect maybe-configure-expect
 maybe-configure-expect:
 @if expect
 maybe-configure-expect: configure-expect
-configure-expect: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
+configure-expect:
+	@test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/expect; \
-	cd "$(HOST_SUBDIR)/expect" || exit 1; \
+	echo Configuring in expect; \
+	cd $(HOST_SUBDIR)/expect || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
@@ -27205,17 +21616,12 @@ configure-expect:
 	  || exit 1
 @endif expect
 
-
-
-
-
 .PHONY: all-expect maybe-all-expect
 maybe-all-expect:
 @if expect
 TARGET-expect=all
 maybe-all-expect: all-expect
 all-expect: configure-expect
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27223,16 +21629,12 @@ all-expect: configure-expect
 	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect))
 @endif expect
 
-
-
-
 .PHONY: check-expect maybe-check-expect
 maybe-check-expect:
 @if expect
 maybe-check-expect: check-expect
 
 check-expect:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27247,7 +21649,6 @@ maybe-install-expect:
 maybe-install-expect: install-expect
 
 install-expect: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27265,7 +21666,6 @@ maybe-info-expect: info-expect
 
 info-expect: \
     configure-expect 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27291,7 +21691,6 @@ maybe-dvi-expect: dvi-expect
 
 dvi-expect: \
     configure-expect 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27317,7 +21716,6 @@ maybe-html-expect: html-expect
 
 html-expect: \
     configure-expect 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27343,7 +21741,6 @@ maybe-TAGS-expect: TAGS-expect
 
 TAGS-expect: \
     configure-expect 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27370,7 +21767,6 @@ maybe-install-info-expect: install-info-expect
 install-info-expect: \
     configure-expect \
     info-expect 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27396,7 +21792,6 @@ maybe-installcheck-expect: installcheck-expect
 
 installcheck-expect: \
     configure-expect 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27421,7 +21816,6 @@ maybe-mostlyclean-expect:
 maybe-mostlyclean-expect: mostlyclean-expect
 
 mostlyclean-expect: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27446,7 +21840,6 @@ maybe-clean-expect:
 maybe-clean-expect: clean-expect
 
 clean-expect: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27471,7 +21864,6 @@ maybe-distclean-expect:
 maybe-distclean-expect: distclean-expect
 
 distclean-expect: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27496,7 +21888,6 @@ maybe-maintainer-clean-expect:
 maybe-maintainer-clean-expect: maintainer-clean-expect
 
 maintainer-clean-expect: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27516,20 +21907,18 @@ maintainer-clean-expect:
 @endif expect
 
 
-
 .PHONY: configure-guile maybe-configure-guile
 maybe-configure-guile:
 @if guile
 maybe-configure-guile: configure-guile
-configure-guile: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
+configure-guile:
+	@test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/guile; \
-	cd "$(HOST_SUBDIR)/guile" || exit 1; \
+	echo Configuring in guile; \
+	cd $(HOST_SUBDIR)/guile || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
@@ -27542,17 +21931,12 @@ configure-guile:
 	  || exit 1
 @endif guile
 
-
-
-
-
 .PHONY: all-guile maybe-all-guile
 maybe-all-guile:
 @if guile
 TARGET-guile=all
 maybe-all-guile: all-guile
 all-guile: configure-guile
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27560,16 +21944,12 @@ all-guile: configure-guile
 	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile))
 @endif guile
 
-
-
-
 .PHONY: check-guile maybe-check-guile
 maybe-check-guile:
 @if guile
 maybe-check-guile: check-guile
 
 check-guile:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27584,7 +21964,6 @@ maybe-install-guile:
 maybe-install-guile: install-guile
 
 install-guile: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27602,7 +21981,6 @@ maybe-info-guile: info-guile
 
 info-guile: \
     configure-guile 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27628,7 +22006,6 @@ maybe-dvi-guile: dvi-guile
 
 dvi-guile: \
     configure-guile 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27654,7 +22031,6 @@ maybe-html-guile: html-guile
 
 html-guile: \
     configure-guile 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27680,7 +22056,6 @@ maybe-TAGS-guile: TAGS-guile
 
 TAGS-guile: \
     configure-guile 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27707,7 +22082,6 @@ maybe-install-info-guile: install-info-guile
 install-info-guile: \
     configure-guile \
     info-guile 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27733,7 +22107,6 @@ maybe-installcheck-guile: installcheck-guile
 
 installcheck-guile: \
     configure-guile 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27758,7 +22131,6 @@ maybe-mostlyclean-guile:
 maybe-mostlyclean-guile: mostlyclean-guile
 
 mostlyclean-guile: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27783,7 +22155,6 @@ maybe-clean-guile:
 maybe-clean-guile: clean-guile
 
 clean-guile: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27808,7 +22179,6 @@ maybe-distclean-guile:
 maybe-distclean-guile: distclean-guile
 
 distclean-guile: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27833,7 +22203,6 @@ maybe-maintainer-clean-guile:
 maybe-maintainer-clean-guile: maintainer-clean-guile
 
 maintainer-clean-guile: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27853,20 +22222,18 @@ maintainer-clean-guile:
 @endif guile
 
 
-
 .PHONY: configure-tk maybe-configure-tk
 maybe-configure-tk:
 @if tk
 maybe-configure-tk: configure-tk
-configure-tk: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
+configure-tk:
+	@test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/tk; \
-	cd "$(HOST_SUBDIR)/tk" || exit 1; \
+	echo Configuring in tk; \
+	cd $(HOST_SUBDIR)/tk || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
@@ -27879,17 +22246,12 @@ configure-tk:
 	  || exit 1
 @endif tk
 
-
-
-
-
 .PHONY: all-tk maybe-all-tk
 maybe-all-tk:
 @if tk
 TARGET-tk=all
 maybe-all-tk: all-tk
 all-tk: configure-tk
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27897,16 +22259,12 @@ all-tk: configure-tk
 	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk))
 @endif tk
 
-
-
-
 .PHONY: check-tk maybe-check-tk
 maybe-check-tk:
 @if tk
 maybe-check-tk: check-tk
 
 check-tk:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27921,7 +22279,6 @@ maybe-install-tk:
 maybe-install-tk: install-tk
 
 install-tk: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27939,7 +22296,6 @@ maybe-info-tk: info-tk
 
 info-tk: \
     configure-tk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27965,7 +22321,6 @@ maybe-dvi-tk: dvi-tk
 
 dvi-tk: \
     configure-tk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27991,7 +22346,6 @@ maybe-html-tk: html-tk
 
 html-tk: \
     configure-tk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28017,7 +22371,6 @@ maybe-TAGS-tk: TAGS-tk
 
 TAGS-tk: \
     configure-tk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28044,7 +22397,6 @@ maybe-install-info-tk: install-info-tk
 install-info-tk: \
     configure-tk \
     info-tk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28070,7 +22422,6 @@ maybe-installcheck-tk: installcheck-tk
 
 installcheck-tk: \
     configure-tk 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28095,7 +22446,6 @@ maybe-mostlyclean-tk:
 maybe-mostlyclean-tk: mostlyclean-tk
 
 mostlyclean-tk: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28120,7 +22470,6 @@ maybe-clean-tk:
 maybe-clean-tk: clean-tk
 
 clean-tk: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28145,7 +22494,6 @@ maybe-distclean-tk:
 maybe-distclean-tk: distclean-tk
 
 distclean-tk: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28170,7 +22518,6 @@ maybe-maintainer-clean-tk:
 maybe-maintainer-clean-tk: maintainer-clean-tk
 
 maintainer-clean-tk: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28190,20 +22537,18 @@ maintainer-clean-tk:
 @endif tk
 
 
-
 .PHONY: configure-libtermcap maybe-configure-libtermcap
 maybe-configure-libtermcap:
 @if libtermcap
 maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
+configure-libtermcap:
+	@test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libtermcap; \
-	cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
+	echo Configuring in libtermcap; \
+	cd $(HOST_SUBDIR)/libtermcap || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
@@ -28216,17 +22561,12 @@ configure-libtermcap:
 	  || exit 1
 @endif libtermcap
 
-
-
-
-
 .PHONY: all-libtermcap maybe-all-libtermcap
 maybe-all-libtermcap:
 @if libtermcap
 TARGET-libtermcap=all
 maybe-all-libtermcap: all-libtermcap
 all-libtermcap: configure-libtermcap
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28234,9 +22574,6 @@ all-libtermcap: configure-libtermcap
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtermcap))
 @endif libtermcap
 
-
-
-
 .PHONY: check-libtermcap maybe-check-libtermcap
 maybe-check-libtermcap:
 @if libtermcap
@@ -28252,7 +22589,6 @@ maybe-install-libtermcap:
 maybe-install-libtermcap: install-libtermcap
 
 install-libtermcap: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28270,7 +22606,6 @@ maybe-info-libtermcap: info-libtermcap
 
 info-libtermcap: \
     configure-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28296,7 +22631,6 @@ maybe-dvi-libtermcap: dvi-libtermcap
 
 dvi-libtermcap: \
     configure-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28322,7 +22656,6 @@ maybe-html-libtermcap: html-libtermcap
 
 html-libtermcap: \
     configure-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28348,7 +22681,6 @@ maybe-TAGS-libtermcap: TAGS-libtermcap
 
 TAGS-libtermcap: \
     configure-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28375,7 +22707,6 @@ maybe-install-info-libtermcap: install-info-libtermcap
 install-info-libtermcap: \
     configure-libtermcap \
     info-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28401,7 +22732,6 @@ maybe-installcheck-libtermcap: installcheck-libtermcap
 
 installcheck-libtermcap: \
     configure-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28461,20 +22791,18 @@ maintainer-clean-libtermcap:
 @endif libtermcap
 
 
-
 .PHONY: configure-utils maybe-configure-utils
 maybe-configure-utils:
 @if utils
 maybe-configure-utils: configure-utils
-configure-utils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
+configure-utils:
+	@test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/utils; \
-	cd "$(HOST_SUBDIR)/utils" || exit 1; \
+	echo Configuring in utils; \
+	cd $(HOST_SUBDIR)/utils || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
@@ -28487,17 +22815,12 @@ configure-utils:
 	  || exit 1
 @endif utils
 
-
-
-
-
 .PHONY: all-utils maybe-all-utils
 maybe-all-utils:
 @if utils
 TARGET-utils=all
 maybe-all-utils: all-utils
 all-utils: configure-utils
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28505,9 +22828,6 @@ all-utils: configure-utils
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-utils))
 @endif utils
 
-
-
-
 .PHONY: check-utils maybe-check-utils
 maybe-check-utils:
 @if utils
@@ -28523,7 +22843,6 @@ maybe-install-utils:
 maybe-install-utils: install-utils
 
 install-utils: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28541,7 +22860,6 @@ maybe-info-utils: info-utils
 
 info-utils: \
     configure-utils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28567,7 +22885,6 @@ maybe-dvi-utils: dvi-utils
 
 dvi-utils: \
     configure-utils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28593,7 +22910,6 @@ maybe-html-utils: html-utils
 
 html-utils: \
     configure-utils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28619,7 +22935,6 @@ maybe-TAGS-utils: TAGS-utils
 
 TAGS-utils: \
     configure-utils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28646,7 +22961,6 @@ maybe-install-info-utils: install-info-utils
 install-info-utils: \
     configure-utils \
     info-utils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28672,7 +22986,6 @@ maybe-installcheck-utils: installcheck-utils
 
 installcheck-utils: \
     configure-utils 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28697,7 +23010,6 @@ maybe-mostlyclean-utils:
 maybe-mostlyclean-utils: mostlyclean-utils
 
 mostlyclean-utils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28722,7 +23034,6 @@ maybe-clean-utils:
 maybe-clean-utils: clean-utils
 
 clean-utils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28747,7 +23058,6 @@ maybe-distclean-utils:
 maybe-distclean-utils: distclean-utils
 
 distclean-utils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28772,7 +23082,6 @@ maybe-maintainer-clean-utils:
 maybe-maintainer-clean-utils: maintainer-clean-utils
 
 maintainer-clean-utils: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28792,20 +23101,18 @@ maintainer-clean-utils:
 @endif utils
 
 
-
 .PHONY: configure-gnattools maybe-configure-gnattools
 maybe-configure-gnattools:
 @if gnattools
 maybe-configure-gnattools: configure-gnattools
-configure-gnattools: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
+configure-gnattools:
+	@test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gnattools; \
-	cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
+	echo Configuring in gnattools; \
+	cd $(HOST_SUBDIR)/gnattools || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
 	  *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
@@ -28818,17 +23125,12 @@ configure-gnattools:
 	  || exit 1
 @endif gnattools
 
-
-
-
-
 .PHONY: all-gnattools maybe-all-gnattools
 maybe-all-gnattools:
 @if gnattools
 TARGET-gnattools=all
 maybe-all-gnattools: all-gnattools
 all-gnattools: configure-gnattools
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28836,16 +23138,12 @@ all-gnattools: configure-gnattools
 	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnattools))
 @endif gnattools
 
-
-
-
 .PHONY: check-gnattools maybe-check-gnattools
 maybe-check-gnattools:
 @if gnattools
 maybe-check-gnattools: check-gnattools
 
 check-gnattools:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28860,7 +23158,6 @@ maybe-install-gnattools:
 maybe-install-gnattools: install-gnattools
 
 install-gnattools: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28878,7 +23175,6 @@ maybe-info-gnattools: info-gnattools
 
 info-gnattools: \
     configure-gnattools 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28904,7 +23200,6 @@ maybe-dvi-gnattools: dvi-gnattools
 
 dvi-gnattools: \
     configure-gnattools 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28930,7 +23225,6 @@ maybe-html-gnattools: html-gnattools
 
 html-gnattools: \
     configure-gnattools 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28956,7 +23250,6 @@ maybe-TAGS-gnattools: TAGS-gnattools
 
 TAGS-gnattools: \
     configure-gnattools 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28983,7 +23276,6 @@ maybe-install-info-gnattools: install-info-gnattools
 install-info-gnattools: \
     configure-gnattools \
     info-gnattools 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29009,7 +23301,6 @@ maybe-installcheck-gnattools: installcheck-gnattools
 
 installcheck-gnattools: \
     configure-gnattools 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29034,7 +23325,6 @@ maybe-mostlyclean-gnattools:
 maybe-mostlyclean-gnattools: mostlyclean-gnattools
 
 mostlyclean-gnattools: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29059,7 +23349,6 @@ maybe-clean-gnattools:
 maybe-clean-gnattools: clean-gnattools
 
 clean-gnattools: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29084,7 +23373,6 @@ maybe-distclean-gnattools:
 maybe-distclean-gnattools: distclean-gnattools
 
 distclean-gnattools: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29109,7 +23397,6 @@ maybe-maintainer-clean-gnattools:
 maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
 
 maintainer-clean-gnattools: 
-	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29134,32 +23421,22 @@ maintainer-clean-gnattools:
 # Modules which run on the target machine
 # ---------------------------------------
 
-
-
-
 .PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
 maybe-configure-target-libstdc++-v3:
 @if target-libstdc++-v3
 maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libstdc++-v3..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libstdc++-v3/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
+
+configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
 	cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
@@ -29172,39 +23449,30 @@ configure-target-libstdc++-v3:
 	libsrcdir="$$s/libstdc++-v3"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libstdc++-v3
 
-
-
-
-
 .PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
 maybe-all-target-libstdc++-v3:
 @if target-libstdc++-v3
 TARGET-target-libstdc++-v3=all
 maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
 all-target-libstdc++-v3: configure-target-libstdc++-v3
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libstdc++-v3))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libstdc++-v3))
 @endif target-libstdc++-v3
 
-
-
-
-
 .PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
 maybe-check-target-libstdc++-v3:
 @if target-libstdc++-v3
 maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
 
 check-target-libstdc++-v3:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -29219,7 +23487,6 @@ maybe-install-target-libstdc++-v3:
 maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
 
 install-target-libstdc++-v3: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -29237,7 +23504,6 @@ maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
 
 info-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29263,7 +23529,6 @@ maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
 
 dvi-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29289,7 +23554,6 @@ maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
 
 html-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29315,7 +23579,6 @@ maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
 
 TAGS-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29342,7 +23605,6 @@ maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
 install-info-target-libstdc++-v3: \
     configure-target-libstdc++-v3 \
     info-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29368,7 +23630,6 @@ maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
 
 installcheck-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29393,7 +23654,6 @@ maybe-mostlyclean-target-libstdc++-v3:
 maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
 
 mostlyclean-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29418,7 +23678,6 @@ maybe-clean-target-libstdc++-v3:
 maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
 
 clean-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29443,7 +23702,6 @@ maybe-distclean-target-libstdc++-v3:
 maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
 
 distclean-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29468,7 +23726,6 @@ maybe-maintainer-clean-target-libstdc++-v3:
 maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
 
 maintainer-clean-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29488,32 +23745,22 @@ maintainer-clean-target-libstdc++-v3:
 @endif target-libstdc++-v3
 
 
-
-
-
 .PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
 maybe-configure-target-libmudflap:
 @if target-libmudflap
 maybe-configure-target-libmudflap: configure-target-libmudflap
-configure-target-libmudflap: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libmudflap..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libmudflap/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmudflap/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libmudflap/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libmudflap/Makefile; \
-	    mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libmudflap/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libmudflap/multilib.out
+
+configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
 	cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
@@ -29526,39 +23773,30 @@ configure-target-libmudflap:
 	libsrcdir="$$s/libmudflap"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libmudflap
 
-
-
-
-
 .PHONY: all-target-libmudflap maybe-all-target-libmudflap
 maybe-all-target-libmudflap:
 @if target-libmudflap
 TARGET-target-libmudflap=all
 maybe-all-target-libmudflap: all-target-libmudflap
 all-target-libmudflap: configure-target-libmudflap
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libmudflap))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libmudflap))
 @endif target-libmudflap
 
-
-
-
-
 .PHONY: check-target-libmudflap maybe-check-target-libmudflap
 maybe-check-target-libmudflap:
 @if target-libmudflap
 maybe-check-target-libmudflap: check-target-libmudflap
 
 check-target-libmudflap:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29573,7 +23811,6 @@ maybe-install-target-libmudflap:
 maybe-install-target-libmudflap: install-target-libmudflap
 
 install-target-libmudflap: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29591,7 +23828,6 @@ maybe-info-target-libmudflap: info-target-libmudflap
 
 info-target-libmudflap: \
     configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29617,7 +23853,6 @@ maybe-dvi-target-libmudflap: dvi-target-libmudflap
 
 dvi-target-libmudflap: \
     configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29643,7 +23878,6 @@ maybe-html-target-libmudflap: html-target-libmudflap
 
 html-target-libmudflap: \
     configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29669,7 +23903,6 @@ maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
 
 TAGS-target-libmudflap: \
     configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29696,7 +23929,6 @@ maybe-install-info-target-libmudflap: install-info-target-libmudflap
 install-info-target-libmudflap: \
     configure-target-libmudflap \
     info-target-libmudflap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29722,7 +23954,6 @@ maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
 
 installcheck-target-libmudflap: \
     configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29747,7 +23978,6 @@ maybe-mostlyclean-target-libmudflap:
 maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
 
 mostlyclean-target-libmudflap: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29772,7 +24002,6 @@ maybe-clean-target-libmudflap:
 maybe-clean-target-libmudflap: clean-target-libmudflap
 
 clean-target-libmudflap: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29797,7 +24026,6 @@ maybe-distclean-target-libmudflap:
 maybe-distclean-target-libmudflap: distclean-target-libmudflap
 
 distclean-target-libmudflap: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29822,7 +24050,6 @@ maybe-maintainer-clean-target-libmudflap:
 maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
 
 maintainer-clean-target-libmudflap: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29842,740 +24069,22 @@ maintainer-clean-target-libmudflap:
 @endif target-libmudflap
 
 
-
-
-
-.PHONY: configure-target-libssp maybe-configure-target-libssp
-maybe-configure-target-libssp:
-@if target-libssp
-maybe-configure-target-libssp: configure-target-libssp
-configure-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libssp..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libssp/Makefile; \
-	    mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libssp; \
-	cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libssp"; \
-	libsrcdir="$$s/libssp"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libssp
-
-
-
-
-
-.PHONY: all-target-libssp maybe-all-target-libssp
-maybe-all-target-libssp:
-@if target-libssp
-TARGET-target-libssp=all
-maybe-all-target-libssp: all-target-libssp
-all-target-libssp: configure-target-libssp
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libssp))
-@endif target-libssp
-
-
-
-
-
-.PHONY: check-target-libssp maybe-check-target-libssp
-maybe-check-target-libssp:
-@if target-libssp
-maybe-check-target-libssp: check-target-libssp
-
-check-target-libssp:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libssp
-
-.PHONY: install-target-libssp maybe-install-target-libssp
-maybe-install-target-libssp:
-@if target-libssp
-maybe-install-target-libssp: install-target-libssp
-
-install-target-libssp: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libssp
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libssp info-target-libssp
-maybe-info-target-libssp:
-@if target-libssp
-maybe-info-target-libssp: info-target-libssp
-
-info-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-dvi-target-libssp dvi-target-libssp
-maybe-dvi-target-libssp:
-@if target-libssp
-maybe-dvi-target-libssp: dvi-target-libssp
-
-dvi-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-html-target-libssp html-target-libssp
-maybe-html-target-libssp:
-@if target-libssp
-maybe-html-target-libssp: html-target-libssp
-
-html-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-TAGS-target-libssp TAGS-target-libssp
-maybe-TAGS-target-libssp:
-@if target-libssp
-maybe-TAGS-target-libssp: TAGS-target-libssp
-
-TAGS-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-install-info-target-libssp install-info-target-libssp
-maybe-install-info-target-libssp:
-@if target-libssp
-maybe-install-info-target-libssp: install-info-target-libssp
-
-install-info-target-libssp: \
-    configure-target-libssp \
-    info-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-installcheck-target-libssp installcheck-target-libssp
-maybe-installcheck-target-libssp:
-@if target-libssp
-maybe-installcheck-target-libssp: installcheck-target-libssp
-
-installcheck-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-mostlyclean-target-libssp mostlyclean-target-libssp
-maybe-mostlyclean-target-libssp:
-@if target-libssp
-maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
-
-mostlyclean-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-clean-target-libssp clean-target-libssp
-maybe-clean-target-libssp:
-@if target-libssp
-maybe-clean-target-libssp: clean-target-libssp
-
-clean-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-distclean-target-libssp distclean-target-libssp
-maybe-distclean-target-libssp:
-@if target-libssp
-maybe-distclean-target-libssp: distclean-target-libssp
-
-distclean-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-maintainer-clean-target-libssp maintainer-clean-target-libssp
-maybe-maintainer-clean-target-libssp:
-@if target-libssp
-maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
-
-maintainer-clean-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libssp
-
-
-
-
-
-.PHONY: configure-target-libgcc-math maybe-configure-target-libgcc-math
-maybe-configure-target-libgcc-math:
-@if target-libgcc-math
-maybe-configure-target-libgcc-math: configure-target-libgcc-math
-configure-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgcc-math..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc-math ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc-math/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgcc-math/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgcc-math/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgcc-math/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgcc-math/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc-math ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libgcc-math; \
-	cd "$(TARGET_SUBDIR)/libgcc-math" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc-math/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libgcc-math"; \
-	libsrcdir="$$s/libgcc-math"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libgcc-math
-
-
-
-
-
-.PHONY: all-target-libgcc-math maybe-all-target-libgcc-math
-maybe-all-target-libgcc-math:
-@if target-libgcc-math
-TARGET-target-libgcc-math=all
-maybe-all-target-libgcc-math: all-target-libgcc-math
-all-target-libgcc-math: configure-target-libgcc-math
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgcc-math))
-@endif target-libgcc-math
-
-
-
-
-
-.PHONY: check-target-libgcc-math maybe-check-target-libgcc-math
-maybe-check-target-libgcc-math:
-@if target-libgcc-math
-maybe-check-target-libgcc-math: check-target-libgcc-math
-
-check-target-libgcc-math:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libgcc-math
-
-.PHONY: install-target-libgcc-math maybe-install-target-libgcc-math
-maybe-install-target-libgcc-math:
-@if target-libgcc-math
-maybe-install-target-libgcc-math: install-target-libgcc-math
-
-install-target-libgcc-math: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libgcc-math
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libgcc-math info-target-libgcc-math
-maybe-info-target-libgcc-math:
-@if target-libgcc-math
-maybe-info-target-libgcc-math: info-target-libgcc-math
-
-info-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-dvi-target-libgcc-math dvi-target-libgcc-math
-maybe-dvi-target-libgcc-math:
-@if target-libgcc-math
-maybe-dvi-target-libgcc-math: dvi-target-libgcc-math
-
-dvi-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-html-target-libgcc-math html-target-libgcc-math
-maybe-html-target-libgcc-math:
-@if target-libgcc-math
-maybe-html-target-libgcc-math: html-target-libgcc-math
-
-html-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-TAGS-target-libgcc-math TAGS-target-libgcc-math
-maybe-TAGS-target-libgcc-math:
-@if target-libgcc-math
-maybe-TAGS-target-libgcc-math: TAGS-target-libgcc-math
-
-TAGS-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-install-info-target-libgcc-math install-info-target-libgcc-math
-maybe-install-info-target-libgcc-math:
-@if target-libgcc-math
-maybe-install-info-target-libgcc-math: install-info-target-libgcc-math
-
-install-info-target-libgcc-math: \
-    configure-target-libgcc-math \
-    info-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-installcheck-target-libgcc-math installcheck-target-libgcc-math
-maybe-installcheck-target-libgcc-math:
-@if target-libgcc-math
-maybe-installcheck-target-libgcc-math: installcheck-target-libgcc-math
-
-installcheck-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-mostlyclean-target-libgcc-math mostlyclean-target-libgcc-math
-maybe-mostlyclean-target-libgcc-math:
-@if target-libgcc-math
-maybe-mostlyclean-target-libgcc-math: mostlyclean-target-libgcc-math
-
-mostlyclean-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-clean-target-libgcc-math clean-target-libgcc-math
-maybe-clean-target-libgcc-math:
-@if target-libgcc-math
-maybe-clean-target-libgcc-math: clean-target-libgcc-math
-
-clean-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-distclean-target-libgcc-math distclean-target-libgcc-math
-maybe-distclean-target-libgcc-math:
-@if target-libgcc-math
-maybe-distclean-target-libgcc-math: distclean-target-libgcc-math
-
-distclean-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-maintainer-clean-target-libgcc-math maintainer-clean-target-libgcc-math
-maybe-maintainer-clean-target-libgcc-math:
-@if target-libgcc-math
-maybe-maintainer-clean-target-libgcc-math: maintainer-clean-target-libgcc-math
-
-maintainer-clean-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-
-
-
-
 .PHONY: configure-target-newlib maybe-configure-target-newlib
 maybe-configure-target-newlib:
 @if target-newlib
 maybe-configure-target-newlib: configure-target-newlib
-configure-target-newlib: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for newlib..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/newlib/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/newlib/Makefile; \
-	    mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out
+
+configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/newlib; \
 	cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
@@ -30588,39 +24097,30 @@ configure-target-newlib:
 	libsrcdir="$$s/newlib"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-newlib
 
-
-
-
-
 .PHONY: all-target-newlib maybe-all-target-newlib
 maybe-all-target-newlib:
 @if target-newlib
 TARGET-target-newlib=all
 maybe-all-target-newlib: all-target-newlib
 all-target-newlib: configure-target-newlib
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-newlib))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-newlib))
 @endif target-newlib
 
-
-
-
-
 .PHONY: check-target-newlib maybe-check-target-newlib
 maybe-check-target-newlib:
 @if target-newlib
 maybe-check-target-newlib: check-target-newlib
 
 check-target-newlib:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30635,7 +24135,6 @@ maybe-install-target-newlib:
 maybe-install-target-newlib: install-target-newlib
 
 install-target-newlib: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30653,7 +24152,6 @@ maybe-info-target-newlib: info-target-newlib
 
 info-target-newlib: \
     configure-target-newlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30679,7 +24177,6 @@ maybe-dvi-target-newlib: dvi-target-newlib
 
 dvi-target-newlib: \
     configure-target-newlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30705,7 +24202,6 @@ maybe-html-target-newlib: html-target-newlib
 
 html-target-newlib: \
     configure-target-newlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30731,7 +24227,6 @@ maybe-TAGS-target-newlib: TAGS-target-newlib
 
 TAGS-target-newlib: \
     configure-target-newlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30758,7 +24253,6 @@ maybe-install-info-target-newlib: install-info-target-newlib
 install-info-target-newlib: \
     configure-target-newlib \
     info-target-newlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30784,7 +24278,6 @@ maybe-installcheck-target-newlib: installcheck-target-newlib
 
 installcheck-target-newlib: \
     configure-target-newlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30809,7 +24302,6 @@ maybe-mostlyclean-target-newlib:
 maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
 
 mostlyclean-target-newlib: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30834,7 +24326,6 @@ maybe-clean-target-newlib:
 maybe-clean-target-newlib: clean-target-newlib
 
 clean-target-newlib: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30859,7 +24350,6 @@ maybe-distclean-target-newlib:
 maybe-distclean-target-newlib: distclean-target-newlib
 
 distclean-target-newlib: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30884,7 +24374,6 @@ maybe-maintainer-clean-target-newlib:
 maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
 
 maintainer-clean-target-newlib: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30904,32 +24393,22 @@ maintainer-clean-target-newlib:
 @endif target-newlib
 
 
-
-
-
 .PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
 maybe-configure-target-libgfortran:
 @if target-libgfortran
 maybe-configure-target-libgfortran: configure-target-libgfortran
-configure-target-libgfortran: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgfortran..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libgfortran/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgfortran/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgfortran/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libgfortran/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libgfortran/multilib.out
+
+configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
 	cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
@@ -30942,39 +24421,30 @@ configure-target-libgfortran:
 	libsrcdir="$$s/libgfortran"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libgfortran
 
-
-
-
-
 .PHONY: all-target-libgfortran maybe-all-target-libgfortran
 maybe-all-target-libgfortran:
 @if target-libgfortran
 TARGET-target-libgfortran=all
 maybe-all-target-libgfortran: all-target-libgfortran
 all-target-libgfortran: configure-target-libgfortran
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgfortran))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgfortran))
 @endif target-libgfortran
 
-
-
-
-
 .PHONY: check-target-libgfortran maybe-check-target-libgfortran
 maybe-check-target-libgfortran:
 @if target-libgfortran
 maybe-check-target-libgfortran: check-target-libgfortran
 
 check-target-libgfortran:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30989,7 +24459,6 @@ maybe-install-target-libgfortran:
 maybe-install-target-libgfortran: install-target-libgfortran
 
 install-target-libgfortran: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31007,7 +24476,6 @@ maybe-info-target-libgfortran: info-target-libgfortran
 
 info-target-libgfortran: \
     configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31033,7 +24501,6 @@ maybe-dvi-target-libgfortran: dvi-target-libgfortran
 
 dvi-target-libgfortran: \
     configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31059,7 +24526,6 @@ maybe-html-target-libgfortran: html-target-libgfortran
 
 html-target-libgfortran: \
     configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31085,7 +24551,6 @@ maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
 
 TAGS-target-libgfortran: \
     configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31112,7 +24577,6 @@ maybe-install-info-target-libgfortran: install-info-target-libgfortran
 install-info-target-libgfortran: \
     configure-target-libgfortran \
     info-target-libgfortran 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31138,7 +24602,6 @@ maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
 
 installcheck-target-libgfortran: \
     configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31163,7 +24626,6 @@ maybe-mostlyclean-target-libgfortran:
 maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
 
 mostlyclean-target-libgfortran: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31188,7 +24650,6 @@ maybe-clean-target-libgfortran:
 maybe-clean-target-libgfortran: clean-target-libgfortran
 
 clean-target-libgfortran: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31213,7 +24674,6 @@ maybe-distclean-target-libgfortran:
 maybe-distclean-target-libgfortran: distclean-target-libgfortran
 
 distclean-target-libgfortran: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31238,7 +24698,6 @@ maybe-maintainer-clean-target-libgfortran:
 maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
 
 maintainer-clean-target-libgfortran: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31258,32 +24717,22 @@ maintainer-clean-target-libgfortran:
 @endif target-libgfortran
 
 
-
-
-
 .PHONY: configure-target-libobjc maybe-configure-target-libobjc
 maybe-configure-target-libobjc:
 @if target-libobjc
 maybe-configure-target-libobjc: configure-target-libobjc
-configure-target-libobjc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libobjc..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libobjc/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libobjc/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \
-	    mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out
+
+configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libobjc; \
 	cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
@@ -31296,39 +24745,30 @@ configure-target-libobjc:
 	libsrcdir="$$s/libobjc"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libobjc
 
-
-
-
-
 .PHONY: all-target-libobjc maybe-all-target-libobjc
 maybe-all-target-libobjc:
 @if target-libobjc
 TARGET-target-libobjc=all
 maybe-all-target-libobjc: all-target-libobjc
 all-target-libobjc: configure-target-libobjc
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libobjc))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libobjc))
 @endif target-libobjc
 
-
-
-
-
 .PHONY: check-target-libobjc maybe-check-target-libobjc
 maybe-check-target-libobjc:
 @if target-libobjc
 maybe-check-target-libobjc: check-target-libobjc
 
 check-target-libobjc:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31343,7 +24783,6 @@ maybe-install-target-libobjc:
 maybe-install-target-libobjc: install-target-libobjc
 
 install-target-libobjc: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31361,7 +24800,6 @@ maybe-info-target-libobjc: info-target-libobjc
 
 info-target-libobjc: \
     configure-target-libobjc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31387,7 +24825,6 @@ maybe-dvi-target-libobjc: dvi-target-libobjc
 
 dvi-target-libobjc: \
     configure-target-libobjc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31413,7 +24850,6 @@ maybe-html-target-libobjc: html-target-libobjc
 
 html-target-libobjc: \
     configure-target-libobjc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31439,7 +24875,6 @@ maybe-TAGS-target-libobjc: TAGS-target-libobjc
 
 TAGS-target-libobjc: \
     configure-target-libobjc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31466,7 +24901,6 @@ maybe-install-info-target-libobjc: install-info-target-libobjc
 install-info-target-libobjc: \
     configure-target-libobjc \
     info-target-libobjc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31492,7 +24926,6 @@ maybe-installcheck-target-libobjc: installcheck-target-libobjc
 
 installcheck-target-libobjc: \
     configure-target-libobjc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31517,7 +24950,6 @@ maybe-mostlyclean-target-libobjc:
 maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
 
 mostlyclean-target-libobjc: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31542,7 +24974,6 @@ maybe-clean-target-libobjc:
 maybe-clean-target-libobjc: clean-target-libobjc
 
 clean-target-libobjc: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31567,7 +24998,6 @@ maybe-distclean-target-libobjc:
 maybe-distclean-target-libobjc: distclean-target-libobjc
 
 distclean-target-libobjc: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31592,7 +25022,6 @@ maybe-maintainer-clean-target-libobjc:
 maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
 
 maintainer-clean-target-libobjc: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31612,32 +25041,22 @@ maintainer-clean-target-libobjc:
 @endif target-libobjc
 
 
-
-
-
 .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
 maybe-configure-target-libtermcap:
 @if target-libtermcap
 maybe-configure-target-libtermcap: configure-target-libtermcap
-configure-target-libtermcap: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libtermcap..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libtermcap/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \
-	    mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out
+
+configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
 	cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
@@ -31650,32 +25069,24 @@ configure-target-libtermcap:
 	libsrcdir="$$s/libtermcap"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libtermcap
 
-
-
-
-
 .PHONY: all-target-libtermcap maybe-all-target-libtermcap
 maybe-all-target-libtermcap:
 @if target-libtermcap
 TARGET-target-libtermcap=all
 maybe-all-target-libtermcap: all-target-libtermcap
 all-target-libtermcap: configure-target-libtermcap
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libtermcap && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libtermcap))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libtermcap))
 @endif target-libtermcap
 
-
-
-
-
 .PHONY: check-target-libtermcap maybe-check-target-libtermcap
 maybe-check-target-libtermcap:
 @if target-libtermcap
@@ -31692,7 +25103,6 @@ maybe-install-target-libtermcap:
 maybe-install-target-libtermcap: install-target-libtermcap
 
 install-target-libtermcap: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31710,7 +25120,6 @@ maybe-info-target-libtermcap: info-target-libtermcap
 
 info-target-libtermcap: \
     configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31736,7 +25145,6 @@ maybe-dvi-target-libtermcap: dvi-target-libtermcap
 
 dvi-target-libtermcap: \
     configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31762,7 +25170,6 @@ maybe-html-target-libtermcap: html-target-libtermcap
 
 html-target-libtermcap: \
     configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31788,7 +25195,6 @@ maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
 
 TAGS-target-libtermcap: \
     configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31815,7 +25221,6 @@ maybe-install-info-target-libtermcap: install-info-target-libtermcap
 install-info-target-libtermcap: \
     configure-target-libtermcap \
     info-target-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31841,7 +25246,6 @@ maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
 
 installcheck-target-libtermcap: \
     configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31901,32 +25305,22 @@ maintainer-clean-target-libtermcap:
 @endif target-libtermcap
 
 
-
-
-
 .PHONY: configure-target-winsup maybe-configure-target-winsup
 maybe-configure-target-winsup:
 @if target-winsup
 maybe-configure-target-winsup: configure-target-winsup
-configure-target-winsup: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for winsup..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/winsup/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/winsup/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/winsup/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/winsup/Makefile; \
-	    mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out
+
+configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/winsup; \
 	cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
@@ -31939,39 +25333,30 @@ configure-target-winsup:
 	libsrcdir="$$s/winsup"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-winsup
 
-
-
-
-
 .PHONY: all-target-winsup maybe-all-target-winsup
 maybe-all-target-winsup:
 @if target-winsup
 TARGET-target-winsup=all
 maybe-all-target-winsup: all-target-winsup
 all-target-winsup: configure-target-winsup
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-winsup))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-winsup))
 @endif target-winsup
 
-
-
-
-
 .PHONY: check-target-winsup maybe-check-target-winsup
 maybe-check-target-winsup:
 @if target-winsup
 maybe-check-target-winsup: check-target-winsup
 
 check-target-winsup:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31986,7 +25371,6 @@ maybe-install-target-winsup:
 maybe-install-target-winsup: install-target-winsup
 
 install-target-winsup: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32004,7 +25388,6 @@ maybe-info-target-winsup: info-target-winsup
 
 info-target-winsup: \
     configure-target-winsup 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32030,7 +25413,6 @@ maybe-dvi-target-winsup: dvi-target-winsup
 
 dvi-target-winsup: \
     configure-target-winsup 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32056,7 +25438,6 @@ maybe-html-target-winsup: html-target-winsup
 
 html-target-winsup: \
     configure-target-winsup 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32082,7 +25463,6 @@ maybe-TAGS-target-winsup: TAGS-target-winsup
 
 TAGS-target-winsup: \
     configure-target-winsup 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32109,7 +25489,6 @@ maybe-install-info-target-winsup: install-info-target-winsup
 install-info-target-winsup: \
     configure-target-winsup \
     info-target-winsup 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32135,7 +25514,6 @@ maybe-installcheck-target-winsup: installcheck-target-winsup
 
 installcheck-target-winsup: \
     configure-target-winsup 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32160,7 +25538,6 @@ maybe-mostlyclean-target-winsup:
 maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
 
 mostlyclean-target-winsup: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32185,7 +25562,6 @@ maybe-clean-target-winsup:
 maybe-clean-target-winsup: clean-target-winsup
 
 clean-target-winsup: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32210,7 +25586,6 @@ maybe-distclean-target-winsup:
 maybe-distclean-target-winsup: distclean-target-winsup
 
 distclean-target-winsup: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32235,7 +25610,6 @@ maybe-maintainer-clean-target-winsup:
 maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
 
 maintainer-clean-target-winsup: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32255,32 +25629,22 @@ maintainer-clean-target-winsup:
 @endif target-winsup
 
 
-
-
-
 .PHONY: configure-target-libgloss maybe-configure-target-libgloss
 maybe-configure-target-libgloss:
 @if target-libgloss
 maybe-configure-target-libgloss: configure-target-libgloss
-configure-target-libgloss: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgloss..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgloss/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgloss/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out
+
+configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libgloss; \
 	cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
@@ -32293,32 +25657,24 @@ configure-target-libgloss:
 	libsrcdir="$$s/libgloss"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libgloss
 
-
-
-
-
 .PHONY: all-target-libgloss maybe-all-target-libgloss
 maybe-all-target-libgloss:
 @if target-libgloss
 TARGET-target-libgloss=all
 maybe-all-target-libgloss: all-target-libgloss
 all-target-libgloss: configure-target-libgloss
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgloss))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libgloss))
 @endif target-libgloss
 
-
-
-
-
 .PHONY: check-target-libgloss maybe-check-target-libgloss
 maybe-check-target-libgloss:
 @if target-libgloss
@@ -32335,7 +25691,6 @@ maybe-install-target-libgloss:
 maybe-install-target-libgloss: install-target-libgloss
 
 install-target-libgloss: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32353,7 +25708,6 @@ maybe-info-target-libgloss: info-target-libgloss
 
 info-target-libgloss: \
     configure-target-libgloss 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32379,7 +25733,6 @@ maybe-dvi-target-libgloss: dvi-target-libgloss
 
 dvi-target-libgloss: \
     configure-target-libgloss 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32405,7 +25758,6 @@ maybe-html-target-libgloss: html-target-libgloss
 
 html-target-libgloss: \
     configure-target-libgloss 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32431,7 +25783,6 @@ maybe-TAGS-target-libgloss: TAGS-target-libgloss
 
 TAGS-target-libgloss: \
     configure-target-libgloss 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32458,7 +25809,6 @@ maybe-install-info-target-libgloss: install-info-target-libgloss
 install-info-target-libgloss: \
     configure-target-libgloss \
     info-target-libgloss 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32484,7 +25834,6 @@ maybe-installcheck-target-libgloss: installcheck-target-libgloss
 
 installcheck-target-libgloss: \
     configure-target-libgloss 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32509,7 +25858,6 @@ maybe-mostlyclean-target-libgloss:
 maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
 
 mostlyclean-target-libgloss: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32534,7 +25882,6 @@ maybe-clean-target-libgloss:
 maybe-clean-target-libgloss: clean-target-libgloss
 
 clean-target-libgloss: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32559,7 +25906,6 @@ maybe-distclean-target-libgloss:
 maybe-distclean-target-libgloss: distclean-target-libgloss
 
 distclean-target-libgloss: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32584,7 +25930,6 @@ maybe-maintainer-clean-target-libgloss:
 maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
 
 maintainer-clean-target-libgloss: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32604,32 +25949,22 @@ maintainer-clean-target-libgloss:
 @endif target-libgloss
 
 
-
-
-
 .PHONY: configure-target-libiberty maybe-configure-target-libiberty
 maybe-configure-target-libiberty:
 @if target-libiberty
 maybe-configure-target-libiberty: configure-target-libiberty
-configure-target-libiberty: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libiberty..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libiberty/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libiberty/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libiberty/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libiberty/Makefile; \
-	    mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out
+
+configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libiberty; \
 	cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
@@ -32642,39 +25977,30 @@ configure-target-libiberty:
 	libsrcdir="$$s/libiberty"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libiberty
 
-
-
-
-
 .PHONY: all-target-libiberty maybe-all-target-libiberty
 maybe-all-target-libiberty:
 @if target-libiberty
 TARGET-target-libiberty=all
 maybe-all-target-libiberty: all-target-libiberty
 all-target-libiberty: configure-target-libiberty
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libiberty))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libiberty))
 @endif target-libiberty
 
-
-
-
-
 .PHONY: check-target-libiberty maybe-check-target-libiberty
 maybe-check-target-libiberty:
 @if target-libiberty
 maybe-check-target-libiberty: check-target-libiberty
 
 check-target-libiberty:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32689,7 +26015,6 @@ maybe-install-target-libiberty:
 maybe-install-target-libiberty: install-target-libiberty
 
 install-target-libiberty: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32707,7 +26032,6 @@ maybe-info-target-libiberty: info-target-libiberty
 
 info-target-libiberty: \
     configure-target-libiberty 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32733,7 +26057,6 @@ maybe-dvi-target-libiberty: dvi-target-libiberty
 
 dvi-target-libiberty: \
     configure-target-libiberty 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32759,7 +26082,6 @@ maybe-html-target-libiberty: html-target-libiberty
 
 html-target-libiberty: \
     configure-target-libiberty 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32785,7 +26107,6 @@ maybe-TAGS-target-libiberty: TAGS-target-libiberty
 
 TAGS-target-libiberty: \
     configure-target-libiberty 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32812,7 +26133,6 @@ maybe-install-info-target-libiberty: install-info-target-libiberty
 install-info-target-libiberty: \
     configure-target-libiberty \
     info-target-libiberty 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32838,7 +26158,6 @@ maybe-installcheck-target-libiberty: installcheck-target-libiberty
 
 installcheck-target-libiberty: \
     configure-target-libiberty 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32863,7 +26182,6 @@ maybe-mostlyclean-target-libiberty:
 maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty
 
 mostlyclean-target-libiberty: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32888,7 +26206,6 @@ maybe-clean-target-libiberty:
 maybe-clean-target-libiberty: clean-target-libiberty
 
 clean-target-libiberty: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32913,7 +26230,6 @@ maybe-distclean-target-libiberty:
 maybe-distclean-target-libiberty: distclean-target-libiberty
 
 distclean-target-libiberty: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32938,7 +26254,6 @@ maybe-maintainer-clean-target-libiberty:
 maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty
 
 maintainer-clean-target-libiberty: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32958,32 +26273,22 @@ maintainer-clean-target-libiberty:
 @endif target-libiberty
 
 
-
-
-
 .PHONY: configure-target-gperf maybe-configure-target-gperf
 maybe-configure-target-gperf:
 @if target-gperf
 maybe-configure-target-gperf: configure-target-gperf
-configure-target-gperf: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for gperf..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/gperf/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/gperf/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/gperf/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/gperf/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/gperf/Makefile; \
-	    mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out
+
+configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/gperf; \
 	cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
@@ -32996,39 +26301,30 @@ configure-target-gperf:
 	libsrcdir="$$s/gperf"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-gperf
 
-
-
-
-
 .PHONY: all-target-gperf maybe-all-target-gperf
 maybe-all-target-gperf:
 @if target-gperf
 TARGET-target-gperf=all
 maybe-all-target-gperf: all-target-gperf
 all-target-gperf: configure-target-gperf
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-gperf))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-gperf))
 @endif target-gperf
 
-
-
-
-
 .PHONY: check-target-gperf maybe-check-target-gperf
 maybe-check-target-gperf:
 @if target-gperf
 maybe-check-target-gperf: check-target-gperf
 
 check-target-gperf:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33043,7 +26339,6 @@ maybe-install-target-gperf:
 maybe-install-target-gperf: install-target-gperf
 
 install-target-gperf: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33061,7 +26356,6 @@ maybe-info-target-gperf: info-target-gperf
 
 info-target-gperf: \
     configure-target-gperf 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33087,7 +26381,6 @@ maybe-dvi-target-gperf: dvi-target-gperf
 
 dvi-target-gperf: \
     configure-target-gperf 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33113,7 +26406,6 @@ maybe-html-target-gperf: html-target-gperf
 
 html-target-gperf: \
     configure-target-gperf 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33139,7 +26431,6 @@ maybe-TAGS-target-gperf: TAGS-target-gperf
 
 TAGS-target-gperf: \
     configure-target-gperf 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33166,7 +26457,6 @@ maybe-install-info-target-gperf: install-info-target-gperf
 install-info-target-gperf: \
     configure-target-gperf \
     info-target-gperf 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33192,7 +26482,6 @@ maybe-installcheck-target-gperf: installcheck-target-gperf
 
 installcheck-target-gperf: \
     configure-target-gperf 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33217,7 +26506,6 @@ maybe-mostlyclean-target-gperf:
 maybe-mostlyclean-target-gperf: mostlyclean-target-gperf
 
 mostlyclean-target-gperf: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33242,7 +26530,6 @@ maybe-clean-target-gperf:
 maybe-clean-target-gperf: clean-target-gperf
 
 clean-target-gperf: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33267,7 +26554,6 @@ maybe-distclean-target-gperf:
 maybe-distclean-target-gperf: distclean-target-gperf
 
 distclean-target-gperf: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33292,7 +26578,6 @@ maybe-maintainer-clean-target-gperf:
 maybe-maintainer-clean-target-gperf: maintainer-clean-target-gperf
 
 maintainer-clean-target-gperf: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33312,32 +26597,22 @@ maintainer-clean-target-gperf:
 @endif target-gperf
 
 
-
-
-
 .PHONY: configure-target-examples maybe-configure-target-examples
 maybe-configure-target-examples:
 @if target-examples
 maybe-configure-target-examples: configure-target-examples
-configure-target-examples: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for examples..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/examples/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/examples/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/examples/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/examples/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/examples/Makefile; \
-	    mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out
+
+configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/examples; \
 	cd "$(TARGET_SUBDIR)/examples" || exit 1; \
@@ -33350,32 +26625,24 @@ configure-target-examples:
 	libsrcdir="$$s/examples"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-examples
 
-
-
-
-
 .PHONY: all-target-examples maybe-all-target-examples
 maybe-all-target-examples:
 @if target-examples
 TARGET-target-examples=all
 maybe-all-target-examples: all-target-examples
 all-target-examples: configure-target-examples
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-examples))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-examples))
 @endif target-examples
 
-
-
-
-
 .PHONY: check-target-examples maybe-check-target-examples
 maybe-check-target-examples:
 @if target-examples
@@ -33405,7 +26672,6 @@ maybe-info-target-examples: info-target-examples
 
 info-target-examples: \
     configure-target-examples 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33431,7 +26697,6 @@ maybe-dvi-target-examples: dvi-target-examples
 
 dvi-target-examples: \
     configure-target-examples 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33457,7 +26722,6 @@ maybe-html-target-examples: html-target-examples
 
 html-target-examples: \
     configure-target-examples 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33483,7 +26747,6 @@ maybe-TAGS-target-examples: TAGS-target-examples
 
 TAGS-target-examples: \
     configure-target-examples 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33510,7 +26773,6 @@ maybe-install-info-target-examples: install-info-target-examples
 install-info-target-examples: \
     configure-target-examples \
     info-target-examples 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33536,7 +26798,6 @@ maybe-installcheck-target-examples: installcheck-target-examples
 
 installcheck-target-examples: \
     configure-target-examples 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33561,7 +26822,6 @@ maybe-mostlyclean-target-examples:
 maybe-mostlyclean-target-examples: mostlyclean-target-examples
 
 mostlyclean-target-examples: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33586,7 +26846,6 @@ maybe-clean-target-examples:
 maybe-clean-target-examples: clean-target-examples
 
 clean-target-examples: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33611,7 +26870,6 @@ maybe-distclean-target-examples:
 maybe-distclean-target-examples: distclean-target-examples
 
 distclean-target-examples: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33636,7 +26894,6 @@ maybe-maintainer-clean-target-examples:
 maybe-maintainer-clean-target-examples: maintainer-clean-target-examples
 
 maintainer-clean-target-examples: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33656,32 +26913,22 @@ maintainer-clean-target-examples:
 @endif target-examples
 
 
-
-
-
 .PHONY: configure-target-libffi maybe-configure-target-libffi
 maybe-configure-target-libffi:
 @if target-libffi
 maybe-configure-target-libffi: configure-target-libffi
-configure-target-libffi: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libffi..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libffi/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libffi/Makefile; \
-	    mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out
+
+configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libffi; \
 	cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
@@ -33694,39 +26941,30 @@ configure-target-libffi:
 	libsrcdir="$$s/libffi"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libffi
 
-
-
-
-
 .PHONY: all-target-libffi maybe-all-target-libffi
 maybe-all-target-libffi:
 @if target-libffi
 TARGET-target-libffi=all
 maybe-all-target-libffi: all-target-libffi
 all-target-libffi: configure-target-libffi
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libffi))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libffi))
 @endif target-libffi
 
-
-
-
-
 .PHONY: check-target-libffi maybe-check-target-libffi
 maybe-check-target-libffi:
 @if target-libffi
 maybe-check-target-libffi: check-target-libffi
 
 check-target-libffi:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33741,7 +26979,6 @@ maybe-install-target-libffi:
 maybe-install-target-libffi: install-target-libffi
 
 install-target-libffi: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33759,7 +26996,6 @@ maybe-info-target-libffi: info-target-libffi
 
 info-target-libffi: \
     configure-target-libffi 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33785,7 +27021,6 @@ maybe-dvi-target-libffi: dvi-target-libffi
 
 dvi-target-libffi: \
     configure-target-libffi 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33811,7 +27046,6 @@ maybe-html-target-libffi: html-target-libffi
 
 html-target-libffi: \
     configure-target-libffi 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33837,7 +27071,6 @@ maybe-TAGS-target-libffi: TAGS-target-libffi
 
 TAGS-target-libffi: \
     configure-target-libffi 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33864,7 +27097,6 @@ maybe-install-info-target-libffi: install-info-target-libffi
 install-info-target-libffi: \
     configure-target-libffi \
     info-target-libffi 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33890,7 +27122,6 @@ maybe-installcheck-target-libffi: installcheck-target-libffi
 
 installcheck-target-libffi: \
     configure-target-libffi 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33915,7 +27146,6 @@ maybe-mostlyclean-target-libffi:
 maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
 
 mostlyclean-target-libffi: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33940,7 +27170,6 @@ maybe-clean-target-libffi:
 maybe-clean-target-libffi: clean-target-libffi
 
 clean-target-libffi: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33965,7 +27194,6 @@ maybe-distclean-target-libffi:
 maybe-distclean-target-libffi: distclean-target-libffi
 
 distclean-target-libffi: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33990,7 +27218,6 @@ maybe-maintainer-clean-target-libffi:
 maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
 
 maintainer-clean-target-libffi: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34010,32 +27237,22 @@ maintainer-clean-target-libffi:
 @endif target-libffi
 
 
-
-
-
 .PHONY: configure-target-libjava maybe-configure-target-libjava
 maybe-configure-target-libjava:
 @if target-libjava
 maybe-configure-target-libjava: configure-target-libjava
-configure-target-libjava: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libjava..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libjava/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libjava/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libjava/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libjava/Makefile; \
-	    mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out
+
+configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libjava; \
 	cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
@@ -34048,39 +27265,30 @@ configure-target-libjava:
 	libsrcdir="$$s/libjava"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libjava
 
-
-
-
-
 .PHONY: all-target-libjava maybe-all-target-libjava
 maybe-all-target-libjava:
 @if target-libjava
 TARGET-target-libjava=all
 maybe-all-target-libjava: all-target-libjava
 all-target-libjava: configure-target-libjava
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libjava))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   $(TARGET-target-libjava))
 @endif target-libjava
 
-
-
-
-
 .PHONY: check-target-libjava maybe-check-target-libjava
 maybe-check-target-libjava:
 @if target-libjava
 maybe-check-target-libjava: check-target-libjava
 
 check-target-libjava:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -34095,7 +27303,6 @@ maybe-install-target-libjava:
 maybe-install-target-libjava: install-target-libjava
 
 install-target-libjava: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -34113,7 +27320,6 @@ maybe-info-target-libjava: info-target-libjava
 
 info-target-libjava: \
     configure-target-libjava 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34139,7 +27345,6 @@ maybe-dvi-target-libjava: dvi-target-libjava
 
 dvi-target-libjava: \
     configure-target-libjava 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34165,7 +27370,6 @@ maybe-html-target-libjava: html-target-libjava
 
 html-target-libjava: \
     configure-target-libjava 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34191,7 +27395,6 @@ maybe-TAGS-target-libjava: TAGS-target-libjava
 
 TAGS-target-libjava: \
     configure-target-libjava 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34218,7 +27421,6 @@ maybe-install-info-target-libjava: install-info-target-libjava
 install-info-target-libjava: \
     configure-target-libjava \
     info-target-libjava 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34244,7 +27446,6 @@ maybe-installcheck-target-libjava: installcheck-target-libjava
 
 installcheck-target-libjava: \
     configure-target-libjava 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34269,7 +27470,6 @@ maybe-mostlyclean-target-libjava:
 maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
 
 mostlyclean-target-libjava: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34294,7 +27494,6 @@ maybe-clean-target-libjava:
 maybe-clean-target-libjava: clean-target-libjava
 
 clean-target-libjava: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34319,7 +27518,6 @@ maybe-distclean-target-libjava:
 maybe-distclean-target-libjava: distclean-target-libjava
 
 distclean-target-libjava: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34344,7 +27542,6 @@ maybe-maintainer-clean-target-libjava:
 maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
 
 maintainer-clean-target-libjava: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34364,32 +27561,22 @@ maintainer-clean-target-libjava:
 @endif target-libjava
 
 
-
-
-
 .PHONY: configure-target-zlib maybe-configure-target-zlib
 maybe-configure-target-zlib:
 @if target-zlib
 maybe-configure-target-zlib: configure-target-zlib
-configure-target-zlib: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for zlib..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/zlib/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/zlib/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/zlib/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/zlib/Makefile; \
-	    mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out
+
+configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/zlib; \
 	cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
@@ -34402,39 +27589,30 @@ configure-target-zlib:
 	libsrcdir="$$s/zlib"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-zlib
 
-
-
-
-
 .PHONY: all-target-zlib maybe-all-target-zlib
 maybe-all-target-zlib:
 @if target-zlib
 TARGET-target-zlib=all
 maybe-all-target-zlib: all-target-zlib
 all-target-zlib: configure-target-zlib
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-zlib))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-zlib))
 @endif target-zlib
 
-
-
-
-
 .PHONY: check-target-zlib maybe-check-target-zlib
 maybe-check-target-zlib:
 @if target-zlib
 maybe-check-target-zlib: check-target-zlib
 
 check-target-zlib:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34449,7 +27627,6 @@ maybe-install-target-zlib:
 maybe-install-target-zlib: install-target-zlib
 
 install-target-zlib: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34467,7 +27644,6 @@ maybe-info-target-zlib: info-target-zlib
 
 info-target-zlib: \
     configure-target-zlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34493,7 +27669,6 @@ maybe-dvi-target-zlib: dvi-target-zlib
 
 dvi-target-zlib: \
     configure-target-zlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34519,7 +27694,6 @@ maybe-html-target-zlib: html-target-zlib
 
 html-target-zlib: \
     configure-target-zlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34545,7 +27719,6 @@ maybe-TAGS-target-zlib: TAGS-target-zlib
 
 TAGS-target-zlib: \
     configure-target-zlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34572,7 +27745,6 @@ maybe-install-info-target-zlib: install-info-target-zlib
 install-info-target-zlib: \
     configure-target-zlib \
     info-target-zlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34598,7 +27770,6 @@ maybe-installcheck-target-zlib: installcheck-target-zlib
 
 installcheck-target-zlib: \
     configure-target-zlib 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34623,7 +27794,6 @@ maybe-mostlyclean-target-zlib:
 maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
 
 mostlyclean-target-zlib: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34648,7 +27818,6 @@ maybe-clean-target-zlib:
 maybe-clean-target-zlib: clean-target-zlib
 
 clean-target-zlib: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34673,7 +27842,6 @@ maybe-distclean-target-zlib:
 maybe-distclean-target-zlib: distclean-target-zlib
 
 distclean-target-zlib: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34698,7 +27866,6 @@ maybe-maintainer-clean-target-zlib:
 maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
 
 maintainer-clean-target-zlib: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34718,32 +27885,22 @@ maintainer-clean-target-zlib:
 @endif target-zlib
 
 
-
-
-
 .PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
 maybe-configure-target-boehm-gc:
 @if target-boehm-gc
 maybe-configure-target-boehm-gc: configure-target-boehm-gc
-configure-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for boehm-gc..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/boehm-gc/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/boehm-gc/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile; \
-	    mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out
+
+configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
 	cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
@@ -34756,39 +27913,30 @@ configure-target-boehm-gc:
 	libsrcdir="$$s/boehm-gc"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-boehm-gc
 
-
-
-
-
 .PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
 maybe-all-target-boehm-gc:
 @if target-boehm-gc
 TARGET-target-boehm-gc=all
 maybe-all-target-boehm-gc: all-target-boehm-gc
 all-target-boehm-gc: configure-target-boehm-gc
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-boehm-gc))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-boehm-gc))
 @endif target-boehm-gc
 
-
-
-
-
 .PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
 maybe-check-target-boehm-gc:
 @if target-boehm-gc
 maybe-check-target-boehm-gc: check-target-boehm-gc
 
 check-target-boehm-gc:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34803,7 +27951,6 @@ maybe-install-target-boehm-gc:
 maybe-install-target-boehm-gc: install-target-boehm-gc
 
 install-target-boehm-gc: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34821,7 +27968,6 @@ maybe-info-target-boehm-gc: info-target-boehm-gc
 
 info-target-boehm-gc: \
     configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34847,7 +27993,6 @@ maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
 
 dvi-target-boehm-gc: \
     configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34873,7 +28018,6 @@ maybe-html-target-boehm-gc: html-target-boehm-gc
 
 html-target-boehm-gc: \
     configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34899,7 +28043,6 @@ maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
 
 TAGS-target-boehm-gc: \
     configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34926,7 +28069,6 @@ maybe-install-info-target-boehm-gc: install-info-target-boehm-gc
 install-info-target-boehm-gc: \
     configure-target-boehm-gc \
     info-target-boehm-gc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34952,7 +28094,6 @@ maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
 
 installcheck-target-boehm-gc: \
     configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34977,7 +28118,6 @@ maybe-mostlyclean-target-boehm-gc:
 maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
 
 mostlyclean-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35002,7 +28142,6 @@ maybe-clean-target-boehm-gc:
 maybe-clean-target-boehm-gc: clean-target-boehm-gc
 
 clean-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35027,7 +28166,6 @@ maybe-distclean-target-boehm-gc:
 maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
 
 distclean-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35052,7 +28190,6 @@ maybe-maintainer-clean-target-boehm-gc:
 maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
 
 maintainer-clean-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35072,32 +28209,22 @@ maintainer-clean-target-boehm-gc:
 @endif target-boehm-gc
 
 
-
-
-
 .PHONY: configure-target-qthreads maybe-configure-target-qthreads
 maybe-configure-target-qthreads:
 @if target-qthreads
 maybe-configure-target-qthreads: configure-target-qthreads
-configure-target-qthreads: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for qthreads..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/qthreads/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/qthreads/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/qthreads/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/qthreads/Makefile; \
-	    mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out
+
+configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/qthreads; \
 	cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
@@ -35110,39 +28237,30 @@ configure-target-qthreads:
 	libsrcdir="$$s/qthreads"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-qthreads
 
-
-
-
-
 .PHONY: all-target-qthreads maybe-all-target-qthreads
 maybe-all-target-qthreads:
 @if target-qthreads
 TARGET-target-qthreads=all
 maybe-all-target-qthreads: all-target-qthreads
 all-target-qthreads: configure-target-qthreads
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-qthreads))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-qthreads))
 @endif target-qthreads
 
-
-
-
-
 .PHONY: check-target-qthreads maybe-check-target-qthreads
 maybe-check-target-qthreads:
 @if target-qthreads
 maybe-check-target-qthreads: check-target-qthreads
 
 check-target-qthreads:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -35157,7 +28275,6 @@ maybe-install-target-qthreads:
 maybe-install-target-qthreads: install-target-qthreads
 
 install-target-qthreads: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -35175,7 +28292,6 @@ maybe-info-target-qthreads: info-target-qthreads
 
 info-target-qthreads: \
     configure-target-qthreads 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35201,7 +28317,6 @@ maybe-dvi-target-qthreads: dvi-target-qthreads
 
 dvi-target-qthreads: \
     configure-target-qthreads 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35227,7 +28342,6 @@ maybe-html-target-qthreads: html-target-qthreads
 
 html-target-qthreads: \
     configure-target-qthreads 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35253,7 +28367,6 @@ maybe-TAGS-target-qthreads: TAGS-target-qthreads
 
 TAGS-target-qthreads: \
     configure-target-qthreads 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35280,7 +28393,6 @@ maybe-install-info-target-qthreads: install-info-target-qthreads
 install-info-target-qthreads: \
     configure-target-qthreads \
     info-target-qthreads 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35306,7 +28418,6 @@ maybe-installcheck-target-qthreads: installcheck-target-qthreads
 
 installcheck-target-qthreads: \
     configure-target-qthreads 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35331,7 +28442,6 @@ maybe-mostlyclean-target-qthreads:
 maybe-mostlyclean-target-qthreads: mostlyclean-target-qthreads
 
 mostlyclean-target-qthreads: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35356,7 +28466,6 @@ maybe-clean-target-qthreads:
 maybe-clean-target-qthreads: clean-target-qthreads
 
 clean-target-qthreads: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35381,7 +28490,6 @@ maybe-distclean-target-qthreads:
 maybe-distclean-target-qthreads: distclean-target-qthreads
 
 distclean-target-qthreads: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35406,7 +28514,6 @@ maybe-maintainer-clean-target-qthreads:
 maybe-maintainer-clean-target-qthreads: maintainer-clean-target-qthreads
 
 maintainer-clean-target-qthreads: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35426,32 +28533,22 @@ maintainer-clean-target-qthreads:
 @endif target-qthreads
 
 
-
-
-
 .PHONY: configure-target-rda maybe-configure-target-rda
 maybe-configure-target-rda:
 @if target-rda
 maybe-configure-target-rda: configure-target-rda
-configure-target-rda: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for rda..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/rda/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/rda/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/rda/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/rda/Makefile; \
-	    mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out
+
+configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/rda; \
 	cd "$(TARGET_SUBDIR)/rda" || exit 1; \
@@ -35464,39 +28561,30 @@ configure-target-rda:
 	libsrcdir="$$s/rda"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-rda
 
-
-
-
-
 .PHONY: all-target-rda maybe-all-target-rda
 maybe-all-target-rda:
 @if target-rda
 TARGET-target-rda=all
 maybe-all-target-rda: all-target-rda
 all-target-rda: configure-target-rda
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-rda))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-rda))
 @endif target-rda
 
-
-
-
-
 .PHONY: check-target-rda maybe-check-target-rda
 maybe-check-target-rda:
 @if target-rda
 maybe-check-target-rda: check-target-rda
 
 check-target-rda:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -35511,7 +28599,6 @@ maybe-install-target-rda:
 maybe-install-target-rda: install-target-rda
 
 install-target-rda: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -35529,7 +28616,6 @@ maybe-info-target-rda: info-target-rda
 
 info-target-rda: \
     configure-target-rda 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35555,7 +28641,6 @@ maybe-dvi-target-rda: dvi-target-rda
 
 dvi-target-rda: \
     configure-target-rda 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35581,7 +28666,6 @@ maybe-html-target-rda: html-target-rda
 
 html-target-rda: \
     configure-target-rda 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35607,7 +28691,6 @@ maybe-TAGS-target-rda: TAGS-target-rda
 
 TAGS-target-rda: \
     configure-target-rda 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35634,7 +28717,6 @@ maybe-install-info-target-rda: install-info-target-rda
 install-info-target-rda: \
     configure-target-rda \
     info-target-rda 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35660,7 +28742,6 @@ maybe-installcheck-target-rda: installcheck-target-rda
 
 installcheck-target-rda: \
     configure-target-rda 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35685,7 +28766,6 @@ maybe-mostlyclean-target-rda:
 maybe-mostlyclean-target-rda: mostlyclean-target-rda
 
 mostlyclean-target-rda: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35710,7 +28790,6 @@ maybe-clean-target-rda:
 maybe-clean-target-rda: clean-target-rda
 
 clean-target-rda: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35735,7 +28814,6 @@ maybe-distclean-target-rda:
 maybe-distclean-target-rda: distclean-target-rda
 
 distclean-target-rda: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35760,7 +28838,6 @@ maybe-maintainer-clean-target-rda:
 maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
 
 maintainer-clean-target-rda: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35780,32 +28857,22 @@ maintainer-clean-target-rda:
 @endif target-rda
 
 
-
-
-
 .PHONY: configure-target-libada maybe-configure-target-libada
 maybe-configure-target-libada:
 @if target-libada
 maybe-configure-target-libada: configure-target-libada
-configure-target-libada: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libada..."; \
+
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/libada/multilib.out: multilib.out
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libada/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libada/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libada/Makefile; \
-	    mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
+	rm -f $(TARGET_SUBDIR)/libada/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/libada/multilib.out
+
+configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libada; \
 	cd "$(TARGET_SUBDIR)/libada" || exit 1; \
@@ -35818,39 +28885,30 @@ configure-target-libada:
 	libsrcdir="$$s/libada"; \
 	rm -f no-such-file || : ; \
 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)"  \
 	  || exit 1
 @endif target-libada
 
-
-
-
-
 .PHONY: all-target-libada maybe-all-target-libada
 maybe-all-target-libada:
 @if target-libada
 TARGET-target-libada=all
 maybe-all-target-libada: all-target-libada
 all-target-libada: configure-target-libada
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
 	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libada))
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   $(TARGET-target-libada))
 @endif target-libada
 
-
-
-
-
 .PHONY: check-target-libada maybe-check-target-libada
 maybe-check-target-libada:
 @if target-libada
 maybe-check-target-libada: check-target-libada
 
 check-target-libada:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -35865,7 +28923,6 @@ maybe-install-target-libada:
 maybe-install-target-libada: install-target-libada
 
 install-target-libada: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -35883,7 +28940,6 @@ maybe-info-target-libada: info-target-libada
 
 info-target-libada: \
     configure-target-libada 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35909,7 +28965,6 @@ maybe-dvi-target-libada: dvi-target-libada
 
 dvi-target-libada: \
     configure-target-libada 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35935,7 +28990,6 @@ maybe-html-target-libada: html-target-libada
 
 html-target-libada: \
     configure-target-libada 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35961,7 +29015,6 @@ maybe-TAGS-target-libada: TAGS-target-libada
 
 TAGS-target-libada: \
     configure-target-libada 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35988,7 +29041,6 @@ maybe-install-info-target-libada: install-info-target-libada
 install-info-target-libada: \
     configure-target-libada \
     info-target-libada 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -36014,7 +29066,6 @@ maybe-installcheck-target-libada: installcheck-target-libada
 
 installcheck-target-libada: \
     configure-target-libada 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -36039,7 +29090,6 @@ maybe-mostlyclean-target-libada:
 maybe-mostlyclean-target-libada: mostlyclean-target-libada
 
 mostlyclean-target-libada: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -36064,7 +29114,6 @@ maybe-clean-target-libada:
 maybe-clean-target-libada: clean-target-libada
 
 clean-target-libada: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -36089,7 +29138,6 @@ maybe-distclean-target-libada:
 maybe-distclean-target-libada: distclean-target-libada
 
 distclean-target-libada: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -36114,7 +29162,6 @@ maybe-maintainer-clean-target-libada:
 maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
 
 maintainer-clean-target-libada: 
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -36135,360 +29182,6 @@ maintainer-clean-target-libada:
 
 
 
-
-
-.PHONY: configure-target-libgomp maybe-configure-target-libgomp
-maybe-configure-target-libgomp:
-@if target-libgomp
-maybe-configure-target-libgomp: configure-target-libgomp
-configure-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgomp..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libgomp; \
-	cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libgomp"; \
-	libsrcdir="$$s/libgomp"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libgomp
-
-
-
-
-
-.PHONY: all-target-libgomp maybe-all-target-libgomp
-maybe-all-target-libgomp:
-@if target-libgomp
-TARGET-target-libgomp=all
-maybe-all-target-libgomp: all-target-libgomp
-all-target-libgomp: configure-target-libgomp
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgomp))
-@endif target-libgomp
-
-
-
-
-
-.PHONY: check-target-libgomp maybe-check-target-libgomp
-maybe-check-target-libgomp:
-@if target-libgomp
-maybe-check-target-libgomp: check-target-libgomp
-
-check-target-libgomp:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libgomp
-
-.PHONY: install-target-libgomp maybe-install-target-libgomp
-maybe-install-target-libgomp:
-@if target-libgomp
-maybe-install-target-libgomp: install-target-libgomp
-
-install-target-libgomp: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libgomp
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libgomp info-target-libgomp
-maybe-info-target-libgomp:
-@if target-libgomp
-maybe-info-target-libgomp: info-target-libgomp
-
-info-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-dvi-target-libgomp dvi-target-libgomp
-maybe-dvi-target-libgomp:
-@if target-libgomp
-maybe-dvi-target-libgomp: dvi-target-libgomp
-
-dvi-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-html-target-libgomp html-target-libgomp
-maybe-html-target-libgomp:
-@if target-libgomp
-maybe-html-target-libgomp: html-target-libgomp
-
-html-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-TAGS-target-libgomp TAGS-target-libgomp
-maybe-TAGS-target-libgomp:
-@if target-libgomp
-maybe-TAGS-target-libgomp: TAGS-target-libgomp
-
-TAGS-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-install-info-target-libgomp install-info-target-libgomp
-maybe-install-info-target-libgomp:
-@if target-libgomp
-maybe-install-info-target-libgomp: install-info-target-libgomp
-
-install-info-target-libgomp: \
-    configure-target-libgomp \
-    info-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-installcheck-target-libgomp installcheck-target-libgomp
-maybe-installcheck-target-libgomp:
-@if target-libgomp
-maybe-installcheck-target-libgomp: installcheck-target-libgomp
-
-installcheck-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-mostlyclean-target-libgomp mostlyclean-target-libgomp
-maybe-mostlyclean-target-libgomp:
-@if target-libgomp
-maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp
-
-mostlyclean-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-clean-target-libgomp clean-target-libgomp
-maybe-clean-target-libgomp:
-@if target-libgomp
-maybe-clean-target-libgomp: clean-target-libgomp
-
-clean-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-distclean-target-libgomp distclean-target-libgomp
-maybe-distclean-target-libgomp:
-@if target-libgomp
-maybe-distclean-target-libgomp: distclean-target-libgomp
-
-distclean-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-maintainer-clean-target-libgomp maintainer-clean-target-libgomp
-maybe-maintainer-clean-target-libgomp:
-@if target-libgomp
-maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp
-
-maintainer-clean-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libgomp
-
-
-
 # ----------
 # GCC module
 # ----------
@@ -36606,42 +29299,42 @@ gcc-no-fixedincludes:
 # stage_last instead tracks the stage that was built last.  These targets
 # are dummy when toplevel bootstrap is not active.
 
-# While making host and target tools, symlinks to the final stage must be
-# there, so $(unstage) should be run at various points.  To avoid excessive
-# recursive invocations of make, we "inline" them using a variable.  These
-# must be referenced as ": $(MAKE) ; $(unstage)" rather than "$(unstage)"
-# to avoid warnings from the GNU Make job server.
-
-unstage = :
-stage = :
-current_stage = ""
-
+.PHONY: unstage
+unstage:
 @if gcc-bootstrap
-unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
-stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
-current_stage = "`cat stage_current 2> /dev/null`"
+	@[ -f stage_current ] || $(MAKE) `cat stage_last`-start
 @endif gcc-bootstrap
 
-.PHONY: unstage stage
-unstage:
-	@: $(MAKE); $(unstage)
+.PHONY: stage
 stage:
-	@: $(MAKE); $(stage)
-
-# Disable commands for lean bootstrap.
-LEAN = false
+@if gcc-bootstrap
+	@$(MAKE) `cat stage_current`-end
+@endif gcc-bootstrap
 
 # We name the build directories for the various stages "stage1-gcc",
 # "stage2-gcc","stage3-gcc", etc.
 
 # Since the 'compare' process will fail (on debugging information) if any
 # directory names are different, we need to link the gcc directory for
-# the previous stage to a constant name ('prev-gcc'), and to make the name of
+# the previous stage to a constant name ('gcc-prev'), and to make the name of
 # the build directories constant as well. For the latter, we use naked names
 # like 'gcc', because the scripts in that directory assume it.  We use
 # mv on platforms where symlinks to directories do not work or are not
 # reliable.
 
+# At the end of the bootstrap, a symlink to 'stage3-gcc' named 'gcc' must
+# be kept, so that libraries can find it.  Ick!
+
+# It would be best to preinstall gcc into a staging area (and in the
+# future, gather there all prebootstrap packages).  This would allow
+# assemblers and linkers can be bootstrapped as well as the compiler
+# (both in a combined tree, or separately).  This however requires some
+# change to the gcc driver, again in order to avoid comparison failures.
+
+# Bugs: This is crippled when doing parallel make, the `make all-host'
+# and `make all-target' phases can be parallelized.
+
+
 # 'touch' doesn't work right on some platforms.
 STAMP = echo timestamp > 
 
@@ -36660,10 +29353,8 @@ objext = .o
 # Flags to pass to stage2 and later makes.
 POSTSTAGE1_FLAGS_TO_PASS = \
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
-	STAGE_PREFIX=$$r/prev-gcc/ \
+	STAGE_PREFIX=$$r/stage-gcc/ \
 	CFLAGS="$(BOOT_CFLAGS)" \
-	LIBCFLAGS="$(BOOT_CFLAGS)" \
-	LDFLAGS="$(BOOT_LDFLAGS)" \
 	ADAC="\$$(CC)"
 
 # For stage 1:
@@ -36679,146 +29370,652 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 .PHONY: stage1-start stage1-end
 
 stage1-start::
-	@: $(MAKE); $(stage); \
+	@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
 	echo stage1 > stage_current ; \
 	echo stage1 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+	$(mkinstalldirs) $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \
 	  mkdir stage1-bfd; \
-	mv stage1-bfd bfd 
+	set stage1-bfd bfd ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \
 	  mkdir stage1-opcodes; \
-	mv stage1-opcodes opcodes 
+	set stage1-opcodes opcodes ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \
 	  mkdir stage1-binutils; \
-	mv stage1-binutils binutils 
+	set stage1-binutils binutils ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage1-gas ] || \
 	  mkdir stage1-gas; \
-	mv stage1-gas gas 
+	set stage1-gas gas ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \
 	  mkdir stage1-gcc; \
-	mv stage1-gcc gcc 
+	set stage1-gcc gcc ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage1-intl ] || \
 	  mkdir stage1-intl; \
-	mv stage1-intl intl 
+	set stage1-intl intl ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage1-ld ] || \
 	  mkdir stage1-ld; \
-	mv stage1-ld ld 
+	set stage1-ld ld ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \
 	  mkdir stage1-libcpp; \
-	mv stage1-libcpp libcpp 
+	set stage1-libcpp libcpp ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \
-	  mkdir stage1-libdecnumber; \
-	mv stage1-libdecnumber libdecnumber 
-@endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \
 	  mkdir stage1-libiberty; \
-	mv stage1-libiberty libiberty 
+	set stage1-libiberty libiberty ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \
 	  mkdir stage1-zlib; \
-	mv stage1-zlib zlib 
+	set stage1-zlib zlib ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif zlib
-	@[ -d stage1-$(TARGET_SUBDIR) ] || \
-	  mkdir stage1-$(TARGET_SUBDIR); \
-	mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) 
 
-stage1-end:: 
+stage1-end::
+	@rm -f stage_current
 @if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stage1-bfd  ; \
-	fi
+	@cd $(HOST_SUBDIR); set bfd stage1-bfd ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stage1-opcodes  ; \
-	fi
+	@cd $(HOST_SUBDIR); set opcodes stage1-opcodes ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stage1-binutils  ; \
-	fi
+	@cd $(HOST_SUBDIR); set binutils stage1-binutils ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif binutils
 @if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stage1-gas  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gas stage1-gas ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gas
 @if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stage1-gcc  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gcc stage1-gcc ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gcc
 @if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stage1-intl  ; \
-	fi
+	@cd $(HOST_SUBDIR); set intl stage1-intl ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif intl
 @if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stage1-ld  ; \
-	fi
+	@cd $(HOST_SUBDIR); set ld stage1-ld ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stage1-libcpp  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libcpp stage1-libcpp ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber  ; \
-	fi
-@endif libdecnumber
 @if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stage1-libiberty  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libiberty stage1-libiberty ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stage1-zlib  ; \
-	fi
+	@cd $(HOST_SUBDIR); set zlib stage1-zlib ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
-	fi
-	rm -f stage_current
 
-# Bubble a bugfix through all the stages up to stage 1.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
+# Bubble a bugfix through all the stages up to stage 1.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
 .PHONY: stage1-bubble
 stage1-bubble:: 
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage1-lean  ; then \
+	@if test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stage1 ; \
 	else \
-	  $(MAKE) stage1-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage1; \
 	fi
 
 .PHONY: all-stage1 clean-stage1
+all-stage1:     \
+  maybe-all-stage1-bfd \
+  maybe-all-stage1-opcodes \
+  maybe-all-stage1-binutils              \
+  maybe-all-stage1-gas \
+  maybe-all-stage1-gcc        \
+  maybe-all-stage1-intl   \
+  maybe-all-stage1-ld \
+  maybe-all-stage1-libcpp  \
+  maybe-all-stage1-libiberty                        \
+  maybe-all-stage1-zlib        
+
 do-clean: clean-stage1
+clean-stage1:     \
+  maybe-clean-stage1-bfd \
+  maybe-clean-stage1-opcodes \
+  maybe-clean-stage1-binutils              \
+  maybe-clean-stage1-gas \
+  maybe-clean-stage1-gcc        \
+  maybe-clean-stage1-intl   \
+  maybe-clean-stage1-ld \
+  maybe-clean-stage1-libcpp  \
+  maybe-clean-stage1-libiberty                        \
+  maybe-clean-stage1-zlib        
+
+
+.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
+.PHONY: all-stage1-bfd maybe-all-stage1-bfd
+.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
+
+maybe-configure-stage1-bfd:
+maybe-all-stage1-bfd:
+maybe-clean-stage1-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage1-bfd: configure-stage1-bfd
+configure-stage1-bfd:
+	@$(MAKE) stage1-start
+	@[ -f bfd/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-bfd: all-stage1-bfd
+all-stage1-bfd: configure-stage1-bfd
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-bfd: clean-stage1-bfd
+clean-stage1-bfd:
+	@[ -f bfd/Makefile ] || [ -f stage1-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
+.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
+.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
+
+maybe-configure-stage1-opcodes:
+maybe-all-stage1-opcodes:
+maybe-clean-stage1-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage1-opcodes: configure-stage1-opcodes
+configure-stage1-opcodes:
+	@$(MAKE) stage1-start
+	@[ -f opcodes/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-opcodes: all-stage1-opcodes
+all-stage1-opcodes: configure-stage1-opcodes
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-opcodes: clean-stage1-opcodes
+clean-stage1-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stage1-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
+.PHONY: all-stage1-binutils maybe-all-stage1-binutils
+.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
+
+maybe-configure-stage1-binutils:
+maybe-all-stage1-binutils:
+maybe-clean-stage1-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage1-binutils: configure-stage1-binutils
+configure-stage1-binutils:
+	@$(MAKE) stage1-start
+	@[ -f binutils/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-binutils: all-stage1-binutils
+all-stage1-binutils: configure-stage1-binutils
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-binutils: clean-stage1-binutils
+clean-stage1-binutils:
+	@[ -f binutils/Makefile ] || [ -f stage1-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage1-gas maybe-configure-stage1-gas
+.PHONY: all-stage1-gas maybe-all-stage1-gas
+.PHONY: clean-stage1-gas maybe-clean-stage1-gas
+
+maybe-configure-stage1-gas:
+maybe-all-stage1-gas:
+maybe-clean-stage1-gas:
+
+@if gas-bootstrap
+maybe-configure-stage1-gas: configure-stage1-gas
+configure-stage1-gas:
+	@$(MAKE) stage1-start
+	@[ -f gas/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-gas: all-stage1-gas
+all-stage1-gas: configure-stage1-gas
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-gas: clean-stage1-gas
+clean-stage1-gas:
+	@[ -f gas/Makefile ] || [ -f stage1-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
+.PHONY: all-stage1-gcc maybe-all-stage1-gcc
+.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
+
+maybe-configure-stage1-gcc:
+maybe-all-stage1-gcc:
+maybe-clean-stage1-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage1-gcc: configure-stage1-gcc
+configure-stage1-gcc:
+	@$(MAKE) stage1-start
+	@[ -f gcc/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-gcc: all-stage1-gcc
+all-stage1-gcc: configure-stage1-gcc
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage1-gcc: clean-stage1-gcc
+clean-stage1-gcc:
+	@[ -f gcc/Makefile ] || [ -f stage1-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+.PHONY: all-stage1-intl maybe-all-stage1-intl
+.PHONY: clean-stage1-intl maybe-clean-stage1-intl
+
+maybe-configure-stage1-intl:
+maybe-all-stage1-intl:
+maybe-clean-stage1-intl:
+
+@if intl-bootstrap
+maybe-configure-stage1-intl: configure-stage1-intl
+configure-stage1-intl:
+	@$(MAKE) stage1-start
+	@[ -f intl/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-intl: all-stage1-intl
+all-stage1-intl: configure-stage1-intl
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-intl: clean-stage1-intl
+clean-stage1-intl:
+	@[ -f intl/Makefile ] || [ -f stage1-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage1-ld maybe-configure-stage1-ld
+.PHONY: all-stage1-ld maybe-all-stage1-ld
+.PHONY: clean-stage1-ld maybe-clean-stage1-ld
+
+maybe-configure-stage1-ld:
+maybe-all-stage1-ld:
+maybe-clean-stage1-ld:
+
+@if ld-bootstrap
+maybe-configure-stage1-ld: configure-stage1-ld
+configure-stage1-ld:
+	@$(MAKE) stage1-start
+	@[ -f ld/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-ld: all-stage1-ld
+all-stage1-ld: configure-stage1-ld
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-ld: clean-stage1-ld
+clean-stage1-ld:
+	@[ -f ld/Makefile ] || [ -f stage1-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
+.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
+
+maybe-configure-stage1-libcpp:
+maybe-all-stage1-libcpp:
+maybe-clean-stage1-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage1-libcpp: configure-stage1-libcpp
+configure-stage1-libcpp:
+	@$(MAKE) stage1-start
+	@[ -f libcpp/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-libcpp: all-stage1-libcpp
+all-stage1-libcpp: configure-stage1-libcpp
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stage1-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
+.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
+.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
+
+maybe-configure-stage1-libiberty:
+maybe-all-stage1-libiberty:
+maybe-clean-stage1-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage1-libiberty: configure-stage1-libiberty
+configure-stage1-libiberty:
+	@$(MAKE) stage1-start
+	@[ -f libiberty/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-libiberty: all-stage1-libiberty
+all-stage1-libiberty: configure-stage1-libiberty
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libiberty: clean-stage1-libiberty
+clean-stage1-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stage1-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
+.PHONY: all-stage1-zlib maybe-all-stage1-zlib
+.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
+
+maybe-configure-stage1-zlib:
+maybe-all-stage1-zlib:
+maybe-clean-stage1-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage1-zlib: configure-stage1-zlib
+configure-stage1-zlib:
+	@$(MAKE) stage1-start
+	@[ -f zlib/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	echo Configuring stage 1 in zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
+
+maybe-all-stage1-zlib: all-stage1-zlib
+all-stage1-zlib: configure-stage1-zlib
+	@$(MAKE) stage1-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-zlib: clean-stage1-zlib
+clean-stage1-zlib:
+	@[ -f zlib/Makefile ] || [ -f stage1-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stage1-start ; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif zlib-bootstrap
+
+
 
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
@@ -36831,7 +30028,7 @@ do-clean: clean-stage1
 
 .PHONY: distclean-stage1
 distclean-stage1::
-	@: $(MAKE); $(stage)
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stage1-* 
 
 
@@ -36841,204 +30038,728 @@ distclean-stage1::
 .PHONY: stage2-start stage2-end
 
 stage2-start::
-	@: $(MAKE); $(stage); \
+	@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
 	echo stage2 > stage_current ; \
 	echo stage2 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+	$(mkinstalldirs) $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
 	  mkdir stage2-bfd; \
-	mv stage2-bfd bfd  ; \
-	mv stage1-bfd prev-bfd || test -f stage1-lean 
+	set stage2-bfd bfd ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-bfd prev-bfd ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
 	  mkdir stage2-opcodes; \
-	mv stage2-opcodes opcodes  ; \
-	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
+	set stage2-opcodes opcodes ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-opcodes prev-opcodes ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
 	  mkdir stage2-binutils; \
-	mv stage2-binutils binutils  ; \
-	mv stage1-binutils prev-binutils || test -f stage1-lean 
+	set stage2-binutils binutils ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-binutils prev-binutils ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
 	  mkdir stage2-gas; \
-	mv stage2-gas gas  ; \
-	mv stage1-gas prev-gas || test -f stage1-lean 
+	set stage2-gas gas ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-gas prev-gas ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
 	  mkdir stage2-gcc; \
-	mv stage2-gcc gcc  ; \
-	mv stage1-gcc prev-gcc || test -f stage1-lean 
+	set stage2-gcc gcc ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-gcc prev-gcc ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
 	  mkdir stage2-intl; \
-	mv stage2-intl intl  ; \
-	mv stage1-intl prev-intl || test -f stage1-lean 
+	set stage2-intl intl ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-intl prev-intl ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
 	  mkdir stage2-ld; \
-	mv stage2-ld ld  ; \
-	mv stage1-ld prev-ld || test -f stage1-lean 
+	set stage2-ld ld ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-ld prev-ld ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
 	  mkdir stage2-libcpp; \
-	mv stage2-libcpp libcpp  ; \
-	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
+	set stage2-libcpp libcpp ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-libcpp prev-libcpp ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
-	  mkdir stage2-libdecnumber; \
-	mv stage2-libdecnumber libdecnumber  ; \
-	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
-@endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
 	  mkdir stage2-libiberty; \
-	mv stage2-libiberty libiberty  ; \
-	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
+	set stage2-libiberty libiberty ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-libiberty prev-libiberty ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
 	  mkdir stage2-zlib; \
-	mv stage2-zlib zlib  ; \
-	mv stage1-zlib prev-zlib || test -f stage1-lean 
+	set stage2-zlib zlib ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-zlib prev-zlib ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif zlib
-	@[ -d stage2-$(TARGET_SUBDIR) ] || \
-	  mkdir stage2-$(TARGET_SUBDIR); \
-	mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
 
-stage2-end:: 
+stage2-end::
+	@rm -f stage_current
 @if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \
-	  mv prev-bfd stage1-bfd ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set bfd stage2-bfd ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-bfd stage1-bfd ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \
-	  mv prev-opcodes stage1-opcodes ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set opcodes stage2-opcodes ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-opcodes stage1-opcodes ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \
-	  mv prev-binutils stage1-binutils ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set binutils stage2-binutils ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-binutils stage1-binutils ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif binutils
 @if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stage2-gas ; \
-	  mv prev-gas stage1-gas ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gas stage2-gas ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gas stage1-gas ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gas
 @if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \
-	  mv prev-gcc stage1-gcc ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gcc stage2-gcc ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gcc stage1-gcc ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gcc
 @if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stage2-intl ; \
-	  mv prev-intl stage1-intl ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set intl stage2-intl ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-intl stage1-intl ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif intl
 @if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stage2-ld ; \
-	  mv prev-ld stage1-ld ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set ld stage2-ld ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-ld stage1-ld ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stage2-libcpp ; \
-	  mv prev-libcpp stage1-libcpp ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libcpp stage2-libcpp ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libcpp stage1-libcpp ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber ; \
-	  mv prev-libdecnumber stage1-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
 @if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stage2-libiberty ; \
-	  mv prev-libiberty stage1-libiberty ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libiberty stage2-libiberty ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libiberty stage1-libiberty ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \
-	  mv prev-zlib stage1-zlib ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set zlib stage2-zlib ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-zlib stage1-zlib ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
 
-# Bubble a bugfix through all the stages up to stage 2.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
+# Bubble a bugfix through all the stages up to stage 2.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
 .PHONY: stage2-bubble
 stage2-bubble:: stage1-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage2-lean || test -f stage1-lean  ; then \
+	@if test -f stage2-lean || test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stage2 ; \
 	else \
-	  $(MAKE) stage2-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \
 	fi
 
 .PHONY: all-stage2 clean-stage2
+all-stage2:     \
+  maybe-all-stage2-bfd \
+  maybe-all-stage2-opcodes \
+  maybe-all-stage2-binutils              \
+  maybe-all-stage2-gas \
+  maybe-all-stage2-gcc        \
+  maybe-all-stage2-intl   \
+  maybe-all-stage2-ld \
+  maybe-all-stage2-libcpp  \
+  maybe-all-stage2-libiberty                        \
+  maybe-all-stage2-zlib        
+
 do-clean: clean-stage2
+clean-stage2:     \
+  maybe-clean-stage2-bfd \
+  maybe-clean-stage2-opcodes \
+  maybe-clean-stage2-binutils              \
+  maybe-clean-stage2-gas \
+  maybe-clean-stage2-gcc        \
+  maybe-clean-stage2-intl   \
+  maybe-clean-stage2-ld \
+  maybe-clean-stage2-libcpp  \
+  maybe-clean-stage2-libiberty                        \
+  maybe-clean-stage2-zlib        
+
+
+.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
+.PHONY: all-stage2-bfd maybe-all-stage2-bfd
+.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
+
+maybe-configure-stage2-bfd:
+maybe-all-stage2-bfd:
+maybe-clean-stage2-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage2-bfd: configure-stage2-bfd
+configure-stage2-bfd:
+	@$(MAKE) stage2-start
+	@[ -f bfd/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage2-bfd: all-stage2-bfd
+all-stage2-bfd: configure-stage2-bfd
+	@$(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage2-bfd: clean-stage2-bfd
+clean-stage2-bfd:
+	@[ -f bfd/Makefile ] || [ -f stage2-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
+.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
+
+maybe-configure-stage2-opcodes:
+maybe-all-stage2-opcodes:
+maybe-clean-stage2-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage2-opcodes: configure-stage2-opcodes
+configure-stage2-opcodes:
+	@$(MAKE) stage2-start
+	@[ -f opcodes/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage2-opcodes: all-stage2-opcodes
+all-stage2-opcodes: configure-stage2-opcodes
+	@$(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage2-opcodes: clean-stage2-opcodes
+clean-stage2-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stage2-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
+.PHONY: all-stage2-binutils maybe-all-stage2-binutils
+.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
+
+maybe-configure-stage2-binutils:
+maybe-all-stage2-binutils:
+maybe-clean-stage2-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage2-binutils: configure-stage2-binutils
+configure-stage2-binutils:
+	@$(MAKE) stage2-start
+	@[ -f binutils/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage2-binutils: all-stage2-binutils
+all-stage2-binutils: configure-stage2-binutils
+	@$(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage2-binutils: clean-stage2-binutils
+clean-stage2-binutils:
+	@[ -f binutils/Makefile ] || [ -f stage2-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage2-gas maybe-configure-stage2-gas
+.PHONY: all-stage2-gas maybe-all-stage2-gas
+.PHONY: clean-stage2-gas maybe-clean-stage2-gas
+
+maybe-configure-stage2-gas:
+maybe-all-stage2-gas:
+maybe-clean-stage2-gas:
+
+@if gas-bootstrap
+maybe-configure-stage2-gas: configure-stage2-gas
+configure-stage2-gas:
+	@$(MAKE) stage2-start
+	@[ -f gas/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage2-gas: all-stage2-gas
+all-stage2-gas: configure-stage2-gas
+	@$(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage2-gas: clean-stage2-gas
+clean-stage2-gas:
+	@[ -f gas/Makefile ] || [ -f stage2-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
+.PHONY: all-stage2-gcc maybe-all-stage2-gcc
+.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
+
+maybe-configure-stage2-gcc:
+maybe-all-stage2-gcc:
+maybe-clean-stage2-gcc:
 
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
+maybe-configure-stage2-gcc: configure-stage2-gcc
+configure-stage2-gcc:
+	@$(MAKE) stage2-start
+	@[ -f gcc/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage2-gcc: all-stage2-gcc
+all-stage2-gcc: configure-stage2-gcc
+	@$(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage2-gcc: clean-stage2-gcc
+clean-stage2-gcc:
+	@[ -f gcc/Makefile ] || [ -f stage2-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
 
+.PHONY: configure-stage2-intl maybe-configure-stage2-intl
+.PHONY: all-stage2-intl maybe-all-stage2-intl
+.PHONY: clean-stage2-intl maybe-clean-stage2-intl
+
+maybe-configure-stage2-intl:
+maybe-all-stage2-intl:
+maybe-clean-stage2-intl:
 
+@if intl-bootstrap
+maybe-configure-stage2-intl: configure-stage2-intl
+configure-stage2-intl:
+	@$(MAKE) stage2-start
+	@[ -f intl/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
 
-.PHONY: bootstrap2 bootstrap2-lean
-bootstrap2:
-	echo stage2 > stage_final
+maybe-all-stage2-intl: all-stage2-intl
+all-stage2-intl: configure-stage2-intl
+	@$(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble
-	@: $(MAKE); $(unstage)
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage2-intl: clean-stage2-intl
+clean-stage2-intl:
+	@[ -f intl/Makefile ] || [ -f stage2-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage2-ld maybe-configure-stage2-ld
+.PHONY: all-stage2-ld maybe-all-stage2-ld
+.PHONY: clean-stage2-ld maybe-clean-stage2-ld
+
+maybe-configure-stage2-ld:
+maybe-all-stage2-ld:
+maybe-clean-stage2-ld:
+
+@if ld-bootstrap
+maybe-configure-stage2-ld: configure-stage2-ld
+configure-stage2-ld:
+	@$(MAKE) stage2-start
+	@[ -f ld/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage2-ld: all-stage2-ld
+all-stage2-ld: configure-stage2-ld
+	@$(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage2-ld: clean-stage2-ld
+clean-stage2-ld:
+	@[ -f ld/Makefile ] || [ -f stage2-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
+.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
 
-bootstrap2-lean:
-	echo stage2 > stage_final
+maybe-configure-stage2-libcpp:
+maybe-all-stage2-libcpp:
+maybe-clean-stage2-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage2-libcpp: configure-stage2-libcpp
+configure-stage2-libcpp:
+	@$(MAKE) stage2-start
+	@[ -f libcpp/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage2-libcpp: all-stage2-libcpp
+all-stage2-libcpp: configure-stage2-libcpp
+	@$(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble
-	@: $(MAKE); $(unstage)
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stage2-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
+.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
+.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
+
+maybe-configure-stage2-libiberty:
+maybe-all-stage2-libiberty:
+maybe-clean-stage2-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage2-libiberty: configure-stage2-libiberty
+configure-stage2-libiberty:
+	@$(MAKE) stage2-start
+	@[ -f libiberty/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage2-libiberty: all-stage2-libiberty
+all-stage2-libiberty: configure-stage2-libiberty
+	@$(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage2-libiberty: clean-stage2-libiberty
+clean-stage2-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stage2-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
+.PHONY: all-stage2-zlib maybe-all-stage2-zlib
+.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
+
+maybe-configure-stage2-zlib:
+maybe-all-stage2-zlib:
+maybe-clean-stage2-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage2-zlib: configure-stage2-zlib
+configure-stage2-zlib:
+	@$(MAKE) stage2-start
+	@[ -f zlib/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 2 in zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage2-zlib: all-stage2-zlib
+all-stage2-zlib: configure-stage2-zlib
+	@$(MAKE) stage2-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage2-zlib: clean-stage2-zlib
+clean-stage2-zlib:
+	@[ -f zlib/Makefile ] || [ -f stage2-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stage2-start ; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
+
+.PHONY: bootstrap2
+bootstrap2: stage2-bubble  all
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage1:: distclean-stage2 
 .PHONY: distclean-stage2
 distclean-stage2::
-	@: $(MAKE); $(stage)
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stage2-* 
 
 
@@ -37048,247 +30769,756 @@ distclean-stage2::
 .PHONY: stage3-start stage3-end
 
 stage3-start::
-	@: $(MAKE); $(stage); \
+	@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
 	echo stage3 > stage_current ; \
 	echo stage3 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+	$(mkinstalldirs) $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
 	  mkdir stage3-bfd; \
-	mv stage3-bfd bfd  ; \
-	mv stage2-bfd prev-bfd || test -f stage2-lean 
+	set stage3-bfd bfd ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-bfd prev-bfd ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \
 	  mkdir stage3-opcodes; \
-	mv stage3-opcodes opcodes  ; \
-	mv stage2-opcodes prev-opcodes || test -f stage2-lean 
+	set stage3-opcodes opcodes ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-opcodes prev-opcodes ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \
 	  mkdir stage3-binutils; \
-	mv stage3-binutils binutils  ; \
-	mv stage2-binutils prev-binutils || test -f stage2-lean 
+	set stage3-binutils binutils ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-binutils prev-binutils ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
 	  mkdir stage3-gas; \
-	mv stage3-gas gas  ; \
-	mv stage2-gas prev-gas || test -f stage2-lean 
+	set stage3-gas gas ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-gas prev-gas ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \
 	  mkdir stage3-gcc; \
-	mv stage3-gcc gcc  ; \
-	mv stage2-gcc prev-gcc || test -f stage2-lean 
+	set stage3-gcc gcc ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-gcc prev-gcc ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage3-intl ] || \
 	  mkdir stage3-intl; \
-	mv stage3-intl intl  ; \
-	mv stage2-intl prev-intl || test -f stage2-lean 
+	set stage3-intl intl ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-intl prev-intl ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage3-ld ] || \
 	  mkdir stage3-ld; \
-	mv stage3-ld ld  ; \
-	mv stage2-ld prev-ld || test -f stage2-lean 
+	set stage3-ld ld ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-ld prev-ld ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
 	  mkdir stage3-libcpp; \
-	mv stage3-libcpp libcpp  ; \
-	mv stage2-libcpp prev-libcpp || test -f stage2-lean 
+	set stage3-libcpp libcpp ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-libcpp prev-libcpp ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \
-	  mkdir stage3-libdecnumber; \
-	mv stage3-libdecnumber libdecnumber  ; \
-	mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean 
-@endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \
 	  mkdir stage3-libiberty; \
-	mv stage3-libiberty libiberty  ; \
-	mv stage2-libiberty prev-libiberty || test -f stage2-lean 
+	set stage3-libiberty libiberty ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-libiberty prev-libiberty ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \
 	  mkdir stage3-zlib; \
-	mv stage3-zlib zlib  ; \
-	mv stage2-zlib prev-zlib || test -f stage2-lean 
+	set stage3-zlib zlib ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage2-zlib prev-zlib ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif zlib
-	@[ -d stage3-$(TARGET_SUBDIR) ] || \
-	  mkdir stage3-$(TARGET_SUBDIR); \
-	mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean 
 
-stage3-end:: 
+stage3-end::
+	@rm -f stage_current
 @if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stage3-bfd ; \
-	  mv prev-bfd stage2-bfd ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set bfd stage3-bfd ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-bfd stage2-bfd ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stage3-opcodes ; \
-	  mv prev-opcodes stage2-opcodes ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set opcodes stage3-opcodes ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-opcodes stage2-opcodes ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stage3-binutils ; \
-	  mv prev-binutils stage2-binutils ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set binutils stage3-binutils ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-binutils stage2-binutils ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif binutils
 @if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stage3-gas ; \
-	  mv prev-gas stage2-gas ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gas stage3-gas ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gas stage2-gas ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gas
 @if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stage3-gcc ; \
-	  mv prev-gcc stage2-gcc ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gcc stage3-gcc ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gcc stage2-gcc ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gcc
 @if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stage3-intl ; \
-	  mv prev-intl stage2-intl ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set intl stage3-intl ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-intl stage2-intl ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif intl
 @if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stage3-ld ; \
-	  mv prev-ld stage2-ld ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set ld stage3-ld ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-ld stage2-ld ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \
-	  mv prev-libcpp stage2-libcpp ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libcpp stage3-libcpp ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libcpp stage2-libcpp ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber ; \
-	  mv prev-libdecnumber stage2-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
 @if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stage3-libiberty ; \
-	  mv prev-libiberty stage2-libiberty ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libiberty stage3-libiberty ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libiberty stage2-libiberty ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stage3-zlib ; \
-	  mv prev-zlib stage2-zlib ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set zlib stage3-zlib ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-zlib stage2-zlib ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
 
-# Bubble a bugfix through all the stages up to stage 3.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
+# Bubble a bugfix through all the stages up to stage 3.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
 .PHONY: stage3-bubble
 stage3-bubble:: stage2-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage3-lean || test -f stage2-lean  ; then \
+	@bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean
+	@if test -f stage3-lean || test -f stage2-lean  ; then \
 	  echo Skipping rebuild of stage3 ; \
 	else \
-	  $(MAKE) stage3-start; \
-	  if $(LEAN); then \
-	    rm -rf stage1-* ; \
-	    $(STAMP) stage1-lean ; \
-	  fi; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \
 	fi
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) compare
 
 .PHONY: all-stage3 clean-stage3
+all-stage3:     \
+  maybe-all-stage3-bfd \
+  maybe-all-stage3-opcodes \
+  maybe-all-stage3-binutils              \
+  maybe-all-stage3-gas \
+  maybe-all-stage3-gcc        \
+  maybe-all-stage3-intl   \
+  maybe-all-stage3-ld \
+  maybe-all-stage3-libcpp  \
+  maybe-all-stage3-libiberty                        \
+  maybe-all-stage3-zlib        
+
 do-clean: clean-stage3
+clean-stage3:     \
+  maybe-clean-stage3-bfd \
+  maybe-clean-stage3-opcodes \
+  maybe-clean-stage3-binutils              \
+  maybe-clean-stage3-gas \
+  maybe-clean-stage3-gcc        \
+  maybe-clean-stage3-intl   \
+  maybe-clean-stage3-ld \
+  maybe-clean-stage3-libcpp  \
+  maybe-clean-stage3-libiberty                        \
+  maybe-clean-stage3-zlib        
+
+
+.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
+.PHONY: all-stage3-bfd maybe-all-stage3-bfd
+.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
+
+maybe-configure-stage3-bfd:
+maybe-all-stage3-bfd:
+maybe-clean-stage3-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage3-bfd: configure-stage3-bfd
+configure-stage3-bfd:
+	@$(MAKE) stage3-start
+	@[ -f bfd/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-bfd: all-stage3-bfd
+all-stage3-bfd: configure-stage3-bfd
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage3-bfd: clean-stage3-bfd
+clean-stage3-bfd:
+	@[ -f bfd/Makefile ] || [ -f stage3-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
+.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
+.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
+
+maybe-configure-stage3-opcodes:
+maybe-all-stage3-opcodes:
+maybe-clean-stage3-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage3-opcodes: configure-stage3-opcodes
+configure-stage3-opcodes:
+	@$(MAKE) stage3-start
+	@[ -f opcodes/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-opcodes: all-stage3-opcodes
+all-stage3-opcodes: configure-stage3-opcodes
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage3-opcodes: clean-stage3-opcodes
+clean-stage3-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stage3-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
+.PHONY: all-stage3-binutils maybe-all-stage3-binutils
+.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
+
+maybe-configure-stage3-binutils:
+maybe-all-stage3-binutils:
+maybe-clean-stage3-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage3-binutils: configure-stage3-binutils
+configure-stage3-binutils:
+	@$(MAKE) stage3-start
+	@[ -f binutils/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-binutils: all-stage3-binutils
+all-stage3-binutils: configure-stage3-binutils
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage3-binutils: clean-stage3-binutils
+clean-stage3-binutils:
+	@[ -f binutils/Makefile ] || [ -f stage3-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage3-gas maybe-configure-stage3-gas
+.PHONY: all-stage3-gas maybe-all-stage3-gas
+.PHONY: clean-stage3-gas maybe-clean-stage3-gas
+
+maybe-configure-stage3-gas:
+maybe-all-stage3-gas:
+maybe-clean-stage3-gas:
+
+@if gas-bootstrap
+maybe-configure-stage3-gas: configure-stage3-gas
+configure-stage3-gas:
+	@$(MAKE) stage3-start
+	@[ -f gas/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-gas: all-stage3-gas
+all-stage3-gas: configure-stage3-gas
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage3-gas: clean-stage3-gas
+clean-stage3-gas:
+	@[ -f gas/Makefile ] || [ -f stage3-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
+.PHONY: all-stage3-gcc maybe-all-stage3-gcc
+.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
+
+maybe-configure-stage3-gcc:
+maybe-all-stage3-gcc:
+maybe-clean-stage3-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage3-gcc: configure-stage3-gcc
+configure-stage3-gcc:
+	@$(MAKE) stage3-start
+	@[ -f gcc/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-gcc: all-stage3-gcc
+all-stage3-gcc: configure-stage3-gcc
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage3-gcc: clean-stage3-gcc
+clean-stage3-gcc:
+	@[ -f gcc/Makefile ] || [ -f stage3-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage3-intl maybe-configure-stage3-intl
+.PHONY: all-stage3-intl maybe-all-stage3-intl
+.PHONY: clean-stage3-intl maybe-clean-stage3-intl
+
+maybe-configure-stage3-intl:
+maybe-all-stage3-intl:
+maybe-clean-stage3-intl:
+
+@if intl-bootstrap
+maybe-configure-stage3-intl: configure-stage3-intl
+configure-stage3-intl:
+	@$(MAKE) stage3-start
+	@[ -f intl/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-intl: all-stage3-intl
+all-stage3-intl: configure-stage3-intl
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage3-intl: clean-stage3-intl
+clean-stage3-intl:
+	@[ -f intl/Makefile ] || [ -f stage3-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage3-ld maybe-configure-stage3-ld
+.PHONY: all-stage3-ld maybe-all-stage3-ld
+.PHONY: clean-stage3-ld maybe-clean-stage3-ld
+
+maybe-configure-stage3-ld:
+maybe-all-stage3-ld:
+maybe-clean-stage3-ld:
+
+@if ld-bootstrap
+maybe-configure-stage3-ld: configure-stage3-ld
+configure-stage3-ld:
+	@$(MAKE) stage3-start
+	@[ -f ld/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-ld: all-stage3-ld
+all-stage3-ld: configure-stage3-ld
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage3-ld: clean-stage3-ld
+clean-stage3-ld:
+	@[ -f ld/Makefile ] || [ -f stage3-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
+.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
+
+maybe-configure-stage3-libcpp:
+maybe-all-stage3-libcpp:
+maybe-clean-stage3-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage3-libcpp: configure-stage3-libcpp
+configure-stage3-libcpp:
+	@$(MAKE) stage3-start
+	@[ -f libcpp/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-libcpp: all-stage3-libcpp
+all-stage3-libcpp: configure-stage3-libcpp
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stage3-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
+.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
+.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
+
+maybe-configure-stage3-libiberty:
+maybe-all-stage3-libiberty:
+maybe-clean-stage3-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage3-libiberty: configure-stage3-libiberty
+configure-stage3-libiberty:
+	@$(MAKE) stage3-start
+	@[ -f libiberty/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-libiberty: all-stage3-libiberty
+all-stage3-libiberty: configure-stage3-libiberty
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage3-libiberty: clean-stage3-libiberty
+clean-stage3-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stage3-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
+.PHONY: all-stage3-zlib maybe-all-stage3-zlib
+.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
+
+maybe-configure-stage3-zlib:
+maybe-all-stage3-zlib:
+maybe-clean-stage3-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage3-zlib: configure-stage3-zlib
+configure-stage3-zlib:
+	@$(MAKE) stage3-start
+	@[ -f zlib/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 3 in zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage3-zlib: all-stage3-zlib
+all-stage3-zlib: configure-stage3-zlib
+	@$(MAKE) stage3-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage3-zlib: clean-stage3-zlib
+clean-stage3-zlib:
+	@[ -f zlib/Makefile ] || [ -f stage3-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stage3-start ; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif zlib-bootstrap
+
+
 
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
 
 compare:
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage2-lean; then \
+	@if test -f stage2-lean; then \
 	  echo Cannot compare object files as stage 2 was deleted. ; \
 	  exit 0 ; \
 	fi; \
-	: $(MAKE); $(stage); \
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	rm -f .bad_compare ; \
-	echo Comparing stages 2 and 3 ; \
 	cd stage3-gcc; \
 	files=`find . -name "*$(objext)" -print` ; \
 	cd .. ; \
 	for file in $${files} ; do \
 	  f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
 	  @do_compare@ > /dev/null 2>&1; \
-	  if test $$? -eq 1; then \
-	    case $$file in \
-	      ./cc*-checksum$(objext) | ./libgcc/* ) \
-	        echo warning: $$file differs ;; \
-	      *) \
-	        echo $$file differs >> .bad_compare ;; \
-	    esac ; \
-	  fi ; \
+	  test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
 	done ; \
 	if [ -f .bad_compare ]; then \
 	  echo "Bootstrap comparison failure!"; \
 	  cat .bad_compare; \
 	  exit 1; \
 	else \
-	  echo Comparison successful.; \
+	  true; \
 	fi ; \
 	$(STAMP) compare
-	if $(LEAN); then \
-	  rm -rf stage2-*; \
-	  $(STAMP) stage2-lean; \
-	fi
+	@bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
 
 
 
-.PHONY: bootstrap bootstrap-lean
-bootstrap:
-	echo stage3 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage3-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap-lean:
-	echo stage3 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage3-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+.PHONY: bootstrap
+bootstrap: stage3-bubble compare all
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage2:: distclean-stage3 
 .PHONY: distclean-stage3
 distclean-stage3::
-	@: $(MAKE); $(stage)
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stage3-* compare 
 
 
@@ -37301,247 +31531,756 @@ cleanstrap: distclean bootstrap
 .PHONY: stage4-start stage4-end
 
 stage4-start::
-	@: $(MAKE); $(stage); \
+	@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
 	echo stage4 > stage_current ; \
 	echo stage4 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+	$(mkinstalldirs) $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \
 	  mkdir stage4-bfd; \
-	mv stage4-bfd bfd  ; \
-	mv stage3-bfd prev-bfd || test -f stage3-lean 
+	set stage4-bfd bfd ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-bfd prev-bfd ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \
 	  mkdir stage4-opcodes; \
-	mv stage4-opcodes opcodes  ; \
-	mv stage3-opcodes prev-opcodes || test -f stage3-lean 
+	set stage4-opcodes opcodes ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-opcodes prev-opcodes ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \
 	  mkdir stage4-binutils; \
-	mv stage4-binutils binutils  ; \
-	mv stage3-binutils prev-binutils || test -f stage3-lean 
+	set stage4-binutils binutils ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-binutils prev-binutils ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage4-gas ] || \
 	  mkdir stage4-gas; \
-	mv stage4-gas gas  ; \
-	mv stage3-gas prev-gas || test -f stage3-lean 
+	set stage4-gas gas ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-gas prev-gas ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \
 	  mkdir stage4-gcc; \
-	mv stage4-gcc gcc  ; \
-	mv stage3-gcc prev-gcc || test -f stage3-lean 
+	set stage4-gcc gcc ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-gcc prev-gcc ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage4-intl ] || \
 	  mkdir stage4-intl; \
-	mv stage4-intl intl  ; \
-	mv stage3-intl prev-intl || test -f stage3-lean 
+	set stage4-intl intl ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-intl prev-intl ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage4-ld ] || \
 	  mkdir stage4-ld; \
-	mv stage4-ld ld  ; \
-	mv stage3-ld prev-ld || test -f stage3-lean 
+	set stage4-ld ld ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-ld prev-ld ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \
 	  mkdir stage4-libcpp; \
-	mv stage4-libcpp libcpp  ; \
-	mv stage3-libcpp prev-libcpp || test -f stage3-lean 
+	set stage4-libcpp libcpp ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-libcpp prev-libcpp ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \
-	  mkdir stage4-libdecnumber; \
-	mv stage4-libdecnumber libdecnumber  ; \
-	mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean 
-@endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \
 	  mkdir stage4-libiberty; \
-	mv stage4-libiberty libiberty  ; \
-	mv stage3-libiberty prev-libiberty || test -f stage3-lean 
+	set stage4-libiberty libiberty ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-libiberty prev-libiberty ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \
 	  mkdir stage4-zlib; \
-	mv stage4-zlib zlib  ; \
-	mv stage3-zlib prev-zlib || test -f stage3-lean 
+	set stage4-zlib zlib ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage3-zlib prev-zlib ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif zlib
-	@[ -d stage4-$(TARGET_SUBDIR) ] || \
-	  mkdir stage4-$(TARGET_SUBDIR); \
-	mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage3-lean 
 
-stage4-end:: 
+stage4-end::
+	@rm -f stage_current
 @if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stage4-bfd ; \
-	  mv prev-bfd stage3-bfd ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set bfd stage4-bfd ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-bfd stage3-bfd ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stage4-opcodes ; \
-	  mv prev-opcodes stage3-opcodes ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set opcodes stage4-opcodes ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-opcodes stage3-opcodes ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stage4-binutils ; \
-	  mv prev-binutils stage3-binutils ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set binutils stage4-binutils ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-binutils stage3-binutils ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif binutils
 @if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stage4-gas ; \
-	  mv prev-gas stage3-gas ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gas stage4-gas ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gas stage3-gas ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gas
 @if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stage4-gcc ; \
-	  mv prev-gcc stage3-gcc ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gcc stage4-gcc ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gcc stage3-gcc ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gcc
 @if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stage4-intl ; \
-	  mv prev-intl stage3-intl ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set intl stage4-intl ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-intl stage3-intl ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif intl
 @if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stage4-ld ; \
-	  mv prev-ld stage3-ld ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set ld stage4-ld ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-ld stage3-ld ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stage4-libcpp ; \
-	  mv prev-libcpp stage3-libcpp ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libcpp stage4-libcpp ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libcpp stage3-libcpp ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber ; \
-	  mv prev-libdecnumber stage3-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
 @if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stage4-libiberty ; \
-	  mv prev-libiberty stage3-libiberty ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libiberty stage4-libiberty ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libiberty stage3-libiberty ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stage4-zlib ; \
-	  mv prev-zlib stage3-zlib ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set zlib stage4-zlib ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-zlib stage3-zlib ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
 
-# Bubble a bugfix through all the stages up to stage 4.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
+# Bubble a bugfix through all the stages up to stage 4.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
 .PHONY: stage4-bubble
 stage4-bubble:: stage3-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage4-lean || test -f stage3-lean  ; then \
+	@bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
+	@if test -f stage4-lean || test -f stage3-lean  ; then \
 	  echo Skipping rebuild of stage4 ; \
 	else \
-	  $(MAKE) stage4-start; \
-	  if $(LEAN); then \
-	    rm -rf stage2-* ; \
-	    $(STAMP) stage2-lean ; \
-	  fi; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \
 	fi
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
 
 .PHONY: all-stage4 clean-stage4
+all-stage4:     \
+  maybe-all-stage4-bfd \
+  maybe-all-stage4-opcodes \
+  maybe-all-stage4-binutils              \
+  maybe-all-stage4-gas \
+  maybe-all-stage4-gcc        \
+  maybe-all-stage4-intl   \
+  maybe-all-stage4-ld \
+  maybe-all-stage4-libcpp  \
+  maybe-all-stage4-libiberty                        \
+  maybe-all-stage4-zlib        
+
 do-clean: clean-stage4
+clean-stage4:     \
+  maybe-clean-stage4-bfd \
+  maybe-clean-stage4-opcodes \
+  maybe-clean-stage4-binutils              \
+  maybe-clean-stage4-gas \
+  maybe-clean-stage4-gcc        \
+  maybe-clean-stage4-intl   \
+  maybe-clean-stage4-ld \
+  maybe-clean-stage4-libcpp  \
+  maybe-clean-stage4-libiberty                        \
+  maybe-clean-stage4-zlib        
+
+
+.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
+.PHONY: all-stage4-bfd maybe-all-stage4-bfd
+.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
+
+maybe-configure-stage4-bfd:
+maybe-all-stage4-bfd:
+maybe-clean-stage4-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stage4-bfd: configure-stage4-bfd
+configure-stage4-bfd:
+	@$(MAKE) stage4-start
+	@[ -f bfd/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-bfd: all-stage4-bfd
+all-stage4-bfd: configure-stage4-bfd
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage4-bfd: clean-stage4-bfd
+clean-stage4-bfd:
+	@[ -f bfd/Makefile ] || [ -f stage4-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
+.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
+.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
+
+maybe-configure-stage4-opcodes:
+maybe-all-stage4-opcodes:
+maybe-clean-stage4-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stage4-opcodes: configure-stage4-opcodes
+configure-stage4-opcodes:
+	@$(MAKE) stage4-start
+	@[ -f opcodes/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-opcodes: all-stage4-opcodes
+all-stage4-opcodes: configure-stage4-opcodes
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage4-opcodes: clean-stage4-opcodes
+clean-stage4-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stage4-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
+.PHONY: all-stage4-binutils maybe-all-stage4-binutils
+.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
+
+maybe-configure-stage4-binutils:
+maybe-all-stage4-binutils:
+maybe-clean-stage4-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stage4-binutils: configure-stage4-binutils
+configure-stage4-binutils:
+	@$(MAKE) stage4-start
+	@[ -f binutils/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-binutils: all-stage4-binutils
+all-stage4-binutils: configure-stage4-binutils
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage4-binutils: clean-stage4-binutils
+clean-stage4-binutils:
+	@[ -f binutils/Makefile ] || [ -f stage4-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stage4-gas maybe-configure-stage4-gas
+.PHONY: all-stage4-gas maybe-all-stage4-gas
+.PHONY: clean-stage4-gas maybe-clean-stage4-gas
+
+maybe-configure-stage4-gas:
+maybe-all-stage4-gas:
+maybe-clean-stage4-gas:
+
+@if gas-bootstrap
+maybe-configure-stage4-gas: configure-stage4-gas
+configure-stage4-gas:
+	@$(MAKE) stage4-start
+	@[ -f gas/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-gas: all-stage4-gas
+all-stage4-gas: configure-stage4-gas
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage4-gas: clean-stage4-gas
+clean-stage4-gas:
+	@[ -f gas/Makefile ] || [ -f stage4-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
+.PHONY: all-stage4-gcc maybe-all-stage4-gcc
+.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
+
+maybe-configure-stage4-gcc:
+maybe-all-stage4-gcc:
+maybe-clean-stage4-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stage4-gcc: configure-stage4-gcc
+configure-stage4-gcc:
+	@$(MAKE) stage4-start
+	@[ -f gcc/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-gcc: all-stage4-gcc
+all-stage4-gcc: configure-stage4-gcc
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage4-gcc: clean-stage4-gcc
+clean-stage4-gcc:
+	@[ -f gcc/Makefile ] || [ -f stage4-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stage4-intl maybe-configure-stage4-intl
+.PHONY: all-stage4-intl maybe-all-stage4-intl
+.PHONY: clean-stage4-intl maybe-clean-stage4-intl
+
+maybe-configure-stage4-intl:
+maybe-all-stage4-intl:
+maybe-clean-stage4-intl:
+
+@if intl-bootstrap
+maybe-configure-stage4-intl: configure-stage4-intl
+configure-stage4-intl:
+	@$(MAKE) stage4-start
+	@[ -f intl/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-intl: all-stage4-intl
+all-stage4-intl: configure-stage4-intl
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage4-intl: clean-stage4-intl
+clean-stage4-intl:
+	@[ -f intl/Makefile ] || [ -f stage4-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stage4-ld maybe-configure-stage4-ld
+.PHONY: all-stage4-ld maybe-all-stage4-ld
+.PHONY: clean-stage4-ld maybe-clean-stage4-ld
+
+maybe-configure-stage4-ld:
+maybe-all-stage4-ld:
+maybe-clean-stage4-ld:
+
+@if ld-bootstrap
+maybe-configure-stage4-ld: configure-stage4-ld
+configure-stage4-ld:
+	@$(MAKE) stage4-start
+	@[ -f ld/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-ld: all-stage4-ld
+all-stage4-ld: configure-stage4-ld
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage4-ld: clean-stage4-ld
+clean-stage4-ld:
+	@[ -f ld/Makefile ] || [ -f stage4-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
+.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
+
+maybe-configure-stage4-libcpp:
+maybe-all-stage4-libcpp:
+maybe-clean-stage4-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stage4-libcpp: configure-stage4-libcpp
+configure-stage4-libcpp:
+	@$(MAKE) stage4-start
+	@[ -f libcpp/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-libcpp: all-stage4-libcpp
+all-stage4-libcpp: configure-stage4-libcpp
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stage4-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
+.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
+.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
+
+maybe-configure-stage4-libiberty:
+maybe-all-stage4-libiberty:
+maybe-clean-stage4-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stage4-libiberty: configure-stage4-libiberty
+configure-stage4-libiberty:
+	@$(MAKE) stage4-start
+	@[ -f libiberty/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-libiberty: all-stage4-libiberty
+all-stage4-libiberty: configure-stage4-libiberty
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage4-libiberty: clean-stage4-libiberty
+clean-stage4-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stage4-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
+.PHONY: all-stage4-zlib maybe-all-stage4-zlib
+.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
+
+maybe-configure-stage4-zlib:
+maybe-all-stage4-zlib:
+maybe-clean-stage4-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stage4-zlib: configure-stage4-zlib
+configure-stage4-zlib:
+	@$(MAKE) stage4-start
+	@[ -f zlib/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage 4 in zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stage4-zlib: all-stage4-zlib
+all-stage4-zlib: configure-stage4-zlib
+	@$(MAKE) stage4-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 
+
+maybe-clean-stage4-zlib: clean-stage4-zlib
+clean-stage4-zlib:
+	@[ -f zlib/Makefile ] || [ -f stage4-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stage4-start ; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif zlib-bootstrap
+
+
 
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
 
 compare3:
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage3-lean; then \
+	@if test -f stage3-lean; then \
 	  echo Cannot compare object files as stage 3 was deleted. ; \
 	  exit 0 ; \
 	fi; \
-	: $(MAKE); $(stage); \
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	rm -f .bad_compare ; \
-	echo Comparing stages 3 and 4 ; \
 	cd stage4-gcc; \
 	files=`find . -name "*$(objext)" -print` ; \
 	cd .. ; \
 	for file in $${files} ; do \
 	  f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \
 	  @do_compare@ > /dev/null 2>&1; \
-	  if test $$? -eq 1; then \
-	    case $$file in \
-	      ./cc*-checksum$(objext) | ./libgcc/* ) \
-	        echo warning: $$file differs ;; \
-	      *) \
-	        echo $$file differs >> .bad_compare ;; \
-	    esac ; \
-	  fi ; \
+	  test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
 	done ; \
 	if [ -f .bad_compare ]; then \
 	  echo "Bootstrap comparison failure!"; \
 	  cat .bad_compare; \
 	  exit 1; \
 	else \
-	  echo Comparison successful.; \
+	  true; \
 	fi ; \
 	$(STAMP) compare3
-	if $(LEAN); then \
-	  rm -rf stage3-*; \
-	  $(STAMP) stage3-lean; \
-	fi
+	@bootstrap_lean@-rm -rf stage3-* ; $(STAMP) stage3-lean
 
 
 
-.PHONY: bootstrap4 bootstrap4-lean
-bootstrap4:
-	echo stage4 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap4-lean:
-	echo stage4 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage4-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+.PHONY: bootstrap4
+bootstrap4: stage4-bubble compare3 all
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage3:: distclean-stage4 
 .PHONY: distclean-stage4
 distclean-stage4::
-	@: $(MAKE); $(stage)
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stage4-* compare3 
 
 
@@ -37551,170 +32290,712 @@ distclean-stage4::
 .PHONY: stageprofile-start stageprofile-end
 
 stageprofile-start::
-	@: $(MAKE); $(stage); \
+	@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
 	echo stageprofile > stage_current ; \
 	echo stageprofile > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+	$(mkinstalldirs) $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
 	  mkdir stageprofile-bfd; \
-	mv stageprofile-bfd bfd  ; \
-	mv stage1-bfd prev-bfd || test -f stage1-lean 
+	set stageprofile-bfd bfd ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-bfd prev-bfd ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \
 	  mkdir stageprofile-opcodes; \
-	mv stageprofile-opcodes opcodes  ; \
-	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
+	set stageprofile-opcodes opcodes ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-opcodes prev-opcodes ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \
 	  mkdir stageprofile-binutils; \
-	mv stageprofile-binutils binutils  ; \
-	mv stage1-binutils prev-binutils || test -f stage1-lean 
+	set stageprofile-binutils binutils ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-binutils prev-binutils ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \
 	  mkdir stageprofile-gas; \
-	mv stageprofile-gas gas  ; \
-	mv stage1-gas prev-gas || test -f stage1-lean 
+	set stageprofile-gas gas ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-gas prev-gas ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \
 	  mkdir stageprofile-gcc; \
-	mv stageprofile-gcc gcc  ; \
-	mv stage1-gcc prev-gcc || test -f stage1-lean 
+	set stageprofile-gcc gcc ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-gcc prev-gcc ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \
 	  mkdir stageprofile-intl; \
-	mv stageprofile-intl intl  ; \
-	mv stage1-intl prev-intl || test -f stage1-lean 
+	set stageprofile-intl intl ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-intl prev-intl ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \
 	  mkdir stageprofile-ld; \
-	mv stageprofile-ld ld  ; \
-	mv stage1-ld prev-ld || test -f stage1-lean 
+	set stageprofile-ld ld ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-ld prev-ld ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \
 	  mkdir stageprofile-libcpp; \
-	mv stageprofile-libcpp libcpp  ; \
-	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
+	set stageprofile-libcpp libcpp ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-libcpp prev-libcpp ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \
-	  mkdir stageprofile-libdecnumber; \
-	mv stageprofile-libdecnumber libdecnumber  ; \
-	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
-@endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \
 	  mkdir stageprofile-libiberty; \
-	mv stageprofile-libiberty libiberty  ; \
-	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
+	set stageprofile-libiberty libiberty ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-libiberty prev-libiberty ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
 	  mkdir stageprofile-zlib; \
-	mv stageprofile-zlib zlib  ; \
-	mv stage1-zlib prev-zlib || test -f stage1-lean 
+	set stageprofile-zlib zlib ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-zlib prev-zlib ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif zlib
-	@[ -d stageprofile-$(TARGET_SUBDIR) ] || \
-	  mkdir stageprofile-$(TARGET_SUBDIR); \
-	mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
 
-stageprofile-end:: 
+stageprofile-end::
+	@rm -f stage_current
 @if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stageprofile-bfd ; \
-	  mv prev-bfd stage1-bfd ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set bfd stageprofile-bfd ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-bfd stage1-bfd ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes ; \
-	  mv prev-opcodes stage1-opcodes ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set opcodes stageprofile-opcodes ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-opcodes stage1-opcodes ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stageprofile-binutils ; \
-	  mv prev-binutils stage1-binutils ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set binutils stageprofile-binutils ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-binutils stage1-binutils ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif binutils
 @if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stageprofile-gas ; \
-	  mv prev-gas stage1-gas ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gas stageprofile-gas ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gas stage1-gas ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gas
 @if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stageprofile-gcc ; \
-	  mv prev-gcc stage1-gcc ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gcc stageprofile-gcc ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gcc stage1-gcc ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gcc
 @if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stageprofile-intl ; \
-	  mv prev-intl stage1-intl ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set intl stageprofile-intl ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-intl stage1-intl ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif intl
 @if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stageprofile-ld ; \
-	  mv prev-ld stage1-ld ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set ld stageprofile-ld ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-ld stage1-ld ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp ; \
-	  mv prev-libcpp stage1-libcpp ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libcpp stageprofile-libcpp ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libcpp stage1-libcpp ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber ; \
-	  mv prev-libdecnumber stage1-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
 @if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty ; \
-	  mv prev-libiberty stage1-libiberty ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libiberty stageprofile-libiberty ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libiberty stage1-libiberty ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stageprofile-zlib ; \
-	  mv prev-zlib stage1-zlib ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set zlib stageprofile-zlib ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-zlib stage1-zlib ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
 
-# Bubble a bugfix through all the stages up to stage profile.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
+# Bubble a bugfix through all the stages up to stage profile.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
 .PHONY: stageprofile-bubble
 stageprofile-bubble:: stage1-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stageprofile-lean || test -f stage1-lean  ; then \
+	@if test -f stageprofile-lean || test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stageprofile ; \
 	else \
-	  $(MAKE) stageprofile-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \
 	fi
 
 .PHONY: all-stageprofile clean-stageprofile
+all-stageprofile:     \
+  maybe-all-stageprofile-bfd \
+  maybe-all-stageprofile-opcodes \
+  maybe-all-stageprofile-binutils              \
+  maybe-all-stageprofile-gas \
+  maybe-all-stageprofile-gcc        \
+  maybe-all-stageprofile-intl   \
+  maybe-all-stageprofile-ld \
+  maybe-all-stageprofile-libcpp  \
+  maybe-all-stageprofile-libiberty                        \
+  maybe-all-stageprofile-zlib        
+
 do-clean: clean-stageprofile
+clean-stageprofile:     \
+  maybe-clean-stageprofile-bfd \
+  maybe-clean-stageprofile-opcodes \
+  maybe-clean-stageprofile-binutils              \
+  maybe-clean-stageprofile-gas \
+  maybe-clean-stageprofile-gcc        \
+  maybe-clean-stageprofile-intl   \
+  maybe-clean-stageprofile-ld \
+  maybe-clean-stageprofile-libcpp  \
+  maybe-clean-stageprofile-libiberty                        \
+  maybe-clean-stageprofile-zlib        
+
+
+.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
+.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
+.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
+
+maybe-configure-stageprofile-bfd:
+maybe-all-stageprofile-bfd:
+maybe-clean-stageprofile-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
+configure-stageprofile-bfd:
+	@$(MAKE) stageprofile-start
+	@[ -f bfd/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-bfd: all-stageprofile-bfd
+all-stageprofile-bfd: configure-stageprofile-bfd
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
+clean-stageprofile-bfd:
+	@[ -f bfd/Makefile ] || [ -f stageprofile-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
+.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
+.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
+
+maybe-configure-stageprofile-opcodes:
+maybe-all-stageprofile-opcodes:
+maybe-clean-stageprofile-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
+configure-stageprofile-opcodes:
+	@$(MAKE) stageprofile-start
+	@[ -f opcodes/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
+all-stageprofile-opcodes: configure-stageprofile-opcodes
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
+clean-stageprofile-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stageprofile-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
+.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
+.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
+
+maybe-configure-stageprofile-binutils:
+maybe-all-stageprofile-binutils:
+maybe-clean-stageprofile-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
+configure-stageprofile-binutils:
+	@$(MAKE) stageprofile-start
+	@[ -f binutils/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-binutils: all-stageprofile-binutils
+all-stageprofile-binutils: configure-stageprofile-binutils
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
+clean-stageprofile-binutils:
+	@[ -f binutils/Makefile ] || [ -f stageprofile-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
+.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
+.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
+
+maybe-configure-stageprofile-gas:
+maybe-all-stageprofile-gas:
+maybe-clean-stageprofile-gas:
+
+@if gas-bootstrap
+maybe-configure-stageprofile-gas: configure-stageprofile-gas
+configure-stageprofile-gas:
+	@$(MAKE) stageprofile-start
+	@[ -f gas/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-gas: all-stageprofile-gas
+all-stageprofile-gas: configure-stageprofile-gas
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-gas: clean-stageprofile-gas
+clean-stageprofile-gas:
+	@[ -f gas/Makefile ] || [ -f stageprofile-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
+.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
+.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
+
+maybe-configure-stageprofile-gcc:
+maybe-all-stageprofile-gcc:
+maybe-clean-stageprofile-gcc:
+
+@if gcc-bootstrap
+maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
+configure-stageprofile-gcc:
+	@$(MAKE) stageprofile-start
+	@[ -f gcc/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-gcc: all-stageprofile-gcc
+all-stageprofile-gcc: configure-stageprofile-gcc
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
+clean-stageprofile-gcc:
+	@[ -f gcc/Makefile ] || [ -f stageprofile-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
+
+
+.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
+.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
+.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
+
+maybe-configure-stageprofile-intl:
+maybe-all-stageprofile-intl:
+maybe-clean-stageprofile-intl:
+
+@if intl-bootstrap
+maybe-configure-stageprofile-intl: configure-stageprofile-intl
+configure-stageprofile-intl:
+	@$(MAKE) stageprofile-start
+	@[ -f intl/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-intl: all-stageprofile-intl
+all-stageprofile-intl: configure-stageprofile-intl
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-intl: clean-stageprofile-intl
+clean-stageprofile-intl:
+	@[ -f intl/Makefile ] || [ -f stageprofile-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
+.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
+.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
+
+maybe-configure-stageprofile-ld:
+maybe-all-stageprofile-ld:
+maybe-clean-stageprofile-ld:
+
+@if ld-bootstrap
+maybe-configure-stageprofile-ld: configure-stageprofile-ld
+configure-stageprofile-ld:
+	@$(MAKE) stageprofile-start
+	@[ -f ld/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-ld: all-stageprofile-ld
+all-stageprofile-ld: configure-stageprofile-ld
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-ld: clean-stageprofile-ld
+clean-stageprofile-ld:
+	@[ -f ld/Makefile ] || [ -f stageprofile-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
+.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
+
+maybe-configure-stageprofile-libcpp:
+maybe-all-stageprofile-libcpp:
+maybe-clean-stageprofile-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
+configure-stageprofile-libcpp:
+	@$(MAKE) stageprofile-start
+	@[ -f libcpp/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
+all-stageprofile-libcpp: configure-stageprofile-libcpp
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stageprofile-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
+.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
+.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
+
+maybe-configure-stageprofile-libiberty:
+maybe-all-stageprofile-libiberty:
+maybe-clean-stageprofile-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
+configure-stageprofile-libiberty:
+	@$(MAKE) stageprofile-start
+	@[ -f libiberty/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
+all-stageprofile-libiberty: configure-stageprofile-libiberty
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
+clean-stageprofile-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stageprofile-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
+.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
+.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
+
+maybe-configure-stageprofile-zlib:
+maybe-all-stageprofile-zlib:
+maybe-clean-stageprofile-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
+configure-stageprofile-zlib:
+	@$(MAKE) stageprofile-start
+	@[ -f zlib/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage profile in zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stageprofile-zlib: all-stageprofile-zlib
+all-stageprofile-zlib: configure-stageprofile-zlib
+	@$(MAKE) stageprofile-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
+clean-stageprofile-zlib:
+	@[ -f zlib/Makefile ] || [ -f stageprofile-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif zlib-bootstrap
+
+
 
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
@@ -37727,7 +33008,7 @@ do-clean: clean-stageprofile
 distclean-stage1:: distclean-stageprofile 
 .PHONY: distclean-stageprofile
 distclean-stageprofile::
-	@: $(MAKE); $(stage)
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stageprofile-* 
 
 
@@ -37737,204 +33018,725 @@ distclean-stageprofile::
 .PHONY: stagefeedback-start stagefeedback-end
 
 stagefeedback-start::
-	@: $(MAKE); $(stage); \
+	@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
 	echo stagefeedback > stage_current ; \
 	echo stagefeedback > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
+	$(mkinstalldirs) $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
 	  mkdir stagefeedback-bfd; \
-	mv stagefeedback-bfd bfd  ; \
-	mv stageprofile-bfd prev-bfd || test -f stageprofile-lean 
+	set stagefeedback-bfd bfd ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-bfd prev-bfd ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \
 	  mkdir stagefeedback-opcodes; \
-	mv stagefeedback-opcodes opcodes  ; \
-	mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean 
+	set stagefeedback-opcodes opcodes ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-opcodes prev-opcodes ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \
 	  mkdir stagefeedback-binutils; \
-	mv stagefeedback-binutils binutils  ; \
-	mv stageprofile-binutils prev-binutils || test -f stageprofile-lean 
+	set stagefeedback-binutils binutils ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-binutils prev-binutils ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \
 	  mkdir stagefeedback-gas; \
-	mv stagefeedback-gas gas  ; \
-	mv stageprofile-gas prev-gas || test -f stageprofile-lean 
+	set stagefeedback-gas gas ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-gas prev-gas ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \
 	  mkdir stagefeedback-gcc; \
-	mv stagefeedback-gcc gcc  ; \
-	mv stageprofile-gcc prev-gcc || test -f stageprofile-lean 
+	set stagefeedback-gcc gcc ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-gcc prev-gcc ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \
 	  mkdir stagefeedback-intl; \
-	mv stagefeedback-intl intl  ; \
-	mv stageprofile-intl prev-intl || test -f stageprofile-lean 
+	set stagefeedback-intl intl ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-intl prev-intl ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \
 	  mkdir stagefeedback-ld; \
-	mv stagefeedback-ld ld  ; \
-	mv stageprofile-ld prev-ld || test -f stageprofile-lean 
+	set stagefeedback-ld ld ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-ld prev-ld ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \
 	  mkdir stagefeedback-libcpp; \
-	mv stagefeedback-libcpp libcpp  ; \
-	mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean 
+	set stagefeedback-libcpp libcpp ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-libcpp prev-libcpp ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \
-	  mkdir stagefeedback-libdecnumber; \
-	mv stagefeedback-libdecnumber libdecnumber  ; \
-	mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean 
-@endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \
 	  mkdir stagefeedback-libiberty; \
-	mv stagefeedback-libiberty libiberty  ; \
-	mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean 
+	set stagefeedback-libiberty libiberty ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-libiberty prev-libiberty ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \
 	  mkdir stagefeedback-zlib; \
-	mv stagefeedback-zlib zlib  ; \
-	mv stageprofile-zlib prev-zlib || test -f stageprofile-lean 
+	set stagefeedback-zlib zlib ; \
+	@CREATE_LINK_TO_DIR@  ; \
+	set stage1-zlib prev-zlib ; \
+	@CREATE_LINK_TO_DIR@ 
 @endif zlib
-	@[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
-	  mkdir stagefeedback-$(TARGET_SUBDIR); \
-	mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean 
 
-stagefeedback-end:: 
+stagefeedback-end::
+	@rm -f stage_current
 @if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd ; \
-	  mv prev-bfd stageprofile-bfd ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set bfd stagefeedback-bfd ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-bfd stage1-bfd ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif bfd
 @if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes ; \
-	  mv prev-opcodes stageprofile-opcodes ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set opcodes stagefeedback-opcodes ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-opcodes stage1-opcodes ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif opcodes
 @if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils ; \
-	  mv prev-binutils stageprofile-binutils ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set binutils stagefeedback-binutils ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-binutils stage1-binutils ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif binutils
 @if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stagefeedback-gas ; \
-	  mv prev-gas stageprofile-gas ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gas stagefeedback-gas ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gas stage1-gas ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gas
 @if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc ; \
-	  mv prev-gcc stageprofile-gcc ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set gcc stagefeedback-gcc ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-gcc stage1-gcc ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif gcc
 @if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stagefeedback-intl ; \
-	  mv prev-intl stageprofile-intl ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set intl stagefeedback-intl ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-intl stage1-intl ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif intl
 @if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stagefeedback-ld ; \
-	  mv prev-ld stageprofile-ld ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set ld stagefeedback-ld ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-ld stage1-ld ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif ld
 @if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp ; \
-	  mv prev-libcpp stageprofile-libcpp ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libcpp stagefeedback-libcpp ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libcpp stage1-libcpp ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber ; \
-	  mv prev-libdecnumber stageprofile-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
 @if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty ; \
-	  mv prev-libiberty stageprofile-libiberty ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set libiberty stagefeedback-libiberty ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-libiberty stage1-libiberty ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif libiberty
 @if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib ; \
-	  mv prev-zlib stageprofile-zlib ; :  ; \
-	fi
+	@cd $(HOST_SUBDIR); set zlib stagefeedback-zlib ; \
+	@UNDO_LINK_TO_DIR@  ; \
+	set prev-zlib stage1-zlib ; \
+	@UNDO_LINK_TO_DIR@ 
 @endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
 
-# Bubble a bugfix through all the stages up to stage feedback.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
+# Bubble a bugfix through all the stages up to stage feedback.  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
 .PHONY: stagefeedback-bubble
-stagefeedback-bubble:: stageprofile-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stagefeedback-lean || test -f stageprofile-lean  ; then \
+stagefeedback-bubble:: stage1-bubble
+	@if test -f stagefeedback-lean || test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stagefeedback ; \
 	else \
-	  $(MAKE) stagefeedback-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stagefeedback; \
 	fi
 
 .PHONY: all-stagefeedback clean-stagefeedback
+all-stagefeedback:     \
+  maybe-all-stagefeedback-bfd \
+  maybe-all-stagefeedback-opcodes \
+  maybe-all-stagefeedback-binutils              \
+  maybe-all-stagefeedback-gas \
+  maybe-all-stagefeedback-gcc        \
+  maybe-all-stagefeedback-intl   \
+  maybe-all-stagefeedback-ld \
+  maybe-all-stagefeedback-libcpp  \
+  maybe-all-stagefeedback-libiberty                        \
+  maybe-all-stagefeedback-zlib        
+
 do-clean: clean-stagefeedback
+clean-stagefeedback:     \
+  maybe-clean-stagefeedback-bfd \
+  maybe-clean-stagefeedback-opcodes \
+  maybe-clean-stagefeedback-binutils              \
+  maybe-clean-stagefeedback-gas \
+  maybe-clean-stagefeedback-gcc        \
+  maybe-clean-stagefeedback-intl   \
+  maybe-clean-stagefeedback-ld \
+  maybe-clean-stagefeedback-libcpp  \
+  maybe-clean-stagefeedback-libiberty                        \
+  maybe-clean-stagefeedback-zlib        
+
+
+.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
+.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
+.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
+
+maybe-configure-stagefeedback-bfd:
+maybe-all-stagefeedback-bfd:
+maybe-clean-stagefeedback-bfd:
+
+@if bfd-bootstrap
+maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
+configure-stagefeedback-bfd:
+	@$(MAKE) stagefeedback-start
+	@[ -f bfd/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in bfd ; \
+	cd $(HOST_SUBDIR)/bfd || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/bfd"; \
+	libsrcdir="$$s/bfd"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
+all-stagefeedback-bfd: configure-stagefeedback-bfd
+	@$(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
+clean-stagefeedback-bfd:
+	@[ -f bfd/Makefile ] || [ -f stagefeedback-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
+.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
+.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
+
+maybe-configure-stagefeedback-opcodes:
+maybe-all-stagefeedback-opcodes:
+maybe-clean-stagefeedback-opcodes:
+
+@if opcodes-bootstrap
+maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
+configure-stagefeedback-opcodes:
+	@$(MAKE) stagefeedback-start
+	@[ -f opcodes/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in opcodes ; \
+	cd $(HOST_SUBDIR)/opcodes || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/opcodes"; \
+	libsrcdir="$$s/opcodes"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
+all-stagefeedback-opcodes: configure-stagefeedback-opcodes
+	@$(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
+clean-stagefeedback-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stagefeedback-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif opcodes-bootstrap
+
+
+.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
+.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
+.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
+
+maybe-configure-stagefeedback-binutils:
+maybe-all-stagefeedback-binutils:
+maybe-clean-stagefeedback-binutils:
+
+@if binutils-bootstrap
+maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
+configure-stagefeedback-binutils:
+	@$(MAKE) stagefeedback-start
+	@[ -f binutils/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in binutils ; \
+	cd $(HOST_SUBDIR)/binutils || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/binutils"; \
+	libsrcdir="$$s/binutils"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
+all-stagefeedback-binutils: configure-stagefeedback-binutils
+	@$(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
+clean-stagefeedback-binutils:
+	@[ -f binutils/Makefile ] || [ -f stagefeedback-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif binutils-bootstrap
+
+
+.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
+.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
+.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
+
+maybe-configure-stagefeedback-gas:
+maybe-all-stagefeedback-gas:
+maybe-clean-stagefeedback-gas:
+
+@if gas-bootstrap
+maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
+configure-stagefeedback-gas:
+	@$(MAKE) stagefeedback-start
+	@[ -f gas/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in gas ; \
+	cd $(HOST_SUBDIR)/gas || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gas"; \
+	libsrcdir="$$s/gas"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-gas: all-stagefeedback-gas
+all-stagefeedback-gas: configure-stagefeedback-gas
+	@$(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
+clean-stagefeedback-gas:
+	@[ -f gas/Makefile ] || [ -f stagefeedback-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif gas-bootstrap
+
+
+.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
+.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
+.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
+
+maybe-configure-stagefeedback-gcc:
+maybe-all-stagefeedback-gcc:
+maybe-clean-stagefeedback-gcc:
 
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
+maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
+configure-stagefeedback-gcc:
+	@$(MAKE) stagefeedback-start
+	@[ -f gcc/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in gcc ; \
+	cd $(HOST_SUBDIR)/gcc || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/gcc"; \
+	libsrcdir="$$s/gcc"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
+all-stagefeedback-gcc: configure-stagefeedback-gcc
+	@$(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
 
+maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
+clean-stagefeedback-gcc:
+	@[ -f gcc/Makefile ] || [ -f stagefeedback-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
+@endif gcc-bootstrap
 
 
-.PHONY: profiledbootstrap profiledbootstrap-lean
-profiledbootstrap:
-	echo stagefeedback > stage_final
+.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
+.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
+
+maybe-configure-stagefeedback-intl:
+maybe-all-stagefeedback-intl:
+maybe-clean-stagefeedback-intl:
+
+@if intl-bootstrap
+maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
+configure-stagefeedback-intl:
+	@$(MAKE) stagefeedback-start
+	@[ -f intl/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in intl ; \
+	cd $(HOST_SUBDIR)/intl || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/intl"; \
+	libsrcdir="$$s/intl"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-intl: all-stagefeedback-intl
+all-stagefeedback-intl: configure-stagefeedback-intl
+	@$(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stagefeedback-bubble
-	@: $(MAKE); $(unstage)
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
+clean-stagefeedback-intl:
+	@[ -f intl/Makefile ] || [ -f stagefeedback-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif intl-bootstrap
+
+
+.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
+.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
+.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
+
+maybe-configure-stagefeedback-ld:
+maybe-all-stagefeedback-ld:
+maybe-clean-stagefeedback-ld:
+
+@if ld-bootstrap
+maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
+configure-stagefeedback-ld:
+	@$(MAKE) stagefeedback-start
+	@[ -f ld/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in ld ; \
+	cd $(HOST_SUBDIR)/ld || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/ld"; \
+	libsrcdir="$$s/ld"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-ld: all-stagefeedback-ld
+all-stagefeedback-ld: configure-stagefeedback-ld
+	@$(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
 
-profiledbootstrap-lean:
-	echo stagefeedback > stage_final
+maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
+clean-stagefeedback-ld:
+	@[ -f ld/Makefile ] || [ -f stagefeedback-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif ld-bootstrap
+
+
+.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
+.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
+
+maybe-configure-stagefeedback-libcpp:
+maybe-all-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libcpp:
+
+@if libcpp-bootstrap
+maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
+configure-stagefeedback-libcpp:
+	@$(MAKE) stagefeedback-start
+	@[ -f libcpp/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in libcpp ; \
+	cd $(HOST_SUBDIR)/libcpp || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libcpp"; \
+	libsrcdir="$$s/libcpp"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
+all-stagefeedback-libcpp: configure-stagefeedback-libcpp
+	@$(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stagefeedback-bubble
-	@: $(MAKE); $(unstage)
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stagefeedback-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/libcpp && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libcpp-bootstrap
+
+
+.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
+.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
+.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
+
+maybe-configure-stagefeedback-libiberty:
+maybe-all-stagefeedback-libiberty:
+maybe-clean-stagefeedback-libiberty:
+
+@if libiberty-bootstrap
+maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
+configure-stagefeedback-libiberty:
+	@$(MAKE) stagefeedback-start
+	@[ -f libiberty/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in libiberty ; \
+	cd $(HOST_SUBDIR)/libiberty || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/libiberty"; \
+	libsrcdir="$$s/libiberty"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
+all-stagefeedback-libiberty: configure-stagefeedback-libiberty
+	@$(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
+clean-stagefeedback-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stagefeedback-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libiberty-bootstrap
+
+
+.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
+.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
+.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
+
+maybe-configure-stagefeedback-zlib:
+maybe-all-stagefeedback-zlib:
+maybe-clean-stagefeedback-zlib:
+
+@if zlib-bootstrap
+maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
+configure-stagefeedback-zlib:
+	@$(MAKE) stagefeedback-start
+	@[ -f zlib/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	echo Configuring stage feedback in zlib ; \
+	cd $(HOST_SUBDIR)/zlib || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/zlib"; \
+	libsrcdir="$$s/zlib"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  @stage2_werror_flag@ 
+
+maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
+all-stagefeedback-zlib: configure-stagefeedback-zlib
+	@$(MAKE) stagefeedback-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
+	$(STAGE_HOST_EXPORTS)  \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
+	@[ -f zlib/Makefile ] || [ -f stagefeedback-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd $(HOST_SUBDIR)/zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif zlib-bootstrap
+
+
+
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
+@if gcc-bootstrap
+
+
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stageprofile:: distclean-stagefeedback 
+distclean-stage1:: distclean-stagefeedback 
 .PHONY: distclean-stagefeedback
 distclean-stagefeedback::
-	@: $(MAKE); $(stage)
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stagefeedback-* 
 
 
@@ -37942,86 +33744,80 @@ distclean-stagefeedback::
 
 
 
-stageprofile-end::
-	$(MAKE) distclean-stagefeedback
-
 stagefeedback-start::
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	for i in prev-*; do \
-	  j=`echo $$i | sed s/^prev-//` ; \
-	  cd $$r/$$i && \
-	  { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \
-	  { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \
-	done
+	cd stageprofile-gcc && \
+	  { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \
+	  { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); }
 
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
-do-distclean: distclean-stage1
-
-# Provide a GCC build when we're building target libraries.  This does
-# not work as a dependency, just as the minimum necessary to avoid errors.
-stage_last:
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
+profiledbootstrap:
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	echo "Bootstrapping the compiler"; \
+	$(MAKE) stageprofile-bubble distclean-stagefeedback
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+	echo "Building runtime libraries and training compiler"; \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	echo "Building feedback based compiler"; \
+	$(MAKE) stagefeedback-bubble stagefeedback-end
 @endif gcc-bootstrap
 
-.PHONY: restrap
-restrap:
-	@: $(MAKE); $(stage)
-	rm -rf stage1-$(TARGET_SUBDIR) stage2 stage3 stage4 stageprofile stagefeedback 
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+@if gcc-bootstrap
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
+do-distclean: distclean-stage1
+@endif gcc-bootstrap
 
 # --------------------------------------
 # Dependencies between different modules
 # --------------------------------------
 
 # Generic dependencies for target modules on host stuff, especially gcc
-@if gcc-bootstrap
-configure-target-libstdc++-v3: stage_last
-configure-target-libmudflap: stage_last
-configure-target-libssp: stage_last
-configure-target-libgcc-math: stage_last
-configure-target-newlib: stage_last
-configure-target-libgfortran: stage_last
-configure-target-libobjc: stage_last
-configure-target-libtermcap: stage_last
-configure-target-winsup: stage_last
-configure-target-libgloss: stage_last
-configure-target-libiberty: stage_last
-configure-target-gperf: stage_last
-configure-target-examples: stage_last
-configure-target-libffi: stage_last
-configure-target-libjava: stage_last
-configure-target-zlib: stage_last
-configure-target-boehm-gc: stage_last
-configure-target-qthreads: stage_last
-configure-target-rda: stage_last
-configure-target-libada: stage_last
-configure-target-libgomp: stage_last
-@endif gcc-bootstrap
 
-@if gcc-no-bootstrap
 configure-target-libstdc++-v3: maybe-all-gcc
+
 configure-target-libmudflap: maybe-all-gcc
-configure-target-libssp: maybe-all-gcc
-configure-target-libgcc-math: maybe-all-gcc
+
 configure-target-newlib: maybe-all-gcc
+
 configure-target-libgfortran: maybe-all-gcc
+
 configure-target-libobjc: maybe-all-gcc
+
 configure-target-libtermcap: maybe-all-gcc
+
 configure-target-winsup: maybe-all-gcc
+
 configure-target-libgloss: maybe-all-gcc
+
 configure-target-libiberty: maybe-all-gcc
+
 configure-target-gperf: maybe-all-gcc
+
 configure-target-examples: maybe-all-gcc
+
 configure-target-libffi: maybe-all-gcc
+
 configure-target-libjava: maybe-all-gcc
+
 configure-target-zlib: maybe-all-gcc
+
 configure-target-boehm-gc: maybe-all-gcc
+
 configure-target-qthreads: maybe-all-gcc
+
 configure-target-rda: maybe-all-gcc
+
 configure-target-libada: maybe-all-gcc
-configure-target-libgomp: maybe-all-gcc
-@endif gcc-no-bootstrap
 
 
 
@@ -38039,12 +33835,8 @@ configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
 configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
 configure-target-libjava: maybe-all-target-libstdc++-v3
 
-configure-target-libmudflap: maybe-all-target-newlib maybe-all-target-libgloss
-
 configure-target-libobjc: maybe-all-target-newlib maybe-all-target-libgloss
 
-configure-target-libssp: maybe-all-target-newlib maybe-all-target-libgloss
-
 configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
@@ -38071,7 +33863,6 @@ configure-target-qthreads: maybe-all-target-newlib maybe-all-target-libgloss
 
 
 
-
 # With all the machinery above in place, it is pretty easy to generate
 # dependencies.  Host dependencies are a bit more complex because we have
 # to check for bootstrap/prebootstrap dependencies.  To resolve
@@ -38094,30 +33885,30 @@ configure-stage3-gcc: maybe-configure-stage3-intl
 configure-stage4-gcc: maybe-configure-stage4-intl
 configure-stageprofile-gcc: maybe-configure-stageprofile-intl
 configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
-configure-gcc: maybe-all-binutils
-
-configure-stage1-gcc: maybe-all-stage1-binutils
-configure-stage2-gcc: maybe-all-stage2-binutils
-configure-stage3-gcc: maybe-all-stage3-binutils
-configure-stage4-gcc: maybe-all-stage4-binutils
-configure-stageprofile-gcc: maybe-all-stageprofile-binutils
-configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils
-configure-gcc: maybe-all-gas
-
-configure-stage1-gcc: maybe-all-stage1-gas
-configure-stage2-gcc: maybe-all-stage2-gas
-configure-stage3-gcc: maybe-all-stage3-gas
-configure-stage4-gcc: maybe-all-stage4-gas
-configure-stageprofile-gcc: maybe-all-stageprofile-gas
-configure-stagefeedback-gcc: maybe-all-stagefeedback-gas
-configure-gcc: maybe-all-ld
-
-configure-stage1-gcc: maybe-all-stage1-ld
-configure-stage2-gcc: maybe-all-stage2-ld
-configure-stage3-gcc: maybe-all-stage3-ld
-configure-stage4-gcc: maybe-all-stage4-ld
-configure-stageprofile-gcc: maybe-all-stageprofile-ld
-configure-stagefeedback-gcc: maybe-all-stagefeedback-ld
+configure-gcc: maybe-configure-binutils
+
+configure-stage1-gcc: maybe-configure-stage1-binutils
+configure-stage2-gcc: maybe-configure-stage2-binutils
+configure-stage3-gcc: maybe-configure-stage3-binutils
+configure-stage4-gcc: maybe-configure-stage4-binutils
+configure-stageprofile-gcc: maybe-configure-stageprofile-binutils
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-binutils
+configure-gcc: maybe-configure-gas
+
+configure-stage1-gcc: maybe-configure-stage1-gas
+configure-stage2-gcc: maybe-configure-stage2-gas
+configure-stage3-gcc: maybe-configure-stage3-gas
+configure-stage4-gcc: maybe-configure-stage4-gas
+configure-stageprofile-gcc: maybe-configure-stageprofile-gas
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-gas
+configure-gcc: maybe-configure-ld
+
+configure-stage1-gcc: maybe-configure-stage1-ld
+configure-stage2-gcc: maybe-configure-stage2-ld
+configure-stage3-gcc: maybe-configure-stage3-ld
+configure-stage4-gcc: maybe-configure-stage4-ld
+configure-stageprofile-gcc: maybe-configure-stageprofile-ld
+configure-stagefeedback-gcc: maybe-configure-stagefeedback-ld
 all-gcc: all-libiberty
 
 all-stage1-gcc: all-stage1-libiberty
@@ -38188,6 +33979,30 @@ all-stage4-gcc: maybe-all-build-fixincludes
 all-stageprofile-gcc: maybe-all-build-fixincludes
 all-stagefeedback-gcc: maybe-all-build-fixincludes
 all-prebootstrap: maybe-all-build-fixincludes
+all-gcc: maybe-all-binutils
+
+all-stage1-gcc: maybe-all-stage1-binutils
+all-stage2-gcc: maybe-all-stage2-binutils
+all-stage3-gcc: maybe-all-stage3-binutils
+all-stage4-gcc: maybe-all-stage4-binutils
+all-stageprofile-gcc: maybe-all-stageprofile-binutils
+all-stagefeedback-gcc: maybe-all-stagefeedback-binutils
+all-gcc: maybe-all-gas
+
+all-stage1-gcc: maybe-all-stage1-gas
+all-stage2-gcc: maybe-all-stage2-gas
+all-stage3-gcc: maybe-all-stage3-gas
+all-stage4-gcc: maybe-all-stage4-gas
+all-stageprofile-gcc: maybe-all-stageprofile-gas
+all-stagefeedback-gcc: maybe-all-stagefeedback-gas
+all-gcc: maybe-all-ld
+
+all-stage1-gcc: maybe-all-stage1-ld
+all-stage2-gcc: maybe-all-stage2-ld
+all-stage3-gcc: maybe-all-stage3-ld
+all-stage4-gcc: maybe-all-stage4-ld
+all-stageprofile-gcc: maybe-all-stageprofile-ld
+all-stagefeedback-gcc: maybe-all-stagefeedback-ld
 all-gcc: maybe-all-zlib
 
 all-stage1-gcc: maybe-all-stage1-zlib
@@ -38204,14 +34019,6 @@ all-stage3-gcc: all-stage3-libcpp
 all-stage4-gcc: all-stage4-libcpp
 all-stageprofile-gcc: all-stageprofile-libcpp
 all-stagefeedback-gcc: all-stagefeedback-libcpp
-all-gcc: all-libdecnumber
-
-all-stage1-gcc: all-stage1-libdecnumber
-all-stage2-gcc: all-stage2-libdecnumber
-all-stage3-gcc: all-stage3-libdecnumber
-all-stage4-gcc: all-stage4-libdecnumber
-all-stageprofile-gcc: all-stageprofile-libdecnumber
-all-stagefeedback-gcc: all-stagefeedback-libdecnumber
 all-gcc: maybe-all-libiberty
 
 all-stage1-gcc: maybe-all-stage1-libiberty
@@ -38256,6 +34063,9 @@ all-stageprofile-libcpp: maybe-all-stageprofile-intl
 all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
 all-fixincludes: maybe-all-libiberty
 all-gnattools: maybe-all-target-libada
+configure-gdb: maybe-configure-itcl
+configure-gdb: maybe-configure-tcl
+configure-gdb: maybe-configure-tk
 configure-gdb: maybe-configure-sim
 all-gdb: maybe-all-libiberty
 all-gdb: maybe-all-opcodes
@@ -38264,6 +34074,10 @@ all-gdb: maybe-all-readline
 all-gdb: maybe-all-build-bison
 all-gdb: maybe-all-build-byacc
 all-gdb: maybe-all-sim
+install-gdb: maybe-install-tcl
+install-gdb: maybe-install-tk
+install-gdb: maybe-install-itcl
+install-gdb: maybe-install-libgui
 configure-libgui: maybe-configure-tcl
 configure-libgui: maybe-configure-tk
 all-libgui: maybe-all-tcl
@@ -38558,17 +34372,12 @@ all-prebootstrap: maybe-all-gas
 all-prebootstrap: maybe-all-intl
 all-prebootstrap: maybe-all-ld
 all-prebootstrap: maybe-all-libcpp
-all-prebootstrap: maybe-all-libdecnumber
 all-prebootstrap: maybe-all-libiberty
 all-prebootstrap: maybe-all-zlib
 @endif gcc-no-bootstrap
 
-CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
 GDB_TK = @GDB_TK@
-INSTALL_GDB_TK = @INSTALL_GDB_TK@
-configure-gdb: $(CONFIGURE_GDB_TK)
 all-gdb: $(gdbnlmrequirements) $(GDB_TK)
-install-gdb: $(INSTALL_GDB_TK)
 
 # Serialization dependencies.  Host configures don't work well in parallel to
 # each other, due to contention over config.cache.  Target configures and 
@@ -38579,6 +34388,17 @@ install-gdb: $(INSTALL_GDB_TK)
 # Regenerating top level configury
 # --------------------------------
 
+# Multilib.out tells target dirs what multilibs they should build.
+# There is really only one copy.  We use the 'timestamp' method to
+# work around various timestamp bugs on some systems.
+# We use move-if-change so that it's only considered updated when it
+# actually changes, because it has to depend on a phony target.
+multilib.out: maybe-all-gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	echo "Checking multilib configuration..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
+	$(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
+
 # Rebuilding Makefile.in, using autogen.
 AUTOGEN = autogen
 $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
diff --git a/Makefile.tpl b/Makefile.tpl
index 274474a5c..ea0de59ed 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -6,7 +6,7 @@ in
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+#   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
 #
 # 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
@@ -20,7 +20,7 @@ in
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
 # -------------------------------
@@ -87,11 +87,13 @@ GDB_NLM_DEPS =
 # the libraries.
 RPATH_ENVVAR = @RPATH_ENVVAR@
 
+# This is the list of directories to be built for the build system.
+BUILD_CONFIGDIRS = libiberty
 # Build programs are put under this directory.
 BUILD_SUBDIR = @build_subdir@
 # This is set by the configure script to the arguments to use when configuring
 # directories built for the build system.
-BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)"
+BUILD_CONFIGARGS = @build_configargs@
 
 # This is the list of variables to export in the environment when
 # configuring any subdirectory.  It must also be exported whenever
@@ -134,8 +136,7 @@ HOST_CONFIGARGS = @host_configargs@
 # with srcdir=..
 HOST_SUBDIR = @host_subdir@
 # This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.  We need to pass
-# some to the GCC configure because of its hybrid host/target nature.
+# configuring subdirectories for the host system.
 HOST_EXPORTS = \
 	$(BASE_EXPORTS) \
 	CC="$(CC)"; export CC; \
@@ -154,23 +155,14 @@ HOST_EXPORTS = \
 	WINDRES="$(WINDRES)"; export WINDRES; \
 	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
 	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
-	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
-	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
-	LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
-	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
-	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
-	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
 	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
-@if gcc-bootstrap
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-@endif gcc-bootstrap
 	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
 
 # Similar, for later GCC stages.
-POSTSTAGE1_HOST_EXPORTS = \
+STAGE_HOST_EXPORTS = \
+	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 	$(HOST_EXPORTS) \
 	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
@@ -179,17 +171,20 @@ POSTSTAGE1_HOST_EXPORTS = \
 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
 	  -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
 
+# This is set by the configure script to the list of directories which
+# should be built using the target tools.
+TARGET_CONFIGDIRS = @target_configdirs@
 # Target libraries are put under this directory:
 TARGET_SUBDIR = @target_subdir@
 # This is set by the configure script to the arguments to use when configuring
 # directories built for the target.
-TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
+TARGET_CONFIGARGS = @target_configargs@
 # This is the list of variables to export in the environment when
 # configuring subdirectories for the host system.
 BASE_TARGET_EXPORTS = \
 	$(BASE_EXPORTS) \
 	AR="$(AR_FOR_TARGET)"; export AR; \
-	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+	AS="$(AS_FOR_TARGET)"; export AS; \
 	CC="$(CC_FOR_TARGET)"; export CC; \
 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
@@ -198,13 +193,10 @@ BASE_TARGET_EXPORTS = \
 	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
 	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
+	LD="$(LD_FOR_TARGET)"; export LD; \
 	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-	LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
-	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
-	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
+	NM="$(NM_FOR_TARGET)"; export NM; \
 	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
 	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
 	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
 
@@ -250,16 +242,48 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 # Flags to pass to stage2 and later makes.  They are defined
 # here so that they can be overridden by Makefile fragments.
 BOOT_CFLAGS= -g -O2
-BOOT_LDFLAGS=
 
-BISON = @BISON@
-YACC = @YACC@
-FLEX = @FLEX@
-LEX = @LEX@
-M4 = @M4@
-MAKEINFO = @MAKEINFO@
-EXPECT = @EXPECT@
-RUNTEST = @RUNTEST@
+CONFIGURED_BISON = @CONFIGURED_BISON@
+BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+	    echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \
+	 else \
+	    echo ${CONFIGURED_BISON} ; \
+	 fi`
+
+CONFIGURED_YACC = @CONFIGURED_YACC@
+YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
+	    echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \
+	elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \
+	    echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \
+	else \
+	    echo ${CONFIGURED_YACC} ; \
+	fi`
+
+CONFIGURED_FLEX = @CONFIGURED_FLEX@
+FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+	then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+	else echo ${CONFIGURED_FLEX} ; fi`
+
+CONFIGURED_LEX = @CONFIGURED_LEX@
+LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
+	then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
+	else echo ${CONFIGURED_LEX} ; fi`
+
+CONFIGURED_M4 = @CONFIGURED_M4@
+M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
+	then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
+	else echo ${CONFIGURED_M4} ; fi`
+
+# For an installed makeinfo, we require it to be from texinfo 4.2 or
+# higher, else we use the "missing" dummy.  We also pass the subdirectory
+# makeinfo even if only the Makefile is there, because Texinfo builds its
+# manual when made, and it requires its own version.
+CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
+MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
+	then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
+	else if (${CONFIGURED_MAKEINFO} --version \
+	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
+        then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
@@ -267,29 +291,43 @@ RUNTEST = @RUNTEST@
 # (Default to avoid splitting info files by setting the threshold high.)
 MAKEINFOFLAGS = --split-size=5000000
 
+# FIXME: expect may become a build tool?
+EXPECT = `if [ -f $$r/$(HOST_SUBDIR)/expect/expect ] ; \
+	then echo $$r/$(HOST_SUBDIR)/expect/expect ; \
+	else echo expect ; fi`
+
+RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
+	then echo $$s/dejagnu/runtest ; \
+	else echo runtest ; fi`
+
 # ---------------------------------------------
 # Programs producing files for the HOST machine
 # ---------------------------------------------
 
 AS = @AS@
+
 AR = @AR@
 AR_FLAGS = rc
+
 CC = @CC@
+CFLAGS = @CFLAGS@
+LIBCFLAGS = $(CFLAGS)
+
 CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+
 DLLTOOL = @DLLTOOL@
-LD = @LD@
-LIPO = @LIPO@
+
 NM = @NM@
-OBJDUMP = @OBJDUMP@
+
+LD = @LD@
+LDFLAGS = 
+
 RANLIB = @RANLIB@
-STRIP = @STRIP@
+
 WINDRES = @WINDRES@
 
-CFLAGS = @CFLAGS@
-LDFLAGS = 
-LIBCFLAGS = $(CFLAGS)
-CXXFLAGS = @CXXFLAGS@
-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 PICFLAG = 
 
 # -----------------------------------------------
@@ -299,42 +337,133 @@ PICFLAG =
 FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
 
 AR_FOR_TARGET=@AR_FOR_TARGET@
-AS_FOR_TARGET=@AS_FOR_TARGET@
-CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
+CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@
+USUAL_AR_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/ar ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/ar ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(AR); \
+    else \
+      echo $(CONFIGURED_AR_FOR_TARGET) ; \
+    fi; \
+  fi`
 
+AS_FOR_TARGET=@AS_FOR_TARGET@
+CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@
+USUAL_AS_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/gas/as-new ] ; then \
+    echo $$r/$(HOST_SUBDIR)/gas/as-new ; \
+  elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=as ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(AS); \
+    else \
+      echo $(CONFIGURED_AS_FOR_TARGET) ; \
+    fi; \
+  fi`
+
+CC_FOR_TARGET = @CC_FOR_TARGET@
+# During gcc bootstrap, if we use some random cc for stage1 then
+# CFLAGS will be just -g.  We want to ensure that TARGET libraries
+# (which we know are built with gcc) are built with optimizations so
+# prepend -O2 when setting CFLAGS_FOR_TARGET.
+CFLAGS_FOR_TARGET = -O2 $(CFLAGS)
 # If GCC_FOR_TARGET is not overriden on the command line, then this
 # variable is passed down to the gcc Makefile, where it is used to
 # build libgcc2.a.  We define it here so that it can itself be
 # overridden on the command line.
-GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET)
+GCC_FOR_TARGET=@GCC_FOR_TARGET@
+USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) \
+  $$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/ $(FLAGS_FOR_TARGET)
+LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+
+CXX_FOR_TARGET = @CXX_FOR_TARGET@
+RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
+CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
+LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
+CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@
+USUAL_DLLTOOL_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/dlltool ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/dlltool ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(DLLTOOL); \
+    else \
+      echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \
+    fi; \
+  fi`
+
+GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
+GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@
+
 LD_FOR_TARGET=@LD_FOR_TARGET@
+CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@
+USUAL_LD_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/ld/ld-new ] ; then \
+    echo $$r/$(HOST_SUBDIR)/ld/ld-new ; \
+  elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=ld ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(LD); \
+    else \
+      echo $(CONFIGURED_LD_FOR_TARGET) ; \
+    fi; \
+  fi`
+
+LDFLAGS_FOR_TARGET = 
 
-LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
 NM_FOR_TARGET=@NM_FOR_TARGET@
-OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
+CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
+USUAL_NM_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/nm-new ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/nm-new ; \
+  elif [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=nm ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(NM); \
+    else \
+      echo $(CONFIGURED_NM_FOR_TARGET) ; \
+    fi; \
+  fi`
+
 RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
-STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
-WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
+USUAL_RANLIB_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/ranlib ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/ranlib ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      if [ x'$(RANLIB)' != x ]; then \
+         echo $(RANLIB); \
+      else \
+         echo ranlib; \
+      fi; \
+    else \
+      echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \
+    fi; \
+  fi`
 
-COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
-COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
-COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
+WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
+USUAL_WINDRES_FOR_TARGET = ` \
+  if [ -f $$r/$(HOST_SUBDIR)/binutils/windres ] ; then \
+    echo $$r/$(HOST_SUBDIR)/binutils/windres ; \
+  else \
+    if [ '$(host)' = '$(target)' ] ; then \
+      echo $(WINDRES); \
+    else \
+      echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \
+    fi; \
+  fi`
 
-# During gcc bootstrap, if we use some random cc for stage1 then
-# CFLAGS will be just -g.  We want to ensure that TARGET libraries
-# (which we know are built with gcc) are built with optimizations so
-# prepend -O2 when setting CFLAGS_FOR_TARGET.
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
-LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-LDFLAGS_FOR_TARGET = 
 PICFLAG_FOR_TARGET = 
 
 # ------------------------------------
@@ -343,7 +472,7 @@ PICFLAG_FOR_TARGET =
 
 # The first rule in the file had better be this one.  Don't put any above it.
 # This lives here to allow makefile fragments to contain dependencies.
-all:
+@default_target@:
 
 #### host and target specific makefile fragments come in here.
 @target_makefile_frag@
@@ -384,14 +513,21 @@ HOST_LIB_PATH_[+module+] = \
 [+ ENDIF lib_path +][+ ENDFOR host_modules +]
 
 # Flags to pass down to all sub-makes.
-BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \
-	"`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \
-	"[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +] \
+BASE_FLAGS_TO_PASS = [+ FOR flags_to_pass +]\
+	"[+flag+]=$([+flag+])" [+ ENDFOR flags_to_pass +]\
 	"CONFIG_SHELL=$(SHELL)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
 
-# We leave this in just in case, but it is not needed anymore.
-RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
+# For any flags above that may contain shell code that varies from one
+# target library to another.  When doing recursive invocations of the
+# top-level Makefile, we don't want the outer make to evaluate them,
+# so we pass these variables down unchanged.  They must not contain
+# single nor double quotes.
+RECURSE_FLAGS = \
+	CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
+	RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
+
+RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS)
 
 # Flags to pass down to most sub-makes, in which we're building with
 # the host environment.
@@ -402,11 +538,8 @@ EXTRA_HOST_FLAGS = \
 	'CXX=$(CXX)' \
 	'DLLTOOL=$(DLLTOOL)' \
 	'LD=$(LD)' \
-	'LIPO=$(LIPO)' \
 	'NM=$(NM)' \
-	'OBJDUMP=$(OBJDUMP)' \
 	'RANLIB=$(RANLIB)' \
-	'STRIP=$(STRIP)' \
 	'WINDRES=$(WINDRES)'
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
@@ -424,23 +557,20 @@ X11_FLAGS_TO_PASS = \
 	'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)'
 
 # Flags to pass down to makes which are built with the target environment.
-# The double $ decreases the length of the command line; those variables
-# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
-# COMPILER_ prefixed variables are not passed down so we expand them here.
+# The double $ decreases the length of the command line; the variables
+# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.
 EXTRA_TARGET_FLAGS = \
 	'AR=$$(AR_FOR_TARGET)' \
-	'AS=$(COMPILER_AS_FOR_TARGET)' \
+	'AS=$$(AS_FOR_TARGET)' \
 	'CC=$$(CC_FOR_TARGET)' \
 	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
 	'CXX=$$(CXX_FOR_TARGET)' \
 	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-	'LD=$(COMPILER_LD_FOR_TARGET)' \
-	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
+	'LD=$$(LD_FOR_TARGET)' \
 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
 	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-	'NM=$(COMPILER_NM_FOR_TARGET)' \
-	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
+	'NM=$$(NM_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)'
 
@@ -453,12 +583,19 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # The BUILD_* variables are a special case, which are used for the gcc
 # cross-building scheme.
 EXTRA_GCC_FLAGS = \
+	'BUILD_PREFIX=$(BUILD_PREFIX)' \
+	'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
+	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
 	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
+	"`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
@@ -475,37 +612,23 @@ configure-target: [+
 
 # The target built for a native non-bootstrap build.
 .PHONY: all
-all:
-@if gcc-bootstrap
-	[ -f stage_final ] || echo stage3 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble
-@endif gcc-bootstrap
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if [ -f stage_last ]; then \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
-	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
-	fi
+all: unstage all-host all-target stage
 
 .PHONY: all-build
-[+ FOR build_modules +]
-all-build: maybe-all-build-[+module+][+ ENDFOR build_modules +]
-
+all-build: [+
+  FOR build_modules +] \
+    maybe-all-build-[+module+][+
+  ENDFOR build_modules +]
 .PHONY: all-host
-[+ FOR host_modules +][+ IF bootstrap +]
-@if [+module+]-no-bootstrap[+ ENDIF bootstrap +]
-all-host: maybe-all-[+module+][+ IF bootstrap +]
-@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
-
+all-host: [+
+  FOR host_modules +] \
+    maybe-all-[+module+][+
+  ENDFOR host_modules +]
 .PHONY: all-target
-[+ FOR target_modules +][+ IF bootstrap +]
-@if [+module+]-no-bootstrap[+ ENDIF bootstrap +]
-all-target: maybe-all-target-[+module+][+ IF bootstrap +]
-@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR target_modules +]
+all-target: [+
+  FOR target_modules +] \
+    maybe-all-target-[+module+][+
+  ENDFOR target_modules +]
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
@@ -513,21 +636,19 @@ all-target: maybe-all-target-[+module+][+ IF bootstrap +]
 # but it may do additional work as well).
 [+ FOR recursive_targets +]
 .PHONY: do-[+make_target+]
-do-[+make_target+]:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+make_target+]-host \
-	  [+make_target+]-target
-
+do-[+make_target+]: unstage [+make_target+]-host [+make_target+]-target stage
 
 .PHONY: [+make_target+]-host
-[+ FOR host_modules +]
-[+make_target+]-host: maybe-[+make_target+]-[+module+][+ ENDFOR host_modules +]
+[+make_target+]-host: [+
+  FOR host_modules +] \
+    maybe-[+make_target+]-[+module+][+
+  ENDFOR host_modules +]
 
 .PHONY: [+make_target+]-target
-[+ FOR target_modules +]
-[+make_target+]-target: maybe-[+make_target+]-target-[+module+][+ ENDFOR target_modules +]
+[+make_target+]-target: [+
+  FOR target_modules +] \
+    maybe-[+make_target+]-target-[+module+][+
+  ENDFOR target_modules +]
 [+ ENDFOR recursive_targets +]
 
 # Here are the targets which correspond to the do-X targets.
@@ -555,7 +676,7 @@ local-clean:
 
 local-distclean:
 	-rm -f Makefile config.status config.cache mh-frag mt-frag
-	-rm -f maybedep.tmp serdep.tmp
+	-rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
 	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
 	  rm -rf $(TARGET_SUBDIR); \
 	else true; fi
@@ -580,10 +701,14 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
 maintainer-clean: local-distclean
 realclean: maintainer-clean
 
-# Extra dependency for clean-target, owing to the mixed nature of gcc.
+# Extra dependency for clean-target, owing to the mixed nature of gcc
 clean-target: clean-target-libgcc
 clean-target-libgcc:
-	test ! -d gcc || (cd gcc && $(MAKE) $@)
+	test ! -d gcc/libgcc || \
+	(cd gcc/libgcc && find . -type d -print) | \
+	while read d; do rm -f gcc/$$d/libgcc.a || : ; done
+	-rm -rf gcc/libgcc
+	-rm -f gcc/stmp-dirs
 
 # Check target.
 
@@ -591,23 +716,13 @@ clean-target-libgcc:
 check: do-check
 
 # Only include modules actually being configured and built.
-.PHONY: check-host
-check-host: [+
+do-check: unstage [+
   FOR host_modules +] \
     maybe-check-[+module+][+
-  ENDFOR host_modules +]
-
-.PHONY: check-target
-check-target: [+
+  ENDFOR host_modules +][+
   FOR target_modules +] \
     maybe-check-target-[+module+][+
-  ENDFOR target_modules +]
-
-do-check:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
+  ENDFOR target_modules +] stage
 
 # Automated reporting of test results.
 
@@ -633,11 +748,7 @@ mail-report-with-warnings.log: warning.log
 # Installation targets.
 
 .PHONY: install uninstall
-install:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
+install: installdirs install-host install-target
 
 .PHONY: install-host-nogcc
 install-host-nogcc: [+
@@ -664,7 +775,6 @@ uninstall:
 install.all: install-no-fixedincludes
 	@if [ -f ./gcc/Makefile ] ; then \
 		r=`${PWD_COMMAND}` ; export r ; \
-		s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 		$(HOST_EXPORTS) \
 		(cd ./gcc && \
 		$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
@@ -708,184 +818,92 @@ etags tags: TAGS
 # built are.
 TAGS: do-TAGS
 
-# ------------------------------------
-# Macros for configure and all targets
-# ------------------------------------
-
-[+ DEFINE configure +]
-.PHONY: configure-[+prefix+][+module+] maybe-configure-[+prefix+][+module+]
-maybe-configure-[+prefix+][+module+]:
-@if [+prefix+][+module+]
-maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+]
-configure-[+prefix+][+module+]: [+ IF bootstrap +]
-@endif [+prefix+][+module+]
-@if [+prefix+][+module+]-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif [+prefix+][+module+]-bootstrap
-@if [+prefix+][+module+][+ ELSE bootstrap +]
-	@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
-	@r=`${PWD_COMMAND}`; export r; \
+# --------------------------------------
+# Modules which run on the build machine
+# --------------------------------------
+[+ FOR build_modules +]
+.PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
+maybe-configure-build-[+module+]:
+@if build-[+module+]
+maybe-configure-build-[+module+]: configure-build-[+module+]
+configure-build-[+module+]:
+	@test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/[+module+] ; \
+	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	[+ IF check_multilibs
-	+]echo "Checking multilib configuration for [+module+]..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
-	$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
-	if test -r [+subdir+]/[+module+]/multilib.out; then \
-	  if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
-	    rm -f [+subdir+]/[+module+]/multilib.tmp; \
-	  else \
-	    rm -f [+subdir+]/[+module+]/Makefile; \
-	    mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	  fi; \
-	else \
-	  mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	fi; \
-	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
-	[+exports+] \
-	echo Configuring in [+subdir+]/[+module+]; \
-	cd "[+subdir+]/[+module+]" || exit 1; \
+	$(BUILD_EXPORTS) \
+	echo Configuring in $(BUILD_SUBDIR)/[+module+]; \
+	cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo [+subdir+]/[+module+]/ | \
+	  *) topdir=`echo $(BUILD_SUBDIR)/[+module+]/ | \
 		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
 	esac; \
 	srcdiroption="--srcdir=$${topdir}/[+module+]"; \
 	libsrcdir="$$s/[+module+]"; \
-	[+ IF no-config-site +]rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file [+ ENDIF +]$(SHELL) $${libsrcdir}/configure \
-	  [+args+] $${srcdiroption} [+extra_configure_flags+] \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(BUILD_CONFIGARGS) $${srcdiroption} \
+	  --with-build-subdir="$(BUILD_SUBDIR)" [+extra_configure_flags+] \
 	  || exit 1
-@endif [+prefix+][+module+]
-
-[+ IF bootstrap +]
-[+ FOR bootstrap_stage +]
-.PHONY: configure-stage[+id+]-[+prefix+][+module+] maybe-configure-stage[+id+]-[+prefix+][+module+]
-maybe-configure-stage[+id+]-[+prefix+][+module+]:
-@if [+prefix+][+module+]-bootstrap
-maybe-configure-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
-configure-stage[+id+]-[+prefix+][+module+]:
-	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
-	@$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]
+@endif build-[+module+]
+
+.PHONY: all-build-[+module+] maybe-all-build-[+module+]
+maybe-all-build-[+module+]:
+@if build-[+module+]
+TARGET-build-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
+maybe-all-build-[+module+]: all-build-[+module+]
+all-build-[+module+]: configure-build-[+module+]
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	[+ IF check_multilibs
-	+]echo "Checking multilib configuration for [+module+]..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
-	if test -r [+subdir+]/[+module+]/multilib.out; then \
-	  if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
-	    rm -f [+subdir+]/[+module+]/multilib.tmp; \
-	  else \
-	    rm -f [+subdir+]/[+module+]/Makefile; \
-	    mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	  fi; \
-	else \
-	  mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	fi; \
-	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
-	[+exports+][+ IF prev +] \
-	[+poststage1_exports+][+ ENDIF prev +] \
-	echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
-	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
-	cd [+subdir+]/[+module+] || exit 1; \
+	$(BUILD_EXPORTS) \
+	(cd $(BUILD_SUBDIR)/[+module+] && \
+	  $(MAKE) [+extra_make_flags+] $(TARGET-build-[+module+]))
+@endif build-[+module+]
+[+ ENDFOR build_modules +]
+
+# --------------------------------------
+# Modules which run on the host machine
+# --------------------------------------
+[+ FOR host_modules +]
+.PHONY: configure-[+module+] maybe-configure-[+module+]
+maybe-configure-[+module+]:
+@if [+module+]
+maybe-configure-[+module+]: configure-[+module+]
+configure-[+module+]:
+	@[+ IF bootstrap +]test -f stage_last && exit 0; \
+	[+ ENDIF bootstrap +]test ! -f $(HOST_SUBDIR)/[+module+]/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/[+module+] ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	echo Configuring in [+module+]; \
+	cd $(HOST_SUBDIR)/[+module+] || exit 1; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo [+subdir+]/[+module+]/ | \
+	  *) topdir=`echo $(HOST_SUBDIR)/[+module+]/ | \
 		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
 	esac; \
 	srcdiroption="--srcdir=$${topdir}/[+module+]"; \
 	libsrcdir="$$s/[+module+]"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  [+args+] $${srcdiroption} \
-	  [+stage_configure_flags+] [+extra_configure_flags+]
-@endif [+prefix+][+module+]-bootstrap
-[+ ENDFOR bootstrap_stage +]
-[+ ENDIF bootstrap +]
-[+ ENDDEF +]
-
-[+ DEFINE all +]
-.PHONY: all-[+prefix+][+module+] maybe-all-[+prefix+][+module+]
-maybe-all-[+prefix+][+module+]:
-@if [+prefix+][+module+]
-TARGET-[+prefix+][+module+]=[+
-  IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
-maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+]
-all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +]
-@endif [+prefix+][+module+]
-@if [+prefix+][+module+]-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif [+prefix+][+module+]-bootstrap
-@if [+prefix+][+module+][+ ELSE bootstrap +]
-	@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	[+exports+] \
-	(cd [+subdir+]/[+module+] && \
-	  $(MAKE) [+args+] [+extra_make_flags+] $(TARGET-[+prefix+][+module+]))
-@endif [+prefix+][+module+]
-
-[+ IF bootstrap +]
-[+ FOR bootstrap_stage +]
-.PHONY: all-stage[+id+]-[+prefix+][+module+] maybe-all-stage[+id+]-[+prefix+][+module+]
-.PHONY: clean-stage[+id+]-[+prefix+][+module+] maybe-clean-stage[+id+]-[+prefix+][+module+]
-maybe-all-stage[+id+]-[+prefix+][+module+]:
-maybe-clean-stage[+id+]-[+prefix+][+module+]:
-@if [+prefix+][+module+]-bootstrap
-maybe-all-stage[+id+]-[+prefix+][+module+]: all-stage[+id+]-[+prefix+][+module+]
-all-stage[+id+]: all-stage[+id+]-[+prefix+][+module+]
-TARGET-stage[+id+]-[+prefix+][+module+] = $(TARGET-[+prefix+][+module+])
-all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
-	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	[+exports+][+ IF prev +] \
-	[+poststage1_exports+][+ ENDIF prev +] \
-	cd [+subdir+]/[+module+] && \
-	$(MAKE) [+args+] [+ IF prev
-		+][+poststage1_args+][+ ENDIF prev
-		+] [+stage_make_flags+] [+extra_make_flags+] \
-		$(TARGET-stage[+id+]-[+prefix+][+module+])
-
-maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+]
-clean-stage[+id+]: clean-stage[+id+]-[+prefix+][+module+]
-clean-stage[+id+]-[+prefix+][+module+]:
-	@[ -f [+subdir+]/[+module+]/Makefile ] || [ -f [+subdir+]/stage[+id+]-[+module+]/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start; \
-	cd [+subdir+]/[+module+] && \
-	$(MAKE) [+args+] [+ IF prev +] \
-		[+poststage1_args+] [+ ENDIF prev +] \
-		[+stage_make_flags+] [+extra_make_flags+] clean
-@endif [+prefix+][+module+]-bootstrap
-
-[+ ENDFOR bootstrap_stage +]
-[+ ENDIF bootstrap +]
-[+ ENDDEF +]
-
-# --------------------------------------
-# Modules which run on the build machine
-# --------------------------------------
-[+ FOR build_modules +]
-[+ configure prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
-	     args="$(BUILD_CONFIGARGS)" no-config-site=true +]
-
-[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +]
-[+ ENDFOR build_module +]
-
-# --------------------------------------
-# Modules which run on the host machine
-# --------------------------------------
-[+ FOR host_modules +]
-[+ configure prefix="" subdir="$(HOST_SUBDIR)"
-	     exports="$(HOST_EXPORTS)"
-	     poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
-	     args="$(HOST_CONFIGARGS)" +]
+	  $(HOST_CONFIGARGS) $${srcdiroption} [+extra_configure_flags+] \
+	  || exit 1
+@endif [+module+]
 
-[+ all prefix="" subdir="$(HOST_SUBDIR)"
-       exports="$(HOST_EXPORTS)"
-       poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
-       args="$(FLAGS_TO_PASS)"
-       poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +]
+.PHONY: all-[+module+] maybe-all-[+module+]
+maybe-all-[+module+]:
+@if [+module+]
+TARGET-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
+maybe-all-[+module+]: all-[+module+]
+all-[+module+]: configure-[+module+]
+	@[+ IF bootstrap +]test -f stage_last && exit 0; \
+	[+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	(cd $(HOST_SUBDIR)/[+module+] && \
+	  $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] $(TARGET-[+module+]))
+@endif [+module+]
 
 .PHONY: check-[+module+] maybe-check-[+module+]
 maybe-check-[+module+]:
@@ -896,7 +914,6 @@ check-[+module+]:
 [+ ELIF no_check_cross +]
 # This module is only tested in a native toolchain.
 check-[+module+]:
-	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -906,7 +923,6 @@ check-[+module+]:
 	fi
 [+ ELSE check +]
 check-[+module+]:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -923,7 +939,6 @@ maybe-install-[+module+]: install-[+module+]
 install-[+module+]:
 [+ ELSE install +]
 install-[+module+]: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -946,8 +961,7 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
   FOR depend +]\
     [+depend+]-[+module+] [+
   ENDFOR depend +]
-	@[+ IF bootstrap +][+ ELSE +]: $(MAKE); $(unstage)
-	@[+ ENDIF bootstrap +][ -f ./[+module+]/Makefile ] || exit 0; \
+	@[ -f ./[+module+]/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -971,26 +985,63 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
 # Modules which run on the target machine
 # ---------------------------------------
 [+ FOR target_modules +]
+.PHONY: configure-target-[+module+] maybe-configure-target-[+module+]
+maybe-configure-target-[+module+]:
+@if target-[+module+]
+maybe-configure-target-[+module+]: configure-target-[+module+]
 
-[+ IF raw_cxx +]
-[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
-	     check_multilibs=true
-	     exports="$(RAW_CXX_TARGET_EXPORTS)"
-	     args="$(TARGET_CONFIGARGS)" no-config-site=true +]
+# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
+$(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \
+	rm -f $(TARGET_SUBDIR)/[+module+]/Makefile || : ; \
+	cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out
 
-[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-       exports="$(RAW_CXX_TARGET_EXPORTS)"
-       args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
-[+ ELSE +]
-[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
-	     check_multilibs=true
-	     exports="$(NORMAL_TARGET_EXPORTS)"
-	     args="$(TARGET_CONFIGARGS)" no-config-site=true +]
-
-[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-       exports="$(NORMAL_TARGET_EXPORTS)"
-       args="$(TARGET_FLAGS_TO_PASS)" +]
-[+ ENDIF +]
+configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out
+	@test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
+IF raw_cxx +]
+	$(RAW_CXX_TARGET_EXPORTS) \[+
+ELSE normal_cxx +]
+	$(NORMAL_TARGET_EXPORTS) \[+
+ENDIF raw_cxx +]
+	echo Configuring in $(TARGET_SUBDIR)/[+module+]; \
+	cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/[+module+]/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/[+module+]"; \
+	libsrcdir="$$s/[+module+]"; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	  $(TARGET_CONFIGARGS) $${srcdiroption} \
+	  --with-target-subdir="$(TARGET_SUBDIR)" [+extra_configure_flags+] \
+	  || exit 1
+@endif target-[+module+]
+
+.PHONY: all-target-[+module+] maybe-all-target-[+module+]
+maybe-all-target-[+module+]:
+@if target-[+module+]
+TARGET-target-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
+maybe-all-target-[+module+]: all-target-[+module+]
+all-target-[+module+]: configure-target-[+module+]
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
+IF raw_cxx +]
+	$(RAW_CXX_TARGET_EXPORTS) \[+
+ELSE normal_cxx +]
+	$(NORMAL_TARGET_EXPORTS) \[+
+ENDIF raw_cxx +]
+	(cd $(TARGET_SUBDIR)/[+module+] && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
+	    IF raw_cxx 
+	  +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
+	    ENDIF raw_cxx 
+	  +] [+extra_make_flags+] $(TARGET-target-[+module+]))
+@endif target-[+module+]
 
 .PHONY: check-target-[+module+] maybe-check-target-[+module+]
 maybe-check-target-[+module+]:
@@ -1001,7 +1052,6 @@ maybe-check-target-[+module+]: check-target-[+module+]
 check-target-[+module+]:
 [+ ELSE check +]
 check-target-[+module+]:
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
 IF raw_cxx +]
@@ -1027,7 +1077,6 @@ maybe-install-target-[+module+]: install-target-[+module+]
 install-target-[+module+]:
 [+ ELSE install +]
 install-target-[+module+]: installdirs
-	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
 IF raw_cxx +]
@@ -1054,7 +1103,6 @@ maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+]
   FOR depend +]\
     [+depend+]-target-[+module+] [+
   ENDFOR depend +]
-	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
@@ -1196,42 +1244,42 @@ gcc-no-fixedincludes:
 # stage_last instead tracks the stage that was built last.  These targets
 # are dummy when toplevel bootstrap is not active.
 
-# While making host and target tools, symlinks to the final stage must be
-# there, so $(unstage) should be run at various points.  To avoid excessive
-# recursive invocations of make, we "inline" them using a variable.  These
-# must be referenced as ": $(MAKE) ; $(unstage)" rather than "$(unstage)"
-# to avoid warnings from the GNU Make job server.
-
-unstage = :
-stage = :
-current_stage = ""
-
+.PHONY: unstage
+unstage:
 @if gcc-bootstrap
-unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
-stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
-current_stage = "`cat stage_current 2> /dev/null`"
+	@[ -f stage_current ] || $(MAKE) `cat stage_last`-start
 @endif gcc-bootstrap
 
-.PHONY: unstage stage
-unstage:
-	@: $(MAKE); $(unstage)
+.PHONY: stage
 stage:
-	@: $(MAKE); $(stage)
-
-# Disable commands for lean bootstrap.
-LEAN = false
+@if gcc-bootstrap
+	@$(MAKE) `cat stage_current`-end
+@endif gcc-bootstrap
 
 # We name the build directories for the various stages "stage1-gcc",
 # "stage2-gcc","stage3-gcc", etc.
 
 # Since the 'compare' process will fail (on debugging information) if any
 # directory names are different, we need to link the gcc directory for
-# the previous stage to a constant name ('prev-gcc'), and to make the name of
+# the previous stage to a constant name ('gcc-prev'), and to make the name of
 # the build directories constant as well. For the latter, we use naked names
 # like 'gcc', because the scripts in that directory assume it.  We use
 # mv on platforms where symlinks to directories do not work or are not
 # reliable.
 
+# At the end of the bootstrap, a symlink to 'stage3-gcc' named 'gcc' must
+# be kept, so that libraries can find it.  Ick!
+
+# It would be best to preinstall gcc into a staging area (and in the
+# future, gather there all prebootstrap packages).  This would allow
+# assemblers and linkers can be bootstrapped as well as the compiler
+# (both in a combined tree, or separately).  This however requires some
+# change to the gcc driver, again in order to avoid comparison failures.
+
+# Bugs: This is crippled when doing parallel make, the `make all-host'
+# and `make all-target' phases can be parallelized.
+
+
 # 'touch' doesn't work right on some platforms.
 STAMP = echo timestamp > 
 
@@ -1250,10 +1298,8 @@ objext = .o
 # Flags to pass to stage2 and later makes.
 POSTSTAGE1_FLAGS_TO_PASS = \
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
-	STAGE_PREFIX=$$r/prev-gcc/ \
+	STAGE_PREFIX=$$r/stage[+prev+]-gcc/ \
 	CFLAGS="$(BOOT_CFLAGS)" \
-	LIBCFLAGS="$(BOOT_CFLAGS)" \
-	LDFLAGS="$(BOOT_LDFLAGS)" \
 	ADAC="\$$(CC)"
 
 # For stage 1:
@@ -1269,129 +1315,150 @@ POSTSTAGE1_FLAGS_TO_PASS = \
 .PHONY: stage[+id+]-start stage[+id+]-end
 
 stage[+id+]-start::
-	@: $(MAKE); $(stage); \
+	@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
 	echo stage[+id+] > stage_current ; \
 	echo stage[+id+] > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)[+
+	$(mkinstalldirs) $(HOST_SUBDIR)[+
    FOR host_modules +][+ IF bootstrap +]
 @if [+ module +]
 	@cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \
 	  mkdir stage[+id+]-[+module+]; \
-	mv stage[+id+]-[+module+] [+module+] [+ IF prev +] ; \
-	mv stage[+prev+]-[+module+] prev-[+module+] || test -f stage[+prev+]-lean [+ ENDIF prev +]
+	set stage[+id+]-[+module+] [+module+] ; \
+	@CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
+	set stage[+prev+]-[+module+] prev-[+module+] ; \
+	@CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
 @endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
-	@[ -d stage[+id+]-$(TARGET_SUBDIR) ] || \
-	  mkdir stage[+id+]-$(TARGET_SUBDIR); \
-	mv stage[+id+]-$(TARGET_SUBDIR) $(TARGET_SUBDIR) [+ IF prev +] ; \
-	mv stage[+prev+]-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage[+prev+]-lean [+ ENDIF prev +]
 
-stage[+id+]-end:: [+ FOR host_modules +][+ IF bootstrap +]
+stage[+id+]-end::
+	@rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +]
 @if [+ module +]
-	@if test -d $(HOST_SUBDIR)/[+module+] ; then \
-	  cd $(HOST_SUBDIR); mv [+module+] stage[+id+]-[+module+] [+ IF prev +]; \
-	  mv prev-[+module+] stage[+prev+]-[+module+] ; : [+ ENDIF prev +] ; \
-	fi
+	@cd $(HOST_SUBDIR); set [+module+] stage[+id+]-[+module+] ; \
+	@UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
+	set prev-[+module+] stage[+prev+]-[+module+] ; \
+	@UNDO_LINK_TO_DIR@ [+ ENDIF prev +]
 @endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR) [+ IF prev +] ; \
-	  mv prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR) ; : [+ ENDIF prev +] ; \
-	fi
-	rm -f stage_current
 
-# Bubble a bugfix through all the stages up to stage [+id+].  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
+# Bubble a bugfix through all the stages up to stage [+id+].  They
+# are remade, but not reconfigured.  The next stage (if any) will not
+# be reconfigured as well.
 .PHONY: stage[+id+]-bubble
-stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage[+id+]-lean [+
+stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +][+IF lean +]
+	@bootstrap_lean@-rm -rf stage[+lean+]-* ; $(STAMP) stage[+lean+]-lean[+ ENDIF lean +]
+	@if test -f stage[+id+]-lean [+
 	  IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \
 	  echo Skipping rebuild of stage[+id+] ; \
 	else \
-	  $(MAKE) stage[+id+]-start; \[+IF lean +]
-	  if $(LEAN); then \
-	    rm -rf stage[+lean+]-* ; \
-	    $(STAMP) stage[+lean+]-lean ; \
-	  fi; \[+ ENDIF lean +]
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
-	fi[+ IF compare-target +]
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+compare-target+][+ ENDIF compare-target +]
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage[+id+]; \
+	fi
 
 .PHONY: all-stage[+id+] clean-stage[+id+]
+all-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\
+  maybe-all-stage[+id+]-[+module+][+
+ENDIF bootstrap+] [+ ENDFOR host_modules +]
+
 do-clean: clean-stage[+id+]
+clean-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\
+  maybe-clean-stage[+id+]-[+module+][+
+ENDIF bootstrap+] [+ ENDFOR host_modules +]
+
+[+ FOR host_modules +][+ IF bootstrap +]
+.PHONY: configure-stage[+id+]-[+module+] maybe-configure-stage[+id+]-[+module+]
+.PHONY: all-stage[+id+]-[+module+] maybe-all-stage[+id+]-[+module+]
+.PHONY: clean-stage[+id+]-[+module+] maybe-clean-stage[+id+]-[+module+]
+
+maybe-configure-stage[+id+]-[+module+]:
+maybe-all-stage[+id+]-[+module+]:
+maybe-clean-stage[+id+]-[+module+]:
+
+@if [+module+]-bootstrap
+maybe-configure-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
+configure-stage[+id+]-[+module+]:
+	@$(MAKE) stage[+id+]-start
+	@[ -f [+module+]/Makefile ] && exit 0 || : ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
+	$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
+	$(HOST_EXPORTS) [+ ENDIF prev +] \
+	echo Configuring stage [+id+] in [+module+] ; \
+	cd $(HOST_SUBDIR)/[+module+] || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(HOST_SUBDIR)/[+module+]/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	srcdiroption="--srcdir=$${topdir}/[+module+]"; \
+	libsrcdir="$$s/[+module+]"; \
+	$(SHELL) $${libsrcdir}/configure \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  [+stage_configure_flags+] [+extra_configure_flags+]
+
+maybe-all-stage[+id+]-[+module+]: all-stage[+id+]-[+module+]
+all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
+	@$(MAKE) stage[+id+]-start
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
+	$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
+	$(HOST_EXPORTS) [+ ENDIF prev +] \
+	cd $(HOST_SUBDIR)/[+module+] && \
+	$(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \
+		$(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \
+		[+stage_make_flags+] [+extra_make_flags+]
+
+maybe-clean-stage[+id+]-[+module+]: clean-stage[+id+]-[+module+]
+clean-stage[+id+]-[+module+]:
+	@[ -f [+module+]/Makefile ] || [ -f stage[+id+]-[+module+]/Makefile ] \
+	  || exit 0 ; \
+	[ -f [+module+]/Makefile ] || $(MAKE) stage[+id+]-start ; \
+	cd $(HOST_SUBDIR)/[+module+] && \
+	$(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \
+		$(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \
+		[+stage_make_flags+] [+extra_make_flags+] clean
+@endif [+module+]-bootstrap
+
+[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
 
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
 [+ IF compare-target +]
 [+compare-target+]:
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage[+prev+]-lean; then \
+	@if test -f stage[+prev+]-lean; then \
 	  echo Cannot compare object files as stage [+prev+] was deleted. ; \
 	  exit 0 ; \
 	fi; \
-	: $(MAKE); $(stage); \
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	rm -f .bad_compare ; \
-	echo Comparing stages [+prev+] and [+id+] ; \
 	cd stage[+id+]-gcc; \
 	files=`find . -name "*$(objext)" -print` ; \
 	cd .. ; \
 	for file in $${files} ; do \
 	  f1=$$r/stage[+prev+]-gcc/$$file; f2=$$r/stage[+id+]-gcc/$$file; \
 	  @do_compare@ > /dev/null 2>&1; \
-	  if test $$? -eq 1; then \
-	    case $$file in \
-	      ./cc*-checksum$(objext) | ./libgcc/* ) \
-	        echo warning: $$file differs ;; \
-	      *) \
-	        echo $$file differs >> .bad_compare ;; \
-	    esac ; \
-	  fi ; \
+	  test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
 	done ; \
 	if [ -f .bad_compare ]; then \
 	  echo "Bootstrap comparison failure!"; \
 	  cat .bad_compare; \
 	  exit 1; \
 	else \
-	  echo Comparison successful.; \
+	  true; \
 	fi ; \
 	$(STAMP) [+compare-target+][+ IF prev +]
-	if $(LEAN); then \
-	  rm -rf stage[+prev+]-*; \
-	  $(STAMP) stage[+prev+]-lean; \
-	fi[+ ENDIF prev +]
+	@bootstrap_lean@-rm -rf stage[+prev+]-* ; $(STAMP) stage[+prev+]-lean[+ ENDIF prev +]
 [+ ENDIF compare-target +]
 
 [+ IF bootstrap-target +]
-.PHONY: [+bootstrap-target+] [+bootstrap-target+]-lean
-[+bootstrap-target+]:
-	echo stage[+id+] > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage[+id+]-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-[+bootstrap-target+]-lean:
-	echo stage[+id+] > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage[+id+]-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
+.PHONY: [+bootstrap-target+]
+[+bootstrap-target+]: stage[+id+]-bubble [+compare-target+] all
 [+ ENDIF bootstrap-target +]
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
 [+ IF prev +]distclean-stage[+prev+]:: distclean-stage[+id+] [+ ENDIF prev +]
 .PHONY: distclean-stage[+id+]
 distclean-stage[+id+]::
-	@: $(MAKE); $(stage)
+	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stage[+id+]-* [+
 	  IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
 
@@ -1403,54 +1470,47 @@ distclean-stage[+id+]::
 
 [+ ENDFOR bootstrap-stage +]
 
-stageprofile-end::
-	$(MAKE) distclean-stagefeedback
-
 stagefeedback-start::
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	for i in prev-*; do \
-	  j=`echo $$i | sed s/^prev-//` ; \
-	  cd $$r/$$i && \
-	  { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \
-	  { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \
-	done
+	cd stageprofile-gcc && \
+	  { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \
+	  { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); }
 
+# FIXME: Will not need to be conditional when toplevel bootstrap is the
+# only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
-do-distclean: distclean-stage1
-
-# Provide a GCC build when we're building target libraries.  This does
-# not work as a dependency, just as the minimum necessary to avoid errors.
-stage_last:
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
+profiledbootstrap:
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	echo "Bootstrapping the compiler"; \
+	$(MAKE) stageprofile-bubble distclean-stagefeedback
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+	echo "Building runtime libraries and training compiler"; \
+	$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	echo "Building feedback based compiler"; \
+	$(MAKE) stagefeedback-bubble stagefeedback-end
 @endif gcc-bootstrap
 
-.PHONY: restrap
-restrap:
-	@: $(MAKE); $(stage)
-	rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev
-	  +]stage[+id+] [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+@if gcc-bootstrap
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
+do-distclean: distclean-stage1
+@endif gcc-bootstrap
 
 # --------------------------------------
 # Dependencies between different modules
 # --------------------------------------
 
 # Generic dependencies for target modules on host stuff, especially gcc
-@if gcc-bootstrap[+ FOR target_modules +][+ IF bootstrap
-  +][+ FOR bootstrap_stage +]
-configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-gcc[+
-  ENDFOR +][+ ELSE bootstrap +]
-configure-target-[+module+]: stage_last[+
-  ENDIF bootstrap +][+ ENDFOR target_modules +]
-@endif gcc-bootstrap
-
-@if gcc-no-bootstrap[+ FOR target_modules +][+ IF bootstrap
-  +][+ ELSE +]
-configure-target-[+module+]: maybe-all-gcc[+
-  ENDIF bootstrap +][+ ENDFOR target_modules +]
-@endif gcc-no-bootstrap
-
+[+ FOR target_modules +]
+configure-target-[+module+]: maybe-all-gcc
+[+ ENDFOR target_modules +]
 
 [+ FOR lang_env_dependencies +]
 configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
@@ -1516,6 +1576,7 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
 	  "prebootstrap"
 
 	  (if (or (= (dep-subtarget "on") "install-")
+		  (=* (dep-module "on") "target-")
 		  (not (hash-ref boot-modules (dep-module "module")))
 		  (not (hash-ref boot-modules (dep-module "on"))))
               "normal"
@@ -1529,10 +1590,6 @@ configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
    (if (exist? "bootstrap")
        (hash-create-handle! boot-modules (get "module") #t))
    "" +][+ ENDFOR host_modules +]
-[+ FOR target_modules +][+
-   (if (exist? "bootstrap")
-       (hash-create-handle! boot-modules (string-append "target-" (get "module")) #t))
-   "" +][+ ENDFOR target_modules +]
 
 # With all the machinery above in place, it is pretty easy to generate
 # dependencies.  Host dependencies are a bit more complex because we have
@@ -1564,12 +1621,8 @@ all-prebootstrap: maybe-all-[+module+][+
 ENDFOR host_modules +]
 @endif gcc-no-bootstrap
 
-CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
 GDB_TK = @GDB_TK@
-INSTALL_GDB_TK = @INSTALL_GDB_TK@
-configure-gdb: $(CONFIGURE_GDB_TK)
 all-gdb: $(gdbnlmrequirements) $(GDB_TK)
-install-gdb: $(INSTALL_GDB_TK)
 
 # Serialization dependencies.  Host configures don't work well in parallel to
 # each other, due to contention over config.cache.  Target configures and 
@@ -1580,6 +1633,17 @@ install-gdb: $(INSTALL_GDB_TK)
 # Regenerating top level configury
 # --------------------------------
 
+# Multilib.out tells target dirs what multilibs they should build.
+# There is really only one copy.  We use the 'timestamp' method to
+# work around various timestamp bugs on some systems.
+# We use move-if-change so that it's only considered updated when it
+# actually changes, because it has to depend on a phony target.
+multilib.out: maybe-all-gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	echo "Checking multilib configuration..."; \
+	$(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
+	$(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
+
 # Rebuilding Makefile.in, using autogen.
 AUTOGEN = autogen
 $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
diff --git a/config-ml.in b/config-ml.in
index 937273173..253e8dd04 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/config.guess b/config.guess
index 17690aea3..822947132 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2006-01-02'
+timestamp='2004-11-12'
 
 # 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
@@ -17,15 +17,13 @@ timestamp='2006-01-02'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -55,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -68,11 +66,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -125,7 +123,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -198,23 +196,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit ;;
+	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -267,43 +297,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit ;;
+	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit ;;
+	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit ;;
+	exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
+	exit 0 ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit ;;
+	exit 0 ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit ;;
+	exit 0 ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit ;;
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	exit 0;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -311,32 +338,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit ;;
+	exit 0 ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit ;;
+	exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -345,10 +372,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
+	exit 0 ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -360,10 +387,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit ;;
+	exit 0 ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -374,40 +401,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit ;;
+	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -431,33 +458,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD -o $dummy $dummy.c \
+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit ;;
+	exit 0 ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit ;;
+	exit 0 ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit ;;
+	exit 0 ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit ;;
+	exit 0 ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -473,29 +499,29 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+ 	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit ;;
+	exit 0 ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit ;;
+	exit 0 ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit ;;
+	exit 0 ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	exit 0 ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit ;;
+	exit 0 ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -503,7 +529,7 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -518,18 +544,14 @@ EOF
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	exit 0 ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -543,28 +565,28 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit ;;
+	exit 0 ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit ;;
+	exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit ;;
+	exit 0 ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit ;;
+	exit 0 ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit ;;
+	exit 0 ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit ;;
+	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -626,19 +648,9 @@ EOF
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+	    # avoid double evaluation of $set_cc_for_build
+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -646,11 +658,11 @@ EOF
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -678,171 +690,158 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
-	exit ;;
+	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit ;;
+	exit 0 ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit ;;
+	exit 0 ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit ;;
+	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit ;;
+	exit 0 ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit ;;
+	exit 0 ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit ;;
+	exit 0 ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit ;;
+	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+        exit 0 ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
+	exit 0 ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	exit 0 ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    x86:Interix*:[345]*)
+	exit 0 ;;
+    x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
+	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
+	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit ;;
+	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
+	exit 0 ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
+	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit ;;
+	exit 0 ;;
     crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
-	exit ;;
+	exit 0 ;;
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -859,8 +858,8 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -878,18 +877,15 @@ EOF
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -903,7 +899,7 @@ EOF
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
+	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -911,28 +907,25 @@ EOF
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit ;;
+	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
+	exit 0 ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
+	exit 0 ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -950,15 +943,15 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
+		exit 0 ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
+		exit 0 ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
+		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -975,7 +968,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI)
+	#ifdef __INTEL_COMPILER
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -985,19 +978,16 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit ;;
+	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -1005,27 +995,27 @@ EOF
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
+	exit 0 ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
+	exit 0 ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
+	exit 0 ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
+	exit 0 ;;
+	i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
+	exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1033,16 +1023,15 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	exit 0 ;;
+    i*86:*:5:[78]*)
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
+	exit 0 ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1060,73 +1049,73 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit ;;
+	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit ;;
+        exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit ;;
+	exit 0 ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit ;;
+	exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit ;;
+	exit 0 ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit ;;
+	exit 0 ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit ;;
+	exit 0 ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit ;;
+	exit 0 ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit ;;
+	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1134,72 +1123,69 @@ EOF
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit ;;
+	exit 0 ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit ;;
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit ;;
+	exit 0 ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	exit 0 ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit ;;
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit ;;
+	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit ;;
+	exit 0 ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit ;;
+	exit 0 ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit ;;
+	exit 0 ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1207,25 +1193,22 @@ EOF
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit ;;
+	exit 0 ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit ;;
+	exit 0 ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1236,47 +1219,41 @@ EOF
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
+	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit ;;
+	exit 0 ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit ;;
+	exit 0 ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit ;;
+	exit 0 ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit ;;
+	exit 0 ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit ;;
+	exit 0 ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit ;;
+	exit 0 ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
+	exit 0 ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
 	esac ;;
     *:XENIX:*:SysV)
 	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1308,7 +1285,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1397,12 +1374,11 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1411,22 +1387,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit ;;
+	exit 0 ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     c34*)
 	echo c34-convex-bsd
-	exit ;;
+	exit 0 ;;
     c38*)
 	echo c38-convex-bsd
-	exit ;;
+	exit 0 ;;
     c4*)
 	echo c4-convex-bsd
-	exit ;;
+	exit 0 ;;
     esac
 fi
 
@@ -1437,9 +1413,7 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+    ftp://ftp.gnu.org/pub/gnu/config/
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/config.sub b/config.sub
index a4e8a94a3..987b17d81 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2006-01-02'
+timestamp='2004-11-30'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,15 +21,14 @@ timestamp='2006-01-02'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -71,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -84,11 +83,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -100,7 +99,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
        break ;;
@@ -119,9 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -172,10 +170,6 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -192,10 +186,6 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -241,14 +231,13 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -257,7 +246,6 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -266,17 +254,15 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| mt \
 	| msp430 \
 	| ns16k | ns32k \
-	| or32 \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
@@ -285,9 +271,6 @@ case $basic_machine in
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -295,9 +278,6 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -318,7 +298,7 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bfin-* | bs2000-* \
+	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -339,7 +319,6 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -348,7 +327,6 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| mt-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -356,10 +334,9 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -371,8 +348,6 @@ case $basic_machine in
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -708,9 +683,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -786,8 +758,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	openrisc | openrisc-*)
+	or32 | or32-*)
 		basic_machine=or32-unknown
+		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -818,12 +791,6 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -880,10 +847,6 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -1123,9 +1086,12 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1199,23 +1165,20 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1233,7 +1196,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1422,9 +1385,6 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1596,7 +1556,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/config/ChangeLog b/config/ChangeLog
index 1ddcfd416..4a6f3c380 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,84 +1,6 @@
-2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
-            Andreas Schwab  <schwab@suse.de>
-
-        * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Use correct program name.
-	(ACX_CHECK_INSTALLED_TARGET_TOOL): Likewise, and always set $1.
-
-2006-01-26  Paolo Bonzini  <bonzini@gnu.org>
-
-	* acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Test $with_build_time_tools.
-	(ACX_PATH_SEP): New.
-	(ACX_TOOL_DIRS): Move here from the gcc directory.
-	(ACX_CHECK_INSTALLED_TARGET_TOOL): New.
-	(GCC_TARGET_TOOL): Do not use a host tool if we found a target tool
-	with a complete path in either $with_build_time_tools or $exec_prefix.
-
-2006-01-02  Paolo Bonzini  <bonzini@gnu.org>
-
-        PR target/25259
-        * stdint.m4: New.
-
-2005-12-20  Paolo Bonzini  <bonzini@gnu.org>
-
-        Revert Ada-related part of the previous change.
-
-        * mt-ppc-aix: Delete.
-
-2005-12-19  Paolo Bonzini  <bonzini@gnu.org>
-        
-        * mt-ppc-aix, mh-ppc-aix: New.
-        
-2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	* acx.m4 (GCC_TARGET_TOOL): New.
-
-2005-09-23  Tom Tromey  <tromey@redhat.com>
-
-	* enable.m4: New file.
-	* tls.m4: New file.
-
-2005-08-12  Paolo Bonzini  <bonzini@gnu.org>
-
-	* config/acx.m4 (NCN_CHECK_TARGET_TOOL, NCN_STRICT_CHECK_TOOL,
-	NCN_STRICT_CHECK_TARGET_TOOL): Remove.
-	(NCN_STRICT_CHECK_TOOLS, NCN_STRICT_CHECK_TARGET_TOOLS): New,
-	based on the deleted macros.
-
-2005-07-27  Mark Mitchell  <mark@codesourcery.com>
-
-	* mt-gnu (CXXFLAGS): Include SYSROOT_CFLAGS_FOR_TARGET.
-
-2005-07-16  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* all files: Update FSF address.
-
-2005-06-14  Tom Tromey  <tromey@redhat.com>
-
-	PR libgcj/19877:
-	* no-executables.m4: Call real AC_FUNC_MMAP when cache variable
-	is set but not 'no'.
-
-2005-06-13  Zack Weinberg  <zack@codesourcery.com>
-
-	* depstand.m4, lead-dot.m4: New files.
-
-2005-05-19  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* accross.m4: Delete file.
-
-2005-05-12  Ryota Kunisawa  <kunisawa@access.co.jp>
-
-	PR bootstrap/21230
-	* warnings.m4 (ACX_PROG_CC_WARNING_ALMOST_PEDANTIC): Add
-	double quotes around GCC variable.
-
-2005-04-29  Paolo Bonzini  <bonzini@gnu.org>
-
-	* acx.m4 (ACX_PROG_GNAT): Remove stray break.
-
 2005-03-31  Paolo Bonzini  <bonzini@gnu.org>
 
-	* gcc-lib-path.m4: Remove.
+	* config/gcc-lib-path.m4: Remove.
 
 2005-03-21  Zack Weinberg  <zack@codesourcery.com>
 
diff --git a/config/accross.m4 b/config/accross.m4
new file mode 100644
index 000000000..535a6f5c0
--- /dev/null
+++ b/config/accross.m4
@@ -0,0 +1,98 @@
+AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
+[changequote(<<, >>)dnl
+dnl The name to #define.
+define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
+dnl The cache variable name.
+define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
+changequote([, ])dnl
+AC_MSG_CHECKING(size of $1)
+AC_CACHE_VAL(AC_CV_NAME,
+[for ac_size in 4 8 1 2 16 12 $2 ; do # List sizes in rough order of prevalence.
+  AC_TRY_COMPILE([#include "confdefs.h"
+#include <sys/types.h>
+$2
+], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size)
+  if test x$AC_CV_NAME != x ; then break; fi
+done
+])
+if test x$AC_CV_NAME = x ; then
+  AC_MSG_ERROR([cannot determine a size for $1])
+fi
+AC_MSG_RESULT($AC_CV_NAME)
+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
+undefine([AC_TYPE_NAME])dnl
+undefine([AC_CV_NAME])dnl
+])
+
+AC_DEFUN([AC_C_BIGENDIAN_CROSS],
+[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
+[ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/param.h>], [
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/param.h>], [
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
+if test $ac_cv_c_bigendian = unknown; then
+AC_TRY_RUN([main () {
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}], ac_cv_c_bigendian=no, ac_cv_c_bigendian=yes,
+[ echo $ac_n "cross-compiling... " 2>&AC_FD_MSG ])
+fi])
+if test $ac_cv_c_bigendian = unknown; then
+AC_MSG_CHECKING(to probe for byte ordering)
+[
+cat >conftest.c <<EOF
+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+void _ascii() { char* s = (char*) ascii_mm; s = (char*) ascii_ii; }
+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+void _ebcdic() { char* s = (char*) ebcdic_mm; s = (char*) ebcdic_ii; }
+int main() { _ascii (); _ebcdic (); return 0; }
+EOF
+] if test -f conftest.c ; then
+     if ${CC-cc} ${CFLAGS} -c conftest.c -o conftest.o && test -f conftest.o ; then
+        if test `grep -l BIGenDianSyS conftest.o` ; then
+           echo $ac_n ' big endian probe OK, ' 1>&AC_FD_MSG
+           ac_cv_c_bigendian=yes
+        fi
+        if test `grep -l LiTTleEnDian conftest.o` ; then
+           echo $ac_n ' little endian probe OK, ' 1>&AC_FD_MSG
+           if test $ac_cv_c_bigendian = yes ; then
+            ac_cv_c_bigendian=unknown;
+           else
+            ac_cv_c_bigendian=no
+           fi
+        fi
+        echo $ac_n 'guessing bigendian ...  ' >&AC_FD_MSG
+     fi
+  fi
+AC_MSG_RESULT($ac_cv_c_bigendian)
+fi
+if test $ac_cv_c_bigendian = yes; then
+  AC_DEFINE(WORDS_BIGENDIAN, 1, [whether byteorder is bigendian])
+  AC_DEFINE(HOST_WORDS_BIG_ENDIAN, 1,
+  [Define if the host machine stores words of multi-word integers in
+   big-endian order.])
+  BYTEORDER=4321
+else
+  BYTEORDER=1234
+fi
+AC_DEFINE_UNQUOTED(BYTEORDER, $BYTEORDER, [1234 = LIL_ENDIAN, 4321 = BIGENDIAN])
+if test $ac_cv_c_bigendian = unknown; then
+  AC_MSG_ERROR([unknown endianess - sorry, please pre-set ac_cv_c_bigendian])
+fi
+])
diff --git a/config/acx.m4 b/config/acx.m4
index 7c4c21386..6d3e6d5d5 100644
--- a/config/acx.m4
+++ b/config/acx.m4
@@ -103,197 +103,72 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
 ]) []dnl # _NCN_TOOL_PREFIXES
 
 ####
-# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
-# Like plain AC_CHECK_TOOLS, but require prefix if build!=host.
+# NCN_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
+# Like AC_CHECK_TOOL, but tries a prefix of the target, not the host.
+# Code is pretty much lifted from autoconf2.53.
 
-AC_DEFUN([NCN_STRICT_CHECK_TOOLS],
+AC_DEFUN([NCN_CHECK_TARGET_TOOL],
 [AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
-for ncn_progname in $2; do
-  if test -n "$ncn_tool_prefix"; then
-    AC_CHECK_PROG([$1], [${ncn_tool_prefix}${ncn_progname}], 
-                  [${ncn_tool_prefix}${ncn_progname}], , [$4])
-  fi
-  if test -z "$ac_cv_prog_$1" && test $build = $host ; then
-    AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) 
-  fi
-  test -n "$ac_cv_prog_$1" && break
-done
-
+if test -n "$ncn_target_tool_prefix"; then
+  AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}$2], 
+                [${ncn_target_tool_prefix}$2], , [$4])
+fi
 if test -z "$ac_cv_prog_$1" ; then
-  ifelse([$3],[], [set dummy $2
-  if test $build = $host ; then
-    $1="[$]2"
-  else
-    $1="${ncn_tool_prefix}[$]2"
-  fi], [$1="$3"])
+  ncn_cv_$1=$$1
+  AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [$3], [$4])
+  $1=$ncn_cv_$1
+else
+  $1="$ac_cv_prog_$1"
 fi
-]) []dnl # NCN_STRICT_CHECK_TOOLS
+]) []dnl # NCN_CHECK_TARGET_TOOL
+
 
 ####
-# NCN_STRICT_CHECK_TARGET_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
-# Like CVS Autoconf AC_CHECK_TARGET_TOOLS, but require prefix if build!=target.
+# NCN_STRICT_CHECK_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
+# Like AC_CHECK_TOOL, but requires the prefix if build!=host.
 
-AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS],
+AC_DEFUN([NCN_STRICT_CHECK_TOOL],
 [AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
-if test -n "$with_build_time_tools"; then
-  for ncn_progname in $2; do
-    AC_MSG_CHECKING([for ${ncn_progname} in $with_build_time_tools])
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_$1=$with_build_time_tools/${ncn_progname}
-      AC_MSG_RESULT(yes)
-      break
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_$1"; then
-  for ncn_progname in $2; do
-    if test -n "$ncn_target_tool_prefix"; then
-      AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}], 
-                    [${ncn_target_tool_prefix}${ncn_progname}], , [$4])
-    fi
-    if test -z "$ac_cv_prog_$1" && test $build = $target ; then
-      AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) 
-    fi
-    test -n "$ac_cv_prog_$1" && break
-  done
+if test -n "$ncn_tool_prefix"; then
+  AC_CHECK_PROG([$1], [${ncn_tool_prefix}$2], 
+                [${ncn_tool_prefix}$2], , [$4])
 fi
-  
 if test -z "$ac_cv_prog_$1" ; then
-  ifelse([$3],[], [set dummy $2
-  if test $build = $target ; then
-    $1="[$]2"
-  else
-    $1="${ncn_target_tool_prefix}[$]2"
-  fi], [$1="$3"])
-fi
-]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS
-  
-
-# Backported from Autoconf 2.5x; can go away when and if
-# we switch.  Put the OS path separator in $PATH_SEPARATOR.
-AC_DEFUN([ACX_PATH_SEP], [
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+  if test $build = $host ; then
+    ncn_cv_$1=$$1
+    AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [ifelse([$3],[],[$2],[$3])], [$4]) 
+    $1=$ncn_cv_$1
   else
-    PATH_SEPARATOR=: 
+    $1="ifelse([$3],[],[${ncn_tool_prefix}$2],[$3])"
   fi
-  rm -f conf$$.sh
-fi
-])
-
-
-AC_DEFUN([ACX_TOOL_DIRS], [
-AC_REQUIRE([ACX_PATH_SEP])
-if test "x$exec_prefix" = xNONE; then
-        if test "x$prefix" = xNONE; then
-                gcc_cv_tool_prefix=$ac_default_prefix
-        else
-                gcc_cv_tool_prefix=$prefix
-        fi
 else
-        gcc_cv_tool_prefix=$exec_prefix
+  $1="$ac_cv_prog_$1"
 fi
+]) []dnl # NCN_STRICT_CHECK_TOOL
 
-# If there is no compiler in the tree, use the PATH only.  In any
-# case, if there is no compiler in the tree nobody should use
-# AS_FOR_TARGET and LD_FOR_TARGET.
-if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then
-    gcc_version=`cat $srcdir/gcc/BASE-VER`
-    gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR"
-else
-    gcc_cv_tool_dirs=
-fi
 
-if test x$build = x$target && test -n "$md_exec_prefix"; then
-        gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR"
-fi
-
-]) []dnl # ACX_TOOL_DIRS
+####
+# NCN_STRICT_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
+# Like NCN_CHECK_TARGET_TOOL, but requires the prefix if build!=target.
 
-# ACX_HAVE_GCC_FOR_TARGET
-# Check if the variable GCC_FOR_TARGET really points to a GCC binary.
-AC_DEFUN([ACX_HAVE_GCC_FOR_TARGET], [
-cat > conftest.c << \EOF
-#ifdef __GNUC__
-  gcc_yay;
-#endif
-EOF
-if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then
-  have_gcc_for_target=yes
-else
-  GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc
-  have_gcc_for_target=no
+AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOL],
+[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
+if test -n "$ncn_target_tool_prefix"; then
+  AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}$2], 
+                [${ncn_target_tool_prefix}$2], , [$4])
 fi
-rm conftest.c
-])
-
-# ACX_CHECK_INSTALLED_TARGET_TOOL(VAR, PROG)
-# Searching for installed target binutils.  We need to take extra care,
-# else we may find the wrong assembler, linker, etc., and lose.
-#
-# First try --with-build-time-tools, if specified.
-#
-# For build != host, we ask the installed GCC for the name of the tool it
-# uses, and accept it if it is an absolute path.  This is because the
-# only good choice for a compiler is the same GCC version that is being
-# installed (or we couldn't make target libraries), and we assume that
-# on the host system we'll have not only the same GCC version, but also
-# the same binutils version.
-#
-# For build == host, search the same directories that the installed
-# compiler will search.  We used to do this for the assembler, linker,
-# and nm only; for simplicity of configuration, however, we extend this
-# criterion to tools (such as ar and ranlib) that are never invoked by
-# the compiler, to avoid mismatches.
-#
-# Also note we have to check MD_EXEC_PREFIX before checking the user's path
-# if build == target.  This makes the most sense only when bootstrapping,
-# but we also do so when build != host.  In this case, we hope that the
-# build and host systems will have similar contents of MD_EXEC_PREFIX.
-#
-# If we do not find a suitable binary, then try the user's path.
-
-AC_DEFUN([ACX_CHECK_INSTALLED_TARGET_TOOL], [
-AC_REQUIRE([ACX_TOOL_DIRS])
-AC_REQUIRE([ACX_HAVE_GCC_FOR_TARGET])
-if test -z "$ac_cv_path_$1" ; then
-  if test -n "$with_build_time_tools"; then
-    AC_MSG_CHECKING([for $2 in $with_build_time_tools])
-    if test -x $with_build_time_tools/$2; then
-      $1=`cd $with_build_time_tools && pwd`/$2
-      ac_cv_path_$1=[$]$1
-      AC_MSG_RESULT([$ac_cv_path_$1])
-    else
-      AC_MSG_RESULT(no)
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    $1=`$GCC_FOR_TARGET --print-prog-name=$2`
-    test [$]$1=$2 && $1=
-    ac_cv_path_$1=[$]$1
+if test -z "$ac_cv_prog_$1" ; then
+  if test $build = $target ; then
+    ncn_cv_$1=$$1
+    AC_CHECK_PROG([ncn_cv_$1], [$2], [$2], [ifelse([$3],[],[$2],[$3])], [$4]) 
+    $1=$ncn_cv_$1
+  else
+    $1="ifelse([$3],[],[${ncn_target_tool_prefix}$2],[$3])"
   fi
-fi
-if test -z "$ac_cv_path_$1" ; then
-  AC_PATH_PROG([$1], [$2], [], [$gcc_cv_tool_dirs])
-fi
-if test -z "$ac_cv_path_$1" ; then
-  NCN_STRICT_CHECK_TARGET_TOOLS([$1], [$2])
 else
-  $1=$ac_cv_path_$1
+  $1="$ac_cv_prog_$1"
 fi
-]) []dnl # ACX_CHECK_INSTALLED_TARGET_TOOL
+]) []dnl # NCN_STRICT_CHECK_TARGET_TOOL
 
 ###
 # AC_PROG_CPP_WERROR
@@ -337,6 +212,7 @@ acx_cv_cc_gcc_supports_ada=no
 errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
 if test x"$errors" = x && test -f conftest.$ac_objext; then
   acx_cv_cc_gcc_supports_ada=yes
+  break
 fi
 rm -f conftest.*])
 
@@ -435,42 +311,3 @@ fi
 AC_SUBST(LN)dnl
 ])
 
-dnl GCC_TARGET_TOOL(PROGRAM, TARGET-VAR, HOST-VAR, IN-TREE-TOOL, LANGUAGE)
-AC_DEFUN([GCC_TARGET_TOOL],
-[AC_MSG_CHECKING(where to find the target $1)
-if test "x${build}" != "x${host}" ; then
-  if expr "x[$]$2" : "x/" > /dev/null; then
-    # We already found the complete path
-    AC_MSG_RESULT(pre-installed in `dirname [$]$2`)
-  else
-    # Canadian cross, just use what we found
-    AC_MSG_RESULT(pre-installed)
-  fi
-else
-  ifelse([$4],,,
-  [ok=yes
-  case " ${configdirs} " in
-    *" patsubst([$4], [/.*], []) "*) ;;
-    *) ok=no ;;
-  esac
-  ifelse([$5],,, 
-  [case ,${enable_languages}, in
-    *,$5,*) ;;
-    *) ok=no ;;
-  esac])
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    $2='$$r/$(HOST_SUBDIR)/$4'
-    AC_MSG_RESULT(just compiled)
-  el])if expr "x[$]$2" : "x/" > /dev/null; then
-    # We already found the complete path
-    AC_MSG_RESULT(pre-installed in `dirname [$]$2`)
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    $2='$($3)'
-    AC_MSG_RESULT(host tool)
-  else
-    # We need a cross tool
-    AC_MSG_RESULT(pre-installed)
-  fi
-fi])
diff --git a/config/depstand.m4 b/config/depstand.m4
deleted file mode 100644
index 8f936e0c2..000000000
--- a/config/depstand.m4
+++ /dev/null
@@ -1,136 +0,0 @@
-##                                                          -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# Based on depend.m4 from automake 1.9, modified for standalone use in
-# an environment where GNU make is required. 
-
-# ZW_PROG_COMPILER_DEPENDENCIES
-# -----------------------------
-# Variant of _AM_DEPENDENCIES which just does the dependency probe and
-# sets fooDEPMODE accordingly.  Cache-variable compatible with
-# original; not side-effect compatible.  As the users of this macro
-# may require accurate dependencies for correct builds, it does *not*
-# honor --disable-dependency-checking, and failure to detect a usable
-# method is an error.  depcomp is assumed to be located in
-# $ac_aux_dir.
-#
-# FIXME: Should use the Autoconf 2.5x language-selection mechanism.
-
-AC_DEFUN([ZW_PROG_COMPILER_DEPENDENCIES],
-[ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-am_depcomp=$ac_aux_dir/depcomp
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    if test $depmode = none; then break; fi
-
-    _AS_ECHO([$as_me:$LINENO: trying $depmode], AS_MESSAGE_LOG_FD)
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "include sub/conftest.Po" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    depcmd="depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c"
-    echo "| $depcmd" | sed -e 's/  */ /g' >&AS_MESSAGE_LOG_FD
-    if env $depcmd > conftest.err 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po >>conftest.err 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po >>conftest.err 2>&1 &&
-       ${MAKE-make} -s -f confmf >>conftest.err 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-	_AS_ECHO([$as_me:$LINENO: success], AS_MESSAGE_LOG_FD)
-        break
-      fi
-    fi
-    _AS_ECHO([$as_me:$LINENO: failure, diagnostics are:], AS_MESSAGE_LOG_FD)
-    sed -e 's/^/| /' < conftest.err >&AS_MESSAGE_LOG_FD
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-if test x${am_cv_$1_dependencies_compiler_type-none} = xnone
-then AC_MSG_ERROR([no usable dependency style found])
-else AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-fi
-])
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-# ZW_CREATE_DEPDIR
-# ----------------
-# As AM_SET_DEPDIR, but also create the directory at config.status time.
-AC_DEFUN([ZW_CREATE_DEPDIR],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_CONFIG_COMMANDS([depdir], [mkdir $DEPDIR], [DEPDIR=$DEPDIR])
-])
diff --git a/config/enable.m4 b/config/enable.m4
deleted file mode 100644
index 88b29b8aa..000000000
--- a/config/enable.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl ----------------------------------------------------------------------
-dnl This whole bit snagged from libstdc++-v3.
-
-dnl
-dnl GCC_ENABLE
-dnl    (FEATURE, DEFAULT, HELP-ARG, HELP-STRING)
-dnl    (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, permit a|b|c)
-dnl    (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, SHELL-CODE-HANDLER)
-dnl
-dnl See docs/html/17_intro/configury.html#enable for documentation.
-dnl
-AC_DEFUN([GCC_ENABLE],[dnl
-m4_define([_g_switch],[--enable-$1])dnl
-m4_define([_g_help],[AC_HELP_STRING(_g_switch$3,[$4 @<:@default=$2@:>@])])dnl
- AC_ARG_ENABLE($1,_g_help,
-  m4_bmatch([$5],
-   [^permit ],
-     [[
-      case "$enableval" in
-       m4_bpatsubst([$5],[permit ])) ;;
-       *) AC_MSG_ERROR(Unknown argument to enable/disable $1) ;;
-          dnl Idea for future:  generate a URL pointing to
-          dnl "onlinedocs/configopts.html#whatever"
-      esac
-     ]],
-   [^$],
-     [[
-      case "$enableval" in
-       yes|no) ;;
-       *) AC_MSG_ERROR(Argument to enable/disable $1 must be yes or no) ;;
-      esac
-     ]],
-   [[$5]]),
-  [enable_]m4_bpatsubst([$1],-,_)[=][$2])
-m4_undefine([_g_switch])dnl
-m4_undefine([_g_help])dnl
-])
-
diff --git a/config/lead-dot.m4 b/config/lead-dot.m4
deleted file mode 100644
index e019030e0..000000000
--- a/config/lead-dot.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
diff --git a/config/mh-ppc-aix b/config/mh-ppc-aix
deleted file mode 100644
index f2bc76a0c..000000000
--- a/config/mh-ppc-aix
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Compile Ada files with minimal-toc.  The primary focus is gnatlib, so
-# that the library does not use nearly the entire TOC of applications
-# until gnatlib is built as a shared library on AIX.  Compiling the
-# compiler with -mminimal-toc does not cause any harm.
-BOOT_ADAFLAGS = -mminimal-toc
-BOOT_LDFLAGS = -Wl,-bbigtoc
-LDFLAGS = `case $(CC) in *gcc*) echo -Wl,-bbigtoc ;; esac;`
diff --git a/config/mt-gnu b/config/mt-gnu
index f05c4f92f..15bf41716 100644
--- a/config/mt-gnu
+++ b/config/mt-gnu
@@ -1 +1 @@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) -D_GNU_SOURCE
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
diff --git a/config/no-executables.m4 b/config/no-executables.m4
index 54e5a0242..ca26b7112 100644
--- a/config/no-executables.m4
+++ b/config/no-executables.m4
@@ -53,7 +53,7 @@ if test x$gcc_no_link = xyes; then
     ac_cv_func_mmap_fixed_mapped=no
   fi
 fi
-if test "x${ac_cv_func_mmap_fixed_mapped}" != xno; then
+if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then
   m4_defn([AC_FUNC_MMAP])
 fi)
 
diff --git a/config/stdint.m4 b/config/stdint.m4
deleted file mode 100644
index 21ef2ec43..000000000
--- a/config/stdint.m4
+++ /dev/null
@@ -1,486 +0,0 @@
-dnl @synopsis GCC_HEADER_STDINT [( HEADER-TO-GENERATE [, HEADERS-TO-CHECK])]
-dnl
-dnl the "ISO C9X: 7.18 Integer types <stdint.h>" section requires the
-dnl existence of an include file <stdint.h> that defines a set of
-dnl typedefs, especially uint8_t,int32_t,uintptr_t.
-dnl Many older installations will not provide this file, but some will
-dnl have the very same definitions in <inttypes.h>. In other enviroments
-dnl we can use the inet-types in <sys/types.h> which would define the
-dnl typedefs int8_t and u_int8_t respectivly.
-dnl
-dnl This macros will create a local "_stdint.h" or the headerfile given as
-dnl an argument. In many cases that file will pick the definition from a
-dnl "#include <stdint.h>" or "#include <inttypes.h>" statement, while
-dnl in other environments it will provide the set of basic 'stdint's defined:
-dnl int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t
-dnl int_least32_t.. int_fast32_t.. intmax_t
-dnl which may or may not rely on the definitions of other files.
-dnl
-dnl Sometimes the stdint.h or inttypes.h headers conflict with sys/types.h,
-dnl so we test the headers together with sys/types.h and always include it
-dnl into the generated header (to match the tests with the generated file).
-dnl Hopefully this is not a big annoyance.
-dnl
-dnl If your installed header files require the stdint-types you will want to
-dnl create an installable file mylib-int.h that all your other installable
-dnl header may include. So, for a library package named "mylib", just use
-dnl      GCC_HEADER_STDINT(mylib-int.h)
-dnl in configure.in and install that header file in Makefile.am along with
-dnl the other headers (mylib.h).  The mylib-specific headers can simply
-dnl use "#include <mylib-int.h>" to obtain the stdint-types.
-dnl
-dnl Remember, if the system already had a valid <stdint.h>, the generated
-dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things...
-dnl
-dnl @author  Guido Draheim <guidod@gmx.de>, Paolo Bonzini <bonzini@gnu.org>
-
-AC_DEFUN([GCC_HEADER_STDINT],
-[m4_define(_GCC_STDINT_H, m4_ifval($1, $1, _stdint.h))
-
-inttype_headers=`echo inttypes.h sys/inttypes.h $2 | sed -e 's/,/ /g'`
-
-acx_cv_header_stdint=stddef.h
-acx_cv_header_stdint_kind="(already complete)"
-for i in stdint.h $inttype_headers; do
-  unset ac_cv_type_uintptr_t
-  unset ac_cv_type_uintmax_t
-  unset ac_cv_type_int_least32_t
-  unset ac_cv_type_int_fast32_t
-  unset ac_cv_type_uint64_t
-  _AS_ECHO_N([looking for a compliant stdint.h in $i, ])
-  AC_CHECK_TYPE(uintmax_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
-#include <$i>])
-  AC_CHECK_TYPE(uintptr_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h>
-#include <$i>])
-  AC_CHECK_TYPE(int_least32_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h>
-#include <$i>])
-  AC_CHECK_TYPE(int_fast32_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h>
-#include <$i>])
-  AC_CHECK_TYPE(uint64_t,,[acx_cv_header_stdint_kind="(lacks uint64_t)"], [#include <sys/types.h>
-#include <$i>])
-  break
-done
-if test "$acx_cv_header_stdint" = stddef.h; then
-  acx_cv_header_stdint_kind="(lacks uintptr_t)"
-  for i in stdint.h $inttype_headers; do
-    unset ac_cv_type_uint32_t
-    unset ac_cv_type_uint64_t
-    _AS_ECHO_N([looking for an incomplete stdint.h in $i, ])
-    AC_CHECK_TYPE(uint32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
-#include <$i>])
-    AC_CHECK_TYPE(uint64_t,,[acx_cv_header_stdint_kind="(lacks uintptr_t and uint64_t)"], [#include <sys/types.h>
-#include <$i>])
-    break
-  done
-fi
-if test "$acx_cv_header_stdint" = stddef.h; then
-  acx_cv_header_stdint_kind="(u_intXX_t style)"
-  for i in sys/types.h $inttype_headers; do
-    unset ac_cv_type_u_int32_t
-    unset ac_cv_type_u_int64_t
-    _AS_ECHO_N([looking for u_intXX_t types in $i, ])
-    AC_CHECK_TYPE(u_int32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
-#include <$i>])
-    AC_CHECK_TYPE(u_int64_t,,[acx_cv_header_stdint_kind="(u_intXX_t style, lacks u_int64_t)"], [#include <sys/types.h>
-#include <$i>])
-    break
-  done
-fi
-if test "$acx_cv_header_stdint" = stddef.h; then
-  acx_cv_header_stdint_kind="(using manual detection)"
-fi
-
-test -z "$ac_cv_type_uintptr_t" && ac_cv_type_uintptr_t=no
-test -z "$ac_cv_type_uint64_t" && ac_cv_type_uint64_t=no
-test -z "$ac_cv_type_u_int64_t" && ac_cv_type_u_int64_t=no
-test -z "$ac_cv_type_int_least32_t" && ac_cv_type_int_least32_t=no
-test -z "$ac_cv_type_int_fast32_t" && ac_cv_type_int_fast32_t=no
-
-# ----------------- Summarize what we found so far
-
-AC_MSG_CHECKING([what to include in _GCC_STDINT_H])
-
-case `AS_BASENAME(_GCC_STDINT_H)` in
-  stdint.h) AC_MSG_WARN([are you sure you want it there?]) ;;
-  inttypes.h) AC_MSG_WARN([are you sure you want it there?]) ;;
-  *) ;;
-esac
-
-AC_MSG_RESULT($acx_cv_header_stdint $acx_cv_header_stdint_kind)
-
-# ----------------- done included file, check C basic types --------
-
-# Lacking an uintptr_t?  Test size of void *
-case "$acx_cv_header_stdint:$ac_cv_type_uintptr_t" in
-  stddef.h:* | *:no) AC_CHECK_SIZEOF(void *) ;;
-esac
-
-# Lacking an uint64_t?  Test size of long
-case "$acx_cv_header_stdint:$ac_cv_type_uint64_t:$ac_cv_type_u_int64_t" in
-  stddef.h:*:* | *:no:no) AC_CHECK_SIZEOF(long) ;;
-esac
-
-if test $acx_cv_header_stdint = stddef.h; then
-  # Lacking a good header?  Test size of everything and deduce all types.
-  AC_CHECK_SIZEOF(int)
-  AC_CHECK_SIZEOF(short)
-  AC_CHECK_SIZEOF(char)
-
-  AC_MSG_CHECKING(for type equivalent to int8_t)
-  case "$ac_cv_sizeof_char" in
-    1) acx_cv_type_int8_t=char ;;
-    *) AC_MSG_ERROR(no 8-bit type, please report a bug)
-  esac
-  AC_MSG_RESULT($acx_cv_type_int8_t)
-
-  AC_MSG_CHECKING(for type equivalent to int16_t)
-  case "$ac_cv_sizeof_int:$ac_cv_sizeof_short" in
-    2:*) acx_cv_type_int16_t=int ;;
-    *:2) acx_cv_type_int16_t=short ;;
-    *) AC_MSG_ERROR(no 16-bit type, please report a bug)
-  esac
-  AC_MSG_RESULT($acx_cv_type_int16_t)
-
-  AC_MSG_CHECKING(for type equivalent to int32_t)
-  case "$ac_cv_sizeof_int:$ac_cv_sizeof_long" in
-    4:*) acx_cv_type_int32_t=int ;;
-    *:4) acx_cv_type_int32_t=long ;;
-    *) AC_MSG_ERROR(no 32-bit type, please report a bug)
-  esac
-  AC_MSG_RESULT($acx_cv_type_int32_t)
-fi
-
-# These tests are here to make the output prettier
-
-if test "$ac_cv_type_uint64_t" != yes && test "$ac_cv_type_u_int64_t" != yes; then
-  case "$ac_cv_sizeof_long" in
-    8) acx_cv_type_int64_t=long ;;
-  esac
-  AC_MSG_CHECKING(for type equivalent to int64_t)
-  AC_MSG_RESULT(${acx_cv_type_int64_t-'using preprocessor symbols'})
-fi
-
-# Now we can use the above types
-
-if test "$ac_cv_type_uintptr_t" != yes; then
-  AC_MSG_CHECKING(for type equivalent to intptr_t)
-  case $ac_cv_sizeof_void_p in
-    2) acx_cv_type_intptr_t=int16_t ;;
-    4) acx_cv_type_intptr_t=int32_t ;;
-    8) acx_cv_type_intptr_t=int64_t ;;
-    *) AC_MSG_ERROR(no equivalent for intptr_t, please report a bug)
-  esac
-  AC_MSG_RESULT($acx_cv_type_intptr_t)
-fi
-
-# ----------------- done all checks, emit header -------------
-AC_CONFIG_COMMANDS(_GCC_STDINT_H, [
-if test "$GCC" = yes; then
-  echo "/* generated for " `$CC --version | sed 1q` "*/" > tmp-stdint.h
-else
-  echo "/* generated for $CC */" > tmp-stdint.h
-fi
-
-sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-  #ifndef GCC_GENERATED_STDINT_H
-  #define GCC_GENERATED_STDINT_H 1
-
-  #include <sys/types.h>
-EOF
-
-if test "$acx_cv_header_stdint" != stdint.h; then
-  echo "#include <stddef.h>" >> tmp-stdint.h
-fi
-if test "$acx_cv_header_stdint" != stddef.h; then
-  echo "#include <$acx_cv_header_stdint>" >> tmp-stdint.h
-fi
-
-sed 's/^ *//' >> tmp-stdint.h <<EOF
-  /* glibc uses these symbols as guards to prevent redefinitions.  */
-  #ifdef __int8_t_defined
-  #define _INT8_T
-  #define _INT16_T
-  #define _INT32_T
-  #endif
-  #ifdef __uint32_t_defined
-  #define _UINT32_T
-  #endif
-
-EOF
-
-# ----------------- done header, emit basic int types -------------
-if test "$acx_cv_header_stdint" = stddef.h; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    #ifndef _UINT8_T
-    #define _UINT8_T
-    typedef unsigned $acx_cv_type_int8_t uint8_t;
-    #endif
-
-    #ifndef _UINT16_T
-    #define _UINT16_T
-    typedef unsigned $acx_cv_type_int16_t uint16_t;
-    #endif
-
-    #ifndef _UINT32_T
-    #define _UINT32_T
-    typedef unsigned $acx_cv_type_int32_t uint32_t;
-    #endif
-
-    #ifndef _INT8_T
-    #define _INT8_T
-    typedef $acx_cv_type_int8_t int8_t;
-    #endif
-
-    #ifndef _INT16_T
-    #define _INT16_T
-    typedef $acx_cv_type_int16_t int16_t;
-    #endif
-
-    #ifndef _INT32_T
-    #define _INT32_T
-    typedef $acx_cv_type_int32_t int32_t;
-    #endif
-EOF
-elif test "$ac_cv_type_u_int32_t" = yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* int8_t int16_t int32_t defined by inet code, we do the u_intXX types */
-    #ifndef _INT8_T
-    #define _INT8_T
-    #endif
-    #ifndef _INT16_T
-    #define _INT16_T
-    #endif
-    #ifndef _INT32_T
-    #define _INT32_T
-    #endif
-
-    #ifndef _UINT8_T
-    #define _UINT8_T
-    typedef u_int8_t uint8_t;
-    #endif
-
-    #ifndef _UINT16_T
-    #define _UINT16_T
-    typedef u_int16_t uint16_t;
-    #endif
-
-    #ifndef _UINT32_T
-    #define _UINT32_T
-    typedef u_int32_t uint32_t;
-    #endif
-EOF
-else
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Some systems have guard macros to prevent redefinitions, define them.  */
-    #ifndef _INT8_T
-    #define _INT8_T
-    #endif
-    #ifndef _INT16_T
-    #define _INT16_T
-    #endif
-    #ifndef _INT32_T
-    #define _INT32_T
-    #endif
-    #ifndef _UINT8_T
-    #define _UINT8_T
-    #endif
-    #ifndef _UINT16_T
-    #define _UINT16_T
-    #endif
-    #ifndef _UINT32_T
-    #define _UINT32_T
-    #endif
-EOF
-fi
-
-# ------------- done basic int types, emit int64_t types ------------
-if test "$ac_cv_type_uint64_t" = yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* system headers have good uint64_t and int64_t */
-    #ifndef _INT64_T
-    #define _INT64_T
-    #endif
-    #ifndef _UINT64_T
-    #define _UINT64_T
-    #endif
-EOF
-elif test "$ac_cv_type_u_int64_t" = yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* system headers have an u_int64_t (and int64_t) */
-    #ifndef _INT64_T
-    #define _INT64_T
-    #endif
-    #ifndef _UINT64_T
-    #define _UINT64_T
-    typedef u_int64_t uint64_t;
-    #endif
-EOF
-elif test -n "$acx_cv_type_int64_t"; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* architecture has a 64-bit type, $acx_cv_type_int64_t */
-    #ifndef _INT64_T
-    #define _INT64_T
-    typedef $acx_cv_type_int64_t int64_t;
-    #endif
-    #ifndef _UINT64_T
-    #define _UINT64_T
-    typedef unsigned $acx_cv_type_int64_t uint64_t;
-    #endif
-EOF
-else
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* some common heuristics for int64_t, using compiler-specific tests */
-    #if defined __STDC_VERSION__ && (__STDC_VERSION__-0) >= 199901L
-    #ifndef _INT64_T
-    #define _INT64_T
-    typedef long long int64_t;
-    #endif
-    #ifndef _UINT64_T
-    #define _UINT64_T
-    typedef unsigned long long uint64_t;
-    #endif
-
-    #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
-    /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
-       does not implement __extension__.  But that compiler doesn't define
-       __GNUC_MINOR__.  */
-    # if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
-    # define __extension__
-    # endif
-
-    # ifndef _INT64_T
-    # define _INT64_T
-    __extension__ typedef long long int64_t;
-    # endif
-    # ifndef _UINT64_T
-    # define _UINT64_T
-    __extension__ typedef unsigned long long uint64_t;
-    # endif
-
-    #elif !defined __STRICT_ANSI__
-    # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
-
-    #  ifndef _INT64_T
-    #  define _INT64_T
-    typedef __int64 int64_t;
-    #  endif
-    #  ifndef _UINT64_T
-    #  define _UINT64_T
-    typedef unsigned __int64 uint64_t;
-    #  endif
-    # endif /* compiler */
-
-    #endif /* ANSI version */
-EOF
-fi
-
-# ------------- done int64_t types, emit intptr types ------------
-if test "$ac_cv_type_uintptr_t" != yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
-    typedef u$acx_cv_type_intptr_t uintptr_t;
-    typedef $acx_cv_type_intptr_t  intptr_t;
-EOF
-fi
-
-# ------------- done intptr types, emit int_least types ------------
-if test "$ac_cv_type_int_least32_t" != yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Define int_least types */
-    typedef int8_t     int_least8_t;
-    typedef int16_t    int_least16_t;
-    typedef int32_t    int_least32_t;
-    #ifdef _INT64_T
-    typedef int64_t    int_least64_t;
-    #endif
-
-    typedef uint8_t    uint_least8_t;
-    typedef uint16_t   uint_least16_t;
-    typedef uint32_t   uint_least32_t;
-    #ifdef _UINT64_T
-    typedef uint64_t   uint_least64_t;
-    #endif
-EOF
-fi
-
-# ------------- done intptr types, emit int_fast types ------------
-if test "$ac_cv_type_int_fast32_t" != yes; then
-  dnl NOTE: The following code assumes that sizeof (int) > 1.
-  dnl Fix when strange machines are reported.
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Define int_fast types.  short is often slow */
-    typedef int8_t       int_fast8_t;
-    typedef int          int_fast16_t;
-    typedef int32_t      int_fast32_t;
-    #ifdef _INT64_T
-    typedef int64_t      int_fast64_t;
-    #endif
-
-    typedef uint8_t      uint_fast8_t;
-    typedef unsigned int uint_fast16_t;
-    typedef uint32_t     uint_fast32_t;
-    #ifdef _UINT64_T
-    typedef uint64_t     uint_fast64_t;
-    #endif
-EOF
-fi
-
-if test "$ac_cv_type_uintmax_t" != yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Define intmax based on what we found */
-    #ifdef _INT64_T
-    typedef int64_t       intmax_t;
-    #else
-    typedef long          intmax_t;
-    #endif
-    #ifdef _UINT64_T
-    typedef uint64_t      uintmax_t;
-    #else
-    typedef unsigned long uintmax_t;
-    #endif
-EOF
-fi
-
-sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-  #endif /* GCC_GENERATED_STDINT_H */
-EOF
-
-if test -r ]_GCC_STDINT_H[ && cmp -s tmp-stdint.h ]_GCC_STDINT_H[; then
-  rm -f tmp-stdint.h
-else
-  mv -f tmp-stdint.h ]_GCC_STDINT_H[
-fi
-
-], [
-GCC="$GCC"
-CC="$CC"
-acx_cv_header_stdint="$acx_cv_header_stdint"
-acx_cv_type_int8_t="$acx_cv_type_int8_t"
-acx_cv_type_int16_t="$acx_cv_type_int16_t"
-acx_cv_type_int32_t="$acx_cv_type_int32_t"
-acx_cv_type_int64_t="$acx_cv_type_int64_t"
-acx_cv_type_intptr_t="$acx_cv_type_intptr_t"
-ac_cv_type_uintmax_t="$ac_cv_type_uintmax_t"
-ac_cv_type_uintptr_t="$ac_cv_type_uintptr_t"
-ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
-ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
-ac_cv_type_u_int32_t="$ac_cv_type_u_int32_t"
-ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
-ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
-ac_cv_sizeof_void_p="$ac_cv_sizeof_void_p"
-])
-
-])
diff --git a/config/tls.m4 b/config/tls.m4
deleted file mode 100644
index 5cbb6854f..000000000
--- a/config/tls.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-dnl Check whether the target supports TLS.
-AC_DEFUN([GCC_CHECK_TLS], [
-  GCC_ENABLE(tls, yes, [Use thread-local storage])
-  AC_CACHE_CHECK([whether the target supports thread-local storage],
-		 have_tls, [
-    AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
-      [dnl If the test case passed with dynamic linking, try again with
-      dnl static linking.  This fails at least with some older Red Hat
-      dnl releases.
-      save_LDFLAGS="$LDFLAGS"
-      LDFLAGS="-static $LDFLAGS"
-      AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
-		    [have_tls=yes], [have_tls=no], [])
-      LDFLAGS="$save_LDFLAGS"],
-      [have_tls=no],
-      [AC_COMPILE_IFELSE([__thread int foo;], [have_tls=yes], [have_tls=no])]
-    )])
-  if test "$enable_tls $have_tls" = "yes yes"; then
-    AC_DEFINE(HAVE_TLS, 1,
-	      [Define to 1 if the target supports thread-local storage.])
-  fi])
diff --git a/config/warnings.m4 b/config/warnings.m4
index 8b832382b..2f44c9222 100644
--- a/config/warnings.m4
+++ b/config/warnings.m4
@@ -16,8 +16,8 @@
 
 #You should have received a copy of the GNU General Public License
 #along with GCC; see the file COPYING.  If not, write to the Free
-#Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-#02110-1301, USA.
+#Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+#02111-1307, USA.
 
 # ACX_PROG_CC_WARNING_OPTS([-Wfoo -Wbar -Wbaz])
 #   Sets @WARN_CFLAGS@ to the subset of the given options which the
@@ -50,7 +50,7 @@ AC_DEFUN([ACX_PROG_CC_WARNING_ALMOST_PEDANTIC],
 AC_SUBST([WARN_PEDANTIC])dnl
 AS_VAR_PUSHDEF([acx_Pedantic], [acx_cv_prog_cc_pedantic_$1])dnl
 WARN_PEDANTIC=
-AS_IF([test "$GCC" = yes],
+AS_IF([test $GCC = yes],
 [AC_CACHE_CHECK([whether $CC supports -pedantic $1], acx_Pedantic,
 [save_CFLAGS="$CFLAGS"
 CFLAGS="-pedantic $1"
diff --git a/configure b/configure
index 2dae3f1c7..519767c54 100755
--- a/configure
+++ b/configure
@@ -14,10 +14,6 @@ ac_default_prefix=/usr/local
 ac_help="$ac_help
   --enable-libada        Builds libada directory"
 ac_help="$ac_help
-  --enable-libssp        Builds libssp directory"
-ac_help="$ac_help
-  --enable-libgcc-math   Builds libgcc-math directory"
-ac_help="$ac_help
   --with-mpfr-dir=PATH    Specify source directory for MPFR library"
 ac_help="$ac_help
   --with-mpfr=PATH        Specify directory for installed MPFR library"
@@ -26,19 +22,13 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-gmp=PATH         Specify directory for installed GMP library"
 ac_help="$ac_help
-  --with-build-sysroot=sysroot
-                          use sysroot as the system root during the build"
-ac_help="$ac_help
-  --enable-bootstrap           Enable bootstrapping [yes if native build]"
+  --enable-bootstrap[=lean]     Enable bootstrapping [no]"
 ac_help="$ac_help
   --enable-serial-[{host,target,build}-]configure
                           Force sequential configuration of
                           sub-packages for the host, target or build
 			  machine, or all sub-packages"
 ac_help="$ac_help
-  --with-build-time-tools=path
-                          use given path to find target tools during the build"
-ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
 ac_help="$ac_help
@@ -601,7 +591,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:605: checking host system type" >&5
+echo "configure:595: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -622,7 +612,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:626: checking target system type" >&5
+echo "configure:616: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -640,7 +630,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:644: checking build system type" >&5
+echo "configure:634: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -695,7 +685,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:699: checking for a BSD compatible install" >&5
+echo "configure:689: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -748,7 +738,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln works""... $ac_c" 1>&6
-echo "configure:752: checking whether ln works" >&5
+echo "configure:742: checking whether ln works" >&5
 if eval "test \"`echo '$''{'acx_cv_prog_LN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -772,7 +762,7 @@ else
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:776: checking whether ln -s works" >&5
+echo "configure:766: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -886,7 +876,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber"
+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp"
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
@@ -910,13 +900,10 @@ target_libraries="target-libiberty \
 		target-newlib \
 		target-libstdc++-v3 \
 		target-libmudflap \
-		target-libssp \
-		target-libgcc-math \
 		target-libgfortran \
 		${libgcj} \
 		target-libobjc \
-		target-libada \
-		target-libgomp"
+		target-libada"
 
 # these tools are built using the target libraries, and are intended to
 # run only in the target environment
@@ -1049,10 +1036,6 @@ case "${host}" in
     configdirs="$configdirs libtermcap" ;;
 esac
 
-# A target can indicate whether a language isn't supported for some reason.
-# Only spaces may be used in this macro; not newlines or tabs.
-unsupported_languages=
-
 # Remove more programs from consideration, based on the host or 
 # target this usually means that a port of the program doesn't
 # exist yet.
@@ -1098,35 +1081,10 @@ else
 fi
 
 if test "${ENABLE_LIBADA}" != "yes" ; then
+  noconfigdirs="$noconfigdirs target-libada"
   noconfigdirs="$noconfigdirs gnattools"
 fi
 
-# Check whether --enable-libssp or --disable-libssp was given.
-if test "${enable_libssp+set}" = set; then
-  enableval="$enable_libssp"
-  ENABLE_LIBSSP=$enableval
-else
-  ENABLE_LIBSSP=yes
-fi
-
-
-# Set the default so we build libgcc-math for ix86 and x86_64
-# Check whether --enable-libgcc-math or --disable-libgcc-math was given.
-if test "${enable_libgcc_math+set}" = set; then
-  enableval="$enable_libgcc_math"
-  :
-else
-  
-case "${target}" in
-  i?86-* | x86_64-* )
-    enable_libgcc_math=yes ;;
-  *)
-    enable_libgcc_math=no ;;
-esac
-
-fi
-
-
 # Save it here so that, even in case of --enable-libgcj, if the Java
 # front-end isn't enabled, we still get libgcj disabled.
 libgcj_saved=$libgcj
@@ -1144,10 +1102,16 @@ no)
 esac
 
 
-# Disable libmudflap on some systems.
-if test x$enable_libmudflap = x ; then
+# Allow --disable-libmudflap to exclude target-libmudflap
+case $enable_libmudflap in
+yes)
+    ;;
+no)
+    noconfigdirs="$noconfigdirs target-libmudflap"
+    ;;
+"")
     case "${target}" in
-    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
         # Enable libmudflap by default in GNU and friends.
 	;;
     *-*-freebsd*)
@@ -1158,25 +1122,7 @@ if test x$enable_libmudflap = x ; then
 	noconfigdirs="$noconfigdirs target-libmudflap"
 	;;
     esac
-fi
-
-# Disable libgomp on non POSIX hosted systems.
-if test x$enable_libgomp = x ; then
-    # Enable libgomp by default on hosted POSIX systems.
-    case "${target}" in
-    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-	;;
-    *-*-netbsd* | *-*-freebsd* | *-*-openbsd*)
-	;;
-    *-*-solaris2* | *-*-sysv4* | *-*-irix* | *-*-osf* | *-*-hpux*)
-	;;
-    *-*-darwin* | *-*-aix*)
-	;;
-    *)
-	noconfigdirs="$noconfigdirs target-libgomp"
-	;;
-    esac
-fi
+esac
 
 
 case "${target}" in
@@ -1185,11 +1131,9 @@ case "${target}" in
     ;;
   powerpc-*-darwin*)
     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
-    noconfigdirs="$noconfigdirs sim target-rda"
     ;;
   *-*-darwin*)
-    noconfigdirs="$noconfigdirs ld gas gdb gprof"
-    noconfigdirs="$noconfigdirs sim target-rda"
+    noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
@@ -1237,18 +1181,11 @@ case "${target}" in
   *-*-rtems*)
     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
     ;;
-    # The tpf target doesn't support gdb yet.
-  *-*-tpf*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} target-libmudflap gdb tcl tk libgui itcl"
-    ;;
   *-*-uclinux*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}"
     ;;
   *-*-vxworks*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}"
-    ;;
-  m32c-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj}"
     ;;
   alpha*-dec-osf*)
     # ld works, but does not support shared libraries.
@@ -1299,10 +1236,6 @@ case "${target}" in
   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
     ;;
-  arm*-*-linux-gnueabi)
-    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-    noconfigdirs="$noconfigdirs target-libjava target-libobjc"
-    ;;
   arm*-*-symbianelf*)
     noconfigdirs="$noconfigdirs ${libgcj} target-libiberty"
     ;;
@@ -1324,12 +1257,6 @@ case "${target}" in
   avr-*-*)
     noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
     ;;
-  bfin-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss gdb"
-    if test x${is_cross_compiler} != xno ; then
-      target_configdirs="${target_configdirs} target-bsp target-cygmon"
-    fi
-    ;;
   c4x-*-* | tic4x-*-*)
     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
     ;;
@@ -1337,18 +1264,10 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib"
     ;;
   cris-*-* | crisv32-*-*)
-    unsupported_languages="$unsupported_languages java"
     case "${target}" in
-      *-*-aout)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
-      *-*-elf)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs target-boehm-gc";;
-      *-*-linux*)
-	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
+      *-*-elf | *-*-aout)
+	noconfigdirs="$noconfigdirs ${libgcj}";;
       *)
-	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
     esac
     ;;
@@ -1480,9 +1399,6 @@ case "${target}" in
   i[3456789]86-*-beos*)
     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
     ;;
-  i[3456789]86-*-rdos*)
-    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
-    ;;
   m32r-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
@@ -1501,8 +1417,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libstdc++-v3"
     ;;
   mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss"
-    unsupported_languages="$unsupported_languages fortran java"
+    noconfigdirs="$noconfigdirs ${libgcj} gdb libgloss target-libgfortran"
     ;;
   mn10200-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
@@ -1510,12 +1425,9 @@ case "${target}" in
   mn10300-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  mt-*-*)
-    noconfigdirs="$noconfigdirs sim"
-    ;;
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
-    noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
     ;;
   powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
     target_configdirs="$target_configdirs target-winsup"
@@ -1539,7 +1451,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
     ;;
   rs6000-*-aix*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
     ;;
   rs6000-*-*)
     noconfigdirs="$noconfigdirs gprof ${libgcj}"
@@ -1794,12 +1706,6 @@ case "${host}" in
   powerpc-*-darwin*)
     host_makefile_frag="config/mh-ppc-darwin"
     ;;
-  powerpc-*-aix*)
-    host_makefile_frag="config/mh-ppc-aix"
-    ;;
-  rs6000-*-aix*)
-    host_makefile_frag="config/mh-ppc-aix"
-    ;;
   *-*-lynxos*)
     # /bin/cc is less than useful for our purposes.  Always use GCC
     tentative_cc="/bin/gcc"
@@ -1843,6 +1749,12 @@ if test "${build}" != "${host}" ; then
   CXX=${CXX-${host_alias}-c++}
   CXXFLAGS=${CXXFLAGS-"-g -O2"}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
+  CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc}
+  CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
+  GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj}
+  GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
+  BUILD_PREFIX=${build_alias}-
+  BUILD_PREFIX_1=${build_alias}-
 
 else
   # Set reasonable default values for some tools even if not Canadian.
@@ -1854,10 +1766,14 @@ else
   # This is all going to change when we autoconfiscate...
 
   CC_FOR_BUILD="\$(CC)"
+  GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)"
+  BUILD_PREFIX=
+  BUILD_PREFIX_1=loser-
+
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1861: checking for $ac_word" >&5
+echo "configure:1777: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1887,7 +1803,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1891: checking for $ac_word" >&5
+echo "configure:1807: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1938,7 +1854,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1942: checking for $ac_word" >&5
+echo "configure:1858: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1970,7 +1886,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1974: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1890: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1981,12 +1897,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1985 "configure"
+#line 1901 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2012,12 +1928,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2016: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1932: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2021: checking whether we are using GNU C" >&5
+echo "configure:1937: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2026,7 +1942,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2045,7 +1961,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2049: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1965: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2112,7 +2028,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2116: checking for $ac_word" >&5
+echo "configure:2032: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2144,7 +2060,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "gnatbind", so it can be a program name with args.
 set dummy gnatbind; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2148: checking for $ac_word" >&5
+echo "configure:2064: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2177,7 +2093,7 @@ fi
 fi
 
 echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6
-echo "configure:2181: checking whether compiler driver understands Ada" >&5
+echo "configure:2097: checking whether compiler driver understands Ada" >&5
 if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2196,6 +2112,7 @@ acx_cv_cc_gcc_supports_ada=no
 errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
 if test x"$errors" = x && test -f conftest.$ac_objext; then
   acx_cv_cc_gcc_supports_ada=yes
+  break
 fi
 rm -f conftest.*
 fi
@@ -2209,7 +2126,7 @@ else
 fi
 
 echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6
-echo "configure:2213: checking how to compare bootstrapped objects" >&5
+echo "configure:2130: checking how to compare bootstrapped objects" >&5
 if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2253,7 +2170,7 @@ fi
 
 
 if test "x$with_mpfr_dir" != x; then
-  gmpinc="-I$with_mpfr_dir"
+  gmpinc="-I$with_mpfr_dir/mpfr"
   gmplibs="$with_mpfr_dir/libmpfr.a"
 else
   gmplibs="-lmpfr"
@@ -2307,9 +2224,9 @@ saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $gmpinc"
 # Check GMP actually works
 echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6
-echo "configure:2311: checking for correct version of gmp.h" >&5
+echo "configure:2228: checking for correct version of gmp.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2313 "configure"
+#line 2230 "configure"
 #include "confdefs.h"
 #include "gmp.h"
 int main() {
@@ -2320,7 +2237,7 @@ choke me
 
 ; return 0; }
 EOF
-if { (eval echo configure:2324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2333,12 +2250,12 @@ rm -f conftest*
 
 if test x"$have_gmp" = xyes; then
   echo $ac_n "checking for MPFR""... $ac_c" 1>&6
-echo "configure:2337: checking for MPFR" >&5
+echo "configure:2254: checking for MPFR" >&5
 
   saved_LIBS="$LIBS"
   LIBS="$LIBS $gmplibs"
   cat > conftest.$ac_ext <<EOF
-#line 2342 "configure"
+#line 2259 "configure"
 #include "confdefs.h"
 #include <gmp.h>
 #include <mpfr.h>
@@ -2346,7 +2263,7 @@ int main() {
 mpfr_t n; mpfr_init(n);
 ; return 0; }
 EOF
-if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2391,15 +2308,6 @@ if test -d ${srcdir}/gcc; then
   fi
   enable_languages=`echo "${enable_languages}" | sed -e 's/[ 	,][ 	,]*/,/g' -e 's/,$//'`
 
-  # 'f95' is the old name for the 'fortran' language. We issue a warning
-  # and make the substitution.
-  case ,${enable_languages}, in
-    *,f95,*)
-      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
-      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
-      ;;
-  esac
-
   # First scan to see if an enabled language requires some other language.
   # We assume that a given config-lang.in will list all the language
   # front ends it requires, even if some are required indirectly.
@@ -2488,14 +2396,7 @@ if test -d ${srcdir}/gcc; then
             add_this_lang=no
             ;;
         esac
-
-	# Disable a language that is unsupported by the target.
-	case " $unsupported_languages " in
-	  *" $language "*)
-	    add_this_lang=no
-	    ;;
-	esac
-
+        
 	case $add_this_lang in
 	  no)
             # Remove language-dependent dirs.
@@ -2519,8 +2420,8 @@ if test -d ${srcdir}/gcc; then
   missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"`
   if test "x$missing_languages" != x; then
     { echo "configure: error: 
-The following requested languages could not be built: ${missing_languages}
-Recognised languages are: ${potential_languages}" 1>&2; exit 1; }
+The following requested languages were not found: ${missing_languages}
+The available languages are: ${potential_languages}" 1>&2; exit 1; }
   fi
 
   if test "x$new_enable_languages" != "x$enable_languages"; then
@@ -2530,14 +2431,6 @@ Recognised languages are: ${potential_languages}" 1>&2; exit 1; }
   ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[^ ]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `
 fi
 
-# Handle --disable-<component> generically.
-for dir in $configdirs $build_configdirs $target_configdirs ; do
-  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g`
-  if eval test x\${enable_${dirname}} "=" xno ; then
-    noconfigdirs="$noconfigdirs $dir"
-  fi
-done
-
 # Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
 # $build_configdirs and $target_configdirs.
 # If we have the source for $noconfigdirs entries, add them to $notsupp.
@@ -2665,18 +2558,6 @@ esac
 
 copy_dirs=
 
-# Check whether --with-build-sysroot or --without-build-sysroot was given.
-if test "${with_build_sysroot+set}" = set; then
-  withval="$with_build_sysroot"
-  if test x"$withval" != x ; then
-     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
-   fi
-else
-  SYSROOT_CFLAGS_FOR_TARGET=
-fi
-
-
-
 # Handle --with-headers=XXX.  If the value is not "yes", the contents of
 # the named directory are copied to $(tooldir)/sys-include.
 if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
@@ -2714,39 +2595,6 @@ if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
   fi
 fi
 
-# Set with_gnu_as and with_gnu_ld as appropriate.
-#
-# This is done by determining whether or not the appropriate directory
-# is available, and by checking whether or not specific configurations
-# have requested that this magic not happen.
-# 
-# The command line options always override the explicit settings in 
-# configure.in, and the settings in configure.in override this magic.
-#
-# If the default for a toolchain is to use GNU as and ld, and you don't 
-# want to do that, then you should use the --without-gnu-as and
-# --without-gnu-ld options for the configure script.
-
-if test x${use_gnu_as} = x &&
-   echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
-  with_gnu_as=yes
-  extra_host_args="$extra_host_args --with-gnu-as"
-fi
-
-if test x${use_gnu_ld} = x &&
-   echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then
-  with_gnu_ld=yes
-  extra_host_args="$extra_host_args --with-gnu-ld"
-fi
-
-# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
-# can detect this case.
-
-if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
-  with_newlib=yes
-  extra_host_args="$extra_host_args --with-newlib"
-fi
-
 # Handle ${copy_dirs}
 set fnord ${copy_dirs}
 shift
@@ -2778,55 +2626,6 @@ while test $# != 0 ; do
   shift; shift
 done
 
-# Determine a target-dependent exec_prefix that the installed
-# gcc will search in.  Keep this list sorted by triplet, with
-# the *-*-osname triplets last.
-md_exec_prefix=
-case "${target}" in
-  alpha*-*-*vms*)
-    md_exec_prefix=/gnu/lib/gcc-lib
-    ;;
-  i3456786-pc-msdosdjgpp*)
-    md_exec_prefix=/dev/env/DJDIR/bin
-    ;;
-  i3456786-*-sco3.2v5*)
-    if test $with_gnu_as = yes; then
-      md_exec_prefix=/usr/gnu/bin
-    else
-      md_exec_prefix=/usr/ccs/bin/elf
-    fi
-    ;;
-
-  mn10300-*-* | \
-  powerpc-*-chorusos* | \
-  powerpc*-*-eabi* | \
-  powerpc*-*-sysv* | \
-  powerpc*-*-kaos* | \
-  s390x-ibm-tpf*)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-  sparc64-*-elf*)
-    ;;
-  v850*-*-*)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-  xtensa-*-elf*)
-    ;;
-
-  *-*-beos* | \
-  *-*-elf* | \
-  *-*-hpux* | \
-  *-*-netware* | \
-  *-*-nto-qnx* | \
-  *-*-rtems* | \
-  *-*-solaris2* | \
-  *-*-sysv45* | \
-  *-*-vxworks* | \
-  *-wrs-windiss)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-esac
-
 extra_arflags_for_target=
 extra_nmflags_for_target=
 extra_ranlibflags_for_target=
@@ -2884,6 +2683,39 @@ case "${enable_target_optspace}:${target}" in
     ;;
 esac
 
+# Set with_gnu_as and with_gnu_ld as appropriate.
+#
+# This is done by determining whether or not the appropriate directory
+# is available, and by checking whether or not specific configurations
+# have requested that this magic not happen.
+# 
+# The command line options always override the explicit settings in 
+# configure.in, and the settings in configure.in override this magic.
+#
+# If the default for a toolchain is to use GNU as and ld, and you don't 
+# want to do that, then you should use the --without-gnu-as and
+# --without-gnu-ld options for the configure script.
+
+if test x${use_gnu_as} = x &&
+   echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
+  with_gnu_as=yes
+  extra_host_args="$extra_host_args --with-gnu-as"
+fi
+
+if test x${use_gnu_ld} = x &&
+   echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then
+  with_gnu_ld=yes
+  extra_host_args="$extra_host_args --with-gnu-ld"
+fi
+
+# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
+# can detect this case.
+
+if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
+  with_newlib=yes
+  extra_host_args="$extra_host_args --with-newlib"
+fi
+
 # Default to using --with-stabs for certain targets.
 if test x${with_stabs} = x ; then
   case "${target}" in
@@ -2909,6 +2741,221 @@ esac
 tooldir='${exec_prefix}'/${target_alias}
 build_tooldir=${tooldir}
 
+# Generate default definitions for YACC, M4, LEX and other programs that run
+# on the build machine.  These are used if the Makefile can't locate these
+# programs in objdir.
+MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
+for ac_prog in bison
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2754: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_BISON'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CONFIGURED_BISON"; then
+  ac_cv_prog_CONFIGURED_BISON="$CONFIGURED_BISON" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CONFIGURED_BISON="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CONFIGURED_BISON="$ac_cv_prog_CONFIGURED_BISON"
+if test -n "$CONFIGURED_BISON"; then
+  echo "$ac_t""$CONFIGURED_BISON" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CONFIGURED_BISON" && break
+done
+test -n "$CONFIGURED_BISON" || CONFIGURED_BISON="$MISSING bison"
+
+for ac_prog in 'bison -y' byacc yacc
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2789: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_YACC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CONFIGURED_YACC"; then
+  ac_cv_prog_CONFIGURED_YACC="$CONFIGURED_YACC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CONFIGURED_YACC="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CONFIGURED_YACC="$ac_cv_prog_CONFIGURED_YACC"
+if test -n "$CONFIGURED_YACC"; then
+  echo "$ac_t""$CONFIGURED_YACC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CONFIGURED_YACC" && break
+done
+test -n "$CONFIGURED_YACC" || CONFIGURED_YACC="$MISSING bison -y"
+
+for ac_prog in gm4 gnum4 m4
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2824: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_M4'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CONFIGURED_M4"; then
+  ac_cv_prog_CONFIGURED_M4="$CONFIGURED_M4" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CONFIGURED_M4="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CONFIGURED_M4="$ac_cv_prog_CONFIGURED_M4"
+if test -n "$CONFIGURED_M4"; then
+  echo "$ac_t""$CONFIGURED_M4" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CONFIGURED_M4" && break
+done
+test -n "$CONFIGURED_M4" || CONFIGURED_M4="$MISSING m4"
+
+for ac_prog in flex
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2859: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_FLEX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CONFIGURED_FLEX"; then
+  ac_cv_prog_CONFIGURED_FLEX="$CONFIGURED_FLEX" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CONFIGURED_FLEX="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CONFIGURED_FLEX="$ac_cv_prog_CONFIGURED_FLEX"
+if test -n "$CONFIGURED_FLEX"; then
+  echo "$ac_t""$CONFIGURED_FLEX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CONFIGURED_FLEX" && break
+done
+test -n "$CONFIGURED_FLEX" || CONFIGURED_FLEX="$MISSING flex"
+
+for ac_prog in flex lex
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2894: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LEX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CONFIGURED_LEX"; then
+  ac_cv_prog_CONFIGURED_LEX="$CONFIGURED_LEX" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CONFIGURED_LEX="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CONFIGURED_LEX="$ac_cv_prog_CONFIGURED_LEX"
+if test -n "$CONFIGURED_LEX"; then
+  echo "$ac_t""$CONFIGURED_LEX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CONFIGURED_LEX" && break
+done
+test -n "$CONFIGURED_LEX" || CONFIGURED_LEX="$MISSING flex"
+
+for ac_prog in makeinfo
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2929: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_MAKEINFO'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CONFIGURED_MAKEINFO"; then
+  ac_cv_prog_CONFIGURED_MAKEINFO="$CONFIGURED_MAKEINFO" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CONFIGURED_MAKEINFO="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CONFIGURED_MAKEINFO="$ac_cv_prog_CONFIGURED_MAKEINFO"
+if test -n "$CONFIGURED_MAKEINFO"; then
+  echo "$ac_t""$CONFIGURED_MAKEINFO" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CONFIGURED_MAKEINFO" && break
+done
+test -n "$CONFIGURED_MAKEINFO" || CONFIGURED_MAKEINFO="$MISSING makeinfo"
+
+
 # Create a .gdbinit file which runs the one in srcdir
 # and tells GDB to look there for source files.
 
@@ -3011,8 +3058,6 @@ case "$enable_gdbtk" in
     fi
     ;;
 esac
-CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
-INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
 
 # Strip out unwanted targets.
 
@@ -3045,26 +3090,27 @@ esac
 case "$have_compiler:$host:$target:$enable_bootstrap" in
   *:*:*:no) ;;
 
-  # Default behavior.  Enable bootstrap if we have a compiler
+  # Default behavior.  (We'll) enable bootstrap if we have a compiler
   # and we are in a native configuration.
   yes:$build:$build:default)
-    enable_bootstrap=yes ;;
+    # This will become 'yes'
+    enable_bootstrap=no ;;
 
   *:*:*:default)
     enable_bootstrap=no ;;
 
   # We have a compiler and we are in a native configuration, bootstrap is ok
-  yes:$build:$build:yes)
+  yes:$build:$build:yes | yes:$build:$build:lean)
     ;;
 
   # Other configurations, but we have a compiler.  Assume the user knows
   # what he's doing.
-  yes:*:*:yes)
+  yes:*:*:yes | yes:*:*:lean)
     echo "configure: warning: trying to bootstrap a cross compiler" 1>&2
     ;;
 
   # No compiler: if they passed --enable-bootstrap explicitly, fail
-  no:*:*:yes)
+  no:*:*:yes | no:*:*:lean)
     { echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; } ;;
 
   # Fail if wrong command line
@@ -3076,11 +3122,20 @@ esac
 # Adjust the toplevel makefile according to whether bootstrap was selected.
 case "$enable_bootstrap" in
   yes)
+    bootstrap_lean='#'
+    default_target=bootstrap
+    bootstrap_suffix=bootstrap ;;
+  lean)
+    bootstrap_lean=''
+    default_target=bootstrap
     bootstrap_suffix=bootstrap ;;
   no)
+    default_target=all
     bootstrap_suffix=no-bootstrap ;;
 esac
 
+
+
 for module in ${build_configdirs} ; do
   if test -z "${no_recursion}" \
      && test -f ${build_subdir}/${module}/Makefile; then
@@ -3094,13 +3149,10 @@ for module in ${build_configdirs} ; do
 /^@endif build-$module-$bootstrap_suffix\$/d"
 done
 for module in ${configdirs} ; do
-  if test -z "${no_recursion}"; then
-    for file in stage*-${module}/Makefile ${module}/Makefile; do
-      if test -f ${file}; then
-	echo 1>&2 "*** removing ${file} to force reconfigure"
-	rm -f ${file}
-      fi
-    done
+  if test -z "${no_recursion}" \
+     && test -f ${module}/Makefile; then
+    echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
+    rm -f ${module}/Makefile
   fi
   extrasub="$extrasub
 /^@if $module\$/d
@@ -3275,10 +3327,8 @@ fi
 # fixed in future.  It's still worthwhile to use a cache file for each
 # directory.  I think.
 
-# Pass the appropriate --build, --host, --target and --cache-file arguments.
-# We need to pass --target, as newer autoconf's requires consistency
-# for target_alias and gcc doesn't manage it consistently.
-target_configargs="--cache-file=./config.cache --build=${build_alias} --host=${target_alias} --target=${target_alias} ${target_configargs}"
+# Pass the appropriate --host, --build, and --cache-file arguments.
+target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
 
 FLAGS_FOR_TARGET=
 case " $target_configdirs " in
@@ -3350,6 +3400,89 @@ if test "x${use_gnu_ld}" = x &&
   FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(HOST_SUBDIR)/ld'
 fi
 
+if test "x${CC_FOR_TARGET+set}" = xset; then
+  :
+elif test -d ${srcdir}/gcc; then
+  CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/'
+elif test "$host" = "$target"; then
+  CC_FOR_TARGET='$(CC)'
+else
+  CC_FOR_TARGET=`echo gcc | sed "${program_transform_name}"`
+fi
+CC_FOR_TARGET=$CC_FOR_TARGET' $(FLAGS_FOR_TARGET)'
+
+if test "x${GCJ_FOR_TARGET+set}" = xset; then
+  :
+elif test -d ${srcdir}/gcc; then
+  GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/'
+elif test "$host" = "$target"; then
+  GCJ_FOR_TARGET='gcj'
+else
+  GCJ_FOR_TARGET=`echo gcj | sed "${program_transform_name}"`
+fi
+GCJ_FOR_TARGET=$GCJ_FOR_TARGET' $(FLAGS_FOR_TARGET)'
+
+if test "x${GFORTRAN_FOR_TARGET+set}" = xset; then
+  :
+elif test -d ${srcdir}/gcc; then
+  GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/'
+elif test "$host" = "$target"; then
+  GFORTRAN_FOR_TARGET='gfortran'
+else
+  GFORTRAN_FOR_TARGET=`echo gfortran | sed "${program_transform_name}"`
+fi
+case $GFORTRAN_FOR_TARGET in
+*' $(FLAGS_FOR_TARGET)') ;;
+*) GFORTRAN_FOR_TARGET=$GFORTRAN_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
+esac
+
+# Don't use libstdc++-v3's flags to configure/build itself.
+libstdcxx_flags='`test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
+raw_libstdcxx_flags='-L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
+
+if test "x${CXX_FOR_TARGET+set}" = xset; then
+  if test "x${RAW_CXX_FOR_TARGET+set}" != xset; then
+    RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET}
+  fi
+elif test -d ${srcdir}/gcc; then
+  # We add -shared-libgcc to CXX_FOR_TARGET whenever we use xgcc instead
+  # of g++ for linking C++ or Java, because g++ has -shared-libgcc by
+  # default whereas gcc does not.
+  # RAW_CXX_FOR_TARGET is for linking C++ or java; CXX_FOR_TARGET is for
+  # all other cases.
+  CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ '$libstdcxx_flags
+  RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ '$raw_libstdcxx_flags
+elif test "$host" = "$target"; then
+  CXX_FOR_TARGET='$(CXX)'
+  RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET}
+else
+  CXX_FOR_TARGET=`echo c++ | sed "${program_transform_name}"`
+  RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET}
+fi
+CXX_FOR_TARGET=$CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)'
+RAW_CXX_FOR_TARGET=$RAW_CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)'
+
+qCXX_FOR_TARGET=`echo "$CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'`
+qRAW_CXX_FOR_TARGET=`echo "$RAW_CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'`
+
+# We want to defer the evaluation of `cmd`s and shell variables in
+# CXX_FOR_TARGET when recursing in the top-level Makefile, such as for
+# bootstrap.  We'll enclose CXX_FOR_TARGET_FOR_RECURSIVE_MAKE in single
+# quotes, but we still have to duplicate `$'s so that shell variables
+# can be expanded by the nested make as shell variables, not as make
+# macros.
+qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
+qqRAW_CXX_FOR_TARGET=`echo "$qRAW_CXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
+
+# Wrap CC_FOR_TARGET and friends, for certain types of builds.
+CC_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}"
+GCJ_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}"
+GFORTRAN_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${GFORTRAN_FOR_TARGET}"
+CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}"
+RAW_CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qRAW_CXX_FOR_TARGET}"
+CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}"
+RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqRAW_CXX_FOR_TARGET}"
+
 # Makefile fragments.
 for frag in host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag;
 do
@@ -3387,356 +3520,17 @@ done
 
 
 
-# Generate default definitions for YACC, M4, LEX and other programs that run
-# on the build machine.  These are used if the Makefile can't locate these
-# programs in objdir.
-MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
-
-for ac_prog in 'bison -y' byacc yacc
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3401: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YACC="$ac_cv_prog_YACC"
-if test -n "$YACC"; then
-  echo "$ac_t""$YACC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="$MISSING bison -y"
-
-case " $build_configdirs " in
-  *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;;
-  *" byacc "*) YACC='$$r/$(BUILD_SUBDIR)/byacc/byacc' ;;
-esac
-
-for ac_prog in bison
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3441: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$BISON"; then
-  ac_cv_prog_BISON="$BISON" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_BISON="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-BISON="$ac_cv_prog_BISON"
-if test -n "$BISON"; then
-  echo "$ac_t""$BISON" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$BISON" && break
-done
-test -n "$BISON" || BISON="$MISSING bison"
-
-case " $build_configdirs " in
-  *" bison "*) BISON='$$r/$(BUILD_SUBDIR)/bison/tests/bison' ;;
-esac
-
-for ac_prog in gm4 gnum4 m4
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3480: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$M4"; then
-  ac_cv_prog_M4="$M4" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_M4="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-M4="$ac_cv_prog_M4"
-if test -n "$M4"; then
-  echo "$ac_t""$M4" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$M4" && break
-done
-test -n "$M4" || M4="$MISSING m4"
-
-case " $build_configdirs " in
-  *" m4 "*) M4='$$r/$(BUILD_SUBDIR)/m4/m4' ;;
-esac
-
-for ac_prog in flex lex
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3519: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$LEX" && break
-done
-test -n "$LEX" || LEX="$MISSING flex"
-
-case " $build_configdirs " in
-  *" flex "*) LEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
-  *" lex "*) LEX='$$r/$(BUILD_SUBDIR)/lex/lex' ;;
-esac
-
-for ac_prog in flex
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3559: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$FLEX"; then
-  ac_cv_prog_FLEX="$FLEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_FLEX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-FLEX="$ac_cv_prog_FLEX"
-if test -n "$FLEX"; then
-  echo "$ac_t""$FLEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$FLEX" && break
-done
-test -n "$FLEX" || FLEX="$MISSING flex"
-
-case " $build_configdirs " in
-  *" flex "*) FLEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
-esac
-
-for ac_prog in makeinfo
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3598: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$MAKEINFO"; then
-  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_MAKEINFO="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-MAKEINFO="$ac_cv_prog_MAKEINFO"
-if test -n "$MAKEINFO"; then
-  echo "$ac_t""$MAKEINFO" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$MAKEINFO" && break
-done
-test -n "$MAKEINFO" || MAKEINFO="$MISSING makeinfo"
-
-case " $build_configdirs " in
-  *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
-  *)
-
-    # For an installed makeinfo, we require it to be from texinfo 4.2 or
-    # higher, else we use the "missing" dummy.
-    if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-      :
-    else
-      MAKEINFO="$MISSING makeinfo"
-    fi
-    ;;
-
-esac
-
-# FIXME: expect and dejagnu may become build tools?
-
-for ac_prog in expect
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3651: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$EXPECT"; then
-  ac_cv_prog_EXPECT="$EXPECT" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_EXPECT="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-EXPECT="$ac_cv_prog_EXPECT"
-if test -n "$EXPECT"; then
-  echo "$ac_t""$EXPECT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$EXPECT" && break
-done
-test -n "$EXPECT" || EXPECT="expect"
-
-case " $configdirs " in
-  *" expect "*)
-    test $host = $build && EXPECT='$$r/$(HOST_SUBDIR)/expect/expect'
-    ;;
-esac
-
-for ac_prog in runtest
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3692: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RUNTEST"; then
-  ac_cv_prog_RUNTEST="$RUNTEST" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RUNTEST="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RUNTEST="$ac_cv_prog_RUNTEST"
-if test -n "$RUNTEST"; then
-  echo "$ac_t""$RUNTEST" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$RUNTEST" && break
-done
-test -n "$RUNTEST" || RUNTEST="runtest"
-
-case " $configdirs " in
-  *" dejagnu "*)
-    test $host = $build && RUNTEST='$$r/$(HOST_SUBDIR)/dejagnu/runtest'
-    ;;
-esac
-
-
 # Host tools.
 ncn_tool_prefix=
 test -n "$host_alias" && ncn_tool_prefix=$host_alias-
 ncn_target_tool_prefix=
 test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
 
- for ncn_progname in ar; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_tool_prefix"; then
+  # Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3740: checking for $ac_word" >&5
+echo "configure:3534: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3748,7 +3542,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ncn_tool_prefix}${ncn_progname}"
+      ac_cv_prog_AR="${ncn_tool_prefix}ar"
       break
     fi
   done
@@ -3762,56 +3556,53 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-  fi
-  if test -z "$ac_cv_prog_AR" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+fi
+if test -z "$ac_cv_prog_AR" ; then
+  if test $build = $host ; then
+    ncn_cv_AR=$AR
+    # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3771: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+echo "configure:3567: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
+  if test -n "$ncn_cv_AR"; then
+  ac_cv_prog_ncn_cv_AR="$ncn_cv_AR" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ncn_progname}"
+      ac_cv_prog_ncn_cv_AR="ar"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_AR" && ac_cv_prog_ncn_cv_AR="ar"
 fi
 fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
+ncn_cv_AR="$ac_cv_prog_ncn_cv_AR"
+if test -n "$ncn_cv_AR"; then
+  echo "$ac_t""$ncn_cv_AR" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-  fi
-  test -n "$ac_cv_prog_AR" && break
-done
-
-if test -z "$ac_cv_prog_AR" ; then
-  set dummy ar
-  if test $build = $host ; then
-    AR="$2"
+    AR=$ncn_cv_AR
   else
-    AR="${ncn_tool_prefix}$2"
+    AR="${ncn_tool_prefix}ar"
   fi
+else
+  AR="$ac_cv_prog_AR"
 fi
 
- for ncn_progname in as; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_tool_prefix"; then
+  # Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3815: checking for $ac_word" >&5
+echo "configure:3606: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3823,7 +3614,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ncn_tool_prefix}${ncn_progname}"
+      ac_cv_prog_AS="${ncn_tool_prefix}as"
       break
     fi
   done
@@ -3837,56 +3628,53 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-  fi
-  if test -z "$ac_cv_prog_AS" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+fi
+if test -z "$ac_cv_prog_AS" ; then
+  if test $build = $host ; then
+    ncn_cv_AS=$AS
+    # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3846: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+echo "configure:3639: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
+  if test -n "$ncn_cv_AS"; then
+  ac_cv_prog_ncn_cv_AS="$ncn_cv_AS" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ncn_progname}"
+      ac_cv_prog_ncn_cv_AS="as"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_AS" && ac_cv_prog_ncn_cv_AS="as"
 fi
 fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
+ncn_cv_AS="$ac_cv_prog_ncn_cv_AS"
+if test -n "$ncn_cv_AS"; then
+  echo "$ac_t""$ncn_cv_AS" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-  fi
-  test -n "$ac_cv_prog_AS" && break
-done
-
-if test -z "$ac_cv_prog_AS" ; then
-  set dummy as
-  if test $build = $host ; then
-    AS="$2"
+    AS=$ncn_cv_AS
   else
-    AS="${ncn_tool_prefix}$2"
+    AS="${ncn_tool_prefix}as"
   fi
+else
+  AS="$ac_cv_prog_AS"
 fi
 
- for ncn_progname in dlltool; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_tool_prefix"; then
+  # Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3890: checking for $ac_word" >&5
+echo "configure:3678: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3898,7 +3686,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ncn_tool_prefix}${ncn_progname}"
+      ac_cv_prog_DLLTOOL="${ncn_tool_prefix}dlltool"
       break
     fi
   done
@@ -3912,87 +3700,53 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-  fi
-  if test -z "$ac_cv_prog_DLLTOOL" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+fi
+if test -z "$ac_cv_prog_DLLTOOL" ; then
+  if test $build = $host ; then
+    ncn_cv_DLLTOOL=$DLLTOOL
+    # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3921: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
+echo "configure:3711: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+  if test -n "$ncn_cv_DLLTOOL"; then
+  ac_cv_prog_ncn_cv_DLLTOOL="$ncn_cv_DLLTOOL" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ncn_progname}"
+      ac_cv_prog_ncn_cv_DLLTOOL="dlltool"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_DLLTOOL" && ac_cv_prog_ncn_cv_DLLTOOL="dlltool"
 fi
 fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
+ncn_cv_DLLTOOL="$ac_cv_prog_ncn_cv_DLLTOOL"
+if test -n "$ncn_cv_DLLTOOL"; then
+  echo "$ac_t""$ncn_cv_DLLTOOL" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-  fi
-  test -n "$ac_cv_prog_DLLTOOL" && break
-done
-
-if test -z "$ac_cv_prog_DLLTOOL" ; then
-  set dummy dlltool
-  if test $build = $host ; then
-    DLLTOOL="$2"
+    DLLTOOL=$ncn_cv_DLLTOOL
   else
-    DLLTOOL="${ncn_tool_prefix}$2"
+    DLLTOOL="${ncn_tool_prefix}dlltool"
   fi
-fi
-
- for ncn_progname in ld; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3965: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
 else
-  echo "$ac_t""no" 1>&6
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
 fi
 
-  fi
-  if test -z "$ac_cv_prog_LD" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+ if test -n "$ncn_tool_prefix"; then
+  # Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3996: checking for $ac_word" >&5
+echo "configure:3750: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4004,7 +3758,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="${ncn_progname}"
+      ac_cv_prog_LD="${ncn_tool_prefix}ld"
       break
     fi
   done
@@ -4017,101 +3771,54 @@ if test -n "$LD"; then
 else
   echo "$ac_t""no" 1>&6
 fi
- 
-  fi
-  test -n "$ac_cv_prog_LD" && break
-done
 
+fi
 if test -z "$ac_cv_prog_LD" ; then
-  set dummy ld
   if test $build = $host ; then
-    LD="$2"
-  else
-    LD="${ncn_tool_prefix}$2"
-  fi
-fi
-
- for ncn_progname in lipo; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4040: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LIPO="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LIPO="$ac_cv_prog_LIPO"
-if test -n "$LIPO"; then
-  echo "$ac_t""$LIPO" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_LIPO" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+    ncn_cv_LD=$LD
+    # Extract the first word of "ld", so it can be a program name with args.
+set dummy ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4071: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
+echo "configure:3783: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+  if test -n "$ncn_cv_LD"; then
+  ac_cv_prog_ncn_cv_LD="$ncn_cv_LD" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LIPO="${ncn_progname}"
+      ac_cv_prog_ncn_cv_LD="ld"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_LD" && ac_cv_prog_ncn_cv_LD="ld"
 fi
 fi
-LIPO="$ac_cv_prog_LIPO"
-if test -n "$LIPO"; then
-  echo "$ac_t""$LIPO" 1>&6
+ncn_cv_LD="$ac_cv_prog_ncn_cv_LD"
+if test -n "$ncn_cv_LD"; then
+  echo "$ac_t""$ncn_cv_LD" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-  fi
-  test -n "$ac_cv_prog_LIPO" && break
-done
-
-if test -z "$ac_cv_prog_LIPO" ; then
-  set dummy lipo
-  if test $build = $host ; then
-    LIPO="$2"
+    LD=$ncn_cv_LD
   else
-    LIPO="${ncn_tool_prefix}$2"
+    LD="${ncn_tool_prefix}ld"
   fi
+else
+  LD="$ac_cv_prog_LD"
 fi
 
- for ncn_progname in nm; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_tool_prefix"; then
+  # Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4115: checking for $ac_word" >&5
+echo "configure:3822: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4123,7 +3830,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="${ncn_tool_prefix}${ncn_progname}"
+      ac_cv_prog_NM="${ncn_tool_prefix}nm"
       break
     fi
   done
@@ -4137,87 +3844,53 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-  fi
-  if test -z "$ac_cv_prog_NM" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+fi
+if test -z "$ac_cv_prog_NM" ; then
+  if test $build = $host ; then
+    ncn_cv_NM=$NM
+    # Extract the first word of "nm", so it can be a program name with args.
+set dummy nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4146: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
+echo "configure:3855: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
+  if test -n "$ncn_cv_NM"; then
+  ac_cv_prog_ncn_cv_NM="$ncn_cv_NM" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="${ncn_progname}"
+      ac_cv_prog_ncn_cv_NM="nm"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_NM" && ac_cv_prog_ncn_cv_NM="nm"
 fi
 fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
+ncn_cv_NM="$ac_cv_prog_ncn_cv_NM"
+if test -n "$ncn_cv_NM"; then
+  echo "$ac_t""$ncn_cv_NM" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-  fi
-  test -n "$ac_cv_prog_NM" && break
-done
-
-if test -z "$ac_cv_prog_NM" ; then
-  set dummy nm
-  if test $build = $host ; then
-    NM="$2"
+    NM=$ncn_cv_NM
   else
-    NM="${ncn_tool_prefix}$2"
+    NM="${ncn_tool_prefix}nm"
   fi
-fi
-
- for ncn_progname in ranlib; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4190: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+  NM="$ac_cv_prog_NM"
 fi
 
-  fi
-  if test -z "$ac_cv_prog_RANLIB" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+ if test -n "$ncn_tool_prefix"; then
+  # Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4221: checking for $ac_word" >&5
+echo "configure:3894: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4229,7 +3902,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ncn_progname}"
+      ac_cv_prog_RANLIB="${ncn_tool_prefix}ranlib"
       break
     fi
   done
@@ -4242,91 +3915,54 @@ if test -n "$RANLIB"; then
 else
   echo "$ac_t""no" 1>&6
 fi
- 
-  fi
-  test -n "$ac_cv_prog_RANLIB" && break
-done
-
-if test -z "$ac_cv_prog_RANLIB" ; then
-  RANLIB=":"
-fi
 
- for ncn_progname in strip; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4260: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
 fi
-
-  fi
-  if test -z "$ac_cv_prog_STRIP" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+if test -z "$ac_cv_prog_RANLIB" ; then
+  if test $build = $host ; then
+    ncn_cv_RANLIB=$RANLIB
+    # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4291: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+echo "configure:3927: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+  if test -n "$ncn_cv_RANLIB"; then
+  ac_cv_prog_ncn_cv_RANLIB="$ncn_cv_RANLIB" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ncn_progname}"
+      ac_cv_prog_ncn_cv_RANLIB="ranlib"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_RANLIB" && ac_cv_prog_ncn_cv_RANLIB=":"
 fi
 fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+ncn_cv_RANLIB="$ac_cv_prog_ncn_cv_RANLIB"
+if test -n "$ncn_cv_RANLIB"; then
+  echo "$ac_t""$ncn_cv_RANLIB" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
+    RANLIB=$ncn_cv_RANLIB
+  else
+    RANLIB=":"
   fi
-  test -n "$ac_cv_prog_STRIP" && break
-done
-
-if test -z "$ac_cv_prog_STRIP" ; then
-  STRIP=":"
+else
+  RANLIB="$ac_cv_prog_RANLIB"
 fi
 
- for ncn_progname in windres; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_tool_prefix"; then
+  # Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}windres; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4330: checking for $ac_word" >&5
+echo "configure:3966: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4338,7 +3974,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="${ncn_tool_prefix}${ncn_progname}"
+      ac_cv_prog_WINDRES="${ncn_tool_prefix}windres"
       break
     fi
   done
@@ -4352,56 +3988,53 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-  fi
-  if test -z "$ac_cv_prog_WINDRES" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+fi
+if test -z "$ac_cv_prog_WINDRES" ; then
+  if test $build = $host ; then
+    ncn_cv_WINDRES=$WINDRES
+    # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4361: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
+echo "configure:3999: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+  if test -n "$ncn_cv_WINDRES"; then
+  ac_cv_prog_ncn_cv_WINDRES="$ncn_cv_WINDRES" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="${ncn_progname}"
+      ac_cv_prog_ncn_cv_WINDRES="windres"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_WINDRES" && ac_cv_prog_ncn_cv_WINDRES="windres"
 fi
 fi
-WINDRES="$ac_cv_prog_WINDRES"
-if test -n "$WINDRES"; then
-  echo "$ac_t""$WINDRES" 1>&6
+ncn_cv_WINDRES="$ac_cv_prog_ncn_cv_WINDRES"
+if test -n "$ncn_cv_WINDRES"; then
+  echo "$ac_t""$ncn_cv_WINDRES" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-  fi
-  test -n "$ac_cv_prog_WINDRES" && break
-done
-
-if test -z "$ac_cv_prog_WINDRES" ; then
-  set dummy windres
-  if test $build = $host ; then
-    WINDRES="$2"
+    WINDRES=$ncn_cv_WINDRES
   else
-    WINDRES="${ncn_tool_prefix}$2"
+    WINDRES="${ncn_tool_prefix}windres"
   fi
+else
+  WINDRES="$ac_cv_prog_WINDRES"
 fi
 
- for ncn_progname in objcopy; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_tool_prefix"; then
+  # Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4405: checking for $ac_word" >&5
+echo "configure:4038: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4413,7 +4046,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJCOPY="${ncn_tool_prefix}${ncn_progname}"
+      ac_cv_prog_OBJCOPY="${ncn_tool_prefix}objcopy"
       break
     fi
   done
@@ -4427,56 +4060,53 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-  fi
-  if test -z "$ac_cv_prog_OBJCOPY" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+fi
+if test -z "$ac_cv_prog_OBJCOPY" ; then
+  if test $build = $host ; then
+    ncn_cv_OBJCOPY=$OBJCOPY
+    # Extract the first word of "objcopy", so it can be a program name with args.
+set dummy objcopy; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4436: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
+echo "configure:4071: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$OBJCOPY"; then
-  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
+  if test -n "$ncn_cv_OBJCOPY"; then
+  ac_cv_prog_ncn_cv_OBJCOPY="$ncn_cv_OBJCOPY" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJCOPY="${ncn_progname}"
+      ac_cv_prog_ncn_cv_OBJCOPY="objcopy"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_OBJCOPY" && ac_cv_prog_ncn_cv_OBJCOPY="objcopy"
 fi
 fi
-OBJCOPY="$ac_cv_prog_OBJCOPY"
-if test -n "$OBJCOPY"; then
-  echo "$ac_t""$OBJCOPY" 1>&6
+ncn_cv_OBJCOPY="$ac_cv_prog_ncn_cv_OBJCOPY"
+if test -n "$ncn_cv_OBJCOPY"; then
+  echo "$ac_t""$ncn_cv_OBJCOPY" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-  fi
-  test -n "$ac_cv_prog_OBJCOPY" && break
-done
-
-if test -z "$ac_cv_prog_OBJCOPY" ; then
-  set dummy objcopy
-  if test $build = $host ; then
-    OBJCOPY="$2"
+    OBJCOPY=$ncn_cv_OBJCOPY
   else
-    OBJCOPY="${ncn_tool_prefix}$2"
+    OBJCOPY="${ncn_tool_prefix}objcopy"
   fi
+else
+  OBJCOPY="$ac_cv_prog_OBJCOPY"
 fi
 
- for ncn_progname in objdump; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_tool_prefix"; then
+  # Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ncn_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4480: checking for $ac_word" >&5
+echo "configure:4110: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4488,7 +4118,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ncn_tool_prefix}${ncn_progname}"
+      ac_cv_prog_OBJDUMP="${ncn_tool_prefix}objdump"
       break
     fi
   done
@@ -4502,48 +4132,46 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-  fi
-  if test -z "$ac_cv_prog_OBJDUMP" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+fi
+if test -z "$ac_cv_prog_OBJDUMP" ; then
+  if test $build = $host ; then
+    ncn_cv_OBJDUMP=$OBJDUMP
+    # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4511: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
+echo "configure:4143: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+  if test -n "$ncn_cv_OBJDUMP"; then
+  ac_cv_prog_ncn_cv_OBJDUMP="$ncn_cv_OBJDUMP" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ncn_progname}"
+      ac_cv_prog_ncn_cv_OBJDUMP="objdump"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_OBJDUMP" && ac_cv_prog_ncn_cv_OBJDUMP="objdump"
 fi
 fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
+ncn_cv_OBJDUMP="$ac_cv_prog_ncn_cv_OBJDUMP"
+if test -n "$ncn_cv_OBJDUMP"; then
+  echo "$ac_t""$ncn_cv_OBJDUMP" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-  fi
-  test -n "$ac_cv_prog_OBJDUMP" && break
-done
-
-if test -z "$ac_cv_prog_OBJDUMP" ; then
-  set dummy objdump
-  if test $build = $host ; then
-    OBJDUMP="$2"
+    OBJDUMP=$ncn_cv_OBJDUMP
   else
-    OBJDUMP="${ncn_tool_prefix}$2"
+    OBJDUMP="${ncn_tool_prefix}objdump"
   fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
 
@@ -4553,2595 +4181,550 @@ fi
 
 
 # Target tools.
-# Check whether --with-build-time-tools or --without-build-time-tools was given.
-if test "${with_build_time_tools+set}" = set; then
-  withval="$with_build_time_tools"
-  case x"$withval" in
-     x/*) ;;
-     *)
-       with_build_time_tools=
-       echo "configure: warning: argument to --with-build-time-tools must be an absolute path" 1>&2
-       ;;
-   esac
-else
-  with_build_time_tools=
-fi
-
-
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in cc gcc; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4575: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_CC_FOR_TARGET"; then
-  for ncn_progname in cc gcc; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_target_tool_prefix"; then
+  # Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4592: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4189: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$CC_FOR_TARGET"; then
-  ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test.
+  if test -n "$CONFIGURED_AR_FOR_TARGET"; then
+  ac_cv_prog_CONFIGURED_AR_FOR_TARGET="$CONFIGURED_AR_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+      ac_cv_prog_CONFIGURED_AR_FOR_TARGET="${ncn_target_tool_prefix}ar"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
 fi
-CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET"
-if test -n "$CC_FOR_TARGET"; then
-  echo "$ac_t""$CC_FOR_TARGET" 1>&6
+CONFIGURED_AR_FOR_TARGET="$ac_cv_prog_CONFIGURED_AR_FOR_TARGET"
+if test -n "$CONFIGURED_AR_FOR_TARGET"; then
+  echo "$ac_t""$CONFIGURED_AR_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    fi
-    if test -z "$ac_cv_prog_CC_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4623: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC_FOR_TARGET"; then
-  ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
 fi
-fi
-CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET"
-if test -n "$CC_FOR_TARGET"; then
-  echo "$ac_t""$CC_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_CC_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then
-  set dummy cc gcc
+if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then
   if test $build = $target ; then
-    CC_FOR_TARGET="$2"
-  else
-    CC_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in c++ g++ cxx gxx; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4666: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_CXX_FOR_TARGET"; then
-  for ncn_progname in c++ g++ cxx gxx; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4683: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX_FOR_TARGET"; then
-  ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET"
-if test -n "$CXX_FOR_TARGET"; then
-  echo "$ac_t""$CXX_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+    ncn_cv_CONFIGURED_AR_FOR_TARGET=$CONFIGURED_AR_FOR_TARGET
+    # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4714: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4222: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$CXX_FOR_TARGET"; then
-  ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test.
+  if test -n "$ncn_cv_CONFIGURED_AR_FOR_TARGET"; then
+  ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET="$ncn_cv_CONFIGURED_AR_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}"
+      ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET="ar"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET="ar"
 fi
 fi
-CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET"
-if test -n "$CXX_FOR_TARGET"; then
-  echo "$ac_t""$CXX_FOR_TARGET" 1>&6
+ncn_cv_CONFIGURED_AR_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET"
+if test -n "$ncn_cv_CONFIGURED_AR_FOR_TARGET"; then
+  echo "$ac_t""$ncn_cv_CONFIGURED_AR_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-    fi
-    test -n "$ac_cv_prog_CXX_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then
-  set dummy c++ g++ cxx gxx
-  if test $build = $target ; then
-    CXX_FOR_TARGET="$2"
+    CONFIGURED_AR_FOR_TARGET=$ncn_cv_CONFIGURED_AR_FOR_TARGET
   else
-    CXX_FOR_TARGET="${ncn_target_tool_prefix}$2"
+    CONFIGURED_AR_FOR_TARGET="${ncn_target_tool_prefix}ar"
   fi
-fi
-
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in gcc; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4757: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_GCC_FOR_TARGET"; then
-  for ncn_progname in gcc; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GCC_FOR_TARGET"; then
-  ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET"
-if test -n "$GCC_FOR_TARGET"; then
-  echo "$ac_t""$GCC_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4805: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GCC_FOR_TARGET"; then
-  ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET"
-if test -n "$GCC_FOR_TARGET"; then
-  echo "$ac_t""$GCC_FOR_TARGET" 1>&6
 else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_GCC_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then
-  GCC_FOR_TARGET="${CC_FOR_TARGET}"
+  CONFIGURED_AR_FOR_TARGET="$ac_cv_prog_CONFIGURED_AR_FOR_TARGET"
 fi
 
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in gcj; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4843: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_GCJ_FOR_TARGET"; then
-  for ncn_progname in gcj; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_target_tool_prefix"; then
+  # Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4860: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4261: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$GCJ_FOR_TARGET"; then
-  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test.
+  if test -n "$CONFIGURED_AS_FOR_TARGET"; then
+  ac_cv_prog_CONFIGURED_AS_FOR_TARGET="$CONFIGURED_AS_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+      ac_cv_prog_CONFIGURED_AS_FOR_TARGET="${ncn_target_tool_prefix}as"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
 fi
-GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET"
-if test -n "$GCJ_FOR_TARGET"; then
-  echo "$ac_t""$GCJ_FOR_TARGET" 1>&6
+CONFIGURED_AS_FOR_TARGET="$ac_cv_prog_CONFIGURED_AS_FOR_TARGET"
+if test -n "$CONFIGURED_AS_FOR_TARGET"; then
+  echo "$ac_t""$CONFIGURED_AS_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    fi
-    if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4891: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GCJ_FOR_TARGET"; then
-  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET"
-if test -n "$GCJ_FOR_TARGET"; then
-  echo "$ac_t""$GCJ_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_GCJ_FOR_TARGET" && break
-  done
 fi
-  
-if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then
-  set dummy gcj
+if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then
   if test $build = $target ; then
-    GCJ_FOR_TARGET="$2"
-  else
-    GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in gfortran; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4934: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET"; then
-  for ncn_progname in gfortran; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4951: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GFORTRAN_FOR_TARGET"; then
-  ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET"
-if test -n "$GFORTRAN_FOR_TARGET"; then
-  echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+    ncn_cv_CONFIGURED_AS_FOR_TARGET=$CONFIGURED_AS_FOR_TARGET
+    # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4982: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4294: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$GFORTRAN_FOR_TARGET"; then
-  ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test.
+  if test -n "$ncn_cv_CONFIGURED_AS_FOR_TARGET"; then
+  ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET="$ncn_cv_CONFIGURED_AS_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}"
+      ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET="as"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET="as"
 fi
 fi
-GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET"
-if test -n "$GFORTRAN_FOR_TARGET"; then
-  echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6
+ncn_cv_CONFIGURED_AS_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET"
+if test -n "$ncn_cv_CONFIGURED_AS_FOR_TARGET"; then
+  echo "$ac_t""$ncn_cv_CONFIGURED_AS_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-    fi
-    test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then
-  set dummy gfortran
-  if test $build = $target ; then
-    GFORTRAN_FOR_TARGET="$2"
+    CONFIGURED_AS_FOR_TARGET=$ncn_cv_CONFIGURED_AS_FOR_TARGET
   else
-    GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2"
+    CONFIGURED_AS_FOR_TARGET="${ncn_target_tool_prefix}as"
   fi
-fi
-
-
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=: 
-  fi
-  rm -f conf$$.sh
-fi
-
-
-
-if test "x$exec_prefix" = xNONE; then
-        if test "x$prefix" = xNONE; then
-                gcc_cv_tool_prefix=$ac_default_prefix
-        else
-                gcc_cv_tool_prefix=$prefix
-        fi
 else
-        gcc_cv_tool_prefix=$exec_prefix
+  CONFIGURED_AS_FOR_TARGET="$ac_cv_prog_CONFIGURED_AS_FOR_TARGET"
 fi
 
-# If there is no compiler in the tree, use the PATH only.  In any
-# case, if there is no compiler in the tree nobody should use
-# AS_FOR_TARGET and LD_FOR_TARGET.
-if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then
-    gcc_version=`cat $srcdir/gcc/BASE-VER`
-    gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR"
-else
-    gcc_cv_tool_dirs=
-fi
-
-if test x$build = x$target && test -n "$md_exec_prefix"; then
-        gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR"
-fi
-
-
-
-cat > conftest.c << \EOF
-#ifdef __GNUC__
-  gcc_yay;
-#endif
-EOF
-if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then
-  have_gcc_for_target=yes
-else
-  GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc
-  have_gcc_for_target=no
-fi
-rm conftest.c
-
-
-
-
-if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ar in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5089: checking for ar in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/ar; then
-      AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/ar
-      ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_AR_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar`
-    test $AR_FOR_TARGET=ar && AR_FOR_TARGET=
-    ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+ if test -n "$ncn_target_tool_prefix"; then
+  # Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4333: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$AR_FOR_TARGET" in
-  /*)
-  ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_AR_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-AR_FOR_TARGET="$ac_cv_path_AR_FOR_TARGET"
-if test -n "$AR_FOR_TARGET"; then
-  echo "$ac_t""$AR_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in ar; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5144: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_AR_FOR_TARGET"; then
-  for ncn_progname in ar; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5161: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR_FOR_TARGET"; then
-  ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test.
+  if test -n "$CONFIGURED_DLLTOOL_FOR_TARGET"; then
+  ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET="$CONFIGURED_DLLTOOL_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+      ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}dlltool"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
 fi
-AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET"
-if test -n "$AR_FOR_TARGET"; then
-  echo "$ac_t""$AR_FOR_TARGET" 1>&6
+CONFIGURED_DLLTOOL_FOR_TARGET="$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET"
+if test -n "$CONFIGURED_DLLTOOL_FOR_TARGET"; then
+  echo "$ac_t""$CONFIGURED_DLLTOOL_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    fi
-    if test -z "$ac_cv_prog_AR_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5192: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR_FOR_TARGET"; then
-  ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
 fi
-AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET"
-if test -n "$AR_FOR_TARGET"; then
-  echo "$ac_t""$AR_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_AR_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then
-  set dummy ar
+if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then
   if test $build = $target ; then
-    AR_FOR_TARGET="$2"
-  else
-    AR_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  AR_FOR_TARGET=$ac_cv_path_AR_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for as in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5242: checking for as in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/as; then
-      AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/as
-      ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_AS_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as`
-    test $AS_FOR_TARGET=as && AS_FOR_TARGET=
-    ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5260: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$AS_FOR_TARGET" in
-  /*)
-  ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_AS_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-AS_FOR_TARGET="$ac_cv_path_AS_FOR_TARGET"
-if test -n "$AS_FOR_TARGET"; then
-  echo "$ac_t""$AS_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in as; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5297: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_AS_FOR_TARGET"; then
-  for ncn_progname in as; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5314: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS_FOR_TARGET"; then
-  ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET"
-if test -n "$AS_FOR_TARGET"; then
-  echo "$ac_t""$AS_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_AS_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+    ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET=$CONFIGURED_DLLTOOL_FOR_TARGET
+    # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5345: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4366: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$AS_FOR_TARGET"; then
-  ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test.
+  if test -n "$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET"; then
+  ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS_FOR_TARGET="${ncn_progname}"
+      ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="dlltool"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="dlltool"
 fi
 fi
-AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET"
-if test -n "$AS_FOR_TARGET"; then
-  echo "$ac_t""$AS_FOR_TARGET" 1>&6
+ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET"
+if test -n "$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET"; then
+  echo "$ac_t""$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-    fi
-    test -n "$ac_cv_prog_AS_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then
-  set dummy as
-  if test $build = $target ; then
-    AS_FOR_TARGET="$2"
+    CONFIGURED_DLLTOOL_FOR_TARGET=$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET
   else
-    AS_FOR_TARGET="${ncn_target_tool_prefix}$2"
+    CONFIGURED_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}dlltool"
   fi
-fi
-
 else
-  AS_FOR_TARGET=$ac_cv_path_AS_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for dlltool in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5395: checking for dlltool in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/dlltool; then
-      DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/dlltool
-      ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_DLLTOOL_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool`
-    test $DLLTOOL_FOR_TARGET=dlltool && DLLTOOL_FOR_TARGET=
-    ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5413: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$DLLTOOL_FOR_TARGET" in
-  /*)
-  ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_DLLTOOL_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-DLLTOOL_FOR_TARGET="$ac_cv_path_DLLTOOL_FOR_TARGET"
-if test -n "$DLLTOOL_FOR_TARGET"; then
-  echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in dlltool; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5450: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
+  CONFIGURED_DLLTOOL_FOR_TARGET="$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET"
 fi
 
-if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET"; then
-  for ncn_progname in dlltool; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_target_tool_prefix"; then
+  # Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5467: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4405: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$DLLTOOL_FOR_TARGET"; then
-  ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test.
+  if test -n "$CONFIGURED_LD_FOR_TARGET"; then
+  ac_cv_prog_CONFIGURED_LD_FOR_TARGET="$CONFIGURED_LD_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+      ac_cv_prog_CONFIGURED_LD_FOR_TARGET="${ncn_target_tool_prefix}ld"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
 fi
-DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET"
-if test -n "$DLLTOOL_FOR_TARGET"; then
-  echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6
+CONFIGURED_LD_FOR_TARGET="$ac_cv_prog_CONFIGURED_LD_FOR_TARGET"
+if test -n "$CONFIGURED_LD_FOR_TARGET"; then
+  echo "$ac_t""$CONFIGURED_LD_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    fi
-    if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5498: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL_FOR_TARGET"; then
-  ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET"
-if test -n "$DLLTOOL_FOR_TARGET"; then
-  echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET" && break
-  done
 fi
-  
-if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then
-  set dummy dlltool
+if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then
   if test $build = $target ; then
-    DLLTOOL_FOR_TARGET="$2"
-  else
-    DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  DLLTOOL_FOR_TARGET=$ac_cv_path_DLLTOOL_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ld in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5548: checking for ld in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/ld; then
-      LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/ld
-      ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_LD_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld`
-    test $LD_FOR_TARGET=ld && LD_FOR_TARGET=
-    ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
-  # Extract the first word of "ld", so it can be a program name with args.
+    ncn_cv_CONFIGURED_LD_FOR_TARGET=$CONFIGURED_LD_FOR_TARGET
+    # Extract the first word of "ld", so it can be a program name with args.
 set dummy ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5566: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$LD_FOR_TARGET" in
-  /*)
-  ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_LD_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-LD_FOR_TARGET="$ac_cv_path_LD_FOR_TARGET"
-if test -n "$LD_FOR_TARGET"; then
-  echo "$ac_t""$LD_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in ld; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5603: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_LD_FOR_TARGET"; then
-  for ncn_progname in ld; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5620: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4438: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$LD_FOR_TARGET"; then
-  ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test.
+  if test -n "$ncn_cv_CONFIGURED_LD_FOR_TARGET"; then
+  ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET="$ncn_cv_CONFIGURED_LD_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+      ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET="ld"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET="ld"
 fi
 fi
-LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET"
-if test -n "$LD_FOR_TARGET"; then
-  echo "$ac_t""$LD_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_LD_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5651: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD_FOR_TARGET"; then
-  ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET"
-if test -n "$LD_FOR_TARGET"; then
-  echo "$ac_t""$LD_FOR_TARGET" 1>&6
+ncn_cv_CONFIGURED_LD_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET"
+if test -n "$ncn_cv_CONFIGURED_LD_FOR_TARGET"; then
+  echo "$ac_t""$ncn_cv_CONFIGURED_LD_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-    fi
-    test -n "$ac_cv_prog_LD_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then
-  set dummy ld
-  if test $build = $target ; then
-    LD_FOR_TARGET="$2"
+    CONFIGURED_LD_FOR_TARGET=$ncn_cv_CONFIGURED_LD_FOR_TARGET
   else
-    LD_FOR_TARGET="${ncn_target_tool_prefix}$2"
+    CONFIGURED_LD_FOR_TARGET="${ncn_target_tool_prefix}ld"
   fi
-fi
-
-else
-  LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for lipo in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5701: checking for lipo in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/lipo; then
-      LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/lipo
-      ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_LIPO_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo`
-    test $LIPO_FOR_TARGET=lipo && LIPO_FOR_TARGET=
-    ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5719: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_LIPO_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$LIPO_FOR_TARGET" in
-  /*)
-  ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_LIPO_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-LIPO_FOR_TARGET="$ac_cv_path_LIPO_FOR_TARGET"
-if test -n "$LIPO_FOR_TARGET"; then
-  echo "$ac_t""$LIPO_FOR_TARGET" 1>&6
 else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in lipo; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5756: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
+  CONFIGURED_LD_FOR_TARGET="$ac_cv_prog_CONFIGURED_LD_FOR_TARGET"
 fi
 
-if test -z "$ac_cv_prog_LIPO_FOR_TARGET"; then
-  for ncn_progname in lipo; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_target_tool_prefix"; then
+  # Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5773: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4477: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$LIPO_FOR_TARGET"; then
-  ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test.
+  if test -n "$CONFIGURED_NM_FOR_TARGET"; then
+  ac_cv_prog_CONFIGURED_NM_FOR_TARGET="$CONFIGURED_NM_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LIPO_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+      ac_cv_prog_CONFIGURED_NM_FOR_TARGET="${ncn_target_tool_prefix}nm"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
 fi
-LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET"
-if test -n "$LIPO_FOR_TARGET"; then
-  echo "$ac_t""$LIPO_FOR_TARGET" 1>&6
+CONFIGURED_NM_FOR_TARGET="$ac_cv_prog_CONFIGURED_NM_FOR_TARGET"
+if test -n "$CONFIGURED_NM_FOR_TARGET"; then
+  echo "$ac_t""$CONFIGURED_NM_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    fi
-    if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5804: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LIPO_FOR_TARGET"; then
-  ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LIPO_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET"
-if test -n "$LIPO_FOR_TARGET"; then
-  echo "$ac_t""$LIPO_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break
-  done
 fi
-  
-if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then
-  set dummy lipo
+if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then
   if test $build = $target ; then
-    LIPO_FOR_TARGET="$2"
-  else
-    LIPO_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  LIPO_FOR_TARGET=$ac_cv_path_LIPO_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for nm in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5854: checking for nm in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/nm; then
-      NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/nm
-      ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_NM_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm`
-    test $NM_FOR_TARGET=nm && NM_FOR_TARGET=
-    ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
-  # Extract the first word of "nm", so it can be a program name with args.
+    ncn_cv_CONFIGURED_NM_FOR_TARGET=$CONFIGURED_NM_FOR_TARGET
+    # Extract the first word of "nm", so it can be a program name with args.
 set dummy nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5872: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4510: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$NM_FOR_TARGET" in
-  /*)
-  ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_NM_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-NM_FOR_TARGET="$ac_cv_path_NM_FOR_TARGET"
-if test -n "$NM_FOR_TARGET"; then
-  echo "$ac_t""$NM_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in nm; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5909: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_NM_FOR_TARGET"; then
-  for ncn_progname in nm; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5926: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM_FOR_TARGET"; then
-  ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test.
+  if test -n "$ncn_cv_CONFIGURED_NM_FOR_TARGET"; then
+  ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET="$ncn_cv_CONFIGURED_NM_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+      ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET="nm"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET="nm"
 fi
 fi
-NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET"
-if test -n "$NM_FOR_TARGET"; then
-  echo "$ac_t""$NM_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_NM_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5957: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM_FOR_TARGET"; then
-  ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET"
-if test -n "$NM_FOR_TARGET"; then
-  echo "$ac_t""$NM_FOR_TARGET" 1>&6
+ncn_cv_CONFIGURED_NM_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET"
+if test -n "$ncn_cv_CONFIGURED_NM_FOR_TARGET"; then
+  echo "$ac_t""$ncn_cv_CONFIGURED_NM_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-    fi
-    test -n "$ac_cv_prog_NM_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then
-  set dummy nm
-  if test $build = $target ; then
-    NM_FOR_TARGET="$2"
+    CONFIGURED_NM_FOR_TARGET=$ncn_cv_CONFIGURED_NM_FOR_TARGET
   else
-    NM_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  NM_FOR_TARGET=$ac_cv_path_NM_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for objdump in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6007: checking for objdump in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/objdump; then
-      OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/objdump
-      ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_OBJDUMP_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump`
-    test $OBJDUMP_FOR_TARGET=objdump && OBJDUMP_FOR_TARGET=
-    ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
+    CONFIGURED_NM_FOR_TARGET="${ncn_target_tool_prefix}nm"
   fi
-fi
-if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6025: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$OBJDUMP_FOR_TARGET" in
-  /*)
-  ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_OBJDUMP_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-OBJDUMP_FOR_TARGET="$ac_cv_path_OBJDUMP_FOR_TARGET"
-if test -n "$OBJDUMP_FOR_TARGET"; then
-  echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6
 else
-  echo "$ac_t""no" 1>&6
+  CONFIGURED_NM_FOR_TARGET="$ac_cv_prog_CONFIGURED_NM_FOR_TARGET"
 fi
 
-fi
-if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in objdump; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6062: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET"; then
-  for ncn_progname in objdump; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_target_tool_prefix"; then
+  # Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6079: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4549: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$OBJDUMP_FOR_TARGET"; then
-  ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test.
+  if test -n "$CONFIGURED_RANLIB_FOR_TARGET"; then
+  ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET="$CONFIGURED_RANLIB_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+      ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}ranlib"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
 fi
-OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET"
-if test -n "$OBJDUMP_FOR_TARGET"; then
-  echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6
+CONFIGURED_RANLIB_FOR_TARGET="$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET"
+if test -n "$CONFIGURED_RANLIB_FOR_TARGET"; then
+  echo "$ac_t""$CONFIGURED_RANLIB_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    fi
-    if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+fi
+if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then
+  if test $build = $target ; then
+    ncn_cv_CONFIGURED_RANLIB_FOR_TARGET=$CONFIGURED_RANLIB_FOR_TARGET
+    # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6110: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4582: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$OBJDUMP_FOR_TARGET"; then
-  ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test.
+  if test -n "$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET"; then
+  ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET="$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_progname}"
+      ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET="ranlib"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET=":"
 fi
 fi
-OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET"
-if test -n "$OBJDUMP_FOR_TARGET"; then
-  echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6
+ncn_cv_CONFIGURED_RANLIB_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET"
+if test -n "$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET"; then
+  echo "$ac_t""$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-    fi
-    test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then
-  set dummy objdump
-  if test $build = $target ; then
-    OBJDUMP_FOR_TARGET="$2"
+    CONFIGURED_RANLIB_FOR_TARGET=$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET
   else
-    OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}$2"
+    CONFIGURED_RANLIB_FOR_TARGET=":"
   fi
-fi
-
-else
-  OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ranlib in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6160: checking for ranlib in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/ranlib; then
-      RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/ranlib
-      ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_RANLIB_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib`
-    test $RANLIB_FOR_TARGET=ranlib && RANLIB_FOR_TARGET=
-    ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6178: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$RANLIB_FOR_TARGET" in
-  /*)
-  ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_RANLIB_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-RANLIB_FOR_TARGET="$ac_cv_path_RANLIB_FOR_TARGET"
-if test -n "$RANLIB_FOR_TARGET"; then
-  echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6
 else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in ranlib; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6215: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
+  CONFIGURED_RANLIB_FOR_TARGET="$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET"
 fi
 
-if test -z "$ac_cv_prog_RANLIB_FOR_TARGET"; then
-  for ncn_progname in ranlib; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
+ if test -n "$ncn_target_tool_prefix"; then
+  # Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6232: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4621: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$RANLIB_FOR_TARGET"; then
-  ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test.
+  if test -n "$CONFIGURED_WINDRES_FOR_TARGET"; then
+  ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET="$CONFIGURED_WINDRES_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
+      ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}windres"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
 fi
-RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET"
-if test -n "$RANLIB_FOR_TARGET"; then
-  echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6
+CONFIGURED_WINDRES_FOR_TARGET="$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET"
+if test -n "$CONFIGURED_WINDRES_FOR_TARGET"; then
+  echo "$ac_t""$CONFIGURED_WINDRES_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    fi
-    if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
+fi
+if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then
+  if test $build = $target ; then
+    ncn_cv_CONFIGURED_WINDRES_FOR_TARGET=$CONFIGURED_WINDRES_FOR_TARGET
+    # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6263: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
+echo "configure:4654: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$RANLIB_FOR_TARGET"; then
-  ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test.
+  if test -n "$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET"; then
+  ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB_FOR_TARGET="${ncn_progname}"
+      ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="windres"
       break
     fi
   done
   IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET" && ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="windres"
 fi
 fi
-RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET"
-if test -n "$RANLIB_FOR_TARGET"; then
-  echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6
+ncn_cv_CONFIGURED_WINDRES_FOR_TARGET="$ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET"
+if test -n "$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET"; then
+  echo "$ac_t""$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
  
-    fi
-    test -n "$ac_cv_prog_RANLIB_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then
-  set dummy ranlib
-  if test $build = $target ; then
-    RANLIB_FOR_TARGET="$2"
+    CONFIGURED_WINDRES_FOR_TARGET=$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET
   else
-    RANLIB_FOR_TARGET="${ncn_target_tool_prefix}$2"
+    CONFIGURED_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}windres"
   fi
-fi
-
 else
-  RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET
+  CONFIGURED_WINDRES_FOR_TARGET="$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET"
 fi
 
 
 
 
-if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for strip in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6313: checking for strip in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/strip; then
-      STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/strip
-      ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_STRIP_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip`
-    test $STRIP_FOR_TARGET=strip && STRIP_FOR_TARGET=
-    ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6331: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$STRIP_FOR_TARGET" in
-  /*)
-  ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_STRIP_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-STRIP_FOR_TARGET="$ac_cv_path_STRIP_FOR_TARGET"
-if test -n "$STRIP_FOR_TARGET"; then
-  echo "$ac_t""$STRIP_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in strip; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6368: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_STRIP_FOR_TARGET"; then
-  for ncn_progname in strip; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6385: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP_FOR_TARGET"; then
-  ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET"
-if test -n "$STRIP_FOR_TARGET"; then
-  echo "$ac_t""$STRIP_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6416: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP_FOR_TARGET"; then
-  ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET"
-if test -n "$STRIP_FOR_TARGET"; then
-  echo "$ac_t""$STRIP_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then
-  set dummy strip
-  if test $build = $target ; then
-    STRIP_FOR_TARGET="$2"
-  else
-    STRIP_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
 
-else
-  STRIP_FOR_TARGET=$ac_cv_path_STRIP_FOR_TARGET
-fi
 
 
 
 
-if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for windres in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6466: checking for windres in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/windres; then
-      WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/windres
-      ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_WINDRES_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres`
-    test $WINDRES_FOR_TARGET=windres && WINDRES_FOR_TARGET=
-    ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
-  # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6484: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_WINDRES_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$WINDRES_FOR_TARGET" in
-  /*)
-  ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_WINDRES_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-WINDRES_FOR_TARGET="$ac_cv_path_WINDRES_FOR_TARGET"
-if test -n "$WINDRES_FOR_TARGET"; then
-  echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-fi
-if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in windres; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6521: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
 
-if test -z "$ac_cv_prog_WINDRES_FOR_TARGET"; then
-  for ncn_progname in windres; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6538: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES_FOR_TARGET"; then
-  ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET"
-if test -n "$WINDRES_FOR_TARGET"; then
-  echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-    fi
-    if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6569: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES_FOR_TARGET"; then
-  ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET"
-if test -n "$WINDRES_FOR_TARGET"; then
-  echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6
+# Fix up target tools.
+if test "x${build}" = "x${host}" ; then
+  # In this case, the newly built tools can and should be used,
+  # so we override the results of the autoconf tests.
+  # This should really only happen when the tools are actually being built,
+  # but that's a further refinement.  The new build scheme, where
+  # tools are built into a structure paralleling where they're installed,
+  # should also eliminate all of this cleanly.
+  AR_FOR_TARGET="\$(USUAL_AR_FOR_TARGET)"
+  AS_FOR_TARGET="\$(USUAL_AS_FOR_TARGET)"
+  DLLTOOL_FOR_TARGET="\$(USUAL_DLLTOOL_FOR_TARGET)"
+  LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)"
+  NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)"
+  RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)"
+  WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)"
 else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then
-  set dummy windres
-  if test $build = $target ; then
-    WINDRES_FOR_TARGET="$2"
-  else
-    WINDRES_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
+  # Just use the ones we found.
+  AR_FOR_TARGET="\$(CONFIGURED_AR_FOR_TARGET)"
+  AS_FOR_TARGET="\$(CONFIGURED_AS_FOR_TARGET)"
+  DLLTOOL_FOR_TARGET="\$(CONFIGURED_DLLTOOL_FOR_TARGET)"
+  LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)"
+  NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)"
+  RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)"
+  WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)"  
 fi
 
-else
-  WINDRES_FOR_TARGET=$ac_cv_path_WINDRES_FOR_TARGET
-fi
 
 
-RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
 
-echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6
-echo "configure:6617: checking where to find the target ar" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    AR_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ar'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    AR_FOR_TARGET='$(AR)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target as""... $ac_c" 1>&6
-echo "configure:6650: checking where to find the target as" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gas "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gas/as-new'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    AS_FOR_TARGET='$(AS)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6
-echo "configure:6683: checking where to find the target cc" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    CC_FOR_TARGET='$(CC)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6
-echo "configure:6716: checking where to find the target c++" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  case ,${enable_languages}, in
-    *,c++,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    CXX_FOR_TARGET='$(CXX)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6
-echo "configure:6752: checking where to find the target c++ for libstdc++" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  case ,${enable_languages}, in
-    *,c++,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    RAW_CXX_FOR_TARGET='$(CXX)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6
-echo "configure:6788: checking where to find the target dlltool" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    DLLTOOL_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/dlltool'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    DLLTOOL_FOR_TARGET='$(DLLTOOL)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6
-echo "configure:6821: checking where to find the target gcc" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    GCC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    GCC_FOR_TARGET='$()'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6
-echo "configure:6854: checking where to find the target gcj" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  case ,${enable_languages}, in
-    *,java,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    GCJ_FOR_TARGET='$(GCJ)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6
-echo "configure:6890: checking where to find the target gfortran" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  case ,${enable_languages}, in
-    *,fortran,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    GFORTRAN_FOR_TARGET='$(GFORTRAN)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6
-echo "configure:6926: checking where to find the target ld" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" ld "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/ld/ld-new'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    LD_FOR_TARGET='$(LD)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6
-echo "configure:6959: checking where to find the target lipo" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    LIPO_FOR_TARGET='$(LIPO)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6
-echo "configure:6982: checking where to find the target nm" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/nm-new'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    NM_FOR_TARGET='$(NM)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6
-echo "configure:7015: checking where to find the target objdump" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    OBJDUMP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/objdump'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    OBJDUMP_FOR_TARGET='$(OBJDUMP)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6
-echo "configure:7048: checking where to find the target ranlib" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    RANLIB_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ranlib'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    RANLIB_FOR_TARGET='$(RANLIB)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6
-echo "configure:7081: checking where to find the target strip" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    STRIP_FOR_TARGET='$(STRIP)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6
-echo "configure:7114: checking where to find the target windres" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    WINDRES_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/windres'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    WINDRES_FOR_TARGET='$(WINDRES)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
 
 
 
@@ -7151,27 +4734,8 @@ AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
 RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
 NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
 
-# When building target libraries, except in a Canadian cross, we use
-# the same toolchain as the compiler we just built.
-COMPILER_AS_FOR_TARGET='$(AS_FOR_TARGET)'
-COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)'
-COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)'
-if test $host = $build; then
-  case " $configdirs " in
-    *" gcc "*)
-      COMPILER_AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as'
-      COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld'
-      COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target}
-      ;;
-  esac
-fi
-
-
-
-
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:7175: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:4739: checking whether to enable maintainer-specific portions of Makefiles" >&5
 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -7214,6 +4778,42 @@ case $build in
 esac
 
 
+# It makes debugging easier if we create as symlinks the stage directories
+# gcc for stageN-gcc and stagePREV-gcc for stage(N-1).  In case this is not
+# possible, however, we can resort to mv.
+echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
+echo "configure:4786: checking if symbolic links between directories work" >&5
+if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "${LN_S}" = "ln -s" \
+   && mkdir confdir.s1 \
+   && ln -s confdir.s1 confdir.s2 \
+   && echo timestamp1 > confdir.s1/conftest.1 \
+   && cmp confdir.s1/conftest.1 confdir.s2/conftest.1 \
+   && echo timestamp2 > confdir.s2/conftest.2 \
+   && cmp confdir.s1/conftest.2 confdir.s1/conftest.2 \
+   && rm -f confdir.s2; then
+  gcc_cv_prog_ln_s_dir=yes
+else
+  gcc_cv_prog_ln_s_dir=no
+fi
+rm -rf confdir.s1 confdir.s2
+fi
+
+echo "$ac_t""$gcc_cv_prog_ln_s_dir" 1>&6
+
+case ${gcc_cv_prog_ln_s_dir} in
+  yes)
+    CREATE_LINK_TO_DIR='ln -s $$1 $$2'
+    UNDO_LINK_TO_DIR='rm -f $$1' ;;
+  *)
+    CREATE_LINK_TO_DIR='mv $$1 $$2'
+    UNDO_LINK_TO_DIR='mv $$1 $$2' ;;
+esac
+
+
+
 # Enable -Werror in bootstrap stage2 and later.
 # Change the default to "no" on release branches.
 # Check whether --enable-werror or --disable-werror was given.
@@ -7296,15 +4896,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
 
 # Without the "./", some shells look in PATH for config.status.
@@ -7405,7 +5024,14 @@ s%@do_compare@%$do_compare%g
 s%@gmplibs@%$gmplibs%g
 s%@gmpinc@%$gmpinc%g
 s%@stage1_languages@%$stage1_languages%g
-s%@SYSROOT_CFLAGS_FOR_TARGET@%$SYSROOT_CFLAGS_FOR_TARGET%g
+s%@CONFIGURED_BISON@%$CONFIGURED_BISON%g
+s%@CONFIGURED_YACC@%$CONFIGURED_YACC%g
+s%@CONFIGURED_M4@%$CONFIGURED_M4%g
+s%@CONFIGURED_FLEX@%$CONFIGURED_FLEX%g
+s%@CONFIGURED_LEX@%$CONFIGURED_LEX%g
+s%@CONFIGURED_MAKEINFO@%$CONFIGURED_MAKEINFO%g
+s%@bootstrap_lean@%$bootstrap_lean%g
+s%@default_target@%$default_target%g
 /@serialization_dependencies@/r $serialization_dependencies
 s%@serialization_dependencies@%%g
 /@host_makefile_frag@/r $host_makefile_frag
@@ -7417,63 +5043,75 @@ s%@alphaieee_frag@%%g
 /@ospace_frag@/r $ospace_frag
 s%@ospace_frag@%%g
 s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
+s%@BUILD_PREFIX@%$BUILD_PREFIX%g
+s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g
 s%@tooldir@%$tooldir%g
 s%@build_tooldir@%$build_tooldir%g
-s%@CONFIGURE_GDB_TK@%$CONFIGURE_GDB_TK%g
 s%@GDB_TK@%$GDB_TK%g
-s%@INSTALL_GDB_TK@%$INSTALL_GDB_TK%g
 s%@build_configargs@%$build_configargs%g
 s%@build_configdirs@%$build_configdirs%g
 s%@host_configargs@%$host_configargs%g
 s%@configdirs@%$configdirs%g
 s%@target_configargs@%$target_configargs%g
+s%@target_configdirs@%$target_configdirs%g
 s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
 s%@config_shell@%$config_shell%g
-s%@YACC@%$YACC%g
-s%@BISON@%$BISON%g
-s%@M4@%$M4%g
-s%@LEX@%$LEX%g
-s%@FLEX@%$FLEX%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@EXPECT@%$EXPECT%g
-s%@RUNTEST@%$RUNTEST%g
 s%@AR@%$AR%g
+s%@ncn_cv_AR@%$ncn_cv_AR%g
 s%@AS@%$AS%g
+s%@ncn_cv_AS@%$ncn_cv_AS%g
 s%@DLLTOOL@%$DLLTOOL%g
+s%@ncn_cv_DLLTOOL@%$ncn_cv_DLLTOOL%g
 s%@LD@%$LD%g
-s%@LIPO@%$LIPO%g
+s%@ncn_cv_LD@%$ncn_cv_LD%g
 s%@NM@%$NM%g
+s%@ncn_cv_NM@%$ncn_cv_NM%g
 s%@RANLIB@%$RANLIB%g
-s%@STRIP@%$STRIP%g
+s%@ncn_cv_RANLIB@%$ncn_cv_RANLIB%g
 s%@WINDRES@%$WINDRES%g
+s%@ncn_cv_WINDRES@%$ncn_cv_WINDRES%g
 s%@OBJCOPY@%$OBJCOPY%g
+s%@ncn_cv_OBJCOPY@%$ncn_cv_OBJCOPY%g
 s%@OBJDUMP@%$OBJDUMP%g
+s%@ncn_cv_OBJDUMP@%$ncn_cv_OBJDUMP%g
 s%@CXX@%$CXX%g
 s%@CFLAGS_FOR_BUILD@%$CFLAGS_FOR_BUILD%g
-s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g
-s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g
+s%@CONFIGURED_AR_FOR_TARGET@%$CONFIGURED_AR_FOR_TARGET%g
+s%@ncn_cv_CONFIGURED_AR_FOR_TARGET@%$ncn_cv_CONFIGURED_AR_FOR_TARGET%g
+s%@CONFIGURED_AS_FOR_TARGET@%$CONFIGURED_AS_FOR_TARGET%g
+s%@ncn_cv_CONFIGURED_AS_FOR_TARGET@%$ncn_cv_CONFIGURED_AS_FOR_TARGET%g
+s%@CONFIGURED_DLLTOOL_FOR_TARGET@%$CONFIGURED_DLLTOOL_FOR_TARGET%g
+s%@ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET@%$ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET%g
+s%@CONFIGURED_LD_FOR_TARGET@%$CONFIGURED_LD_FOR_TARGET%g
+s%@ncn_cv_CONFIGURED_LD_FOR_TARGET@%$ncn_cv_CONFIGURED_LD_FOR_TARGET%g
+s%@CONFIGURED_NM_FOR_TARGET@%$CONFIGURED_NM_FOR_TARGET%g
+s%@ncn_cv_CONFIGURED_NM_FOR_TARGET@%$ncn_cv_CONFIGURED_NM_FOR_TARGET%g
+s%@CONFIGURED_RANLIB_FOR_TARGET@%$CONFIGURED_RANLIB_FOR_TARGET%g
+s%@ncn_cv_CONFIGURED_RANLIB_FOR_TARGET@%$ncn_cv_CONFIGURED_RANLIB_FOR_TARGET%g
+s%@CONFIGURED_WINDRES_FOR_TARGET@%$CONFIGURED_WINDRES_FOR_TARGET%g
+s%@ncn_cv_CONFIGURED_WINDRES_FOR_TARGET@%$ncn_cv_CONFIGURED_WINDRES_FOR_TARGET%g
 s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g
+s%@FLAGS_FOR_TARGET@%$FLAGS_FOR_TARGET%g
+s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g
 s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g
 s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g
+s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g
+s%@RAW_CXX_FOR_TARGET@%$RAW_CXX_FOR_TARGET%g
+s%@CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%$CXX_FOR_TARGET_FOR_RECURSIVE_MAKE%g
+s%@RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%$RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE%g
 s%@AR_FOR_TARGET@%$AR_FOR_TARGET%g
 s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g
 s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g
 s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g
-s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g
 s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g
-s%@OBJDUMP_FOR_TARGET@%$OBJDUMP_FOR_TARGET%g
 s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g
-s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
 s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g
-s%@FLAGS_FOR_TARGET@%$FLAGS_FOR_TARGET%g
-s%@RAW_CXX_FOR_TARGET@%$RAW_CXX_FOR_TARGET%g
-s%@COMPILER_AS_FOR_TARGET@%$COMPILER_AS_FOR_TARGET%g
-s%@COMPILER_LD_FOR_TARGET@%$COMPILER_LD_FOR_TARGET%g
-s%@COMPILER_NM_FOR_TARGET@%$COMPILER_NM_FOR_TARGET%g
 s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
 s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@stage1_cflags@%$stage1_cflags%g
+s%@CREATE_LINK_TO_DIR@%$CREATE_LINK_TO_DIR%g
+s%@UNDO_LINK_TO_DIR@%$UNDO_LINK_TO_DIR%g
 s%@stage2_werror_flag@%$stage2_werror_flag%g
 
 CEOF
diff --git a/configure.in b/configure.in
index da7c63f4f..64dad1b9f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+#   1999, 2000, 2001, 2002, 2003, 2004 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
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ##############################################################################
 ### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
@@ -123,7 +123,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber"
+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp"
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
@@ -147,13 +147,10 @@ target_libraries="target-libiberty \
 		target-newlib \
 		target-libstdc++-v3 \
 		target-libmudflap \
-		target-libssp \
-		target-libgcc-math \
 		target-libgfortran \
 		${libgcj} \
 		target-libobjc \
-		target-libada \
-		target-libgomp"
+		target-libada"
 
 # these tools are built using the target libraries, and are intended to
 # run only in the target environment
@@ -260,10 +257,6 @@ case "${host}" in
     configdirs="$configdirs libtermcap" ;;
 esac
 
-# A target can indicate whether a language isn't supported for some reason.
-# Only spaces may be used in this macro; not newlines or tabs.
-unsupported_languages=
-
 # Remove more programs from consideration, based on the host or 
 # target this usually means that a port of the program doesn't
 # exist yet.
@@ -305,26 +298,10 @@ AC_ARG_ENABLE(libada,
 ENABLE_LIBADA=$enableval,
 ENABLE_LIBADA=yes)
 if test "${ENABLE_LIBADA}" != "yes" ; then
+  noconfigdirs="$noconfigdirs target-libada"
   noconfigdirs="$noconfigdirs gnattools"
 fi
 
-AC_ARG_ENABLE(libssp,
-[  --enable-libssp        Builds libssp directory],
-ENABLE_LIBSSP=$enableval,
-ENABLE_LIBSSP=yes)
-
-# Set the default so we build libgcc-math for ix86 and x86_64
-AC_ARG_ENABLE(libgcc-math,
-[  --enable-libgcc-math   Builds libgcc-math directory],,
-[
-case "${target}" in
-  i?86-* | x86_64-* )
-    enable_libgcc_math=yes ;;
-  *)
-    enable_libgcc_math=no ;;
-esac
-])
-
 # Save it here so that, even in case of --enable-libgcj, if the Java
 # front-end isn't enabled, we still get libgcj disabled.
 libgcj_saved=$libgcj
@@ -342,10 +319,16 @@ no)
 esac
 
 
-# Disable libmudflap on some systems.
-if test x$enable_libmudflap = x ; then
+# Allow --disable-libmudflap to exclude target-libmudflap
+case $enable_libmudflap in
+yes)
+    ;;
+no)
+    noconfigdirs="$noconfigdirs target-libmudflap"
+    ;;
+"")
     case "${target}" in
-    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)
         # Enable libmudflap by default in GNU and friends.
 	;;
     *-*-freebsd*)
@@ -356,25 +339,7 @@ if test x$enable_libmudflap = x ; then
 	noconfigdirs="$noconfigdirs target-libmudflap"
 	;;
     esac
-fi
-
-# Disable libgomp on non POSIX hosted systems.
-if test x$enable_libgomp = x ; then
-    # Enable libgomp by default on hosted POSIX systems.
-    case "${target}" in
-    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-	;;
-    *-*-netbsd* | *-*-freebsd* | *-*-openbsd*)
-	;;
-    *-*-solaris2* | *-*-sysv4* | *-*-irix* | *-*-osf* | *-*-hpux*)
-	;;
-    *-*-darwin* | *-*-aix*)
-	;;
-    *)
-	noconfigdirs="$noconfigdirs target-libgomp"
-	;;
-    esac
-fi
+esac
 
 
 case "${target}" in
@@ -383,11 +348,9 @@ case "${target}" in
     ;;
   powerpc-*-darwin*)
     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
-    noconfigdirs="$noconfigdirs sim target-rda"
     ;;
   *-*-darwin*)
-    noconfigdirs="$noconfigdirs ld gas gdb gprof"
-    noconfigdirs="$noconfigdirs sim target-rda"
+    noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   *-*-freebsd[[12]] | *-*-freebsd[[12]].* | *-*-freebsd*aout*)
@@ -435,18 +398,11 @@ case "${target}" in
   *-*-rtems*)
     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
     ;;
-    # The tpf target doesn't support gdb yet.
-  *-*-tpf*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} target-libmudflap gdb tcl tk libgui itcl"
-    ;;
   *-*-uclinux*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}"
     ;;
   *-*-vxworks*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}"
-    ;;
-  m32c-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj}"
     ;;
   alpha*-dec-osf*)
     # ld works, but does not support shared libraries.
@@ -497,10 +453,6 @@ case "${target}" in
   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
     ;;
-  arm*-*-linux-gnueabi)
-    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-    noconfigdirs="$noconfigdirs target-libjava target-libobjc"
-    ;;
   arm*-*-symbianelf*)
     noconfigdirs="$noconfigdirs ${libgcj} target-libiberty"
     ;;
@@ -522,12 +474,6 @@ case "${target}" in
   avr-*-*)
     noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
     ;;
-  bfin-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss gdb"
-    if test x${is_cross_compiler} != xno ; then
-      target_configdirs="${target_configdirs} target-bsp target-cygmon"
-    fi
-    ;;
   c4x-*-* | tic4x-*-*)
     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
     ;;
@@ -535,18 +481,10 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib"
     ;;
   cris-*-* | crisv32-*-*)
-    unsupported_languages="$unsupported_languages java"
     case "${target}" in
-      *-*-aout)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
-      *-*-elf)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs target-boehm-gc";;
-      *-*-linux*)
-	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
+      *-*-elf | *-*-aout)
+	noconfigdirs="$noconfigdirs ${libgcj}";;
       *)
-	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
     esac
     ;;
@@ -678,9 +616,6 @@ case "${target}" in
   i[[3456789]]86-*-beos*)
     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
     ;;
-  i[[3456789]]86-*-rdos*)
-    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
-    ;;
   m32r-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
@@ -699,8 +634,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libstdc++-v3"
     ;;
   mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss"
-    unsupported_languages="$unsupported_languages fortran java"
+    noconfigdirs="$noconfigdirs ${libgcj} gdb libgloss target-libgfortran"
     ;;
   mn10200-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
@@ -708,12 +642,9 @@ case "${target}" in
   mn10300-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  mt-*-*)
-    noconfigdirs="$noconfigdirs sim"
-    ;;
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
-    noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
     ;;
   powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
     target_configdirs="$target_configdirs target-winsup"
@@ -737,7 +668,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
     ;;
   rs6000-*-aix*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
     ;;
   rs6000-*-*)
     noconfigdirs="$noconfigdirs gprof ${libgcj}"
@@ -992,12 +923,6 @@ case "${host}" in
   powerpc-*-darwin*)
     host_makefile_frag="config/mh-ppc-darwin"
     ;;
-  powerpc-*-aix*)
-    host_makefile_frag="config/mh-ppc-aix"
-    ;;
-  rs6000-*-aix*)
-    host_makefile_frag="config/mh-ppc-aix"
-    ;;
   *-*-lynxos*)
     # /bin/cc is less than useful for our purposes.  Always use GCC
     tentative_cc="/bin/gcc"
@@ -1041,6 +966,12 @@ if test "${build}" != "${host}" ; then
   CXX=${CXX-${host_alias}-c++}
   CXXFLAGS=${CXXFLAGS-"-g -O2"}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
+  CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc}
+  CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
+  GCJ_FOR_TARGET=${GCJ_FOR_TARGET-${target_alias}-gcj}
+  GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
+  BUILD_PREFIX=${build_alias}-
+  BUILD_PREFIX_1=${build_alias}-
 
 else
   # Set reasonable default values for some tools even if not Canadian.
@@ -1052,6 +983,10 @@ else
   # This is all going to change when we autoconfiscate...
 
   CC_FOR_BUILD="\$(CC)"
+  GCC_FOR_TARGET="\$(USUAL_GCC_FOR_TARGET)"
+  BUILD_PREFIX=
+  BUILD_PREFIX_1=loser-
+
   AC_PROG_CC
 
   # We must set the default linker to the linker used by gcc for the correct
@@ -1090,7 +1025,7 @@ have_gmp=yes
 AC_ARG_WITH(mpfr-dir, [  --with-mpfr-dir=PATH    Specify source directory for MPFR library])
 
 if test "x$with_mpfr_dir" != x; then
-  gmpinc="-I$with_mpfr_dir"
+  gmpinc="-I$with_mpfr_dir/mpfr"
   gmplibs="$with_mpfr_dir/libmpfr.a"
 else
   gmplibs="-lmpfr"
@@ -1179,15 +1114,6 @@ if test -d ${srcdir}/gcc; then
   fi
   enable_languages=`echo "${enable_languages}" | sed -e 's/[[ 	,]][[ 	,]]*/,/g' -e 's/,$//'`
 
-  # 'f95' is the old name for the 'fortran' language. We issue a warning
-  # and make the substitution.
-  case ,${enable_languages}, in
-    *,f95,*)
-      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
-      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
-      ;;
-  esac
-
   # First scan to see if an enabled language requires some other language.
   # We assume that a given config-lang.in will list all the language
   # front ends it requires, even if some are required indirectly.
@@ -1276,14 +1202,7 @@ if test -d ${srcdir}/gcc; then
             add_this_lang=no
             ;;
         esac
-
-	# Disable a language that is unsupported by the target.
-	case " $unsupported_languages " in
-	  *" $language "*)
-	    add_this_lang=no
-	    ;;
-	esac
-
+        
 	case $add_this_lang in
 	  no)
             # Remove language-dependent dirs.
@@ -1307,8 +1226,8 @@ if test -d ${srcdir}/gcc; then
   missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"`
   if test "x$missing_languages" != x; then
     AC_MSG_ERROR([
-The following requested languages could not be built: ${missing_languages}
-Recognised languages are: ${potential_languages}])
+The following requested languages were not found: ${missing_languages}
+The available languages are: ${potential_languages}])
   fi
 
   if test "x$new_enable_languages" != "x$enable_languages"; then
@@ -1318,14 +1237,6 @@ Recognised languages are: ${potential_languages}])
   ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[[^ ]]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `
 fi
 
-# Handle --disable-<component> generically.
-for dir in $configdirs $build_configdirs $target_configdirs ; do
-  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g`
-  if eval test x\${enable_${dirname}} "=" xno ; then
-    noconfigdirs="$noconfigdirs $dir"
-  fi
-done
-
 # Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
 # $build_configdirs and $target_configdirs.
 # If we have the source for $noconfigdirs entries, add them to $notsupp.
@@ -1453,15 +1364,6 @@ esac
 
 copy_dirs=
 
-AC_ARG_WITH([build-sysroot], 
-  [  --with-build-sysroot=sysroot
-                          use sysroot as the system root during the build],
-  [if test x"$withval" != x ; then
-     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
-   fi],
-  [SYSROOT_CFLAGS_FOR_TARGET=])
-AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
-
 # Handle --with-headers=XXX.  If the value is not "yes", the contents of
 # the named directory are copied to $(tooldir)/sys-include.
 if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
@@ -1499,39 +1401,6 @@ if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
   fi
 fi
 
-# Set with_gnu_as and with_gnu_ld as appropriate.
-#
-# This is done by determining whether or not the appropriate directory
-# is available, and by checking whether or not specific configurations
-# have requested that this magic not happen.
-# 
-# The command line options always override the explicit settings in 
-# configure.in, and the settings in configure.in override this magic.
-#
-# If the default for a toolchain is to use GNU as and ld, and you don't 
-# want to do that, then you should use the --without-gnu-as and
-# --without-gnu-ld options for the configure script.
-
-if test x${use_gnu_as} = x &&
-   echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
-  with_gnu_as=yes
-  extra_host_args="$extra_host_args --with-gnu-as"
-fi
-
-if test x${use_gnu_ld} = x &&
-   echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then
-  with_gnu_ld=yes
-  extra_host_args="$extra_host_args --with-gnu-ld"
-fi
-
-# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
-# can detect this case.
-
-if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
-  with_newlib=yes
-  extra_host_args="$extra_host_args --with-newlib"
-fi
-
 # Handle ${copy_dirs}
 set fnord ${copy_dirs}
 shift
@@ -1563,55 +1432,6 @@ while test $# != 0 ; do
   shift; shift
 done
 
-# Determine a target-dependent exec_prefix that the installed
-# gcc will search in.  Keep this list sorted by triplet, with
-# the *-*-osname triplets last.
-md_exec_prefix=
-case "${target}" in
-  alpha*-*-*vms*)
-    md_exec_prefix=/gnu/lib/gcc-lib
-    ;;
-  i[34567]86-pc-msdosdjgpp*)
-    md_exec_prefix=/dev/env/DJDIR/bin
-    ;;
-  i[34567]86-*-sco3.2v5*)
-    if test $with_gnu_as = yes; then
-      md_exec_prefix=/usr/gnu/bin
-    else
-      md_exec_prefix=/usr/ccs/bin/elf
-    fi
-    ;;
-
-  mn10300-*-* | \
-  powerpc-*-chorusos* | \
-  powerpc*-*-eabi* | \
-  powerpc*-*-sysv* | \
-  powerpc*-*-kaos* | \
-  s390x-ibm-tpf*)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-  sparc64-*-elf*)
-    ;;
-  v850*-*-*)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-  xtensa-*-elf*)
-    ;;
-
-  *-*-beos* | \
-  *-*-elf* | \
-  *-*-hpux* | \
-  *-*-netware* | \
-  *-*-nto-qnx* | \
-  *-*-rtems* | \
-  *-*-solaris2* | \
-  *-*-sysv[45]* | \
-  *-*-vxworks* | \
-  *-wrs-windiss)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-esac
-
 extra_arflags_for_target=
 extra_nmflags_for_target=
 extra_ranlibflags_for_target=
@@ -1669,6 +1489,39 @@ case "${enable_target_optspace}:${target}" in
     ;;
 esac
 
+# Set with_gnu_as and with_gnu_ld as appropriate.
+#
+# This is done by determining whether or not the appropriate directory
+# is available, and by checking whether or not specific configurations
+# have requested that this magic not happen.
+# 
+# The command line options always override the explicit settings in 
+# configure.in, and the settings in configure.in override this magic.
+#
+# If the default for a toolchain is to use GNU as and ld, and you don't 
+# want to do that, then you should use the --without-gnu-as and
+# --without-gnu-ld options for the configure script.
+
+if test x${use_gnu_as} = x &&
+   echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
+  with_gnu_as=yes
+  extra_host_args="$extra_host_args --with-gnu-as"
+fi
+
+if test x${use_gnu_ld} = x &&
+   echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then
+  with_gnu_ld=yes
+  extra_host_args="$extra_host_args --with-gnu-ld"
+fi
+
+# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
+# can detect this case.
+
+if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
+  with_newlib=yes
+  extra_host_args="$extra_host_args --with-newlib"
+fi
+
 # Default to using --with-stabs for certain targets.
 if test x${with_stabs} = x ; then
   case "${target}" in
@@ -1694,6 +1547,17 @@ esac
 tooldir='${exec_prefix}'/${target_alias}
 build_tooldir=${tooldir}
 
+# Generate default definitions for YACC, M4, LEX and other programs that run
+# on the build machine.  These are used if the Makefile can't locate these
+# programs in objdir.
+MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
+AC_CHECK_PROGS([CONFIGURED_BISON], [bison], [$MISSING bison])
+AC_CHECK_PROGS([CONFIGURED_YACC], ['bison -y' byacc yacc], [$MISSING bison -y])
+AC_CHECK_PROGS([CONFIGURED_M4], [gm4 gnum4 m4], [$MISSING m4])
+AC_CHECK_PROGS([CONFIGURED_FLEX], [flex], [$MISSING flex])
+AC_CHECK_PROGS([CONFIGURED_LEX], [flex lex], [$MISSING flex])
+AC_CHECK_PROGS([CONFIGURED_MAKEINFO], makeinfo, [$MISSING makeinfo])
+
 # Create a .gdbinit file which runs the one in srcdir
 # and tells GDB to look there for source files.
 
@@ -1796,8 +1660,6 @@ case "$enable_gdbtk" in
     fi
     ;;
 esac
-CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
-INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
 
 # Strip out unwanted targets.
 
@@ -1813,7 +1675,7 @@ INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
 # not to nest @if/@endif pairs, because configure will not warn you at all.
 
 AC_ARG_ENABLE([bootstrap],
-[  --enable-bootstrap           Enable bootstrapping [yes if native build]],,
+[  --enable-bootstrap[=lean]     Enable bootstrapping [no]],,
 enable_bootstrap=default)
 
 # Issue errors and warnings for invalid/strange bootstrap combinations.
@@ -1825,26 +1687,27 @@ esac
 case "$have_compiler:$host:$target:$enable_bootstrap" in
   *:*:*:no) ;;
 
-  # Default behavior.  Enable bootstrap if we have a compiler
+  # Default behavior.  (We'll) enable bootstrap if we have a compiler
   # and we are in a native configuration.
   yes:$build:$build:default)
-    enable_bootstrap=yes ;;
+    # This will become 'yes'
+    enable_bootstrap=no ;;
 
   *:*:*:default)
     enable_bootstrap=no ;;
 
   # We have a compiler and we are in a native configuration, bootstrap is ok
-  yes:$build:$build:yes)
+  yes:$build:$build:yes | yes:$build:$build:lean)
     ;;
 
   # Other configurations, but we have a compiler.  Assume the user knows
   # what he's doing.
-  yes:*:*:yes)
+  yes:*:*:yes | yes:*:*:lean)
     AC_MSG_WARN([trying to bootstrap a cross compiler])
     ;;
 
   # No compiler: if they passed --enable-bootstrap explicitly, fail
-  no:*:*:yes)
+  no:*:*:yes | no:*:*:lean)
     AC_MSG_ERROR([cannot bootstrap without a compiler]) ;;
 
   # Fail if wrong command line
@@ -1856,10 +1719,19 @@ esac
 # Adjust the toplevel makefile according to whether bootstrap was selected.
 case "$enable_bootstrap" in
   yes)
+    bootstrap_lean='#'
+    default_target=bootstrap
+    bootstrap_suffix=bootstrap ;;
+  lean)
+    bootstrap_lean=''
+    default_target=bootstrap
     bootstrap_suffix=bootstrap ;;
   no)
+    default_target=all
     bootstrap_suffix=no-bootstrap ;;
 esac
+AC_SUBST(bootstrap_lean)
+AC_SUBST(default_target)
 
 for module in ${build_configdirs} ; do
   if test -z "${no_recursion}" \
@@ -1874,13 +1746,10 @@ for module in ${build_configdirs} ; do
 /^@endif build-$module-$bootstrap_suffix\$/d"
 done
 for module in ${configdirs} ; do
-  if test -z "${no_recursion}"; then
-    for file in stage*-${module}/Makefile ${module}/Makefile; do
-      if test -f ${file}; then
-	echo 1>&2 "*** removing ${file} to force reconfigure"
-	rm -f ${file}
-      fi
-    done
+  if test -z "${no_recursion}" \
+     && test -f ${module}/Makefile; then
+    echo 1>&2 "*** removing ${module}/Makefile to force reconfigure"
+    rm -f ${module}/Makefile
   fi
   extrasub="$extrasub
 /^@if $module\$/d
@@ -2054,10 +1923,8 @@ fi
 # fixed in future.  It's still worthwhile to use a cache file for each
 # directory.  I think.
 
-# Pass the appropriate --build, --host, --target and --cache-file arguments.
-# We need to pass --target, as newer autoconf's requires consistency
-# for target_alias and gcc doesn't manage it consistently.
-target_configargs="--cache-file=./config.cache --build=${build_alias} --host=${target_alias} --target=${target_alias} ${target_configargs}"
+# Pass the appropriate --host, --build, and --cache-file arguments.
+target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
 
 FLAGS_FOR_TARGET=
 case " $target_configdirs " in
@@ -2129,6 +1996,89 @@ if test "x${use_gnu_ld}" = x &&
   FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(HOST_SUBDIR)/ld'
 fi
 
+if test "x${CC_FOR_TARGET+set}" = xset; then
+  :
+elif test -d ${srcdir}/gcc; then
+  CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/'
+elif test "$host" = "$target"; then
+  CC_FOR_TARGET='$(CC)'
+else
+  CC_FOR_TARGET=`echo gcc | sed "${program_transform_name}"`
+fi
+CC_FOR_TARGET=$CC_FOR_TARGET' $(FLAGS_FOR_TARGET)'
+
+if test "x${GCJ_FOR_TARGET+set}" = xset; then
+  :
+elif test -d ${srcdir}/gcc; then
+  GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/'
+elif test "$host" = "$target"; then
+  GCJ_FOR_TARGET='gcj'
+else
+  GCJ_FOR_TARGET=`echo gcj | sed "${program_transform_name}"`
+fi
+GCJ_FOR_TARGET=$GCJ_FOR_TARGET' $(FLAGS_FOR_TARGET)'
+
+if test "x${GFORTRAN_FOR_TARGET+set}" = xset; then
+  :
+elif test -d ${srcdir}/gcc; then
+  GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/'
+elif test "$host" = "$target"; then
+  GFORTRAN_FOR_TARGET='gfortran'
+else
+  GFORTRAN_FOR_TARGET=`echo gfortran | sed "${program_transform_name}"`
+fi
+case $GFORTRAN_FOR_TARGET in
+*' $(FLAGS_FOR_TARGET)') ;;
+*) GFORTRAN_FOR_TARGET=$GFORTRAN_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
+esac
+
+# Don't use libstdc++-v3's flags to configure/build itself.
+libstdcxx_flags='`test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
+raw_libstdcxx_flags='-L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
+
+if test "x${CXX_FOR_TARGET+set}" = xset; then
+  if test "x${RAW_CXX_FOR_TARGET+set}" != xset; then
+    RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET}
+  fi
+elif test -d ${srcdir}/gcc; then
+  # We add -shared-libgcc to CXX_FOR_TARGET whenever we use xgcc instead
+  # of g++ for linking C++ or Java, because g++ has -shared-libgcc by
+  # default whereas gcc does not.
+  # RAW_CXX_FOR_TARGET is for linking C++ or java; CXX_FOR_TARGET is for
+  # all other cases.
+  CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ '$libstdcxx_flags
+  RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ '$raw_libstdcxx_flags
+elif test "$host" = "$target"; then
+  CXX_FOR_TARGET='$(CXX)'
+  RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET}
+else
+  CXX_FOR_TARGET=`echo c++ | sed "${program_transform_name}"`
+  RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET}
+fi
+CXX_FOR_TARGET=$CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)'
+RAW_CXX_FOR_TARGET=$RAW_CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)'
+
+qCXX_FOR_TARGET=`echo "$CXX_FOR_TARGET" | sed 's,[[&%]],\\\&,g'`
+qRAW_CXX_FOR_TARGET=`echo "$RAW_CXX_FOR_TARGET" | sed 's,[[&%]],\\\&,g'`
+
+# We want to defer the evaluation of `cmd`s and shell variables in
+# CXX_FOR_TARGET when recursing in the top-level Makefile, such as for
+# bootstrap.  We'll enclose CXX_FOR_TARGET_FOR_RECURSIVE_MAKE in single
+# quotes, but we still have to duplicate `$'s so that shell variables
+# can be expanded by the nested make as shell variables, not as make
+# macros.
+qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[[$]][[$]],$$$$,g'`
+qqRAW_CXX_FOR_TARGET=`echo "$qRAW_CXX_FOR_TARGET" | sed -e 's,[[$]][[$]],$$$$,g'`
+
+# Wrap CC_FOR_TARGET and friends, for certain types of builds.
+CC_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}"
+GCJ_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}"
+GFORTRAN_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${GFORTRAN_FOR_TARGET}"
+CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}"
+RAW_CXX_FOR_TARGET="\$(STAGE_CC_WRAPPER) ${qRAW_CXX_FOR_TARGET}"
+CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}"
+RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE="\$(STAGE_CC_WRAPPER) ${qqRAW_CXX_FOR_TARGET}"
+
 # Makefile fragments.
 for frag in host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag;
 do
@@ -2144,11 +2094,11 @@ AC_SUBST_FILE(ospace_frag)
 
 # Miscellanea: directories, flags, etc.
 AC_SUBST(RPATH_ENVVAR)
+AC_SUBST(BUILD_PREFIX)
+AC_SUBST(BUILD_PREFIX_1)
 AC_SUBST(tooldir)
 AC_SUBST(build_tooldir)
-AC_SUBST(CONFIGURE_GDB_TK)
 AC_SUBST(GDB_TK)
-AC_SUBST(INSTALL_GDB_TK)
 
 # Build module lists & subconfigure args.
 AC_SUBST(build_configargs)
@@ -2160,90 +2110,22 @@ AC_SUBST(configdirs)
 
 # Target module lists & subconfigure args.
 AC_SUBST(target_configargs)
-
+AC_SUBST(target_configdirs)
 
 # Build tools.
 AC_SUBST(CC_FOR_BUILD)
 AC_SUBST(config_shell)
 
-# Generate default definitions for YACC, M4, LEX and other programs that run
-# on the build machine.  These are used if the Makefile can't locate these
-# programs in objdir.
-MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
-
-AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [$MISSING bison -y])
-case " $build_configdirs " in
-  *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;;
-  *" byacc "*) YACC='$$r/$(BUILD_SUBDIR)/byacc/byacc' ;;
-esac
-
-AC_CHECK_PROGS([BISON], [bison], [$MISSING bison])
-case " $build_configdirs " in
-  *" bison "*) BISON='$$r/$(BUILD_SUBDIR)/bison/tests/bison' ;;
-esac
-
-AC_CHECK_PROGS([M4], [gm4 gnum4 m4], [$MISSING m4])
-case " $build_configdirs " in
-  *" m4 "*) M4='$$r/$(BUILD_SUBDIR)/m4/m4' ;;
-esac
-
-AC_CHECK_PROGS([LEX], [flex lex], [$MISSING flex])
-case " $build_configdirs " in
-  *" flex "*) LEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
-  *" lex "*) LEX='$$r/$(BUILD_SUBDIR)/lex/lex' ;;
-esac
-
-AC_CHECK_PROGS([FLEX], [flex], [$MISSING flex])
-case " $build_configdirs " in
-  *" flex "*) FLEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
-esac
-
-AC_CHECK_PROGS([MAKEINFO], makeinfo, [$MISSING makeinfo])
-case " $build_configdirs " in
-  *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
-  *)
-changequote(,)
-    # For an installed makeinfo, we require it to be from texinfo 4.2 or
-    # higher, else we use the "missing" dummy.
-    if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-      :
-    else
-      MAKEINFO="$MISSING makeinfo"
-    fi
-    ;;
-changequote([,])
-esac
-
-# FIXME: expect and dejagnu may become build tools?
-
-AC_CHECK_PROGS(EXPECT, expect, expect)
-case " $configdirs " in
-  *" expect "*)
-    test $host = $build && EXPECT='$$r/$(HOST_SUBDIR)/expect/expect'
-    ;;
-esac
-
-AC_CHECK_PROGS(RUNTEST, runtest, runtest)
-case " $configdirs " in
-  *" dejagnu "*)
-    test $host = $build && RUNTEST='$$r/$(HOST_SUBDIR)/dejagnu/runtest'
-    ;;
-esac
-
-
 # Host tools.
-NCN_STRICT_CHECK_TOOLS(AR, ar)
-NCN_STRICT_CHECK_TOOLS(AS, as)
-NCN_STRICT_CHECK_TOOLS(DLLTOOL, dlltool)
-NCN_STRICT_CHECK_TOOLS(LD, ld)
-NCN_STRICT_CHECK_TOOLS(LIPO, lipo)
-NCN_STRICT_CHECK_TOOLS(NM, nm)
-NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, :)
-NCN_STRICT_CHECK_TOOLS(STRIP, strip, :)
-NCN_STRICT_CHECK_TOOLS(WINDRES, windres)
-NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy)
-NCN_STRICT_CHECK_TOOLS(OBJDUMP, objdump)
+NCN_STRICT_CHECK_TOOL(AR, ar)
+NCN_STRICT_CHECK_TOOL(AS, as)
+NCN_STRICT_CHECK_TOOL(DLLTOOL, dlltool)
+NCN_STRICT_CHECK_TOOL(LD, ld)
+NCN_STRICT_CHECK_TOOL(NM, nm)
+NCN_STRICT_CHECK_TOOL(RANLIB, ranlib, :)
+NCN_STRICT_CHECK_TOOL(WINDRES, windres)
+NCN_STRICT_CHECK_TOOL(OBJCOPY, objcopy)
+NCN_STRICT_CHECK_TOOL(OBJDUMP, objdump)
 AC_SUBST(CC)
 AC_SUBST(CXX)
 AC_SUBST(CFLAGS)
@@ -2251,87 +2133,62 @@ AC_SUBST(CFLAGS_FOR_BUILD)
 AC_SUBST(CXXFLAGS)
 
 # Target tools.
-AC_ARG_WITH([build-time-tools], 
-  [  --with-build-time-tools=path
-                          use given path to find target tools during the build],
-  [case x"$withval" in
-     x/*) ;;
-     *)
-       with_build_time_tools=
-       AC_MSG_WARN([argument to --with-build-time-tools must be an absolute path])
-       ;;
-   esac],
-  [with_build_time_tools=])
-
-NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc)
-NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx)
-NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
-NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj)
-NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
-
-ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
-ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
-ACX_CHECK_INSTALLED_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool)
-ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_TARGET, ld)
-ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo)
-ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm)
-ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump)
-ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :)
-ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip)
-ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres)
-
-RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
-
-GCC_TARGET_TOOL(ar, AR_FOR_TARGET, AR, [binutils/ar])
-GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new])
-GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
-GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX,
-		[gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
-		c++)
-GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
-		[gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
-		c++)
-GCC_TARGET_TOOL(dlltool, DLLTOOL_FOR_TARGET, DLLTOOL, [binutils/dlltool])
-GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
-GCC_TARGET_TOOL(gcj, GCJ_FOR_TARGET, GCJ,
-		[gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/], java)
-GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN,
-		[gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
-GCC_TARGET_TOOL(ld, LD_FOR_TARGET, LD, [ld/ld-new])
-GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO)
-GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new])
-GCC_TARGET_TOOL(objdump, OBJDUMP_FOR_TARGET, OBJDUMP, [binutils/objdump])
-GCC_TARGET_TOOL(ranlib, RANLIB_FOR_TARGET, RANLIB, [binutils/ranlib])
-GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip])
-GCC_TARGET_TOOL(windres, WINDRES_FOR_TARGET, WINDRES, [binutils/windres])
-
+NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_AR_FOR_TARGET, ar)
+NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_AS_FOR_TARGET, as)
+NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_DLLTOOL_FOR_TARGET, dlltool)
+NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_LD_FOR_TARGET, ld)
+NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_NM_FOR_TARGET, nm)
+NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_RANLIB_FOR_TARGET, ranlib, :)
+NCN_STRICT_CHECK_TARGET_TOOL(CONFIGURED_WINDRES_FOR_TARGET, windres)
+
+AC_SUBST(GCC_FOR_TARGET)
 AC_SUBST(FLAGS_FOR_TARGET)
+AC_SUBST(CC_FOR_TARGET)
+AC_SUBST(GCJ_FOR_TARGET)
+AC_SUBST(GFORTRAN_FOR_TARGET)
+AC_SUBST(CXX_FOR_TARGET)
 AC_SUBST(RAW_CXX_FOR_TARGET)
+AC_SUBST(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)
+AC_SUBST(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)
+
+# Fix up target tools.
+if test "x${build}" = "x${host}" ; then
+  # In this case, the newly built tools can and should be used,
+  # so we override the results of the autoconf tests.
+  # This should really only happen when the tools are actually being built,
+  # but that's a further refinement.  The new build scheme, where
+  # tools are built into a structure paralleling where they're installed,
+  # should also eliminate all of this cleanly.
+  AR_FOR_TARGET="\$(USUAL_AR_FOR_TARGET)"
+  AS_FOR_TARGET="\$(USUAL_AS_FOR_TARGET)"
+  DLLTOOL_FOR_TARGET="\$(USUAL_DLLTOOL_FOR_TARGET)"
+  LD_FOR_TARGET="\$(USUAL_LD_FOR_TARGET)"
+  NM_FOR_TARGET="\$(USUAL_NM_FOR_TARGET)"
+  RANLIB_FOR_TARGET="\$(USUAL_RANLIB_FOR_TARGET)"
+  WINDRES_FOR_TARGET="\$(USUAL_WINDRES_FOR_TARGET)"
+else
+  # Just use the ones we found.
+  AR_FOR_TARGET="\$(CONFIGURED_AR_FOR_TARGET)"
+  AS_FOR_TARGET="\$(CONFIGURED_AS_FOR_TARGET)"
+  DLLTOOL_FOR_TARGET="\$(CONFIGURED_DLLTOOL_FOR_TARGET)"
+  LD_FOR_TARGET="\$(CONFIGURED_LD_FOR_TARGET)"
+  NM_FOR_TARGET="\$(CONFIGURED_NM_FOR_TARGET)"
+  RANLIB_FOR_TARGET="\$(CONFIGURED_RANLIB_FOR_TARGET)"
+  WINDRES_FOR_TARGET="\$(CONFIGURED_WINDRES_FOR_TARGET)"  
+fi
+AC_SUBST(AR_FOR_TARGET)
+AC_SUBST(AS_FOR_TARGET)
+AC_SUBST(DLLTOOL_FOR_TARGET)
+AC_SUBST(LD_FOR_TARGET)
+AC_SUBST(NM_FOR_TARGET)
+AC_SUBST(RANLIB_FOR_TARGET)
+AC_SUBST(WINDRES_FOR_TARGET)
 
 # Certain tools may need extra flags.
 AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
 RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
 NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
 
-# When building target libraries, except in a Canadian cross, we use
-# the same toolchain as the compiler we just built.
-COMPILER_AS_FOR_TARGET='$(AS_FOR_TARGET)'
-COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)'
-COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)'
-if test $host = $build; then
-  case " $configdirs " in
-    *" gcc "*)
-      COMPILER_AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as'
-      COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld'
-      COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target}
-      ;;
-  esac
-fi
-
-AC_SUBST(COMPILER_AS_FOR_TARGET)
-AC_SUBST(COMPILER_LD_FOR_TARGET)
-AC_SUBST(COMPILER_NM_FOR_TARGET)
-
 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 AC_ARG_ENABLE(maintainer-mode,
 [  --enable-maintainer-mode enable make rules and dependencies not useful
@@ -2373,6 +2230,36 @@ case $build in
 esac
 AC_SUBST(stage1_cflags)
 
+# It makes debugging easier if we create as symlinks the stage directories
+# gcc for stageN-gcc and stagePREV-gcc for stage(N-1).  In case this is not
+# possible, however, we can resort to mv.
+AC_CACHE_CHECK([if symbolic links between directories work],
+[gcc_cv_prog_ln_s_dir],
+[if test "${LN_S}" = "ln -s" \
+   && mkdir confdir.s1 \
+   && ln -s confdir.s1 confdir.s2 \
+   && echo timestamp1 > confdir.s1/conftest.1 \
+   && cmp confdir.s1/conftest.1 confdir.s2/conftest.1 \
+   && echo timestamp2 > confdir.s2/conftest.2 \
+   && cmp confdir.s1/conftest.2 confdir.s1/conftest.2 \
+   && rm -f confdir.s2; then
+  gcc_cv_prog_ln_s_dir=yes
+else
+  gcc_cv_prog_ln_s_dir=no
+fi
+rm -rf confdir.s1 confdir.s2])
+
+case ${gcc_cv_prog_ln_s_dir} in
+  yes)
+    CREATE_LINK_TO_DIR='ln -s $$1 $$2'
+    UNDO_LINK_TO_DIR='rm -f $$1' ;;
+  *)
+    CREATE_LINK_TO_DIR='mv $$1 $$2'
+    UNDO_LINK_TO_DIR='mv $$1 $$2' ;;
+esac
+AC_SUBST(CREATE_LINK_TO_DIR)
+AC_SUBST(UNDO_LINK_TO_DIR)
+
 # Enable -Werror in bootstrap stage2 and later.
 # Change the default to "no" on release branches.
 AC_ARG_ENABLE(werror,
diff --git a/depcomp b/depcomp
deleted file mode 100755
index 3510ab0ff..000000000
--- a/depcomp
+++ /dev/null
@@ -1,553 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-05-16.16
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-ia64hp)
-  # The "hp" stanza above does not work with HP's ia64 compilers,
-  # which have integrated preprocessors.  The correct option to use
-  # with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  tmpdepfile=`echo "$object" | sed -e 's/\.o$/.d/'`
-  "$@" +Maked
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile"
-     exit $stat
-  fi
-  rm -f "$depfile"
-
-  # The object file name is correct already.
-  cat "$tmpdepfile" > "$depfile"
-  # Add `dependent.h:' lines.
-  sed -ne '2,${; s/^ //; s/ \\*$//; s/$/:/; p; }' "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 64fdee6c0..6865f2df1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,23 +1,3 @@
-2006-02-27  Carlos O'Donell  <carlos@codesourcery.com>
-
-	* Makefile.in: TEXI2HTML uses makeinfo. Define 
-	HTMLFILES. Add html targets.
-	* configure.texi: Use ifnottex. Add alternative 
-	image format specifier as jpg.
-	* standards.texi: Use ifnottex.
-
-2005-10-21  Mark Mitchell  <mark@codesourcery.com>
-
-	* texi2pod.pl: Substitue for @value even when part of @include. 
-
-2005-10-21  Bob Wilson  <bob.wilson@acm.org>
-
-	* texi2pod.pl: Import latest version from GCC.
-
-2005-05-19  Zack Weinberg  <zack@codesourcery.com>
-
-	* Makefile.in: Have 'all' depend on 'info'.
-
 2003-05-16  Kelley Cook  <kelleycook@wideopenwest.com>
 
 	* configure.texi: Use "i[3-7]86" in example.
@@ -83,7 +63,7 @@
 1998-12-03  Nick Clifton  <nickc@cygnus.com>
 
 	* targetdoc/fr30.texi: New document.
-
+	
 1998-10-01  Angela Marie Thomas (angela@cygnus.com)
 
 	* comp-tools-fix, cross-tools-fix: Replace /usr/include
@@ -148,7 +128,7 @@ Mon May 18 14:27:37 1998  Angela Marie Thomas (angela@cygnus.com)
 Thu May 14 14:43:10 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* targetdoc/arm-interwork.texi: Document dlltool support of
-	interworking.
+	interworking. 
 
 Thu May  7 16:49:38 1998  Jason Molenda  (crash@bugshack.cygnus.com)
 
@@ -157,7 +137,7 @@ Thu May  7 16:49:38 1998  Jason Molenda  (crash@bugshack.cygnus.com)
 
 Wed Apr  1 17:11:44 1998  Nick Clifton  <nickc@cygnus.com>
 
-	* targetdoc/arm-interwork.texi: Document ARM/thumb interworking.
+	* targetdoc/arm-interwork.texi: Document ARM/thumb interworking. 
 
 Tue Mar 31 15:28:20 1998  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -167,7 +147,7 @@ Tue Mar 31 15:28:20 1998  Ian Lance Taylor  <ian@cygnus.com>
 Tue Mar 24 16:13:26 1998  Stu Grossman  <grossman@bhuna.cygnus.co.uk>
 
 	* configure:  Regenerate with autoconf 2.12.1 to fix shell issues
-	for NT native builds.
+	for NT native builds. 
 
 Mon Mar  9 16:41:04 1998  Doug Evans  <devans@canuck.cygnus.com>
 
@@ -203,7 +183,7 @@ Tue Jun 17 15:50:23 1997  Angela Marie Thomas (angela@cygnus.com)
 
 Thu Jun 12 13:47:00 1997  Angela Marie Thomas (angela@cygnus.com)
 
-	* Install.in (show_exec_prefix_msg): fix quoting
+        * Install.in (show_exec_prefix_msg): fix quoting
 
 Wed Jun  4 15:31:43 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
 
@@ -251,8 +231,8 @@ Thu Apr 10 23:23:33 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
 
 Mon Apr  7 18:15:00 1997  Brendan Kehoe <brendan@cygnus.com>
 
-	* Fix the version string for OSF1 4.0 to recognize either
-	V4.* or X4.*
+        * Fix the version string for OSF1 4.0 to recognize either
+        V4.* or X4.*
 
 Mon Apr  7 15:34:47 1997  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -323,8 +303,8 @@ Mon Aug 28 17:25:49 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
 Tue Aug 15 21:51:58 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
-	* Install.in (guess_system): Match OSF/1 v3.x as the same as
-	v2.x--v2.x binaries are upward compatible.
+	* Install.in (guess_system): Match OSF/1 v3.x as the same as 
+        v2.x--v2.x binaries are upward compatible.
 
 Tue Aug 15 21:46:54 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
@@ -339,8 +319,8 @@ Tue Aug  8 13:11:56 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
 Thu Jun  8 00:42:56 1995  Angela Marie Thomas  <angela@cirdan.cygnus.com>
 
-	* subst-strings: change du commands to $BINDIR/. & $SRCDIR/. just
-	in case they are symlinks.
+        * subst-strings: change du commands to $BINDIR/. & $SRCDIR/. just
+        in case they are symlinks.
 
 Tue Apr 18 14:23:10 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
@@ -355,7 +335,7 @@ Tue Apr 18 14:23:10 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 	* Install.in (do_mkdir): New function.
 
 	* Install.in: Added support for --with and --without options.
-	  Changed so that tape commands are not run when extracting
+	  Changed so that tape commands are not run when extracting 
 	  from a file.
 	  (do_mt): Changed to take only one argument.
 
@@ -363,7 +343,7 @@ Wed Mar 29 11:16:38 1995  Jason Molenda (crash@phydeaux.cygnus.com)
 
 	* Install.in: catch UNAME==alpha-dec-osf2.x and correct entry for
 	alpha-dec-osf1.x
-
+	
 Fri Jan 27 12:04:29 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
 	* subst-strings (mips-sgi-irix5): New entry in table.
@@ -408,8 +388,8 @@ Thu Apr 28 14:42:22 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
 
 Tue Apr 26 17:18:03 1994  Jason Molenda (crash@sendai.cygnus.com)
 
-	* Install.in:  fixincludes output is actually put in fixincludes.log,
-	but echo'ed messages claim it is fixinc.log.  This is the same
+        * Install.in:  fixincludes output is actually put in fixincludes.log,
+        but echo'ed messages claim it is fixinc.log.  This is the same
 	messages as I logged in March 4 1994, but for some reason we found
 	the change hadn't been done.  I'll have to dig through the logs
 	and find out what I really did do that day. :)
@@ -469,21 +449,21 @@ Wed Mar 23 23:38:24 1994  Jason Molenda  (crash@sendai.cygnus.com)
 
 Wed Mar 23 13:42:48 1994  Jason Molenda  (crash@sendai.cygnus.com)
 
-	* Install.in: set PATH to $PATH:/bin:/usr/bin so we can pick
-	up native tools even if the user doesn't have them in his
-	path.
+        * Install.in: set PATH to $PATH:/bin:/usr/bin so we can pick
+        up native tools even if the user doesn't have them in his
+        path.
 
-	* Install.in: ``hppa-1.1-hp-hpux'' -> ``hppa1.1-hp-hpux''.
+        * Install.in: ``hppa-1.1-hp-hpux'' -> ``hppa1.1-hp-hpux''.
 
 Tue Mar 15 22:09:20 1994  Jason Molenda  (crash@sendai.cygnus.com)
-
-	* Install.in: TAPE_REWIND and TAPE_FORWARD variables for Unixunaware,
-	added switch statement to detect if system is Unixunaware.
+        
+        * Install.in: TAPE_REWIND and TAPE_FORWARD variables for Unixunaware,
+        added switch statement to detect if system is Unixunaware.
 
 Fri Mar  4 12:10:30 1994  Jason Molenda (crash@sendai.cygnus.com)
 
-	* Install.in:  fixincludes output is actually put in fixincludes.log,
-	but echo'ed messages claim it is fixinc.log.
+        * Install.in:  fixincludes output is actually put in fixincludes.log,
+        but echo'ed messages claim it is fixinc.log.
 
 Wed Nov  3 02:58:02 1993  Jeffrey Osier  (jeffrey@thepub.cygnus.com)
 
@@ -514,9 +494,9 @@ Thu Jun 10 16:01:25 1993  Jeffrey Osier  (jeffrey@cygnus.com)
 
 Wed Jun  9 19:23:59 1993  Jeffrey Osier  (jeffrey@rtl.cygnus.com)
 
-	* install-texi.in:	added conditionals (nearly complete)
-				  cleaned up
-				  added support for other releases (not done)
+        * install-texi.in:        added conditionals (nearly complete)
+                                  cleaned up
+                                  added support for other releases (not done)
 
 Wed Jun  9 15:53:58 1993  Jim Kingdon  (kingdon@cygnus.com)
 
@@ -531,7 +511,7 @@ Fri Jun  4 17:09:56 1993  Jeffrey Osier  (jeffrey@cygnus.com)
 
 Thu Jun  3 00:37:01 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
-	* Install.in: pull COPYING and COPYING.LIB off of the tape
+	* Install.in: pull COPYING and COPYING.LIB off of the tape 
 
 Tue Jun  1 16:52:08 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
diff --git a/etc/Makefile.in b/etc/Makefile.in
index df461cfd5..63f7738c6 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -39,10 +39,7 @@ MAKEINFO = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
 TEXI2DVI = `if [ -f ../texinfo/util/texi2dvi ]; \
 	then echo ../texinfo/util/texi2dvi; \
 	else echo texi2dvi; fi`
-TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
-	then echo "../texinfo/makeinfo/makeinfo --html"; \
-	else echo "makeinfo --html"; fi`
-
+TEXI2HTML = texi2html
 DVIPS = dvips
 
 # Where to find texinfo.tex to format documentation with TeX.
@@ -53,9 +50,10 @@ TEXIDIR = $(srcdir)/../texinfo
 
 INFOFILES = standards.info configure.info
 DVIFILES = standards.dvi configure.dvi
-HTMLFILES = standards.html configure.html
 
-all: info
+all:
+
+# We want install to imply install-info as per GNU standards.
 install: install-info
 
 uninstall:
@@ -86,18 +84,6 @@ install-info: info
 	  done; \
 	fi
 
-html:
-	for f in $(HTMLFILES); do \
-	  if test -f $(srcdir)/`echo $$f | sed -e 's/.html$$/.texi/'`; then \
-	    if $(MAKE) "TEXI2HTML=$(TEXI2HTML)" $$f; then \
-	      true; \
-	    else \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	done
-
-
 dvi:
 	for f in $(DVIFILES); do \
 	  if test -f $(srcdir)/`echo $$f | sed -e 's/.dvi$$/.texi/'`; then \
@@ -112,9 +98,6 @@ dvi:
 standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
 	$(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi
 
-standards.html: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
-	$(TEXI2HTML) --no-split -I$(srcdir) -o standards.html $(srcdir)/standards.texi
-
 standards.dvi: $(srcdir)/standards.texi
 	TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/standards.texi
 
@@ -150,15 +133,12 @@ configure.ps: configure.dvi $(srcdir)/configdev.ein $(srcdir)/configbuild.ein
 	rm -f configdev.eps configbuild.eps
 
 configure.html: $(srcdir)/configure.texi
-	cp $(srcdir)/configdev.jin configdev.jpg
-	cp $(srcdir)/configbuild.jin configbuild.jpg
-	$(TEXI2HTML) --no-split -I$(srcdir) -o configure.html $(srcdir)/configure.texi
+	$(TEXI2HTML) -split_chapter $(srcdir)/configure.texi
 
 clean:
 	rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
 	rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
-	rm -f configdev.txt configbuild.txt 
-	rm -f configdev.eps configbuild.eps
+	rm -f configdev.txt configbuild.txt configdev.eps configbuild.eps
 	rm -f configdev.jpg configbuild.jpg
 
 mostlyclean: clean
@@ -167,7 +147,6 @@ distclean:   clean
 	rm -f Makefile config.status config.cache
 
 maintainer-clean realclean:   distclean
-	rm -f *.html*
 	rm -f *.info*
 
 Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
diff --git a/etc/configure.texi b/etc/configure.texi
index 385a7c447..d69dc414d 100644
--- a/etc/configure.texi
+++ b/etc/configure.texi
@@ -10,7 +10,7 @@
 * configure: (configure).	The GNU configure and build system
 @end direntry
 
-@ifnottex
+@ifinfo
 This file documents the GNU configure and build system.
 
 Copyright (C) 1998 Cygnus Solutions.
@@ -35,7 +35,7 @@ Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation approved
 by the Foundation.
-@end ifnottex
+@end ifinfo
 
 @titlepage
 @title The GNU configure and build system
@@ -60,7 +60,7 @@ except that this permission notice may be stated in a translation
 approved by the Free Software Foundation.
 @end titlepage
 
-@ifnottex
+@ifinfo
 @node Top
 @top GNU configure and build system
 
@@ -79,7 +79,7 @@ The GNU configure and build system.
 * Index::			Index.
 @end menu
 
-@end ifnottex
+@end ifinfo
 
 @node Introduction
 @chapter Introduction
@@ -1085,7 +1085,7 @@ are in rectangles with rounded corners
 @end ifnotinfo
 (e.g., @samp{autoheader} is the name of a tool, not the name of a file).
 
-@image{configdev,,,,jpg}
+@image{configdev}
 
 @node Written Developer Files
 @subsection Written Developer Files
@@ -1235,7 +1235,7 @@ Here is a picture of the files which will be created at build time.
 @file{config.status} is both a created file and a shell script which is
 run to create other files, and the picture attempts to show that.
 
-@image{configbuild,,,,jpg}
+@image{configbuild}
 
 @node Build Files Description
 @subsection Build Files Description
diff --git a/etc/standards.texi b/etc/standards.texi
index 490e15b15..5aa508e01 100644
--- a/etc/standards.texi
+++ b/etc/standards.texi
@@ -6,13 +6,13 @@
 @set lastupdate February 14, 2002
 @c %**end of header
 
-@ifnottex
+@ifinfo
 @format
 START-INFO-DIR-ENTRY
 * Standards: (standards).        GNU coding standards.
 END-INFO-DIR-ENTRY
 @end format
-@end ifnottex
+@end ifinfo
 
 @c @setchapternewpage odd
 @setchapternewpage off
@@ -28,11 +28,11 @@ END-INFO-DIR-ENTRY
 @iftex
 @set CHAPTER chapter
 @end iftex
-@ifnottex
+@ifinfo
 @set CHAPTER node
-@end ifnottex
+@end ifinfo
 
-@ifnottex
+@ifinfo
 GNU Coding Standards
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
@@ -43,7 +43,7 @@ with no Invariant Sections, with no
 Front-Cover Texts, and with no Back-Cover Texts.
 A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
-@end ifnottex
+@end ifinfo
 
 @titlepage
 @title GNU Coding Standards
@@ -63,12 +63,12 @@ A copy of the license is included in the section entitled ``GNU
 Free Documentation License''.
 @end titlepage
 
-@ifnottex
+@ifinfo
 @node Top, Preface, (dir), (dir)
 @top Version
 
 Last updated @value{lastupdate}.
-@end ifnottex
+@end ifinfo
 
 @menu
 * Preface::                     About the GNU Coding Standards
diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
index 9696a12f3..bdc20e811 100644
--- a/etc/texi2pod.pl
+++ b/etc/texi2pod.pl
@@ -1,23 +1,23 @@
 #! /usr/bin/perl -w
 
-#   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1999, 2000, 2001, 200 Free Software Foundation, Inc.
 
-# This file is part of GCC.
+# This file is part of GNU CC.
 
-# GCC is free software; you can redistribute it and/or modify
+# GNU CC is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 
-# GCC is distributed in the hope that it will be useful,
+# GNU CC is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GCC; see the file COPYING.  If not, write to
-# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-# Boston MA 02110-1301, USA.
+# along with GNU CC; see the file COPYING.  If not, write to
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston MA 02111-1307, USA.
 
 # This does trivial (and I mean _trivial_) conversion of Texinfo
 # markup to Perl POD format.  It's intended to be used to extract
@@ -138,7 +138,7 @@ while(<$inf>) {
 	# Ignore @end foo, where foo is not an operation which may
 	# cause us to skip, if we are presently skipping.
 	my $ended = $1;
-	next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex|copying)$/;
+	next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex)$/;
 
 	die "\@end $ended without \@$ended at line $.\n" unless defined $endw;
 	die "\@$endw ended by \@end $ended at line $.\n" unless $ended eq $endw;
@@ -178,7 +178,7 @@ while(<$inf>) {
 	next;
     };
 
-    /^\@(ignore|menu|iftex|copying)\b/ and do {
+    /^\@(ignore|menu|iftex)\b/ and do {
 	push @endwstack, $endw;
 	push @skstack, $skipping;
 	$endw = $1;
@@ -227,12 +227,11 @@ while(<$inf>) {
     /^\@include\s+(.+)$/ and do {
 	push @instack, $inf;
 	$inf = gensym();
-	$file = postprocess($1);
 
 	# Try cwd and $ibase.
-	open($inf, "<" . $file) 
-	    or open($inf, "<" . $ibase . "/" . $file)
-		or die "cannot open $file or $ibase/$file: $!\n";
+	open($inf, "<" . $1) 
+	    or open($inf, "<" . $ibase . "/" . $1)
+		or die "cannot open $1 or $ibase/$1: $!\n";
 	next;
     };
 
@@ -242,14 +241,10 @@ while(<$inf>) {
 	and $_ = "\n=head3 $1\n";
 
     # Block command handlers:
-    /^\@itemize(?:\s+(\@[a-z]+|\*|-))?/ and do {
+    /^\@itemize\s+(\@[a-z]+|\*|-)/ and do {
 	push @endwstack, $endw;
 	push @icstack, $ic;
-	if (defined $1) {
-	    $ic = $1;
-	} else {
-	    $ic = '@bullet';
-	}
+	$ic = $1;
 	$_ = "\n=over 4\n";
 	$endw = "itemize";
     };
@@ -350,13 +345,6 @@ sub postprocess
     s/\@w\{([^\}]*)\}/S<$1>/g;
     s/\@(?:dmn|math)\{([^\}]*)\}/$1/g;
 
-    # keep references of the form @ref{...}, print them bold
-    s/\@(?:ref)\{([^\}]*)\}/B<$1>/g;
-
-    # Change double single quotes to double quotes.
-    s/''/"/g;
-    s/``/"/g;
-
     # Cross references are thrown away, as are @noindent and @refill.
     # (@noindent is impossible in .pod, and @refill is unnecessary.)
     # @* is also impossible in .pod; we discard it and any newline that
@@ -377,18 +365,14 @@ sub postprocess
     s/\@uref\{([^\},]*),([^\},]*)\}/$2 (C<$1>)/g;
     s/\@uref\{([^\},]*),([^\},]*),([^\},]*)\}/$3/g;
 
-    # Un-escape <> at this point.
+    # Turn B<blah I<blah> blah> into B<blah> I<blah> B<blah> to
+    # match Texinfo semantics of @emph inside @samp.  Also handle @r
+    # inside bold.
     s/&LT;/</g;
     s/&GT;/>/g;
-
-    # Now un-nest all B<>, I<>, R<>.  Theoretically we could have
-    # indefinitely deep nesting; in practice, one level suffices.
-    1 while s/([BIR])<([^<>]*)([BIR])<([^<>]*)>/$1<$2>$3<$4>$1</g;
-
-    # Replace R<...> with bare ...; eliminate empty markup, B<>;
-    # shift white space at the ends of [BI]<...> expressions outside
-    # the expression.
-    s/R<([^<>]*)>/$1/g;
+    1 while s/B<((?:[^<>]|I<[^<>]*>)*)R<([^>]*)>/B<$1>${2}B</g;
+    1 while (s/B<([^<>]*)I<([^>]+)>/B<$1>I<$2>B</g);
+    1 while (s/I<([^<>]*)B<([^>]+)>/I<$1>B<$2>I</g);
     s/[BI]<>//g;
     s/([BI])<(\s+)([^>]+)>/$2$1<$3>/g;
     s/([BI])<([^>]+?)(\s+)>/$1<$2>$3/g;
diff --git a/install-sh b/install-sh
index 4d4a9519e..6ebe46de6 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2004-12-17.09
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -109,7 +109,7 @@ while test -n "$1"; do
         shift
         continue;;
 
-    --help) echo "$usage"; exit $?;;
+    --help) echo "$usage"; exit 0;;
 
     -m) chmodcmd="$chmodprog $2"
         shift
@@ -134,7 +134,7 @@ while test -n "$1"; do
 	shift
 	continue;;
 
-    --version) echo "$0 $scriptversion"; exit $?;;
+    --version) echo "$0 $scriptversion"; exit 0;;
 
     *)  # When -d is used, all remaining arguments are directories to create.
 	# When -t is used, the destination is already specified.
diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 7457e3dbf..680fe7985 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,305 +1,3 @@
-2006-03-02  DJ Delorie  <dj@redhat.com>
-
-	* m32c/exit.S: Preserve r1.
-
-2006-02-24  Paul Brook  <paul@codesourcery.com>
-
-	* arm/redboot-crt0.S: Use cps in Thumb-2 mode.
-
-2006-02-22  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* m68k/Makefile.in (CF_SCRIPTS): New.
-	(all): Add CF_SCRIPTS.
-	(m5208evb.ld, m5213evb.ld, m5235evb.ld, m5272c3.ld,
-	m5282evb.ld): New targets
-	(install): Iterate over CF_SCRIPTS.
-	* m68k/crt0.S: Don't use dbra on any cf chips.
-	* m68k/dbug-cf.sc: New.
-
-2006-02-07  Paul Brook  <paul@codesourcery.com>
-
-	* arm/crt0.S: Add Thumb-2 startup code.
-	* arm/redboot-crt0.S: Ditto.
-	* arm/libcfunc.c (do_AngelSWI): Use AngelSWIInsn.
-	* arm/swi.h (AngelSWIInsn, AngelSWIAsm): Define.
-	* arm/trap.S: Disable for Thumb-2.
-
-2006-01-18  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* mt/ms2.ld (.sram): Correct typo in section names.
-
-2006-01-16  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* mt/Makefile.in (SCRIPTS, CRT0): Add ms2 files.
-	(crt0-ms2.o): New target.
-	* mt/crt0-ms2.S, mt/exit-ms2.c, mt/ms2.ld, mt/startup-ms2.S: New.
-
-2006-01-04  Paul Brook  <paul@codesourcery.com>
-
-	* m68k/bcc.ld: Add .got.plt and .got
-	* m68k/idp.ld: Ditto.
-	* m68k/idpgdb: Ditto.
-	* m68k/mvme135.ld: Ditto.
-	* m68k/sbc5204.ld: Ditto.
-	* m68k/sbc5206.ld: Ditto.
-	* m68k/sim.ld: Ditto.
-
-2005-12-13  DJ Delorie  <dj@redhat.com>
-
-	* m32c/crt0.S: Add support for preinit, init, and fini arrays, and
-	.init and .fini processing.
-	* m32c/crtn.S: Likewise.
-	* m32c/exit.S: Likewise.
-
-2005-12-13  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* mt/16-002.ld: Change architecture to 'mt'.  Remove
-	SEARCH_DIR.
-	* mt/16-003.ld: Likewise.
-	* mt/64-001.ld: Likewise.
-	* mt/Makefile.in: Change comment to reference 'mt' rather than 'ms1'.
-	* mt/crt0.S: Likewise.
-
-2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* configure.in: Replace ms1 arch with mt arch.
-	* configure: Rebuilt.
-	* mt: Renamed from ms1 dir.
-
-2005-12-06  Paul Brook  <paul@codesourcery.com>
-
-	* m68k/bcc.ld: Add .text.*, .rodata.*, .data.* and .bss.*.
-	* m68k/idp.ld: Ditto.
-	* m68k/idpgdb: Ditto.
-	* m68k/mvme135.ld: Ditto.
-	* m68k/sbc5204.ld: Ditto.
-	* m68k/sbc5206.ld: Ditto.
-	* m68k/sim.ld: Ditto.
-
-2005-11-30  Shaun Jackman  <sjackman@gmail.com>
-
-	* libnosys/Makefile.in (OBJS): Add chown, readlink, and symlink.
-	* libnosys/chown.c: New file.
-	* libnosys/readlink.c: New file.
-	* libnosys/symlink.c: New file.
-
-2005-11-30  Shaun Jackman  <sjackman@gmail.com>
-
-	* arm/libcfunc.c (clock, sleep, usleep): New functions.
-	* arm/syscalls.c (_clock): New function.
-	(_times): Call _clock.
-
-2005-11-17  Shaun Jackman  <sjackman@gmail.com>
-
-	* libgloss/arm/libcfunc.c (isatty): Call _isatty. GDB now supports
-	the IsTTY SWI that _isatty calls.
-
-2005-11-17  Hans-Peter Nilsson  <hp@axis.com>
-
-	* cris/linunistd.h: Don't redefine errno as extern int.
-
-2005-10-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* arm/configure.in: Add AC_SUBST for BUILD_CRT0_TRUE and
-	BUILD_CRT0_FALSE.
-	* arm/configure: Regenerate.
-
-2005-10-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* arm/configure.in: Support building crt0.o when syscalls
-	are disabled in newlib.
-	* arm/configure: Regenerated.
-
-2005-10-03  James E Wilson  <wilson@specifix.com>
-
-	* mips/array.ld, mips/cfe.ld, mips/ddb-kseg0.ld, mips/ddb.ld,
-	mips/dve.ld, mips/idt.ld, mips/idt32.ld, mips/idt64.ld,
-	mips/idtecoff.ld, mips/jmr3904app-java.ld, mips/jmr3904app.ld,
-	jmr3904dram-java.ld, mips/jmr3904dram.ld, mips/lsi.ld, mips/nullmon.ld,
-	mips/pmon.ld: Add support for .bss.* sections.
-
-2005-09-23  James E Wilson  <wilson@specifix.com>
-
-	* mips/array.ld, mips/cfe.ld, mips/ddb-kseg0.ld, mips/ddb.ld,
-	mips/dve.ld, mips/idt.ld, mips/idt32.ld, mips/idt64.ld,
-	mips/idtecoff.ld, mips/jmr3904app-java.ld, mips/jmr3904app.ld,
-	jmr3904dram-java.ld, mips/jmr3904dram.ld, mips/lsi.ld, mips/nullmon.ld,
-	mips/pmon.ld: Change x* to x.* in existing linkonce lines.  Add
-	support for .gnu.linkonce.b.*.
-
-2005-08-30  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* rs6000/Makefile.in (VPATH): Use colon as separator.
-
-2005-08-24  Aldy Hernandez  <aldyh@redhat.com>
-
-        * ms1/access.c: Change copyright notice.
-
-2005-08-19  DJ Delorie  <dj@redhat.com>
-
-	* m32c/Makefile.in (m16cmon.ld, m32cmon.ld): Fix output names.
-	(*.o): Add dependencies.
-	* m32c/m32csys.h: Move syscall location to 0x400 as per Renesas
-	recommendations.
-
-2005-08-18  DJ Delorie  <dj@redhat.com>
-
-	* m32c/Makefile.in: Block out memory regions reserved for monitors
-	and simulators.  Add monitor link scripts.
-
-2005-08-16  Shaun Jackman  <sjackman@gmail.com>
-
-	* arm/syscalls.c (initialise_monitor_handles): Set
-	monitor_stderr to the result of SWI_open(":tt", "a")
-	instead of simply duplicating stdout.
-
-2005-08-10  DJ Delorie  <dj@redhat.com>
-
-	* configure.in: Add m32c support.
-	* configure: Regenerated
-	* m32c: New directory, Renesas R8C/M16C/M32C support.
-	* m32c/abort.S m32c/argvlen.S m32c/argv.S m32c/chdir.S, 
-	m32c/chmod.S m32c/close.S m32c/configure m32c/configure.in,
-	m32c/crt0.S, m32c/crtn.S, m32c/exit.S, m32c/fstat.S,
-	m32c/genscript, m32c/getpid.S, m32c/gettimeofday.S,
-	m32c/heaptop.S, m32c/isatty.S, m32c/kill.S, m32c/link.S,
-	m32c/lseek.S, m32c/m32csys.h, m32c/m32c.tmpl, m32c/Makefile.in,
-	m32c/open.S, m32c/read.S, m32c/sbrk.c, m32c/stat.S, m32c/time.S,
-	m32c/times.S, m32c/unlink.S, m32c/utime.S, m32c/write.S: New files
-
-2005-08-02  Shaun Jackman  <sjackman@gmail.com>
-
-        * libgloss/arm/libcfunc.c (isatty): New function.
-
-2005-08-02  Shaun Jackman  <sjackman@gmail.com>
-
-        * libgloss/arm/syscalls.c (_exit): Call _kill with the second
-        argument set to -1, which is an invalid signal number.
-        (_kill): Comment and coding style changes only.
-        (_raise): Remove function.
-
-2005-07-19  Paul Brook  <paul@codesourcery.com>
-
-	* arm/crt0.S: Ensure doubleword stack alignment.
-
-2005-07-18  Richard Sandiford  <richard@codesourcery.com>
-
-	* mips/array.ld (.sdata): Include .gnu.linkonce.s.*, not
-	.gnu.linkonce.s*.
-	(.sbss): Include .sbss.* and .gnu.linkonce.sb.*.
-	* mips/cfe.ld, mips/ddb-kseg0.ld, mips/ddb.ld, mips/dve.ld,
-	* mips/idt32.ld, mips/idt64.ld, mips/idtecoff.ld, mips/idt.ld,
-	* mips/jmr3904app-java.ld, mips/jmr3904app.ld,
-	* mips/jmr3904dram-java.ld, mips/jmr3904dram.ld,
-	* mips/lsi.ld, mips/nullmon.ld, mips/pmon.ld: As for mips/array.ld.
-
-2005-07-18  Shaun Jackman  <sjackman@gmail.com>
-
-	* libgloss/arm/libcfunc.c (abort): Call _exit instead of the RDI swi.
-	(alarm): Add the weak attribute.
-	(pause): New function. Return ENOSYS.
-	* libgloss/arm/syscalls.c (_getpid): Add the weak attribute.
-	(_fstat): Ditto.
-	(_stat): Ditto.
-	(_link): Ditto. Return ENOSYS.
-	(_unlink): Call the swi instead of returning -1.
-	(_raise): Add the weak attribute. Return ENOSYS.
-	(isatty): Rename to _isatty. Call the swi instead of returning 1.
-	(_system): Call the swi instead of returning ENOSYS.
-	(_rename): Ditto.
-
-2005-07-06  Aldy Hernandez  <aldyh@redhat.com>
-
-	* configure.in: Add ms1 case.
-	* configure: Regenerate.
-	* ms1/16-002.ld: New.
-	* ms1/16-003.ld: New.
-	* ms1/64-001.ld: New.
-	* ms1/access.c: New.
-	* ms1/chmod.c: New.
-	* ms1/close.c: New.
-	* ms1/configure: New.
-	* ms1/configure.in: New.
-	* ms1/crt0-16-002.S: New.
-	* ms1/crt0-16-003.S: New.
-	* ms1/crt0-64-001.S: New.
-	* ms1/crt0.S: New.
-	* ms1/exit-16-002.c: New.
-	* ms1/exit-16-003.c: New.
-	* ms1/exit-64-001.c: New.
-	* ms1/exit.c: New.
-	* ms1/fstat.c: New.
-	* ms1/getpid.c: New.
-	* ms1/gettime.c: New.
-	* ms1/isatty.c: New.
-	* ms1/kill.c: New.
-	* ms1/lseek.c: New.
-	* ms1/Makefile.in: New.
-	* ms1/open.c: New.
-	* ms1/read.c: New.
-	* ms1/sbrk.c: New.
-	* ms1/startup-16-002.S: New.
-	* ms1/startup-16-003.S: New.
-	* ms1/startup-64-001.S: New.
-	* ms1/stat.c: New.
-	* ms1/time.c: New.
-	* ms1/times.c: New.
-	* ms1/trap.h: New.
-	* ms1/trap.S: New.
-	* ms1/unlink.c: New.
-	* ms1/utime.c: New.
-	* ms1/write.c: New.
-
-2005-05-19  Corinna Vinschen  <vinschen@redhat.com>
-
-	* arm/elf-redboot.ld, iq2000/sim.ld, m68hc11/sim-valid-m68hc11.ld,
-	* m68hc11/sim-valid-m68hc12.ld, mcore/elf-cmb.ld, mips/cfe.ld,
-	* mips/ddb-kseg0.ld, mips/ddb.ld, mips/dve.ld, mips/idt.ld,
-	* mips/idt32.ld, mips/idt64.ld, mips/jmr3904app-java.ld,
-	* mips/jmr3904app.ld, mips/jmr3904dram-java.ld, mips/jmr3904dram.ld,
-	* mips/nullmon.ld, mips/pmon.ld, mn10200/eval.ld, mn10200/sim.ld,
-	* mn10300/asb2303.ld, mn10300/asb2305.ld, mn10300/eval.ld,
-	* mn10300/sim.ld, rs6000/ads.ld, rs6000/mbx.ld, rs6000/yellowknife.ld,
-	* sh/sh1lcevb.ld, sh/sh2lcevb.ld, sh/sh3bb.ld, sh/sh3lcevb.ld,
-	* sparc/elfsim.ld, sparc/ex930.ld, sparc/ex931.ld, sparc/ex934.ld,
-	* sparc/sparc86x.ld, xstormy16/eva_app.ld, xstormy16/eva_stub.ld,
-	* xstormy16/sim_high.ld, xstormy16/sim_rom.ld: Add .debug_ranges
-	section.
-
-2005-05-05  Tobias Anderberg  <tobias.anderberg@axis.com>
-
-        * arm/syscalls.c (get_errno): Fix output register constraint.
-
-2005-05-05  J"orn Rennecke <joern.rennecke@st.com>
-
-        * rs6000/sim-getrusage.S: New file, broken out of:
-        (simulator.S).
-        * rs6000/Makefile.in (SIM_OBJS): Add sim-getrusage.o.
-        (sim-getrusage.o): New rule.
-
-2005-04-28  Shaun Jackman  <sjackman@gmail.com>
-
-	* libgloss/syscalls.c (get_errno): Add an output register constraint.
-
-2005-04-19  Eric Christopher  <echristo@redhat.com>
-
-	* mips/regs.S: Sign extend constants for mips64 and unify
-        address handling.
-
-2005-04-12  Shaun Jackman  <sjackman@gmail.com>
-
-	* libgloss/arm/Makefile.in (RDPMON_BSP): librdpmon.a was empty due 
-	to a typo. Fixed.
-	(RDIMON_BSP): Ditto.
-
-2005-04-12  Richard Sandiford  <rsandifo@redhat.com>
-
-	* mips/array.ld, mips/cfe.ld, mips/dve.ld, mips/idt32.ld,
-	* mips/idt64.ld, mips/idtecoff.ld, mips/idt.ld,
-	* mips/jmr3904app-java.ld, mips/jmr3904app.ld,
-	* mips/jmr3904dram-java.ld, mips/jmr3904dram.ld, mips/lsi.ld,
-	* mips/nullmon.ld, mips/pmon.ld: Keep .init and .fini.
-
 2005-02-08  Antony King  <antony.king@st.com>
 
 	* arm/syscalls.c: Change CHECK_INIT to pass reentrant struct
diff --git a/libgloss/arm/Makefile.in b/libgloss/arm/Makefile.in
index 436db13ed..828c488b1 100644
--- a/libgloss/arm/Makefile.in
+++ b/libgloss/arm/Makefile.in
@@ -116,11 +116,11 @@ rdimon-libcfunc.o: libcfunc.c
 	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
 
 $(RDPMON_BSP): $(RDPMON_OBJS)
-	${AR} ${ARFLAGS} $@ $^
+	${AR} ${ARFLAGS} $@ $(IDTOBJS)
 	${RANLIB} $@
 
 $(RDIMON_BSP): $(RDIMON_OBJS)
-	${AR} ${ARFLAGS} $@ $^
+	${AR} ${ARFLAGS} $@ $(IDTOBJS)
 	${RANLIB} $@
 
 clean mostlyclean:
diff --git a/libgloss/arm/configure b/libgloss/arm/configure
index 47d91ec30..2103e319a 100644
--- a/libgloss/arm/configure
+++ b/libgloss/arm/configure
@@ -537,16 +537,13 @@ else
 fi
 
 if test "x$newlib_may_supply_syscalls" = "xyes"; then
-  BUILD_CRT0_TRUE='#'
-  BUILD_CRT0_FALSE=
-else
   BUILD_CRT0_TRUE=
   BUILD_CRT0_FALSE='#'
+else
+  BUILD_CRT0_TRUE='#'
+  BUILD_CRT0_FALSE=
 fi
 
-
-
-
 if test "$srcdir" = "." ; then
   if test "${with_target_subdir}" != "." ; then
     libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
@@ -604,7 +601,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:608: checking host system type" >&5
+echo "configure:605: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -625,7 +622,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:629: checking target system type" >&5
+echo "configure:626: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -643,7 +640,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:647: checking build system type" >&5
+echo "configure:644: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -697,7 +694,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:701: checking for a BSD compatible install" >&5
+echo "configure:698: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -761,7 +758,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:765: checking for $ac_word" >&5
+echo "configure:762: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -791,7 +788,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:795: checking for $ac_word" >&5
+echo "configure:792: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -840,7 +837,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:844: checking whether we are using GNU C" >&5
+echo "configure:841: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -849,7 +846,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -864,7 +861,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:868: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:865: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -900,7 +897,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:904: checking for $ac_word" >&5
+echo "configure:901: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1090,8 +1087,6 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@BUILD_CRT0_TRUE@%$BUILD_CRT0_TRUE%g
-s%@BUILD_CRT0_FALSE@%$BUILD_CRT0_FALSE%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
diff --git a/libgloss/arm/configure.in b/libgloss/arm/configure.in
index 71595998a..d334288c4 100644
--- a/libgloss/arm/configure.in
+++ b/libgloss/arm/configure.in
@@ -12,16 +12,13 @@ AC_ARG_ENABLE(newlib-supplied-syscalls,
  esac], [newlib_may_supply_syscalls=yes])dnl
 
 if test "x$newlib_may_supply_syscalls" = "xyes"; then
-  BUILD_CRT0_TRUE='#'
-  BUILD_CRT0_FALSE=
-else
   BUILD_CRT0_TRUE=
   BUILD_CRT0_FALSE='#'
+else
+  BUILD_CRT0_TRUE='#'
+  BUILD_CRT0_FALSE=
 fi
 
-AC_SUBST(BUILD_CRT0_TRUE)
-AC_SUBST(BUILD_CRT0_FALSE)
-
 if test "$srcdir" = "." ; then
   if test "${with_target_subdir}" != "." ; then
     libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
diff --git a/libgloss/arm/crt0.S b/libgloss/arm/crt0.S
index 823f409a4..33bcc3a4b 100644
--- a/libgloss/arm/crt0.S
+++ b/libgloss/arm/crt0.S
@@ -18,26 +18,15 @@
 
 /* .text is used instead of .section .text so it works with arm-aout too.  */
 	.text
-#if defined(__thumb2__)
-	.syntax unified
-	.thumb
-.macro FUNC_START name
-	.global \name
-	.thumb_func
-\name:
-.endm
-#else
 	.code 32
-.macro FUNC_START name
-	.global \name
-\name:
-.endm
-#endif
 	.align 	0
 
-	FUNC_START	_mainCRTStartup
-	FUNC_START	_start
-	FUNC_START	start
+	.global	_mainCRTStartup
+	.global	_start
+	.global	start
+start:
+_start:
+_mainCRTStartup:
 #if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__)
 	/* Annotation for EABI unwinding tables.  */
 	.fnstart
@@ -56,12 +45,7 @@
 	/*  Issue Angel SWI to read stack info */
 	mov	r0, #AngelSWI_Reason_HeapInfo
 	adr	r1, .LC0	/*  point at ptr to 4 words to receive data */
-#if defined(__thumb2__)
-	bkpt	AngelSWI
-#else
-	/*  We are always in ARM mode for startup */
-	AngelSWIAsm	AngelSWI_ARM
-#endif
+	swi	AngelSWI_ARM	/*  We are always in ARM mode for startup */
 	ldr	r0, .LC0	/*  point at values read */
 	ldr	sp, [r0, #8]
 	ldr	sl, [r0, #12]
@@ -140,8 +124,8 @@
 	sub	a3, a3, a1		/* Third arg: length of block */
 	
 
-#if defined(__thumb__) && !defined(__thumb2__)
-	/* Enter Thumb mode.... */
+#ifdef __thumb__		/* Enter Thumb mode.... */
+
 	add	a4, pc, #1	/* Get the address of the Thumb block */
 	bx	a4		/* Go there and start Thumb decoding  */
 
@@ -181,7 +165,7 @@ __change_mode:
 #else
 	mov	r0, #AngelSWI_Reason_GetCmdLine
 	adr	r1, .LC30	/*  Space for command line */
-	AngelSWIAsm	AngelSWI
+	swi	AngelSWI
 	ldr	r1, .LC30
 #endif
 	/*  Parse string at r1 */
@@ -267,11 +251,6 @@ __change_mode:
 	add	r3, #4
 	b	.LC15
 .LC14:	
-	/* Ensure doubleword stack alignment.  */
-	mov	r4, sp
-	mov	r5, #7
-	bic	r4, r5
-	mov	sp, r4
 #else
 	add	r2, sp, r0, LSL #2	/* End of args */
 	mov	r3, sp			/* Start of args */
@@ -281,8 +260,6 @@ __change_mode:
 	strhi	r5, [r2, #-4]!
 	strhi	r4, [r3], #4
 	bhi	.LC13
-	/* Ensure doubleword stack alignment.  */
-	bic	sp, sp, #7
 #endif
 #endif
 
@@ -303,7 +280,7 @@ __change_mode:
 
 	bl	FUNCTION (exit)		/* Should not return.  */
 
-#if defined(__thumb__) && !defined(__thumb2__)
+#ifdef __thumb__
 	/* Come out of Thumb mode.  This code should be redundant.  */
 
 	mov	a4, pc
diff --git a/libgloss/arm/elf-redboot.ld b/libgloss/arm/elf-redboot.ld
index 3d1f8d806..be3865430 100644
--- a/libgloss/arm/elf-redboot.ld
+++ b/libgloss/arm/elf-redboot.ld
@@ -209,7 +209,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/arm/libcfunc.c b/libgloss/arm/libcfunc.c
index 4f131939a..ddc611f34 100644
--- a/libgloss/arm/libcfunc.c
+++ b/libgloss/arm/libcfunc.c
@@ -5,17 +5,15 @@
    Note: These functions are in a seperate file so that OS providers can
    overrride the system call stubs (defined in syscalls.c) without having
    to provide libc funcitons as well.  */
-
 #include "swi.h"
-#include <errno.h>
-#include <unistd.h>
 
 #ifdef ARM_RDI_MONITOR
+
 static inline int
 do_AngelSWI (int reason, void * arg)
 {
   int value;
-  asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
+  asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0"
        : "=r" (value) /* Outputs */
        : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */
        : "r0", "r1", "lr"
@@ -24,65 +22,19 @@ do_AngelSWI (int reason, void * arg)
 }
 #endif /* ARM_RDI_MONITOR */
 
+
 void
 abort (void)
 {
-  extern void _exit (int n);
 #ifdef ARM_RDI_MONITOR
   do_AngelSWI (AngelSWI_Reason_ReportException,
 	      (void *) ADP_Stopped_RunTimeError);
 #else
-  _exit(17);
+ asm ("mov r0,#17\nswi %a0" :: "i" (SWI_Exit));
 #endif
 }
 
-unsigned __attribute__((weak))
-alarm (unsigned seconds)
-{
-	(void)seconds;
-	return 0;
-}
-
-clock_t _clock(void);
-clock_t __attribute__((weak))
-clock(void)
-{
-      return _clock();
-}
-
-int _isatty(int fildes);
-int __attribute__((weak))
-isatty(int fildes)
-{
-	return _isatty(fildes);
-}
-
-int __attribute__((weak))
-pause(void)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-#include <sys/types.h>
-#include <time.h>
-
-unsigned __attribute__((weak))
-sleep(unsigned seconds)
-{
-	clock_t t0 = _clock();
-	clock_t dt = seconds * CLOCKS_PER_SEC;
-
-	while (_clock() - t0  < dt);
-	return 0;
-}
-
-int __attribute__((weak))
-usleep(useconds_t useconds)
+void
+alarm (void)
 {
-	clock_t t0 = _clock();
-	clock_t dt = useconds / (1000000/CLOCKS_PER_SEC);
-
-	while (_clock() - t0  < dt);
-	return 0;
 }
diff --git a/libgloss/arm/redboot-crt0.S b/libgloss/arm/redboot-crt0.S
index 2499ac091..f2963eeb4 100644
--- a/libgloss/arm/redboot-crt0.S
+++ b/libgloss/arm/redboot-crt0.S
@@ -12,34 +12,18 @@
 
     .text
      /* Setup the assembly entry point.  */
-#ifdef __thumb2__
-.macro FUNC_START name
-	.global \name
-	.thumb_func
-\name:
-.endm
-	.syntax unified
-	.thumb
-#else
-.macro FUNC_START name
-	.global \name
-\name:
-.endm
-	.code 32
-#endif
-	FUNC_START SYM_NAME(start)
-	FUNC_START SYM_NAME(_start)
+    .code 32
+    .globl SYM_NAME(start)
+    .globl SYM_NAME(_start)
+SYM_NAME(start):
+SYM_NAME(_start):
 	mov	fp, #0	/* Null frame pointer.  */
 	mov	r7, #0	/* Null frame pointer for Thumb.  */
 
 	/* Enable interrupts for gdb debugging.  */
-#ifdef __thumb2__
-	cpsie if
-#else
 	mrs    r0, cpsr
 	bic    r0, r0, #0xC0
 	msr    cpsr, r0
-#endif
 	
 	mov 	a2, #0			/* Second arg: fill value.  */
 	ldr	a1, .LC1		/* First arg: start of memory block.  */
@@ -62,7 +46,7 @@
 	/* Nothing to left to clear.  */
 #endif
 
-#if defined(__thumb__) && !defined(__thumb2__)	/* Enter Thumb mode. */
+#ifdef __thumb__		/* Enter Thumb mode. */
 	add	a4, pc, #1	/* Get the address of the Thumb block.  */
 	bx	a4		/* Go there and start Thumb decoding.   */
 
diff --git a/libgloss/arm/swi.h b/libgloss/arm/swi.h
index f5c910313..15c3866a1 100644
--- a/libgloss/arm/swi.h
+++ b/libgloss/arm/swi.h
@@ -33,14 +33,6 @@
 #else
 #define AngelSWI 			AngelSWI_ARM
 #endif
-/* For Thumb-2 code use the BKPT instruction instead of SWI.  */
-#ifdef __thumb2__
-#define AngelSWIInsn			"bkpt"
-#define AngelSWIAsm			bkpt
-#else
-#define AngelSWIInsn			"swi"
-#define AngelSWIAsm			swi
-#endif
 
 /* The reason codes:  */
 #define AngelSWI_Reason_Open		0x01
diff --git a/libgloss/arm/syscalls.c b/libgloss/arm/syscalls.c
index a6d2f747e..e89022806 100644
--- a/libgloss/arm/syscalls.c
+++ b/libgloss/arm/syscalls.c
@@ -7,7 +7,6 @@
 #include <sys/stat.h>
 #include <sys/fcntl.h>
 #include <stdio.h>
-#include <string.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/times.h>
@@ -19,10 +18,11 @@
 /* Forward prototypes.  */
 int     _system     _PARAMS ((const char *));
 int     _rename     _PARAMS ((const char *, const char *));
-int     _isatty		_PARAMS ((int));
+int     isatty		_PARAMS ((int));
 clock_t _times		_PARAMS ((struct tms *));
 int     _gettimeofday	_PARAMS ((struct timeval *, struct timezone *));
-int     _unlink		_PARAMS ((const char *));
+void    _raise 		_PARAMS ((void));
+int     _unlink		_PARAMS ((void));
 int     _link 		_PARAMS ((void));
 int     _stat 		_PARAMS ((const char *, struct stat *));
 int     _fstat 		_PARAMS ((int, struct stat *));
@@ -31,7 +31,6 @@ int     _getpid		_PARAMS ((int));
 int     _kill		_PARAMS ((int, int));
 void    _exit		_PARAMS ((int));
 int     _close		_PARAMS ((int));
-clock_t _clock		_PARAMS ((void));
 int     _swiclose	_PARAMS ((int));
 int     _open		_PARAMS ((const char *, int, ...));
 int     _swiopen	_PARAMS ((const char *, int));
@@ -99,7 +98,7 @@ static inline int
 do_AngelSWI (int reason, void * arg)
 {
   int value;
-  asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
+  asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0"
        : "=r" (value) /* Outputs */
        : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */
        : "r0", "r1", "r2", "r3", "ip", "lr", "memory", "cc"
@@ -134,16 +133,6 @@ initialise_monitor_handles (void)
 {
   int i;
   
-  /* Open the standard file descriptors by opening the special
-   * teletype device, ":tt", read-only to obtain a descritpor for
-   * standard input and write-only to obtain a descriptor for standard
-   * output. Finally, open ":tt" in append mode to obtain a descriptor
-   * for standard error. Since this is a write mode, most kernels will
-   * probably return the same value as for standard output, but the
-   * kernel can differentiate the two using the mode flag and return a
-   * different descriptor for standard error.
-   */
-
 #ifdef ARM_RDI_MONITOR
   int volatile block[3];
   
@@ -155,12 +144,7 @@ initialise_monitor_handles (void)
   block[0] = (int) ":tt";
   block[2] = 3;     /* length of filename */
   block[1] = 4;     /* mode "w" */
-  monitor_stdout = do_AngelSWI (AngelSWI_Reason_Open, (void *) block);
-
-  block[0] = (int) ":tt";
-  block[2] = 3;     /* length of filename */
-  block[1] = 8;     /* mode "a" */
-  monitor_stderr = do_AngelSWI (AngelSWI_Reason_Open, (void *) block);
+  monitor_stdout = monitor_stderr = do_AngelSWI (AngelSWI_Reason_Open, (void *) block);
 #else
   int fh;
   const char * name;
@@ -177,14 +161,7 @@ initialise_monitor_handles (void)
        : "=r"(fh)
        : "i" (SWI_Open),"r"(name)
        : "r0","r1");
-  monitor_stdout = fh;
-
-  name = ":tt";
-  asm ("mov r0,%2; mov r1, #8; swi %a1; mov %0, r0"
-       : "=r"(fh)
-       : "i" (SWI_Open),"r"(name)
-       : "r0","r1");
-  monitor_stderr = fh;
+  monitor_stdout = monitor_stderr = fh;
 #endif
 
   for (i = 0; i < MAX_OPEN_FILES; i ++)
@@ -194,8 +171,6 @@ initialise_monitor_handles (void)
   openfiles[0].pos = 0;
   openfiles[1].handle = monitor_stdout;
   openfiles[1].pos = 0;
-  openfiles[2].handle = monitor_stderr;
-  openfiles[2].pos = 0;
 }
 
 static int
@@ -204,9 +179,7 @@ get_errno (void)
 #ifdef ARM_RDI_MONITOR
   return do_AngelSWI (AngelSWI_Reason_Errno, NULL);
 #else
-  register r0 asm("r0");
-  asm ("swi %a1" : "=r"(r0) : "i" (SWI_GetErrno));
-  return r0;
+  asm ("swi %a0" :: "i" (SWI_GetErrno));
 #endif
 }
 
@@ -370,6 +343,8 @@ _write (int    file,
   return len - x;
 }
 
+extern int strlen (const char *);
+
 int
 _swiopen (const char * path,
 	  int          flags)
@@ -458,31 +433,33 @@ _close (int file)
   return wrap (_swiclose (file));
 }
 
+void
+_exit (int n)
+{
+  /* FIXME: return code is thrown away.  */
+  
+#ifdef ARM_RDI_MONITOR
+  do_AngelSWI (AngelSWI_Reason_ReportException,
+	      (void *) ADP_Stopped_ApplicationExit);
+#else
+  asm ("swi %a0" :: "i" (SWI_Exit));
+#endif
+  n = n;
+}
+
 int
-_kill (int pid, int sig)
+_kill (int n, int m)
 {
-  (void)pid; (void)sig;
 #ifdef ARM_RDI_MONITOR
-  /* Note: Both arguments are thrown away.  */
   return do_AngelSWI (AngelSWI_Reason_ReportException,
 		      (void *) ADP_Stopped_ApplicationExit);
 #else
   asm ("swi %a0" :: "i" (SWI_Exit));
 #endif
+  n = n; m = m;
 }
 
-void
-_exit (int status)
-{
-  /* There is only one SWI for both _exit and _kill. For _exit, call
-     the SWI with the second argument set to -1, an invalid value for
-     signum, so that the SWI handler can distinguish the two calls.
-     Note: The RDI implementation of _kill throws away both its
-     arguments.  */
-  _kill(status, -1);
-}
-
-int __attribute__((weak))
+int
 _getpid (int n)
 {
   return 1;
@@ -522,7 +499,9 @@ _sbrk (int incr)
   return (caddr_t) prev_heap_end;
 }
 
-int __attribute__((weak))
+extern void memset (struct stat *, int, unsigned int);
+
+int
 _fstat (int file, struct stat * st)
 {
   memset (st, 0, sizeof (* st));
@@ -532,8 +511,7 @@ _fstat (int file, struct stat * st)
   file = file;
 }
 
-int __attribute__((weak))
-_stat (const char *fname, struct stat *st)
+int _stat (const char *fname, struct stat *st)
 {
   int file;
 
@@ -549,22 +527,22 @@ _stat (const char *fname, struct stat *st)
   return 0;
 }
 
-int __attribute__((weak))
+int
 _link (void)
 {
-  errno = ENOSYS;
   return -1;
 }
 
 int
-_unlink (const char *path)
+_unlink (void)
 {
-#ifdef ARM_RDI_MONITOR
-  return do_AngelSWI (AngelSWI_Reason_Remove, &path);
-#else
-  (void)path;
-  asm ("swi %a0" :: "i" (SWI_Remove));
-#endif
+  return -1;
+}
+
+void
+_raise (void)
+{
+  return;
 }
 
 int
@@ -598,7 +576,7 @@ _gettimeofday (struct timeval * tp, struct timezone * tzp)
 
 /* Return a clock that ticks at 100Hz.  */
 clock_t 
-_clock (void)
+_times (struct tms * tp)
 {
   clock_t timeval;
 
@@ -607,14 +585,6 @@ _clock (void)
 #else
   asm ("swi %a1; mov %0, r0" : "=r" (timeval): "i" (SWI_Clock) : "r0");
 #endif
-  return timeval;
-}
-
-/* Return a clock that ticks at 100Hz.  */
-clock_t
-_times (struct tms * tp)
-{
-  clock_t timeval = _clock();
 
   if (tp)
     {
@@ -629,35 +599,24 @@ _times (struct tms * tp)
 
 
 int
-_isatty (int fd)
+isatty (int fd)
 {
-#ifdef ARM_RDI_MONITOR
-  return do_AngelSWI (AngelSWI_Reason_IsTTY, &fd);
-#else
-  (void)fd;
-  asm ("swi %a0" :: "i" (SWI_IsTTY));
-#endif
+  return 1;
+  fd = fd;
 }
 
 int
 _system (const char *s)
 {
-#ifdef ARM_RDI_MONITOR
-  return do_AngelSWI (AngelSWI_Reason_System, &s);
-#else
-  (void)s;
-  asm ("swi %a0" :: "i" (SWI_CLI));
-#endif
+  if (s == NULL)
+    return 0;
+  errno = ENOSYS;
+  return -1;
 }
 
 int
 _rename (const char * oldpath, const char * newpath)
 {
-#ifdef ARM_RDI_MONITOR
-  const char *block[2] = {oldpath, newpath};
-  return do_AngelSWI (AngelSWI_Reason_Rename, block);
-#else
-  (void)oldpath; (void)newpath;
-  asm ("swi %a0" :: "i" (SWI_Rename));
-#endif
+  errno = ENOSYS;
+  return -1;
 }
diff --git a/libgloss/arm/trap.S b/libgloss/arm/trap.S
index 21b6937f9..328fabca5 100644
--- a/libgloss/arm/trap.S
+++ b/libgloss/arm/trap.S
@@ -1,5 +1,4 @@
         /* Run-time exception support */
-#if !defined(__thumb2__)
 #include "swi.h"
 
 /* .text is used instead of .section .text so it works with arm-aout too.  */
@@ -92,4 +91,3 @@ __rt_stkovf_split_big:
         @ We now know how much extra stack the function requires.
         @ Terminate the program for the moment:
         swi     SWI_Exit
-#endif
diff --git a/libgloss/configure b/libgloss/configure
index 1b2f62305..a75e36ccf 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -792,14 +792,9 @@ case "${target}" in
   mcore-*-*)
 	configdirs="${configdirs} mcore testsuite"
 	;;
-  mt-*-*)
-        configdirs="${configdirs} mt testsuite";;
   xstormy16-*-*)
 	configdirs="${configdirs} xstormy16 testsuite"
 	;;
-  m32c-*-*)
-	configdirs="${configdirs} m32c testsuite"
-	;;
   strongarm-*-elf | strongarm-*-coff)
 	configdirs="${configdirs} arm testsuite";
 	;;
@@ -834,7 +829,7 @@ subdirs="$configdirs"
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:838: checking for $ac_word" >&5
+echo "configure:833: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -864,7 +859,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:868: checking for $ac_word" >&5
+echo "configure:863: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -913,7 +908,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:917: checking whether we are using GNU C" >&5
+echo "configure:912: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -922,7 +917,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -937,7 +932,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:941: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:936: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -969,7 +964,7 @@ AS=${AS-as}
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:973: checking for $ac_word" >&5
+echo "configure:968: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1003,7 +998,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1007: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/libgloss/configure.in b/libgloss/configure.in
index 3eca088ec..5155e72f3 100644
--- a/libgloss/configure.in
+++ b/libgloss/configure.in
@@ -103,14 +103,9 @@ case "${target}" in
   mcore-*-*)
 	configdirs="${configdirs} mcore testsuite"
 	;;
-  mt-*-*)
-        configdirs="${configdirs} mt testsuite";;
   xstormy16-*-*)
 	configdirs="${configdirs} xstormy16 testsuite"
 	;;
-  m32c-*-*)
-	configdirs="${configdirs} m32c testsuite"
-	;;
   strongarm-*-elf | strongarm-*-coff)
 	configdirs="${configdirs} arm testsuite";
 	;;
diff --git a/libgloss/cris/Makefile.in b/libgloss/cris/Makefile.in
deleted file mode 100644
index ca3ec3804..000000000
--- a/libgloss/cris/Makefile.in
+++ /dev/null
@@ -1,277 +0,0 @@
-#
-# libgloss Makefile.in for CRIS.  Copied and modified from mcore long ago.
-#
-
-DESTDIR =
-VPATH = @srcdir@
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-CFLAGS		= -g
-SCRIPTS		=
-
-OBJS = outbyte.o
-
-# Beware: GNU make construct used (shell call).  Since GCC at the time
-# of this writing requires GNU make >= 3.79.1, this should pose no
-# problem.
-SYSCALL_CFILES := $(shell sed -ne 's/^cat > \([^ ]*\).*/\1/p' < $(srcdir)/gensyscalls)
-
-# Here is all of the simulator stuff.
-# Actually, now it's just the GNU/Linux stuff, as that's also the
-# simulator ABI.  The name of the library is different, though.
-SIM_SCRIPTS	=
-SIM_LDFLAGS	=
-SIM_BSP		= libsyssim.a
-SIM_CRT0	= $(LIN_CRT0)
-SIM_OBJS	= $(LIN_OBJS)
-SIM_TEST	= sim-test
-SIM_INSTALL	= install-sim
-
-# Here is all of the GNU/Linux stuff.  At present we don't build newlib
-# and libgloss for cris*-linux-gnu*, but it's nice to keep that as an
-# option.
-LIN_PREFIX	=
-LIN_LDFLAGS	=
-LIN_BSP		= libsyslinux.a
-LIN_CRT0	= lcrt0.o
-LIN_EXTRA	= crti.o crtn.o crt1.o
-LIN_OBJS	= close.o execve.o exit.o fcntl.o fork.o fstat.o getpid.o \
- gettod.o isatty.o kill.o link.o lseek.o open.o read.o \
- rename.o sbrk.o stat.o times.o unlink.o wait.o write.o ${OBJS}
-LIN_SCRIPTS	=
-LIN_TEST	=
-LIN_INSTALL	= install-lin
-
-# In (over)due time, here will be all stuff necessary for a development
-# board.
-BSP_PREFIX	=
-BSP_LDFLAGS	=
-BSP_BSP		= libbsp.a
-BSP_CRT0	= crt0.o
-BSP_OBJS	= ${OBJS} setup.o
-BSP_SCRIPTS	=
-BSP_TEST	=
-BSP_INSTALL	= install-bsp
-
-ALL_INSTALL_FILES = \
- ${SIM_CRT0} ${SIM_EXTRA} ${SIM_BSP} \
- ${LIN_CRT0} ${LIN_EXTRA} ${LIN_BSP} \
- ${BSP_CRT0} ${BSP_EXTRA} ${BSP_BSP}
-
-ALL_INSTALL_FILES_NEWLIB_COPY = \
- $(sort ${ALL_INSTALL_FILES:%=$(objroot)/newlib/%}) $(objroot)/newlib/libnosys.a
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-# Need to augment the definition from host_makefile_frag above.
-INCLUDES += -I$(srcdir)
-
-all: ${ALL_INSTALL_FILES} ${ALL_INSTALL_FILES_NEWLIB_COPY} libnosys.a
-
-#
-# Here's where we build the board support packages for each target.
-#
-${SIM_BSP}: ${SIM_OBJS}
-	${AR} ${ARFLAGS} ${SIM_BSP} ${SIM_OBJS}
-	${RANLIB} ${SIM_BSP}
-
-${BSP_BSP}: ${BSP_OBJS}
-	${AR} ${ARFLAGS} ${BSP_BSP} ${BSP_OBJS}
-	${RANLIB} ${BSP_BSP}
-
-${LIN_BSP}: ${LIN_OBJS}
-	${AR} ${ARFLAGS} ${LIN_BSP} ${LIN_OBJS}
-	${RANLIB} ${LIN_BSP}
-
-# We need a link to libnosys.a in this directory, since this is the
-# directory used when test-compiling for configuration for other parts and
-# when running the testsuite.  By using a symbolic link, it does not
-# matter whether libnosys.a is built yet when the rule is executed.
-libnosys.a:
-	ln -s ../libnosys/libnosys.a
-
-# Toplevel build rules for various other libraries have gcc -B options
-# applied so the newlib build directory is reached, but not the target
-# libgloss directory (whose name is unknown to the toplevel configury
-# anyway).  Configury tests that check for a successful link therefore
-# fail; they can't find crt0.o and non-libc.a+libm.a libraries.  We copy
-# over all files we would install to the neighboring newlib directory.
-# Only the default crt0.o and libraries are needed, but we do them all for
-# completeness.  They're however installed from here, not from the newlib
-# build directory.
-$(objroot)/newlib/%: %
-	cp -p $^ $@
-
-# This rule, being more specific, overrides the pattern rule above.
-$(objroot)/newlib/libnosys.a:
-	ln -s ../libgloss/libnosys/libnosys.a $(objroot)/newlib
-
-#
-# Build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-#
-# Here's where we build the test programs for each target.
-#
-.PHONY: test
-test:	${SIM_TEST} ${BSP_TEST}
-
-sim-test:	sim-test.x sim-test.dis
-
-sim-test.x:	test.o ${SIM_CRT0} ${SIM_BSP}
-	${CC} ${LDFLAGS_FOR_TARGET} -L${objdir} \
-	${SIM_CRT0} test.o \
-	-o sim-test.x ${LIBS_FOR_TARGET} -lc ${SIM_BSP}
-
-sim-test.dis:	sim-test.x
-	${OBJDUMP} -d sim-test.x > sim-test.dis
-
-
-test.o: ${srcdir}/m68k/test.c
-
-# Debug usage.
-.c.S:
-	${CC} ${CFLAGS_FOR_TARGET} $(INCLUDES) $(CFLAGS) -c $<
-
-# Caveat: for the -melinux multilib in cris-axis-aout, crt0.o is the
-# same as lcrt0.o, while elsewhere (other cris-axis-aout multilib and
-# cris-axis-elf) it's crt0.c compiled.
-crt0.o: lcrt0.o crt0.S
-	case "${MULTISUBDIR}" in \
-          */elinux) \
-	   cp -p $< $@; st=$$?;; \
-          *) \
-           case "$?" in \
-            *crt0.S) \
-	     $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -xassembler-with-cpp -c $(srcdir)/crt0.S;; \
-            *) touch $@;; \
-            esac; \
-	   st=$$?;; \
-	esac; exit $$st
-
-crt1.o: lcrt0.o
-	cp -p $< $@
-
-clean mostlyclean:
-	rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) $(BSP_BSP) $(LIN_BSP) libnosys.a
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status *~
-
-.PHONY: install info install-info clean-info
-install: ${SIM_INSTALL} ${BSP_INSTALL} ${LIN_INSTALL}
-
-# Note that bsp and elinux objects are exclusive: do not overlap
-# installed files.
-install-bsp:
-	case "${MULTISUBDIR}" in \
-          */elinux) ;; \
-	  *) set -e; \
-	     for x in ${BSP_CRT0} ${BSP_BSP} ${BSP_SCRIPTS}; do \
-		${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	     done;; \
-	esac
-
-install-sim:
-	set -e; \
-	for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do \
-	  ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-
-install-lin:
-	case "${MULTISUBDIR}" in \
-          */elinux) \
-	    ${INSTALL_DATA} ${LIN_CRT0} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/crt0.o; \
-	    set -e; \
-	    for x in ${LIN_BSP} ${LIN_SCRIPTS}; do \
-	      ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	    done;; \
-          *) \
-	    set -e; \
-	    for x in ${LIN_BSP} ${LIN_SCRIPTS} ${LIN_EXTRA}; do \
-	      ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; \
-	    done;; \
-	esac
-
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
-
-$(SYSCALL_CFILES): syscalls.stamp
-
-syscalls.stamp: gensyscalls
-	$(SHELL) $(srcdir)/gensyscalls
-	touch $@
-
-# Dependencies that could and should be auto-generated.
-close.o: close.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-execve.o: execve.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-exit.o: exit.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-fork.o: fork.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-fstat.o: fstat.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-fcntl.o: fcntl.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-getpid.o: getpid.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-gettod.o: gettod.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-isatty.o: isatty.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-kill.o: kill.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-link.o: link.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-lseek.o: lseek.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-open.o: open.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-read.o: read.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-rename.o: rename.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-sbrk.o: sbrk.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-stat.o: stat.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-times.o: times.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-unlink.o: unlink.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-wait.o: wait.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-write.o: write.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-lcrt0.o: lcrt0.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-setup.o: setup.S
-crti.o: crti.c
-crtn.o: crtn.c
diff --git a/libgloss/cris/configure b/libgloss/cris/configure
deleted file mode 100755
index edda80296..000000000
--- a/libgloss/cris/configure
+++ /dev/null
@@ -1,1203 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.in
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:744: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:823: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:883: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/cris/configure.in b/libgloss/cris/configure.in
deleted file mode 100644
index 9ac0d4589..000000000
--- a/libgloss/cris/configure.in
+++ /dev/null
@@ -1,90 +0,0 @@
-dnl This file is based on ../mcore/configure.in
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(Makefile.in)
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
diff --git a/libgloss/cris/crt0.S b/libgloss/cris/crt0.S
deleted file mode 100644
index a48efceb2..000000000
--- a/libgloss/cris/crt0.S
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Generic simplistic start-up-stub for CRIS/CRISv32.
-   Copyright (C) 1993-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-#undef cris
-#undef L
-#ifdef __NO_UNDERSCORES__
-#define L(x) x
-#else
-#define L(x) _ ## x
-#endif
-
-; Rudimentary v0..v32-compatible startup stub.
-
-#ifdef __ELF__
- .section .startup,"ax"
-#endif
- .global __start
- nop
-__start:
- ba 0f
- nop
-
- .rept 256 - 2
- .dword _.int
- .endr
-
-_.int:
-#ifdef __arch_common_v10_v32
- ; This is just to allow the multilib to compile without
- ; hackery: the "common" subset doesn't recognize
- ; interrupt-return insns.
-#elif __CRIS_arch_version >= 32
- rete
- rfe
-#else
- reti
- nop
-#endif
-
-0:
- move.d __setup,$r9
- jsr $r9
- nop
-#ifdef __ELF__
- jsr L(_init)
- nop
- move.d L(_fini),$r10
- jsr L(atexit)
- nop
-#endif
- jsr L(main)
- nop
- jsr L(exit)
- nop
-0:
- nop
- ba 0b
- nop
diff --git a/libgloss/cris/crti.c b/libgloss/cris/crti.c
deleted file mode 100644
index ceb71e545..000000000
--- a/libgloss/cris/crti.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Executable and DSO init/fini start for cris*-axis-linux-gnu and simulators
-   Copyright (C) 2000, 2001, 2004, 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-#ifdef __ELF__
-__asm__ (".syntax no_register_prefix");
-
-__asm__ (".section .init\n"
-#ifdef __NO_UNDERSCORES__
-         " .globl _init\n"
-         "_init:\n"
-#else /* not __NO_UNDERSCORES__ */
-         " .globl __init\n"
-         "__init:\n"
-#endif /* not __NO_UNDERSCORES__ */
-         "\tsubq 4,sp\n"
-	 "\tmove srp,[sp]\n"
-#ifdef __PIC__
-         "\tsubq 4,sp\n"
-	 "\tmove.d r0,[sp]\n"
-#if __CRIS_arch_version >= 32
-	 "\tlapc _GLOBAL_OFFSET_TABLE_,$r0\n"
-#else /* not __CRIS_arch_version >= 32 */
-	 "\tmove.d $pc,$r0\n"
-	 "\tsub.d .:GOTOFF,$r0\n"
-#endif /* not __CRIS_arch_version >= 32 */
-#endif /* __PIC__ */
-
-         "\t.section .fini\n"
-#ifdef __NO_UNDERSCORES__
-         " .globl _fini\n"
-         "_fini:\n"
-#else /* not __NO_UNDERSCORES__ */
-         " .globl __fini\n"
-         "__fini:\n"
-#endif /* not __NO_UNDERSCORES__ */
-         "\tsubq 4,sp\n"
-	 "\tmove srp,[sp]\n"
-#ifdef __PIC__
-         "\tsubq 4,sp\n"
-	 "\tmove.d r0,[sp]\n"
-#if __CRIS_arch_version >= 32
-	 "\tlapc _GLOBAL_OFFSET_TABLE_,$r0\n"
-#else /* not __CRIS_arch_version >= 32 */
-	 "\tmove.d $pc,$r0\n"
-	 "\tsub.d .:GOTOFF,$r0\n"
-#endif /* not __CRIS_arch_version >= 32 */
-#endif /* __PIC__ */
-);
-
-#else /* not __ELF__ */
-extern int Dummy;
-#endif /* not __ELF__ */
diff --git a/libgloss/cris/crtn.c b/libgloss/cris/crtn.c
deleted file mode 100644
index 012e5b1e4..000000000
--- a/libgloss/cris/crtn.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Executable and DSO init/fini end for cris*-axis-linux-gnu and simulators
-   Copyright (C) 2000, 2001, 2004, 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-#ifdef __ELF__
-
-__asm__ (".syntax no_register_prefix");
-
-__asm__ (".section .init\n"
-#ifdef __PIC__
-	 "\tmove.d [sp+],r0\n"
-#endif
-         "\tmove.d [sp+],r9\n"
-         "\tjump r9\n"
-         "\tnop\n"
-
-         "\t.section .fini\n"
-#ifdef __PIC__
-	 "\tmove.d [sp+],r0\n"
-#endif
-         "\tmove.d [sp+],r9\n"
-         "\tjump r9\n"
-         "\tnop\n");
-
-#else
-extern int Dummy;
-#endif
diff --git a/libgloss/cris/gensyscalls b/libgloss/cris/gensyscalls
deleted file mode 100644
index 9df8b0376..000000000
--- a/libgloss/cris/gensyscalls
+++ /dev/null
@@ -1,252 +0,0 @@
-#! /bin/sh
-#  Copyright (C) 2005 Axis Communications.
-#  All rights reserved.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  1. Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#  2. Neither the name of Axis Communications nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-#  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-#  COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-#  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-#  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-#  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-#  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-#  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-#  POSSIBILITY OF SUCH DAMAGE.
-
-# To avoid an abundance of copyright/license messages for boilerplate
-# code, we instead generate them from this file.  Generating the
-# function code could also be done automatically, but at the cost of
-# slightly more intricate build machinery and/or scattered syscall
-# information.  Beware that the cat-lines must match the sed regexp
-# "^cat > \([^ ]*\).*".
-
-lu='/* -*- buffer-read-only: t -*-
-   THIS FILE IS AUTOMATICALLY GENERATED
-   FROM "'$0'".  */
-#include "linunistd.h"
-#define R(x) return (x); }
-'
-lui="$lu int"
-r=") { R (_Sys_"
-
-cat > close.c <<EOF
-$lui _close (int fd${r}close (fd))
-EOF
-cat > execve.c <<EOF
-$lui _execve (char *path, char **argv, char **env${r}execve (path, argv, env))
-EOF
-cat > exit.c <<EOF
-$lu void _exit (int val) { _Sys_exit (val); /* Appease GCC: */ while (1) ; }
-EOF
-cat > fcntl.c <<EOF
-$lui _fcntl (int fd, int cmd, long arg${r}fcntl (fd, cmd, arg))
-EOF
-cat > fork.c <<EOF
-$lui _fork (void${r}fork ())
-EOF
-cat > fstat.c <<EOF
-$lu#include <string.h>
-#include <sys/stat.h>
-int
-_fstat (int fd, struct stat *buf)
-{
-  struct new_stat ks;
-  int retval = _Sys_fstat (fd, &ks);
-
-  /* Blank before filling it in.  */
-  memset (buf, 0, sizeof (*buf));
-
-  /* We have to translate from the linux struct new_stat.
-     It seems we don't have to translate the contents, though.  */
-  buf->st_dev = ks.st_dev;
-  buf->st_ino = ks.st_ino;
-  buf->st_mode = ks.st_mode;
-  buf->st_nlink = ks.st_nlink;
-  buf->st_uid = ks.st_uid;
-  buf->st_gid = ks.st_gid;
-  buf->st_rdev = ks.st_rdev;
-  buf->st_size = ks.st_size;
-  buf->st_blksize = ks.st_blksize;
-  buf->st_blocks = ks.st_blocks;
-  buf->st_atime = ks.st_atime;
-  buf->st_mtime = ks.st_mtime;
-  buf->st_ctime = ks.st_ctime;
-  R (retval)
-EOF
-cat > getpid.c <<EOF
-$lui _getpid (void${r}getpid ())
-EOF
-cat > gettod.c <<EOF
-$lu#include <sys/time.h>
-#include <sys/times.h>
-int
-_gettimeofday (struct timeval *tp, struct timezone *tzp
-${r}gettimeofday (tp, tzp))
-EOF
-cat > isatty.c <<EOF
-$lu
-typedef unsigned int tcflag_t;
-typedef unsigned char cc_t;
-#define NCCS 19
-
-struct termios {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-};
-
-/* From asm-etrax100/ioctls.h: beware of updates.  */
-#define TCGETS          0x5401
-
-/* Note that this name does not have a prepended underscore.  */
-int
-isatty (int fd)
-{
-  struct termios dummy;
-  int save_errno = errno;
-  int ret = _Sys_ioctl (fd, TCGETS, (unsigned long) &dummy);
-  errno = save_errno;
-  R (ret == 0)
-EOF
-cat > kill.c <<EOF
-$lui _kill (int pid, int sig${r}kill (pid, sig))
-EOF
-cat > link.c <<EOF
-$lui _link (const char *old, const char *new${r}link (old, new))
-EOF
-cat > lseek.c <<EOF
-$lui _lseek (int fd, int offset, int whence${r}lseek (fd, offset, whence))
-EOF
-cat > open.c <<EOF
-$lui _open (const char *fnam, int flags, int mode${r}open (fnam, flags, mode))
-EOF
-cat > read.c <<EOF
-$lui _read (int fd, char *buf, int nbytes${r}read (fd, buf, nbytes))
-EOF
-cat > rename.c <<EOF
-$lui _rename (const char *old, const char *new${r}rename (old, new))
-EOF
-cat > sbrk.c <<EOF
-$lu
-/* From asm-etrax100/mman.h: beware of updates.  */
-#define PROT_READ	0x1		/* page can be read */
-#define PROT_WRITE	0x2		/* page can be written */
-#define MAP_ANONYMOUS	0x20		/* don't use a file */
-char *
-_sbrk (int d)
-{
-  static long last_alloc = 0;
-
-  /* FIXME: Things are a whole lot different than elinux.  */
-#ifdef __elinux__
-
-  /* We can't promise linear memory from a predetermined location.
-     We're NO_MM.  We're paria.  We have to rely on tweaks and unclean
-     behavior.  We abuse the fact that the malloc function in newlib
-     accepts nonlinear chunks in return to its sbrk calls (with a minor
-     patch).  */
-
-  /* We use an "old" type mmap, which takes a pointer to a vector of 6
-     longs where the parameters are stored.  */
-  long buffer[6];
-
-  /* We can't return memory.  Well we could, but we would have to keep a
-     list of previous allocations.  FIXME:  Seems reasonable to do that
-     later.  */
-  if (d < 0)
-    return (char *) last_alloc;
-
-  buffer[3] = MAP_ANONYMOUS;    /* Not associated with a file.  */
-  buffer[4] = -1;               /* No file.  */
-  buffer[0] = 0;                /* Address 0: let mmap pick one.  */
-  buffer[1] = d;                /* Length.  */
-  buffer[2] = (PROT_READ | PROT_WRITE); /* Protection flags.  */
-  buffer[5] = 0;                /* Offset into file.  */
-
-  last_alloc = _Sys_mmap (buffer);
-
-  return (char *) last_alloc;
-
-#else /* not __elinux__ */
-
-  long prev_brk;
-
-  if (last_alloc == 0)
-  {
-    last_alloc = _Sys_brk (0);
-
-    if (last_alloc < 0)
-      return (char *) -1;
-  }
-
-  prev_brk = last_alloc;
-
-  if (_Sys_brk (last_alloc + d) < last_alloc + d)
-    return (char *) -1;
-
-  last_alloc += d;
-
-  return (char *) prev_brk;
-#endif
-}
-EOF
-cat > stat.c <<EOF
-$lu#include <string.h>
-#include <sys/stat.h>
-int
-_stat (const char *path, struct stat *buf)
-{
-  struct new_stat ks;
-  int retval = _Sys_stat (path, &ks);
-
-  /* Blank before filling it in.  */
-  memset (buf, 0, sizeof (*buf));
-
-  /* We have to translate from the linux struct new_stat.
-     It seems we don't have to translate the contents, though.  */
-  buf->st_dev = ks.st_dev;
-  buf->st_ino = ks.st_ino;
-  buf->st_mode = ks.st_mode;
-  buf->st_nlink = ks.st_nlink;
-  buf->st_uid = ks.st_uid;
-  buf->st_gid = ks.st_gid;
-  buf->st_rdev = ks.st_rdev;
-  buf->st_size = ks.st_size;
-  buf->st_blksize = ks.st_blksize;
-  buf->st_blocks = ks.st_blocks;
-  buf->st_atime = ks.st_atime;
-  buf->st_mtime = ks.st_mtime;
-  buf->st_ctime = ks.st_ctime;
-  R (retval)
-EOF
-cat > times.c <<EOF
-$lu#include <sys/times.h>
-clock_t
-_times (struct tms * tp${r}times (tp))
-EOF
-cat > unlink.c <<EOF
-$lui _unlink (const char *f${r}unlink (f))
-EOF
-cat > wait.c <<EOF
-$lui _wait (int *status${r}wait4 (_getpid(), status, 0, 0))
-EOF
-cat > write.c <<EOF
-$lui _write (int fd, char *buf, int nbytes${r}write (fd, buf, nbytes))
-EOF
-exit 0
diff --git a/libgloss/cris/lcrt0.c b/libgloss/cris/lcrt0.c
deleted file mode 100644
index ee5074634..000000000
--- a/libgloss/cris/lcrt0.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Support for cris*-axis-linux-gnu and src/sim/cris simulator.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "linunistd.h"
-
-extern void exit (int) __attribute ((__noreturn__));
-
-__asm__ (".syntax no_register_prefix");
-
-#ifdef __ELF__
-/* This simulator magic for an earlier simulator was supposed to be
-   found two bytes before _start.  Let's keep it for sake of
-   compatibility.  Trying to emit them with an ordinary const char[]
-   and attribute section makes gcc barf; it doesn't like having the
-   same section attribute for both code and data.
-   The code is supposed to cause a crash if someone jumps to 0.  */
-__asm__
- (
-  " .section .startup,\"ax\",@progbits\n"
-  " .byte 55,55\n"
-  " move.d 0xbadacce5,r9\n"
-  " clear.d [r9]\n"
-  " setf\n"
-  " setf\n"
-  " .previous");
-#endif
-
-__asm__
- (
-#ifdef __AOUT__
-  " .text\n\t"
-#elif defined (__ELF__)
-  " .section .startup,\"ax\",@progbits\n"
-#endif
-  " .global __start\n"
-  "__start:\n"
-  /* SP must be set up by the simulator or the system.  */
-
-  /* Find ARGC, ARGV and ENV.  */
-  /* ARGC.  */
-  " move.d [sp],r10\n"
-
-  /* ARGV.  */
-  " move.d sp,r11\n"
-  " addq 4,r11\n"
-
-  /* ENVP.  */
-  " move.d sp,r12\n"
-  " addi r10.d,r12\n"
-  " addq 8,r12\n"
-
-  /* Terminate R9 and R6; we don't have a "console_print_etrax" or system
-     call function.  */
-  " clear.d r9\n"
-  " clear.d r6\n"
-  " move.d __start1,r13\n"
-  " jump r13\n"
-  " setf\n"
-#ifndef __AOUT__
-  /* We rely on a.out not being in .data here.  Quite fragile, but
-     covered by e.g. running the GCC test-suite for cris-unknown-aout. */
-  " .previous"
-#endif
-  );
-
-extern void _Libctors (void);
-extern void _Libdtors (void);
-
-extern void __init__start (void) __attribute ((weak));
-extern void __aout__ctors (void) __attribute ((weak));
-
-static void start1 () __asm__ ("__start1") __attribute ((__used__));
-static void
-start1 (int argc, char **argv, char **env)
-{
-#ifdef __ELF__
-  /* For ELF systems, we call _init and register _fini with atexit.  */
-  {
-    extern void _init (void);
-    extern void _fini (void);
-    _init ();
-    if (atexit (_fini) != 0)
-      exit (-1);
-  }
-#else
-  /* Constructors which may get here through the ELF .init section, when
-     linking ELF and producing a.out.  */
-  if (__init__start)
-    __init__start ();
-
-  if (__aout__ctors)
-    __aout__ctors ();
-
-  /* Call constructors in shared libraries. */
-  _Libctors ();
-
-  if (atexit (_Libdtors) != 0)
-    exit (-1);
-#endif
-
-  /* Call the user program.  */
-  exit (main (argc, argv, env));
-}
diff --git a/libgloss/cris/linunistd.h b/libgloss/cris/linunistd.h
deleted file mode 100644
index 039679d4d..000000000
--- a/libgloss/cris/linunistd.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/* Support for syscalls for cris*-axis-linux-gnu and simulators
-   Copyright (C) 1998-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* Derived from asm-etrax100/unistd.h with minor modifications to fit as
-   LOSS for newlib.  */
-
-#ifndef _ASM_ELINUX_UNISTD_H_
-#define _ASM_ELINUX_UNISTD_H_
-
-/* Our callers might want to use link_warning, so provide it from here.  */
-#include "../libnosys/config.h"
-#include "libnosys/warning.h"
-
-#include <errno.h>
-
-/*
- * This file contains the system call numbers, and stub macros for libc.
- */
-
-#define __NR_setup		  0	/* used only by init, to get system going */
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_chown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_phys		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-
-#define __NR_mmap2		192
-
-#define PASTE(x,y) x##y
-#define XSTR(x) # x
-#define STR(x) XSTR (x)
-
-#ifdef __elinux__
-# define CRIS_SYSCALL "jir .$System.call"
-# define CALLNO_REG r1
-# define ARG5_REG r0
-# define MOVE_ARG5 "move.d"
-# define COLON_ARG5_CLOBBER : "r0"
-#else
-# define CRIS_SYSCALL "break 13"
-# define CALLNO_REG r9
-# define ARG5_REG srp
-# define MOVE_ARG5 "move"
-# define COLON_ARG5_CLOBBER
-#endif
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type PASTE(_Sys_,name) (void) \
-{ \
-  register long __a __asm__ ("r10"); \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type PASTE(_Sys_,name) (type1 arg1) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type PASTE(_Sys_,name) (type1 arg1,type2 arg2) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type PASTE(_Sys_,name) (type1 arg1,type2 arg2,type3 arg3) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b), "r" (__c)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type PASTE(_Sys_,name) (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b), \
-			  "r" (__c), "r" (__d)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5) \
-type PASTE(_Sys_,name) (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (MOVE_ARG5 " %6,$" STR (ARG5_REG) "\n\t" \
-			CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b), \
-			  "r" (__c), "r" (__d), "g" (arg5) \
-			COLON_ARG5_CLOBBER); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5,type6,arg6) \
-type PASTE(_Sys_,name) (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (MOVE_ARG5 " %6,$" STR (ARG5_REG) "\n\t" \
-			"move %7,$mof\n\t" \
-			CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b), \
-			  "r" (__c), "r" (__d), "g" (arg5), "g" (arg6) \
-			COLON_ARG5_CLOBBER); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define __NR__exit __NR_exit
-static inline _syscall0(int,idle)
-static inline _syscall0(int,fork)
-static inline _syscall2(int,clone,unsigned long,flags,char *,esp)
-static inline _syscall0(int,pause)
-static inline _syscall0(int,setup)
-static inline _syscall0(int,sync)
-static inline _syscall3(int,write,int,fd,const char *,buf,unsigned,count)
-static inline _syscall1(int,dup,int,fd)
-static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall1(int,_exit,int,exitcode)
-static inline _syscall1(int,exit,int,exitcode)
-static inline _syscall3(int,waitpid,int,pid,int *,wait_stat,int,options)
-static inline _syscall3(int,read,int,fd,char *,buf,unsigned,count)
-static inline _syscall2(int,socketcall,int,call,unsigned long *,args)
-static inline _syscall3(int,ioctl,unsigned int,fd,unsigned int,cmd,unsigned long,arg)
-static inline _syscall3(int,fcntl,unsigned int,fd,unsigned int,cmd,unsigned long,arg)
-static inline _syscall5(int,mount,const char *,a,const char *,b,const char *,c,unsigned long,rwflag,const void *,data)
-static inline _syscall2(int,rename,const char *,a,const char*,b)
-
-#ifndef __elinux__
-/* Make sure these are only used where they are supported.  */
-static inline _syscall6(int,mmap2,unsigned long, addr, unsigned long, len,
-			unsigned long, prot, unsigned long, flags,
-			unsigned long, fd, unsigned long, pgoff)
-static inline _syscall1(long,brk,long,addr)
-#endif
-
-/* This structure is ripped from asm-etrax100/stat.h: beware of updates.  */
-struct new_stat {
-	unsigned short st_dev;
-	unsigned short __pad1;
-	unsigned long st_ino;
-	unsigned short st_mode;
-	unsigned short st_nlink;
-	unsigned short st_uid;
-	unsigned short st_gid;
-	unsigned short st_rdev;
-	unsigned short __pad2;
-	unsigned long  st_size;
-	unsigned long  st_blksize;
-	unsigned long  st_blocks;
-	unsigned long  st_atime;
-	unsigned long  __unused1;
-	unsigned long  st_mtime;
-	unsigned long  __unused2;
-	unsigned long  st_ctime;
-	unsigned long  __unused3;
-	unsigned long  __unused4;
-	unsigned long  __unused5;
-};
-
-static inline _syscall2(int,stat,const char *,path,struct new_stat *,statbuf)
-static inline _syscall2(int,fstat,int,fd,struct new_stat *,statbuf)
-static inline _syscall0(int,getpid)
-static inline _syscall2(int,kill,int,pid,int,sig)
-static inline _syscall3(int,lseek,int,fd,int,offset,int,whence)
-struct tms;
-static inline _syscall1(long,times,struct tms *,tbuf)
-static inline _syscall1(long,mmap,long *, buf)
-struct timeval;
-struct timezone;
-static inline _syscall2(int,gettimeofday,struct timeval *,tp,
-                        struct timezone *, tzp)
-static inline _syscall2(int,link,const char *,old,const char *,new)
-static inline _syscall1(int,unlink,const char *, f)
-struct rusage;
-static inline _syscall4(int,wait4,int,pid,int *,sa,int,op,struct rusage *,ru)
-#endif /* _ASM_ELINUX_UNISTD_H_ */
diff --git a/libgloss/cris/outbyte.c b/libgloss/cris/outbyte.c
deleted file mode 100644
index 1cb686b96..000000000
--- a/libgloss/cris/outbyte.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Low-level kind-of-support for CRIS.  Mostly used as a placeholder
-   function.  Too small and obvious to warrant a copyright notice.  */
-
-#include <stdio.h>
-void
-outbyte (int ch)
-{
-  write (1, &ch, 1);
-}
diff --git a/libgloss/cris/setup.S b/libgloss/cris/setup.S
deleted file mode 100644
index ef0be7109..000000000
--- a/libgloss/cris/setup.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Support for standalone CRIS/CRISv32 code.
-   Copyright (C) 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
- .text
- .global __setup
-__setup:
- /* Make sure to save SRP.  */
-#ifdef __arch_common_v10_v32
- /* Can't do anything if we don't know for which arch.  This file is
-    then only a placeholder.  Oh, and we can't use the "ret" insn in
-    "common" code.  */
-#else
- /* Code missing:
-    - Initialize RAM circuits.
-    - Initialize serial output and input.
-    - Set stack-pointer.  */
- ret
- nop
-#endif
diff --git a/libgloss/crx/Makefile.in b/libgloss/crx/Makefile.in
deleted file mode 100644
index a4abe3fc9..000000000
--- a/libgloss/crx/Makefile.in
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-#
-
-DESTDIR =
-
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-# Here is all of the handlers stuff
-H_SCRIPTS	=
-H_BSP	= libh.a
-H_OBJS	= intable.o dvz_hndl.o flg_hndl.o iad_hndl.o svc_hndl.o und_hndl.o
-H_TEST	= hndl-test
-H_INSTALL	= install-hndl
-
-# Here is all of the simulator stuff
-SIM_SCRIPTS	= sim.ld
-SIM_BSP	= libsim.a
-SIM_OBJS = _exit.o close.o _getenv.o lseek.o open.o read.o \
-	_rename.o sbrk.o time.o unlink.o write.o \
-	stat.o putnum.o kill.o getpid.o isatty.o fstat.o
-SIM_TEST	= sim-test
-SIM_INSTALL	= install-sim
-
-# Here is all of the CRT stuff
-CRT	= crti.o crtn.o crt0.o
-CRT_INSTALL = install-crt
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-#
-# build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-all: ${CRT} ${SIM_BSP} ${H_BSP}
-
-#
-# here's where we build the board support packages for each target
-#
-${H_BSP}: ${H_OBJS}
-	${AR} ${ARFLAGS} ${H_BSP} ${H_OBJS}
-	${RANLIB} ${H_BSP}
-
-${SIM_BSP}: ${SIM_OBJS}
-	${AR} ${ARFLAGS} ${SIM_BSP} ${SIM_OBJS}
-	${RANLIB} ${SIM_BSP}
-
-#
-# here's where we build the test programs for each target
-#
-.PHONY: test
-test:	${SIM_TEST} ${H_TEST} 
-
-hndl-test:	hndl-test.x hndl-test.dis
-
-hndl-test.x:	test.o ${H_BSP}
-	${CC} ${LDFLAGS_FOR_TARGET} -L${objdir} \
-	test.o \
-	-o hndl-test.x ${LIBS_FOR_TARGET} -lc ${H_BSP} -Wl,-T${SIM_SCRIPTS}
-
-hndl-test.dis:	hndl-test.x
-	${OBJDUMP} -d hndl-test.x > hndl-test.dis
-
-
-sim-test:	sim-test.x sim-test.dis
-
-sim-test.x:	test.o ${SIM_BSP}
-	${CC} ${LDFLAGS_FOR_TARGET} -L${objdir} \
-	test.o \
-	-o sim-test.x ${LIBS_FOR_TARGET} -lc ${SIM_BSP} -Wl,-T${SIM_SCRIPTS}
-
-sim-test.dis:	sim-test.x
-	${OBJDUMP} -d sim-test.x > sim-test.dis
-
-#
-#
-#
-.c.S:
-	${CC} ${CFLAGS_FOR_TARGET} -c $<
-
-clean mostlyclean:
-	rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) $(H_BSP)
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status *~
-
-.PHONY: install info install-info clean-info
-install: ${CRT_INSTALL} ${SIM_INSTALL} ${H_INSTALL}
-
-install-crt:
-	set -e; for x in ${CRT} ; do\
-	  ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-
-install-sim:
-	for x in ${SIM_BSP} ; do\
-	 ${INSTALL_PROGRAM} $${x} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-	for x in ${SIM_SCRIPTS}; do\
-	 ${INSTALL_DATA} ${srcdir}/$${x} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-
-install-hndl:
-	for x in ${H_BSP}; do\
-	 ${INSTALL_PROGRAM} $${x} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/crx/_exit.c b/libgloss/crx/_exit.c
deleted file mode 100644
index 9a3cfa6ae..000000000
--- a/libgloss/crx/_exit.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* _exit.c -- Implementation of the low-level _exit() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <stdlib.h>
-#include <sys/syscall.h>
-
-/* Returns control to the debugger.  */
-void _exit (int stat)
-{
-  HOST_SERVICE (SVC_EOP);
-}
diff --git a/libgloss/crx/_getenv.c b/libgloss/crx/_getenv.c
deleted file mode 100644
index c43555dfa..000000000
--- a/libgloss/crx/_getenv.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* _getenv.c -- Implementation of the low-level _getenv() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-#include <stdlib.h>
-
-register char *R2 __asm__("r2");
-register char *R3 __asm__("r3");
-
-char * _getenv (const char *name)
-{
-  char *x;
-  char *y;
-
-  x  = R2;
-
-  y  = (char *) calloc (256, 1);
-  R3 = y;
-
-  R2 = x;
- 
-  HOST_SERVICE (SVC_GETENV);
-}
-
diff --git a/libgloss/crx/_rename.c b/libgloss/crx/_rename.c
deleted file mode 100644
index b3d7bd0db..000000000
--- a/libgloss/crx/_rename.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* _rename.c -- Implementation of the low-level rename() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int _rename (char *from, char *to)
-{
-  HOST_SERVICE (SVC_RENAME);
-}
diff --git a/libgloss/crx/close.c b/libgloss/crx/close.c
deleted file mode 100644
index 72ce4bd6f..000000000
--- a/libgloss/crx/close.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* close.c -- Implementation of the low-level close() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int close (int fd)
-{
-  HOST_SERVICE (SVC_CLOSE);
-}
diff --git a/libgloss/crx/configure b/libgloss/crx/configure
deleted file mode 100755
index 26420eaa9..000000000
--- a/libgloss/crx/configure
+++ /dev/null
@@ -1,1228 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=intable.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:573: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:594: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:612: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. $srcdir/${mdir}../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ${mdir}../../.. $srcdir/${mdir}../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. $srcdir/${srcdir}/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ${srcdir}/../.. $srcdir/${srcdir}/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:710: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:804: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:853: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:877: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:913: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/crx/configure.in b/libgloss/crx/configure.in
deleted file mode 100644
index 63a902e18..000000000
--- a/libgloss/crx/configure.in
+++ /dev/null
@@ -1,75 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(intable.c)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile)
diff --git a/libgloss/crx/crt0.S b/libgloss/crx/crt0.S
deleted file mode 100644
index c49849728..000000000
--- a/libgloss/crx/crt0.S
+++ /dev/null
@@ -1,93 +0,0 @@
- ##############################################################################
- # crt0.S -- CRX default start-up routine                                     #
- #                                                                            #
- # Copyright (c) 2004 National Semiconductor Corporation                      #
- #                                                                            #
- # The authors hereby grant permission to use, copy, modify, distribute,      #
- # and license this software and its documentation for any purpose, provided  #
- # that existing copyright notices are retained in all copies and that this   #
- # notice is included verbatim in any distributions. No written agreement,    #
- # license, or royalty fee is required for any of the authorized uses.        #
- # Modifications to this software may be copyrighted by their authors         #
- # and need not follow the licensing terms described here, provided that      #
- # the new terms are clearly indicated on the first page of each file where   #
- # they apply.                                                                #
- #                                                                            #
- # This is the  start routine of your CRX program.                            #
- # It is linked with your application automatically. You can use              #
- # this routine as a template and modify it to your needs, yet this           #
- # file must be supplied for the compiler.                                    #
- # It is assumed that the following symbols are defined in your linker        #
- # script: __STACK_START, __ISTACK_START, __DATA_START, __DATA_END,           #
- # __DATA_IMAGE_START, __BSS_START, __BSS_END.                                #
- ##############################################################################
-
-	.text
-	.align	4
-	.globl		_main
-	.globl		_start
-	.globl		_atexit
-	.globl		_exit
-	.globl		__dispatch_table
-
-_start:
-
- #----------------------------------------------------------------------------#
- # Initialize the stack pointers. The constants __STACK_START and             #
- # __ISTACK_START should be defined in the linker script.                     #
-
-	movd	$__STACK_START, sp
-	movd	$__ISTACK_START, r0
-	mtpr    r0, isp
-
- #----------------------------------------------------------------------------#
- # Initialize the default sections according to the linker script.            #
-
-	movd	$__DATA_END, r4
-	subd	$__DATA_START, r4
-	movd	$__DATA_START, r2
-	movd	$__DATA_IMAGE_START, r3
-	bal	ra,	_memcpy
-	movd	$__BSS_END, r4
-	subd	$__BSS_START, r4
-	movd	$__BSS_START, r2
-	movd	$0, r3
-	bal	ra,	_memset
-
- #----------------------------------------------------------------------------#
- # Initialize the intbase (pointer to the dispatch table).                    #
-
-	movd	$__dispatch_table, r0
-	mtpr    r0, intbase
-
- #----------------------------------------------------------------------------#
- # Handle global and static constructurs execution and setup                  #
- # destructors to be called from exit.                                        #
-	bal	ra,	_init
-	movd	$_fini, r2
-	bal     ra, _atexit 
-
- #----------------------------------------------------------------------------#
- # Here you may add initializations that are specific to your                 #
- # environment. For example:                                                  #
- # 1. Configure wait states and other BIU parameters in order to get          #
- #    the best performance out of your target (see the specification          #
- #    document).                                                              #
- # 2. Enable maskable interrupts that should be enabled when your             #
- #    program starts to execute.                                              #
-
-
- #----------------------------------------------------------------------------#
- # Jump to the main function in your application.                             #
-
-	bal	ra, _main
-
- #----------------------------------------------------------------------------#
- # Upon returning from the main function (if it isn't an infinite loop),      #
- # jump to the exit function. The exit function is located in the             #
- # library 'libc.a'.                                                          #
-
-	movd	r0, r2		# _main return value is passed as a
-						# parameter to exit.
-	br	_exit			# returns control to the debugger.
-
diff --git a/libgloss/crx/crti.S b/libgloss/crx/crti.S
deleted file mode 100644
index 7bca798e3..000000000
--- a/libgloss/crx/crti.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Specialized code needed to support construction and destruction of
-   file-scope objects in C++ and Java code, and to support exception handling.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   Contributed by Charles-Antoine Gauthier (charles.gauthier@iit.nrc.ca).
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-/*
- * This file just supplies function prologues for the .init and .fini
- * sections.  It is linked in before crtbegin.o.
- */
-
-	.file   "crti.o"
-	.ident  "GNU C crti.o"
-
-	.section .init
-	.globl  _init
-	.type   _init,@function
-_init:
-        push ra
-	.section .fini
-	.globl  _fini
-	.type   _fini,@function
-_fini:
-        push ra
-	
diff --git a/libgloss/crx/crtn.S b/libgloss/crx/crtn.S
deleted file mode 100644
index 8375f43e8..000000000
--- a/libgloss/crx/crtn.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Specialized code needed to support construction and destruction of
-   file-scope objects in C++ and Java code, and to support exception handling.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   Contributed by Charles-Antoine Gauthier (charles.gauthier@iit.nrc.ca).
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-/*
- * This file supplies function epilogues for the .init and .fini sections.
- * It is linked in after all other files.
- */
-
-	.file   "crtn.o"
-	.ident  "GNU C crtn.o"
-
-	.section .init
-        popret ra
-
-	.section .fini
-        popret ra
diff --git a/libgloss/crx/dvz_hndl.c b/libgloss/crx/dvz_hndl.c
deleted file mode 100644
index a9bde4020..000000000
--- a/libgloss/crx/dvz_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* dvz_hndl.c -- Implementation of the DVZ trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void dvz_handler (void) __attribute__ ((interrupt ()));
-
-void dvz_handler (void)
-{
-  HOST_SERVICE (SVC_DVZ);
-}
diff --git a/libgloss/crx/flg_hndl.c b/libgloss/crx/flg_hndl.c
deleted file mode 100644
index 0bb9c8680..000000000
--- a/libgloss/crx/flg_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* flg_hndl.c -- Implementation of the FLG trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void flg_handler (void) __attribute__ ((interrupt ()));
-
-void flg_handler (void)
-{
-  HOST_SERVICE (SVC_FLG);
-}
diff --git a/libgloss/crx/fstat.c b/libgloss/crx/fstat.c
deleted file mode 100644
index 380fc2aaa..000000000
--- a/libgloss/crx/fstat.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* fstat.c -- get status of a file.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-#include <sys/stat.h>
-
-/*
- * fstat -- Since we have no file system, we just return an error.
- */
-int
-_DEFUN (fstat, (fd, buf),
-       int fd _AND
-       struct stat *buf)
-{
-  buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
-  buf->st_blksize = 0;
-
-  return (0);
-}
diff --git a/libgloss/crx/getpid.c b/libgloss/crx/getpid.c
deleted file mode 100644
index 3c1a7b8b8..000000000
--- a/libgloss/crx/getpid.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* getpid.c -- get the current process id.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-#define __MYPID 1
-
-/*
- * getpid -- only one process, so just return 1.
- */
-int
-_DEFUN (getpid, (),
-        )
-{
-  return __MYPID;
-}
diff --git a/libgloss/crx/iad_hndl.c b/libgloss/crx/iad_hndl.c
deleted file mode 100644
index 875dbe63b..000000000
--- a/libgloss/crx/iad_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* iad_hndl.c -- Implementation of the IAD trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void iad_handler (void) __attribute__ ((interrupt ()));
-
-void iad_handler (void)
-{
-  HOST_SERVICE (SVC_IAD);
-}
diff --git a/libgloss/crx/intable.c b/libgloss/crx/intable.c
deleted file mode 100644
index 02ca66b00..000000000
--- a/libgloss/crx/intable.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* intable.c -- CompactRISC default dispatch table definition
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <stdio.h>
-#include <sys/libh.h>
-
-void (* const _dispatch_table[32])(void)=
-{
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  svc_handler,
-  dvz_handler,
-  flg_handler,
-  NULL,
-  NULL,
-  und_handler,
-  NULL,
-  iad_handler,
-  NULL,
-  NULL,
-  NULL
-};
diff --git a/libgloss/crx/isatty.c b/libgloss/crx/isatty.c
deleted file mode 100644
index 927d75497..000000000
--- a/libgloss/crx/isatty.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* isatty.c -- chek the terminal device.
- * 
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-
-/*
- * isatty -- returns 1 if connected to a terminal device,
- *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
- */
-int
-_DEFUN (isatty, (fd),
-       int fd)
-{
-  return (1);
-}
diff --git a/libgloss/crx/kill.c b/libgloss/crx/kill.c
deleted file mode 100644
index 3ed228fd2..000000000
--- a/libgloss/crx/kill.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* kill.c -- remove a process.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-#define __MYPID 1
-
-/*
- * kill -- go out via exit...
- */
-int
-_DEFUN (kill, (pid, sig),
-        int pid _AND 
-        int sig)
-{
-  if(pid == __MYPID)
-    _exit(sig);
-  return 0;
-}
diff --git a/libgloss/crx/lseek.c b/libgloss/crx/lseek.c
deleted file mode 100644
index 6c4354c93..000000000
--- a/libgloss/crx/lseek.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* lseek.c -- Implementation of the low-level lseek() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-long lseek (int fd, long offset, int whence)
-{
-  HOST_SERVICE (SVC_LSEEK);
-}
diff --git a/libgloss/crx/open.c b/libgloss/crx/open.c
deleted file mode 100644
index abe7bbfd1..000000000
--- a/libgloss/crx/open.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* open.c -- Implementation of the low-level open() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-#include <stdarg.h>
-
-int open_aux (char *, int, int);
-
-/* The prototype in <fcntl.h> for open() uses ..., meaning function 
- * parameters reside on stack, but the debugger expects the parameters 
- * to reside in registers, thus we call an auxiliary function with 
- * bounded number of parameters.
- */
-int open (char *path, int flags, ...)
-{
-  int mode;
-  va_list ap;
-  
-  va_start(ap, flags);
-  mode = va_arg(ap, int);
-  open_aux (path, flags, mode);
-  va_end(ap);
-}
-
-int open_aux (char *path, int flags, int mode)
-{
-  HOST_SERVICE (SVC_OPEN);
-}
-
diff --git a/libgloss/crx/putnum.c b/libgloss/crx/putnum.c
deleted file mode 100644
index 3317bbf0a..000000000
--- a/libgloss/crx/putnum.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* putnum.c -- put a hex number on the output device.
- * 
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-
-/*
- * putnum -- print a 32 bit number in hex
- */
-void
-_DEFUN (putnum, (num),
-	unsigned int num)
-{
-  char  buf[9];
-  int   cnt;
-  char  *ptr;
-  int   digit;
-  
-  ptr = buf;
-  for (cnt = 7 ; cnt >= 0 ; cnt--) {
-    digit = (num >> (cnt * 4)) & 0xf;
-    
-    if (digit <= 9)
-      *ptr++ = (char) ('0' + digit);
-    else
-      *ptr++ = (char) ('a' - 10 + digit);
-  }
-
-  *ptr = (char) 0;
-  print (buf);
-}
diff --git a/libgloss/crx/read.c b/libgloss/crx/read.c
deleted file mode 100644
index f0cb43a52..000000000
--- a/libgloss/crx/read.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* read.c -- Implementation of the low-level read() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int read (int fd, char *buffer, int nbytes)
-{
-  HOST_SERVICE (SVC_READ);
-}
diff --git a/libgloss/crx/sbrk.c b/libgloss/crx/sbrk.c
deleted file mode 100644
index 70d5d4f7d..000000000
--- a/libgloss/crx/sbrk.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* sbrk.c -- Implementation of the low-level sbrk() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <errno.h>
-#include <stddef.h> /* where ptrdiff_t is defined */
-#include <stdlib.h>
-
-/* Extend heap space by size bytes.
-   Return start of new space allocated, or -1 for errors 
-   Error cases:
-    1. Allocation is not within heap range */
-
-void * sbrk (ptrdiff_t size)
-{
-  /*
-  * The following two memory locations should be defined in the linker script file
-  */
-  extern const char _HEAP_START; /* start of heap */
-  extern const char _HEAP_MAX;	 /* end of heap (maximum value of heap_ptr) */
-
-  static const char * heap_ptr;  /* pointer to head of heap */
-  const char * old_heap_ptr;
-  static unsigned char init_sbrk = 0;
-
-  /* heap_ptr is initialized to HEAP_START */
-  if (init_sbrk == 0) 
-  {
-    heap_ptr = &_HEAP_START;
-    init_sbrk = 1;
-  }
-
-  old_heap_ptr = heap_ptr;
-
-  if ((heap_ptr + size) > &_HEAP_MAX)
-  { 
-    /* top of heap is bigger than _HEAP_MAX */
-    errno = ENOMEM;
-    return (void *) -1;
-  }
-
-  /* success: update heap_ptr and return previous value */
-  heap_ptr += size;
-  return (void *)old_heap_ptr;
-}
diff --git a/libgloss/crx/sim.ld b/libgloss/crx/sim.ld
deleted file mode 100644
index a75c03dcd..000000000
--- a/libgloss/crx/sim.ld
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Example Linker Script for linking NS CRX elf32 files. */
-OUTPUT_FORMAT("elf32-crx")
-OUTPUT_ARCH(crx)
-
-/* 
- The libh.a library includes various CR default handlers.
- The libsim.a library includes low-level functions, which
- are used as an interface to communicate with the simulator.
-*/
-GROUP(-lc -lsim -lh -lgcc)
-
-/*
- The next line forces the entry point (_start in this script)
- to be entered in the output file as an undefined symbol.
- It is needed in case the entry point is not called explicitly
- (which is the usual case) AND is in an archive.
-*/
-EXTERN(_start)
-ENTRY(_start)
-
-/* Define memory regions */
-MEMORY
-{
-  rom  : ORIGIN = 0x2,  LENGTH = 3M
-  ram  : ORIGIN = 4M,   LENGTH = 10M
-}
-
-SECTIONS
-{
-  .init :
-  { 
-    __INIT_START = .; 
-    KEEP (*(.init))
-    __INIT_END = .; 
-  } > rom
-
-  .fini :
-  { 
-    __FINI_START = .; 
-    KEEP (*(.fini))
-    __FINI_END = .; 
-  } > rom
-
-  .jcr :
-  { 
-    KEEP (*(.jcr))
-  } > rom
-
-  .text : 
-  { 
-    __TEXT_START = .; 
-    *(.text) *(.text.*) *(.gnu.linkonce.t.*) 
-    __TEXT_END = .; 
-  } > rom
-
-  .rdata : 
-  {
-     __RDATA_START = .; 
-     *(.rdata_4) *(.rdata_2) *(.rdata_1) *(.rdata.*) *(.gnu.linkonce.r.*) 
-     __RDATA_END = .; 
-  } > rom
-
-  .ctor ALIGN(4) : 
-  { 
-    __CTOR_START = .; 
-    KEEP (*crtbegin*.o(.ctors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-    __CTOR_END = .; 
-  } > rom
-
-  .dtor ALIGN(4) : 
-  { 
-    __DTOR_START = .; 
-    KEEP (*crtbegin*.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-    __DTOR_END = .; 
-  } > rom
-
-  .data : 
-  {
-    __DATA_START = .; 
-    *(.data_4) *(.data_2) *(.data_1) *(.data) *(.data.*) *(.gnu.linkonce.d.*) 
-    __DATA_END = .; 
-  } > ram AT > rom
-
-  .bss (NOLOAD) : 
-  {
-    __BSS_START = .; 
-    *(.bss_4) *(.bss_2) *(.bss_1) *(.bss) *(COMMON) *(.bss.*) *(.gnu.linkonce.b.*) 
-    __BSS_END = .; 
-  } > ram
-
-/*
- You may change the sizes of the following sections to fit the actual
- size your program requires.
- The heap and stack are aligned to the bus width, as a speed optimization
- for accessing data located there.
-*/
-  .heap : 
-  { 
-    . = ALIGN(4); 
-    __HEAP_START = .; 
-    . += 0x2000; 
-    __HEAP_MAX = .; 
-  } > ram
-
-  .stack : 
-  { 
-    . = ALIGN(4); 
-    . += 0x6000; 
-    __STACK_START = .; 
-  } > ram
-
-  .istack : 
-  { 
-    . = ALIGN(4); 
-    . += 0x100; 
-    __ISTACK_START = .; 
-  } > ram
-}
-
-__DATA_IMAGE_START = LOADADDR(.data);
diff --git a/libgloss/crx/stat.c b/libgloss/crx/stat.c
deleted file mode 100644
index 6ffef821b..000000000
--- a/libgloss/crx/stat.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* stat.c -- Get the status of a file.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-/*
- * stat -- Since we have no file system, we just return an error.
- */
-int
-_DEFUN (stat, (path, buf),
-       const char *path _AND
-       struct stat *buf)
-{
-  errno = EIO;
-  return (-1);
-}
-
diff --git a/libgloss/crx/svc_hndl.c b/libgloss/crx/svc_hndl.c
deleted file mode 100644
index ab93a4d2c..000000000
--- a/libgloss/crx/svc_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* svc_hndl.c -- Implementation of the SVC trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void svc_handler (void) __attribute__ ((interrupt ()));
-
-void svc_handler (void)
-{
-  HOST_SERVICE (SVC_SVC);
-}
diff --git a/libgloss/crx/time.c b/libgloss/crx/time.c
deleted file mode 100644
index 4d7cfa19a..000000000
--- a/libgloss/crx/time.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* time.c -- Implementation of the low-level time() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <unistd.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/syscall.h>
-
-time_t _Time (time_t *timer)
-{
-  HOST_SERVICE (SVC_TIME);
-}
-
-time_t time (time_t *tod)
-{
-  time_t t = _Time (NULL);
-
-  if (tod)
-    *tod = t;
-  
-  return (t);
-}
-
-/* _times -- no clock, so return an error.  */
-clock_t times (struct tms *buf)
-{
-  errno = EINVAL;
-  return (-1);
-}
-
-/* _gettimeofday -- implement in terms of time.  */
-int gettimeofday (struct timeval *tv, struct timezone *tz)
-{
-  if (tz)
-    tz->tz_minuteswest = tz->tz_dsttime = 0;
-
-  tv->tv_usec = 0;
-  tv->tv_sec = time (0);
-  return 0;
-}
-
diff --git a/libgloss/crx/und_hndl.c b/libgloss/crx/und_hndl.c
deleted file mode 100644
index 4c5cca332..000000000
--- a/libgloss/crx/und_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* und_hndl.c -- Implementation of the UND trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void und_handler (void) __attribute__ ((interrupt ()));
-
-void und_handler (void)
-{
-  HOST_SERVICE (SVC_UND);
-}
diff --git a/libgloss/crx/unlink.c b/libgloss/crx/unlink.c
deleted file mode 100644
index 3a934712a..000000000
--- a/libgloss/crx/unlink.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* unlink.c -- Implementation of the low-level unlink() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int unlink (char *path)
-{
-  HOST_SERVICE (SVC_UNLINK);
-}
diff --git a/libgloss/crx/write.c b/libgloss/crx/write.c
deleted file mode 100644
index a9a7ff48c..000000000
--- a/libgloss/crx/write.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* write.c -- Implementation of the low-level write() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int write (int fd, char *buffer, int nbytes)
-{
-  HOST_SERVICE (SVC_WRITE);
-}
diff --git a/libgloss/iq2000/sim.ld b/libgloss/iq2000/sim.ld
index 5f59d020b..6530a850a 100644
--- a/libgloss/iq2000/sim.ld
+++ b/libgloss/iq2000/sim.ld
@@ -268,7 +268,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/libnosys/Makefile.in b/libgloss/libnosys/Makefile.in
index d6634fc54..263798569 100644
--- a/libgloss/libnosys/Makefile.in
+++ b/libgloss/libnosys/Makefile.in
@@ -65,10 +65,9 @@ OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
 	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
 
 # object files needed
-OBJS = chown.o close.o environ.o errno.o execve.o fork.o fstat.o \
-	getpid.o gettod.o isatty.o kill.o link.o lseek.o open.o \
-	read.o readlink.o sbrk.o stat.o symlink.o times.o unlink.o \
-	wait.o write.o _exit.o
+OBJS = close.o environ.o errno.o execve.o fork.o fstat.o getpid.o gettod.o \
+	isatty.o kill.o link.o lseek.o open.o read.o sbrk.o stat.o \
+	times.o unlink.o wait.o write.o _exit.o
 
 # Object files specific to particular targets.
 EVALOBJS = ${OBJS}
diff --git a/libgloss/libnosys/chown.c b/libgloss/libnosys/chown.c
deleted file mode 100644
index 67f98d59d..000000000
--- a/libgloss/libnosys/chown.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Stub version of chown.
- */
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include <sys/types.h>
-#undef errno
-extern int errno;
-#include "warning.h"
-
-int
-_DEFUN (_chown, (path, owner, group),
-        const char *path  _AND
-        uid_t owner _AND
-        gid_t group)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-stub_warning(_chown)
diff --git a/libgloss/libnosys/readlink.c b/libgloss/libnosys/readlink.c
deleted file mode 100644
index 7df253c40..000000000
--- a/libgloss/libnosys/readlink.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Stub version of readlink.
- */
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include <sys/types.h>
-#undef errno
-extern int errno;
-#include "warning.h"
-
-int
-_DEFUN (_readlink, (path, buf, bufsize),
-        const char *path _AND
-        char *buf _AND
-        size_t bufsize)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-stub_warning(_readlink)
diff --git a/libgloss/libnosys/symlink.c b/libgloss/libnosys/symlink.c
deleted file mode 100644
index d9e29f2e4..000000000
--- a/libgloss/libnosys/symlink.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Stub version of symlink.
- */
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#undef errno
-extern int errno;
-#include "warning.h"
-
-int
-_DEFUN (_symlink, (path1, path2),
-        const char *path1 _AND
-        const char *path2)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-stub_warning(_symlink)
diff --git a/libgloss/m32c/Makefile.in b/libgloss/m32c/Makefile.in
deleted file mode 100644
index eb00aae00..000000000
--- a/libgloss/m32c/Makefile.in
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright (c) 2005 Red Hat Inc
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-
-# Makefile for libgloss/m32c.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL = /bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-AR_FLAGS = rc
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-SCRIPTS = r8c.ld m16c.ld m32cm.ld m32c.ld m16cmon.ld m32cmon.ld sim8.ld sim16.ld sim24.ld
-CRT = crt0.o crtn.o
-SIM_BSP = libsim.a
-LIBNOSYS = ../libnosys/libnosys.a
-SIM_OBJS = \
-	sbrk.o \
-	heaptop.o \
-	exit.o \
-	open.o \
-	close.o \
-	read.o \
-	write.o \
-	lseek.o \
-	unlink.o \
-	getpid.o \
-	kill.o \
-	fstat.o \
-	argvlen.o \
-	argv.o \
-	chdir.o \
-	stat.o \
-	chmod.o \
-	utime.o \
-	time.o \
-	gettimeofday.o \
-	times.o \
-	link.o \
-	isatty.o \
-	abort.o
-
-
-#### Host specific Makefile fragment comes in here.
-@host_makefile_frag@
-
-
-# Override .S.o rule to pass assembler debugging flags
-.S.o:
-	$(CC) -Wa,-gdwarf2 -Wa,-I$(srcdir) $(CFLAGS_FOR_TARGET) $(INCLUDES) $(CFLAGS) -c $<
-
-all: $(CRT) $(SIM_BSP) $(SCRIPTS)
-
-$(SIM_BSP): $(SIM_OBJS)
-	$(AR) $(ARFLAGS) $@ $?
-	$(RANLIB) $@
-
-# genscript parameters: srcdir name ramstart ramsize romstart romsize vecprefix
-
-GDEP = $(srcdir)/m32c.tmpl $(srcdir)/genscript Makefile
-GS = $(SHELL) $(srcdir)/genscript $(srcdir) 
-
-# NOTE: The simulators and monitors reserve the following locations
-# for themselves, so we skip them:
-#   R8C/M16C:	0x400-0x4ff	0x0ff600-0x0ffcff
-#   M32C:	0x400-0x4ff	0xfff600-0xfffcff
-
-r8c.ld : $(GDEP)
-	$(GS) r8c   0x500  0x300   0xc000   0x3f24   0xff
-
-m16c.ld : $(GDEP)
-	$(GS) m16c  0x500 0x4f00  0xc0000  0x3f600  0xfff
-
-m32cm.ld : $(GDEP)
-	$(GS) m32cm 0x500 0x2700 0xfe0000 0x01f600 0xffff
-
-m32c.ld : $(GDEP)
-	$(GS) m32c  0x500 0x7b00 0xf80000 0x07f600 0xffff
-
-
-m16cmon.ld : $(GDEP)
-	$(GS) m16cmon  0x400  0x100  0xff600    0x800  0xfff
-
-m32cmon.ld : $(GDEP)
-	$(GS) m32cmon  0x400  0x100 0xfff600    0x800 0xffff
-
-
-sim8.ld : $(GDEP)
-	$(GS) sim8  0x500 0xf624        0        0   0xff
-
-sim16.ld : $(GDEP)
-	$(GS) sim16 0x500 0xf700  0x20000  0x80000  0xfff
-
-sim24.ld : $(GDEP)
-	$(GS) sim24 0x200000 0x800000   0        0 0xffff
-
-# Dependencies
-
-SDEPS = $(srcdir)/m32csys.h $(srcdir)/../syscall.h
-
-abort.o : $(SDEPS)
-argv.o : $(SDEPS)
-argvlen.o : $(SDEPS)
-chdir.o : $(SDEPS)
-chmod.o : $(SDEPS)
-close.o : $(SDEPS)
-exit.o : $(SDEPS)
-fstat.o : $(SDEPS)
-getpid.o : $(SDEPS)
-gettimeofday.o : $(SDEPS)
-heaptop.o : $(SDEPS)
-kill.o : $(SDEPS)
-link.o : $(SDEPS)
-lseek.o : $(SDEPS)
-open.o : $(SDEPS)
-read.o : $(SDEPS)
-stat.o : $(SDEPS)
-time.o : $(SDEPS)
-times.o : $(SDEPS)
-unlink.o : $(SDEPS)
-utime.o : $(SDEPS)
-write.o : $(SDEPS)
-
-install: $(CRT) $(SIM_BSP) $(SCRIPTS)
-	for c in $(CRT) $(SIM_BSP); do \
-	  $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$c ;\
-	done
-	for c in $(SCRIPTS); do \
-	  $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$c ;\
-	done
-
-clean mostlyclean:
-	rm -f *.o *.a
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.cache config.log config.status
-
-.PHONY: info dvi doc install-info clean-info
-info doc dvi:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/m32c/abort.S b/libgloss/m32c/abort.S
deleted file mode 100644
index 41d2942d5..000000000
--- a/libgloss/m32c/abort.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-	.global _abort
-_abort:
-	/* This is for debuggers.  The simulator stops here too. */
-	brk
-
-	/* Else, fall back on the simulator's "kill me" option.  */
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-	mov.w	#42,r1
-#else
-	mov.w	#42,r0
-#endif
-	
-	SYSCALL(SYS_kill)
-
-	/* Else, exit. */
-	jmp.a	__exit
diff --git a/libgloss/m32c/argv.S b/libgloss/m32c/argv.S
deleted file mode 100644
index 850964cf2..000000000
--- a/libgloss/m32c/argv.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(argv)
diff --git a/libgloss/m32c/argvlen.S b/libgloss/m32c/argvlen.S
deleted file mode 100644
index 073c69be5..000000000
--- a/libgloss/m32c/argvlen.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(argvlen)
diff --git a/libgloss/m32c/chdir.S b/libgloss/m32c/chdir.S
deleted file mode 100644
index a68aeb259..000000000
--- a/libgloss/m32c/chdir.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(chdir)
diff --git a/libgloss/m32c/chmod.S b/libgloss/m32c/chmod.S
deleted file mode 100644
index 7fc14c9a7..000000000
--- a/libgloss/m32c/chmod.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(chmod)
diff --git a/libgloss/m32c/close.S b/libgloss/m32c/close.S
deleted file mode 100644
index ae6b63c98..000000000
--- a/libgloss/m32c/close.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(close)
diff --git a/libgloss/m32c/configure b/libgloss/m32c/configure
deleted file mode 100755
index 5d272c9f8..000000000
--- a/libgloss/m32c/configure
+++ /dev/null
@@ -1,1204 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=crt0.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:744: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:823: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:884: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/m32c/configure.in b/libgloss/m32c/configure.in
deleted file mode 100644
index 877f6a06e..000000000
--- a/libgloss/m32c/configure.in
+++ /dev/null
@@ -1,90 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(crt0.S)
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
diff --git a/libgloss/m32c/crt0.S b/libgloss/m32c/crt0.S
deleted file mode 100644
index 9b29ffc9b..000000000
--- a/libgloss/m32c/crt0.S
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define A16
-#define A(n,w) n
-#define W w
-#define ADDR .2byte
-#define ALIGN 1
-#else
-#define A24
-#define A(n,w) w
-#define W l
-#define ADDR .4byte
-#define ALIGN 2
-#endif
-
-	.text
-
-	.global _start
-_start:
-.LFB2:
-	fset	U	/* User stack */
-	ldc	#__stack,sp
-
-#ifdef A16
-	mov.b	#%hi8(__romdatastart),r1h
-	mov.w	#%lo16(__romdatastart),a0
-	mov.w	#__datastart,a1
-#else
-	mov.l	#__romdatastart,a0
-	mov.l	#__datastart,a1
-#endif
-	mov.w	#__romdatacopysize,r3
-	shl.w	#-1,r3
-	smovf.w
-
-#ifdef A16
-	mov.w	#__bssstart,a1
-#else
-	mov.l	#__bssstart,a1
-#endif
-	mov.w	#__bsssize,r3
-	shl.w	#-1,r3
-	mov.w	#0,r0
-	sstr.w
-
-	jsr.a	__m32c_init
-
-	jsr.a	_main
-.LFE2:
-
-#ifdef A24
-	/* rv in r0, ok for arg0 */
-#else
-	mov.w	r0,r1
-#endif
-
-	jsr.a	_exit
-
-	.text
-
-	.global	_m32c_run_preinit_array
-	.type	_m32c_run_preinit_array,@function
-_m32c_run_preinit_array:
-	mov.W	#__preinit_array_start,a0
-	mov.W	#__preinit_array_end,a1
-	jmp.w	_m32c_run_inilist
-
-	.global	_m32c_run_init_array
-	.type	_m32c_run_init_array,@function
-_m32c_run_init_array:
-	mov.W	#__init_array_start,a0
-	mov.W	#__init_array_end,a1
-	jmp.w	_m32c_run_inilist
-
-	.global	_m32c_run_fini_array
-	.type	_m32c_run_fini_array,@function
-_m32c_run_fini_array:
-	mov.W	#__fini_array_start,a0
-	mov.W	#__fini_array_end,a1
-	/* fall through */
-
-_m32c_run_inilist:
-next_inilist:
-	cmp.W	a0,a1
-	jeq	done_inilist
-	pushm	a0,a1
-	mov.W	[a0],a0
-#ifdef A16
-	mov.b:s	#0,a1	/* zero extends */
-	jsri.a	a1a0
-#else
-	jsri.a	a0
-#endif
-	popm	a0,a1
-	add.W	A(#2,#4),a0
-	jmp.b	next_inilist
-done_inilist:
-	rts
-
-	.section	.init,"ax",@progbits
-
-	.global __m32c_init
-__m32c_init:
-	enter	#0
-
-	.section	.fini,"ax",@progbits
-
-	.global __m32c_fini
-__m32c_fini:
-	enter	#0
-	jsr.a	_m32c_run_fini_array
-
-
-;;; Provide Dwarf unwinding information that will help GDB stop
-;;; backtraces at the right place.  This is stolen from assembly
-;;; code generated by GCC with -dA.
-	.section	.debug_frame,"",@progbits
-.Lframe0:
-	.4byte	.LECIE0-.LSCIE0	; Length of Common Information Entry
-.LSCIE0:
-	.4byte	0xffffffff	; CIE Identifier Tag
-	.byte	0x1	; CIE Version
-	.ascii "\0"	; CIE Augmentation
-	.uleb128 0x1	; CIE Code Alignment Factor
-	.sleb128 -1	; CIE Data Alignment Factor
-	.byte	0xd	; CIE RA Column
-	.byte	0xc	; DW_CFA_def_cfa
-	.uleb128 0xc
-	.uleb128 0x3
-	.byte	0x8d	; DW_CFA_offset, column 0xd
-	.uleb128 0x3
-	.p2align ALIGN
-.LECIE0:
-.LSFDE0:
-	.4byte	.LEFDE0-.LASFDE0	; FDE Length
-.LASFDE0:
-	.4byte	.Lframe0	; FDE CIE offset
-	ADDR	.LFB2		; FDE initial location
-	ADDR	.LFE2-.LFB2	; FDE address range
-	.byte   0xf     	; DW_CFA_def_cfa_expression
-	.uleb128 1		; length of expression
-	.byte 	0x30		; DW_OP_lit0
-	.p2align ALIGN
-.LEFDE0:
-
-	.text
diff --git a/libgloss/m32c/crtn.S b/libgloss/m32c/crtn.S
deleted file mode 100644
index d4e86b8a5..000000000
--- a/libgloss/m32c/crtn.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define A16
-#define A(n,w) n
-#define W w
-#else
-#define A24
-#define A(n,w) w
-#define W l
-#endif
-
-	.section	.init,"ax",@progbits
-	jsr.a	_m32c_run_preinit_array
-	jsr.a	_m32c_run_init_array
-	exitd
-	.global	__m32c_init_end
-__m32c_init_end:
-
-	.section	.fini,"ax",@progbits
-
-	exitd
-	.global	__m32c_fini_end
-__m32c_fini_end:
-
-	.text
-
diff --git a/libgloss/m32c/exit.S b/libgloss/m32c/exit.S
deleted file mode 100644
index e27d73d30..000000000
--- a/libgloss/m32c/exit.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-	.global	__exit
-__exit:
-	push.w	r1
-	jsr.a	__m32c_fini
-	pop.w	r1
-	SYSCALL(SYS_exit)
diff --git a/libgloss/m32c/fstat.S b/libgloss/m32c/fstat.S
deleted file mode 100644
index 44815b17e..000000000
--- a/libgloss/m32c/fstat.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(fstat)
diff --git a/libgloss/m32c/genscript b/libgloss/m32c/genscript
deleted file mode 100644
index 665778e64..000000000
--- a/libgloss/m32c/genscript
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2005 Red Hat Incorporated.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions are met: 
-# 
-#     Redistributions of source code must retain the above copyright 
-#     notice, this list of conditions and the following disclaimer.
-# 
-#     Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-# 
-#     The name of Red Hat Incorporated may not be used to endorse 
-#     or promote products derived from this software without specific 
-#     prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-srcdir="$1"
-name="$2"
-ramstart="$3"
-ramsize="$4"
-romstart="$5"
-romsize="$6"
-vecprefix="$7"
-
-sedcmd="s/RAMSTART/$ramstart/g; s/RAMSIZE/$ramsize/g"
-sedcmd="$sedcmd; s/ROMSTART/$romstart/g; s/ROMSIZE/$romsize/g"
-
-# .rodata can be left with .text
-rotext='/IF_ROCOPY/d'
-# .rodata needs to be with .data
-rodata='/IF_ROROM/d'
-
-# All sections are put in one region
-simram='s/LOWROM/RAM/g; s/= .*SIZEOF.*/= 0);/; s/AT>ROM//g'
-oneram='s/> ROM/> RAM/g;'
-# RW data needs to be copied to RAM
-rwonly='s/LOWROM/ROM/g; s/ SIZEOF(.rodata) + //g'
-# all data needs to be copied to RAM
-rocopy='s/LOWROM/RAM AT>ROM/g'
-
-case $name:$romstart in
-  sim*:0 )
-    # The r8c and m32c simulators have only a single memory region
-    sedcmd="$sedcmd; $simram; $oneram; $rotext"
-    ;;
-  sim*:* )
-    # This is most likely the m16c simulator
-    sedcmd="$sedcmd; $simram; $rodata"
-    ;;
-  *:0x???? )
-    # This is most likely the r8c chip
-    sedcmd="$sedcmd; $rwonly; $rotext"
-    ;;
-  m32*:* )
-    sedcmd="$sedcmd; $rwonly; $rotext"
-    ;;
-  *:* )
-    sedcmd="$sedcmd; $rocopy; $rodata"
-    ;;
-esac
-sedcmd="$sedcmd; /ORIGIN = 0,/d"
-
-sedcmd="$sedcmd; s/VECSTART/${vecprefix}dc/; s/RESETSTART/${vecprefix}fc/"
-
-sed "$sedcmd" < ${srcdir}/m32c.tmpl > ${name}.ld
diff --git a/libgloss/m32c/getpid.S b/libgloss/m32c/getpid.S
deleted file mode 100644
index 00b5d391e..000000000
--- a/libgloss/m32c/getpid.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(getpid)
diff --git a/libgloss/m32c/gettimeofday.S b/libgloss/m32c/gettimeofday.S
deleted file mode 100644
index 8537a1adb..000000000
--- a/libgloss/m32c/gettimeofday.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(gettimeofday)
diff --git a/libgloss/m32c/heaptop.S b/libgloss/m32c/heaptop.S
deleted file mode 100644
index 36c95dfad..000000000
--- a/libgloss/m32c/heaptop.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-#define SYS__set_heaptop 11
-
-S(_set_heaptop)
diff --git a/libgloss/m32c/isatty.S b/libgloss/m32c/isatty.S
deleted file mode 100644
index 490c8cbd3..000000000
--- a/libgloss/m32c/isatty.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-	.global _isatty
-_isatty:
-	mov.w   #1,r0
-	rts
diff --git a/libgloss/m32c/kill.S b/libgloss/m32c/kill.S
deleted file mode 100644
index 61d846947..000000000
--- a/libgloss/m32c/kill.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(kill)
diff --git a/libgloss/m32c/link.S b/libgloss/m32c/link.S
deleted file mode 100644
index 08efad8c7..000000000
--- a/libgloss/m32c/link.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(link)
diff --git a/libgloss/m32c/lseek.S b/libgloss/m32c/lseek.S
deleted file mode 100644
index 9026e9219..000000000
--- a/libgloss/m32c/lseek.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(lseek)
diff --git a/libgloss/m32c/m32c.tmpl b/libgloss/m32c/m32c.tmpl
deleted file mode 100644
index b06ce4ff7..000000000
--- a/libgloss/m32c/m32c.tmpl
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-/* Default linker script, for normal executables */
-OUTPUT_FORMAT("elf32-m32c", "elf32-m32c",
-	      "elf32-m32c")
-OUTPUT_ARCH(m32c)
-ENTRY(_start)
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY {
-	RAM (w) : ORIGIN = RAMSTART, LENGTH = RAMSIZE
-	ROM (r) : ORIGIN = ROMSTART, LENGTH = ROMSIZE
-	VEC (r) : ORIGIN = VECSTART, LENGTH = 32
-	RESETVEC (r) : ORIGIN = RESETSTART, LENGTH = 4
-}
-SECTIONS
-{
-  /* There are three cases we care about: First, RW data that must be
-     in the low 64k.  This will always be copied from ROM.  Second, RO
-     data that must be in the low 64k.  This may be copied from ROM if
-     the ROM is above 64k.  Third, anything that does not need to be
-     in the first 64k.  Chips normally only have two memory regions;
-     low ram and either high or low rom.  We map the low rom needs
-     into one of the actual regions.  */
-
-  /* .text goes first so the rom image of ram data will follow it.  */
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.interp .hash .dynsym .dynstr .gnu.version*)
-    PROVIDE (__etext = .);
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-    . = ALIGN(2);
-    PROVIDE(__romdatastart = .); /* IF_ROCOPY */
-  } > ROM =0
-
-  /* rodata will either be part of data, or will be in low rom.  So we
-     might be spanning it, or we might not.  This lets us include it
-     in our calculations when appropriate.  */
-
-  .rodata : {
-    . = ALIGN(2);
-    PROVIDE(__datastart = .); /* IF_ROCOPY */
-    *(.plt)
-    KEEP (*(.init))
-    KEEP (*(.fini))
-    *(.rodata .rodata.* .gnu.linkonce.r.*)
-    *(.rodata1)
-    *(.eh_frame_hdr)
-    KEEP (*(.eh_frame))
-    KEEP (*(.gcc_except_table)) *(.gcc_except_table.*)
-    . = ALIGN(2);
-    PROVIDE(__romdatastart = .); /* IF_ROROM */
-  } > LOWROM
-
-  .data : {
-    . = ALIGN(32 / 8);
-    PROVIDE (__datastart = .); /* IF_ROROM */
-    PROVIDE (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE (__preinit_array_end = .);
-    PROVIDE (__init_array_start = .);
-    KEEP (*(.init_array))
-    PROVIDE (__init_array_end = .);
-    PROVIDE (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    PROVIDE (__fini_array_end = .);
-
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin*.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*crtbegin*.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-
-    KEEP (*(.jcr))
-    *(.data.rel.ro.local) *(.data.rel.ro*)
-    *(.dynamic)
-
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-    *(.data1)
-    *(.got.plt) *(.got)
-
-    . = ALIGN(2);
-    _edata = .;
-    PROVIDE (edata = .);
-    PROVIDE (__dataend = .);
-  } > RAM AT>ROM
-
-  /* Note that __romdatacopysize may be ZERO for the simulator, which
-     knows how to intialize RAM directly.  It should ONLY be used for
-     copying data from ROM to RAM; if you need to know the size of the
-     data section, subtract the end symbol from the start symbol.  */
-  /* Note that crt0 assumes this is even; all the start/stop symbols
-     are also assumed word-aligned.  */
-  PROVIDE (__romdatacopysize = SIZEOF(.rodata) + SIZEOF(.data));
-
-  .bss : {
-    . = ALIGN(2);
-    PROVIDE (__bssstart = .);
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    . = ALIGN(2);
-    PROVIDE (__bssend = .);
-    _end = .;
-    PROVIDE (end = .);
-  } > RAM
-  PROVIDE (__bsssize = SIZEOF(.bss));
-
-  .stack (RAMSTART + RAMSIZE - 2) :
-  {
-    PROVIDE (__stack = .);
-    *(.stack)
-  }
-
-  .vec : {
-    *(.vec)
-  } > VEC
-  .resetvec : {
-    *(.resetvec)
-  } > RESETVEC
-
-  /* The rest are all not normally part of the runtime image.  */
-
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/m32c/m32csys.h b/libgloss/m32c/m32csys.h
deleted file mode 100644
index e8b9b5f5d..000000000
--- a/libgloss/m32c/m32csys.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "syscall.h"
-
-/* Both the simulators and monitors reserve RAM areas 0x400 through
-   0x4ff for their internal use.  We use one of those memory locations
-   as our system call trap.  */
-
-#define POUND #
-#define SYSCALL(N) mov.b POUND N,0x400
-
-#define SYS__exit SYS_exit
-
-#define S(n) _##n: .global _##n | SYSCALL(SYS_##n) | rts
diff --git a/libgloss/m32c/open.S b/libgloss/m32c/open.S
deleted file mode 100644
index a64585111..000000000
--- a/libgloss/m32c/open.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(open)
diff --git a/libgloss/m32c/read.S b/libgloss/m32c/read.S
deleted file mode 100644
index 0aa4f131e..000000000
--- a/libgloss/m32c/read.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(read)
diff --git a/libgloss/m32c/sbrk.c b/libgloss/m32c/sbrk.c
deleted file mode 100644
index 69375aa42..000000000
--- a/libgloss/m32c/sbrk.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-extern void _set_heaptop(void *ptr);
-
-char *
-sbrk(int adj)
-{
-  extern char end;
-  static char *heap = &end;
-  char *rv = heap;
-
-  heap += adj;
-  _set_heaptop(heap);
-  return rv;
-}
diff --git a/libgloss/m32c/stat.S b/libgloss/m32c/stat.S
deleted file mode 100644
index a96dcbdbc..000000000
--- a/libgloss/m32c/stat.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(stat)
diff --git a/libgloss/m32c/time.S b/libgloss/m32c/time.S
deleted file mode 100644
index 61f5dd5cd..000000000
--- a/libgloss/m32c/time.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(time)
diff --git a/libgloss/m32c/times.S b/libgloss/m32c/times.S
deleted file mode 100644
index bf77a563f..000000000
--- a/libgloss/m32c/times.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(times)
diff --git a/libgloss/m32c/unlink.S b/libgloss/m32c/unlink.S
deleted file mode 100644
index 8dfb05938..000000000
--- a/libgloss/m32c/unlink.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(unlink)
diff --git a/libgloss/m32c/utime.S b/libgloss/m32c/utime.S
deleted file mode 100644
index b244a2149..000000000
--- a/libgloss/m32c/utime.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(utime)
diff --git a/libgloss/m32c/write.S b/libgloss/m32c/write.S
deleted file mode 100644
index 273eb470d..000000000
--- a/libgloss/m32c/write.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(write)
diff --git a/libgloss/m68hc11/sim-valid-m68hc11.ld b/libgloss/m68hc11/sim-valid-m68hc11.ld
index 82e3b68fa..904b8d649 100644
--- a/libgloss/m68hc11/sim-valid-m68hc11.ld
+++ b/libgloss/m68hc11/sim-valid-m68hc11.ld
@@ -306,5 +306,4 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 }
diff --git a/libgloss/m68hc11/sim-valid-m68hc12.ld b/libgloss/m68hc11/sim-valid-m68hc12.ld
index 681bc6d47..17dea1d76 100644
--- a/libgloss/m68hc11/sim-valid-m68hc12.ld
+++ b/libgloss/m68hc11/sim-valid-m68hc12.ld
@@ -306,5 +306,4 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 }
diff --git a/libgloss/m68k/Makefile.in b/libgloss/m68k/Makefile.in
index 8faf5ffcf..5df402288 100644
--- a/libgloss/m68k/Makefile.in
+++ b/libgloss/m68k/Makefile.in
@@ -123,8 +123,6 @@ IDPGDB_OBJS=	leds.o idp-inbyte.o idp-gdb-outbyte.o mc68ec.o
 DBUG_BSP=	libdbug.a
 DBUG_OBJS=	dbug-exit.o dbug-inbyte.o dbug-outbyte.o
 
-CF_SCRIPTS=   m5208evb.ld m5213evb.ld m5235evb.ld m5272c3.ld m5282evb.ld
-
 # Host specific makefile fragment comes in here.
 @host_makefile_frag@
 
@@ -132,7 +130,7 @@ CF_SCRIPTS=   m5208evb.ld m5213evb.ld m5235evb.ld m5272c3.ld m5282evb.ld
 # build a test program for each target board. Just trying to get
 # it to link is a good test, so we ignore all the errors for now.
 #
-all: ${SIM_CRT0} ${SIM_BSP} ${CRT0} ${BCC_BSP} ${IDP_BSP} ${IDPGDB_BSP} ${MVME135_BSP} ${MVME162_BSP} ${DBUG_BSP} ${CF_SCRIPTS}
+all: ${SIM_CRT0} ${SIM_BSP} ${CRT0} ${BCC_BSP} ${IDP_BSP} ${IDPGDB_BSP} ${MVME135_BSP} ${MVME162_BSP} ${DBUG_BSP}
 
 #
 # here's where we build the board support packages for each target
@@ -165,21 +163,6 @@ ${MVME162_BSP}: $(OBJS) ${MVME162_OBJS}
 	${AR} ${ARFLAGS} $@ $(OBJS) ${MVME162_OBJS}
 	${RANLIB} $@
 
-m5208evb.ld: dbug-cf.sc Makefile
-	RAMSTART=1024M RAMSIZE=16M RAMDBUG=128K ${SHELL} $< > $@
-
-m5213evb.ld: dbug-cf.sc Makefile
-	RAMSTART=512M RAMSIZE=32K RAMDBUG=8K ${SHELL} $< > $@
-
-m5235evb.ld: dbug-cf.sc Makefile
-	RAMSTART=0M RAMSIZE=16M RAMDBUG=64K ${SHELL} $< > $@
-
-m5272c3.ld: dbug-cf.sc Makefile
-	RAMSTART=0M RAMSIZE=4M RAMDBUG=128K ${SHELL} $< > $@
-
-m5282evb.ld: dbug-cf.sc Makefile
-	RAMSTART=0M RAMSIZE=16M RAMDBUG=64K ${SHELL} $< > $@
-
 leds.o: ${srcdir}/leds.c
 	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
 
@@ -300,9 +283,6 @@ install:
 	$(INSTALL_PROGRAM) $(DBUG_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(DBUG_BSP)
 	$(INSTALL_DATA) ${srcdir}/sbc5204.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sbc5204.ld
 	$(INSTALL_DATA) ${srcdir}/sbc5206.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sbc5206.ld
-	for script in $(CF_SCRIPTS) ; \
-	do $(INSTALL_DATA) $$script $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$script ; \
-	done
 
 # target specific makefile fragment comes in here.
 @target_makefile_frag@
diff --git a/libgloss/m68k/bcc.ld b/libgloss/m68k/bcc.ld
index b9acfb365..65f6441ef 100644
--- a/libgloss/m68k/bcc.ld
+++ b/libgloss/m68k/bcc.ld
@@ -63,7 +63,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -77,7 +77,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -99,9 +99,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -110,7 +109,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/crt0.S b/libgloss/m68k/crt0.S
index 1aa0dd6bb..321b97f03 100644
--- a/libgloss/m68k/crt0.S
+++ b/libgloss/m68k/crt0.S
@@ -84,7 +84,7 @@ SYM (start):
 	subql	IMM(1), d0
 2:
 	clrb	(a0)+
-#if !defined(__mcoldfire__)
+#if !defined(__mcoldfire__) && !defined(__mcf5200__)
 	dbra	d0, 2b
 	clrw	d0
 	subql	IMM(1), d0
diff --git a/libgloss/m68k/dbug-cf.sc b/libgloss/m68k/dbug-cf.sc
deleted file mode 100644
index 0342ed1fd..000000000
--- a/libgloss/m68k/dbug-cf.sc
+++ /dev/null
@@ -1,112 +0,0 @@
-# a linker script template.
-# RAMSTART - start of board's ram
-# RAMSIZE - size of board's ram
-# RAMDBUG - bytes at start of RAM for DBUG use
-
-cat <<EOF
-STARTUP(crt0.o)
-OUTPUT_ARCH(m68k)
-/* DBUG loads SREC files */
-/*OUTPUT_FORMAT(srec)*/
-ENTRY(start)
-SEARCH_DIR(.)
-GROUP(-ldbug -lc -lgcc -ldbug)
-__DYNAMIC  =  0;
-
-MEMORY
-{
-  ram (rwx) : ORIGIN = ${RAMSTART} + ${RAMDBUG:-0},
-		 LENGTH = ${RAMSIZE} - ${RAMDBUG:-0}
-}
-
-PROVIDE (__stack = ${RAMSTART} + ${RAMSIZE});
-
-/*
- * Initalize some symbols to be zero so we can reference them in the
- * crt0 without core dumping. These functions are all optional, but
- * we do this so we can have our crt0 always use them if they exist. 
- * This is so BSPs work better when using the crt0 installed gcc.
- * We have to initalize them twice, so we cover a.out (which prepends
- * an underscore) and coff object file formats.
- */
-PROVIDE (hardware_init_hook = 0);
-PROVIDE (_hardware_init_hook = 0);
-PROVIDE (software_init_hook = 0);
-PROVIDE (_software_init_hook = 0);
-/*
- * stick everything in ram (of course)
- */
-SECTIONS
-{
-  .text :
-  {
-    CREATE_OBJECT_SYMBOLS
-    *(.text .text.*)
-
-    . = ALIGN(0x4);
-    /* These are for running static constructors and destructors under ELF.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-
-    *(.rodata .rodata.*)
-
-    . = ALIGN(0x4);
-    *(.gcc_except_table) 
-
-    . = ALIGN(0x4);
-    *(.eh_frame)
-
-    . = ALIGN(0x4);
-    __INIT_SECTION__ = . ;
-    LONG (0x4e560000)	/* linkw %fp,#0 */
-    *(.init)
-    SHORT (0x4e5e)	/* unlk %fp */
-    SHORT (0x4e75)	/* rts */
-
-    . = ALIGN(0x4);
-    __FINI_SECTION__ = . ;
-    LONG (0x4e560000)	/* linkw %fp,#0 */
-    *(.fini)
-    SHORT (0x4e5e)	/* unlk %fp */
-    SHORT (0x4e75)	/* rts */
-
-    _etext = .;
-    *(.lit)
-  } > ram
-
-  .data :
-  {
-    *(.got.plt) *(.got)
-    *(.shdata)
-    *(.data .data.*)
-    _edata = .;
-  } > ram
-
-  .bss :
-  {
-    . = ALIGN(0x4);
-    __bss_start = . ;
-    *(.shbss)
-    *(.bss .bss.*)
-    *(COMMON)
-    _end =  ALIGN (0x8);
-    __end = _end;
-  } > ram
-
-  .stab 0 (NOLOAD) :
-  {
-    *(.stab)
-  }
-
-  .stabstr 0 (NOLOAD) :
-  {
-    *(.stabstr)
-  }
-}
-EOF
diff --git a/libgloss/m68k/idp.ld b/libgloss/m68k/idp.ld
index 73597832d..db6d8c56d 100644
--- a/libgloss/m68k/idp.ld
+++ b/libgloss/m68k/idp.ld
@@ -77,7 +77,7 @@ SECTIONS
   .text :
   {
     CREATE_OBJECT_SYMBOLS
-    *(.text .text.*)
+    *(.text)
 
     . = ALIGN(0x4);
     /* These are for running static constructors and destructors under ELF.  */
@@ -90,7 +90,7 @@ SECTIONS
     KEEP (*(SORT(.dtors.*)))
     KEEP (*(.dtors))
 
-    *(.rodata .rodata.*)
+    *(.rodata)
 
     . = ALIGN(0x4);
     *(.gcc_except_table) 
@@ -118,9 +118,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -129,7 +128,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/idpgdb.ld b/libgloss/m68k/idpgdb.ld
index a8a13ee02..9d24e28cf 100644
--- a/libgloss/m68k/idpgdb.ld
+++ b/libgloss/m68k/idpgdb.ld
@@ -77,7 +77,7 @@ SECTIONS
   .text :
   {
     CREATE_OBJECT_SYMBOLS
-    *(.text .text.*)
+    *(.text)
 
     . = ALIGN(0x4);
     /* These are for running static constructors and destructors under ELF.  */
@@ -90,7 +90,7 @@ SECTIONS
     KEEP (*(SORT(.dtors.*)))
     KEEP (*(.dtors))
 
-    *(.rodata .rodata.*)
+    *(.rodata)
 
     . = ALIGN(0x4);
     *(.gcc_except_table) 
@@ -118,9 +118,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -129,7 +128,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/mvme135.ld b/libgloss/m68k/mvme135.ld
index fd52e4e3f..dba0dbe23 100644
--- a/libgloss/m68k/mvme135.ld
+++ b/libgloss/m68k/mvme135.ld
@@ -64,7 +64,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -78,7 +78,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -100,9 +100,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -111,7 +110,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/mvme162.ld b/libgloss/m68k/mvme162.ld
index 18d5f62d2..fd3ae1014 100644
--- a/libgloss/m68k/mvme162.ld
+++ b/libgloss/m68k/mvme162.ld
@@ -65,7 +65,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -79,7 +79,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -101,9 +101,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -112,7 +111,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/sbc5204.ld b/libgloss/m68k/sbc5204.ld
index da10fe811..4570b0e18 100644
--- a/libgloss/m68k/sbc5204.ld
+++ b/libgloss/m68k/sbc5204.ld
@@ -63,7 +63,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -77,7 +77,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -99,9 +99,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -110,7 +109,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/sbc5206.ld b/libgloss/m68k/sbc5206.ld
index e0707d8a2..d082a08d1 100644
--- a/libgloss/m68k/sbc5206.ld
+++ b/libgloss/m68k/sbc5206.ld
@@ -63,7 +63,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -77,7 +77,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -99,9 +99,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -110,7 +109,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/sim.ld b/libgloss/m68k/sim.ld
index 57a41d0cf..b44fd07b3 100644
--- a/libgloss/m68k/sim.ld
+++ b/libgloss/m68k/sim.ld
@@ -18,7 +18,7 @@ SECTIONS
   .text :
   {
     CREATE_OBJECT_SYMBOLS
-    *(.text .text.*)
+    *(.text)
 
     . = ALIGN(0x4);
     /* These are for running static constructors and destructors under ELF.  */
@@ -31,7 +31,7 @@ SECTIONS
     KEEP (*(SORT(.dtors.*)))
     KEEP (*(.dtors))
 
-    *(.rodata .rodata.*)
+    *(.rodata)
 
     . = ALIGN(0x4);
     *(.gcc_except_table) 
@@ -59,9 +59,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -70,7 +69,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/mcore/elf-cmb.ld b/libgloss/mcore/elf-cmb.ld
index 611e6b972..591aa9de8 100644
--- a/libgloss/mcore/elf-cmb.ld
+++ b/libgloss/mcore/elf-cmb.ld
@@ -180,7 +180,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mips/array.ld b/libgloss/mips/array.ld
index fc4cc8fc2..5c99bcb3c 100644
--- a/libgloss/mips/array.ld
+++ b/libgloss/mips/array.ld
@@ -84,17 +84,17 @@ SECTIONS
   . = 0x80020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -140,13 +140,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
    _gp = ALIGN(16) + 0x8000;
   .lit8 : {
@@ -158,22 +158,18 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
    edata  =  .;
    _edata  =  .;
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
    end = .;
diff --git a/libgloss/mips/cfe.ld b/libgloss/mips/cfe.ld
index 58e8014d7..a251f8e91 100644
--- a/libgloss/mips/cfe.ld
+++ b/libgloss/mips/cfe.ld
@@ -36,15 +36,15 @@ SECTIONS
     PROVIDE (eprol = .);
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
   }
   .init : {
-    KEEP (*(.init))
+    *(.init)
   }
   .fini : {
-    KEEP (*(.fini))
+    *(.fini)
   }
   .rel.sdata : {
     PROVIDE (__runtime_reloc_start = .);
@@ -95,13 +95,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -115,7 +115,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    PROVIDE (edata  =  .);
@@ -123,15 +123,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -163,7 +159,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/ddb-kseg0.ld b/libgloss/mips/ddb-kseg0.ld
index db3759ea6..a3b2d5b4f 100644
--- a/libgloss/mips/ddb-kseg0.ld
+++ b/libgloss/mips/ddb-kseg0.ld
@@ -37,7 +37,7 @@ SECTIONS
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
@@ -89,13 +89,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -109,7 +109,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -117,15 +117,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -156,7 +152,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/ddb.ld b/libgloss/mips/ddb.ld
index 028078353..c877d9240 100644
--- a/libgloss/mips/ddb.ld
+++ b/libgloss/mips/ddb.ld
@@ -37,7 +37,7 @@ SECTIONS
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
@@ -89,13 +89,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -109,7 +109,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -117,15 +117,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -156,7 +152,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/dve.ld b/libgloss/mips/dve.ld
index 073d1e9ca..0e91b5ddc 100644
--- a/libgloss/mips/dve.ld
+++ b/libgloss/mips/dve.ld
@@ -33,17 +33,17 @@ SECTIONS
   . = 0xA0040000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -89,13 +89,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
       CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -110,7 +110,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -118,15 +118,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -157,7 +153,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/idt.ld b/libgloss/mips/idt.ld
index e0f87a792..fb06bd8b2 100644
--- a/libgloss/mips/idt.ld
+++ b/libgloss/mips/idt.ld
@@ -37,15 +37,15 @@ SECTIONS
     PROVIDE (eprol = .);
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
   }
   .init : {
-    KEEP (*(.init))
+    *(.init)
   }
   .fini : {
-    KEEP (*(.fini))
+    *(.fini)
   }
   .rel.sdata : {
     PROVIDE (__runtime_reloc_start = .);
@@ -96,13 +96,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -116,7 +116,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    PROVIDE (edata  =  .);
@@ -124,15 +124,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -163,7 +159,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/idt32.ld b/libgloss/mips/idt32.ld
index b5bba04b8..9e6a651cb 100644
--- a/libgloss/mips/idt32.ld
+++ b/libgloss/mips/idt32.ld
@@ -38,15 +38,15 @@ SECTIONS
     PROVIDE (eprol  =  .);
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
   }
   .init : {
-    KEEP (*(.init))
+    *(.init)
   }
   .fini : {
-    KEEP (*(.fini))
+    *(.fini)
   }
   .rel.sdata : {
     PROVIDE (__runtime_reloc_start = .);
@@ -98,13 +98,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -118,7 +118,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
   PROVIDE (edata  =  .);
@@ -126,15 +126,11 @@ SECTIONS
   _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -165,7 +161,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/idt64.ld b/libgloss/mips/idt64.ld
index 4a400ae73..3042e7c38 100644
--- a/libgloss/mips/idt64.ld
+++ b/libgloss/mips/idt64.ld
@@ -38,15 +38,15 @@ SECTIONS
     PROVIDE (eprol  =  .);
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
   }
   .init : {
-    KEEP (*(.init))
+    *(.init)
   }
   .fini : {
-    KEEP (*(.fini))
+    *(.fini)
   }
   .rel.sdata : {
     PROVIDE (__runtime_reloc_start = .);
@@ -97,13 +97,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -117,7 +117,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
   PROVIDE (edata  =  .);
@@ -125,15 +125,11 @@ SECTIONS
   _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -164,7 +160,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/idtecoff.ld b/libgloss/mips/idtecoff.ld
index 2788cc824..2910db687 100644
--- a/libgloss/mips/idtecoff.ld
+++ b/libgloss/mips/idtecoff.ld
@@ -35,17 +35,17 @@ SECTIONS
   . = 0xA0020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -54,13 +54,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -75,7 +75,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -83,15 +83,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
    end = .;
diff --git a/libgloss/mips/jmr3904app-java.ld b/libgloss/mips/jmr3904app-java.ld
index 98ce5357c..3759d0b3c 100644
--- a/libgloss/mips/jmr3904app-java.ld
+++ b/libgloss/mips/jmr3904app-java.ld
@@ -35,17 +35,17 @@ SECTIONS
       /* It fits the Cygmon ROMS */
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -54,13 +54,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -75,7 +75,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -83,15 +83,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
     . += 0x2000 ;  /* 8k bytes of stack. */
     __stack = ALIGN(64) ;
@@ -125,7 +121,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/jmr3904app.ld b/libgloss/mips/jmr3904app.ld
index 3056a36bf..0785d597b 100644
--- a/libgloss/mips/jmr3904app.ld
+++ b/libgloss/mips/jmr3904app.ld
@@ -32,17 +32,17 @@ SECTIONS
       /* It fits the Cygmon ROMS */
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -88,13 +88,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -108,7 +108,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -116,15 +116,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
     . += 0x2000 ;  /* 8k bytes of stack. */
     __stack = ALIGN(64) ;
@@ -158,7 +154,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/jmr3904dram-java.ld b/libgloss/mips/jmr3904dram-java.ld
index 71e84032e..3bf777c48 100644
--- a/libgloss/mips/jmr3904dram-java.ld
+++ b/libgloss/mips/jmr3904dram-java.ld
@@ -37,17 +37,17 @@ SECTIONS
       /* It fits the Cygmon ROMS */
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -56,13 +56,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -77,7 +77,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -85,15 +85,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -128,7 +124,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/jmr3904dram.ld b/libgloss/mips/jmr3904dram.ld
index a2cb1eae5..67be2b532 100644
--- a/libgloss/mips/jmr3904dram.ld
+++ b/libgloss/mips/jmr3904dram.ld
@@ -34,17 +34,17 @@ SECTIONS
       /* It fits the Cygmon ROMS */
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -53,13 +53,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -74,7 +74,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -82,15 +82,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -125,7 +121,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/lsi.ld b/libgloss/mips/lsi.ld
index 839382527..b1f3e6fce 100644
--- a/libgloss/mips/lsi.ld
+++ b/libgloss/mips/lsi.ld
@@ -34,15 +34,15 @@ SECTIONS
   . = 0xA0020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -88,13 +88,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -109,22 +109,18 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
    edata  =  .;
    _edata  =  .;
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
    end = .;
diff --git a/libgloss/mips/nullmon.ld b/libgloss/mips/nullmon.ld
index 1d9319504..a0017392e 100644
--- a/libgloss/mips/nullmon.ld
+++ b/libgloss/mips/nullmon.ld
@@ -34,17 +34,17 @@ SECTIONS
   . = 0xA0020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -90,13 +90,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -110,7 +110,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -118,15 +118,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
    . = ALIGN(64) ;
@@ -158,7 +154,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/pmon.ld b/libgloss/mips/pmon.ld
index e9a20aecc..214594a2d 100644
--- a/libgloss/mips/pmon.ld
+++ b/libgloss/mips/pmon.ld
@@ -34,17 +34,17 @@ SECTIONS
   . = 0xA0020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -90,13 +90,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -110,7 +110,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -118,15 +118,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -157,7 +153,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/regs.S b/libgloss/mips/regs.S
index bdf933f13..17cc15a75 100644
--- a/libgloss/mips/regs.S
+++ b/libgloss/mips/regs.S
@@ -53,16 +53,15 @@
 #define fp1	$f1
 
 /* Useful memory constants: */
+#define K0BASE		0x80000000
 #ifndef __mips64
-#define K0BASE          0x80000000
 #define K1BASE		0xA0000000
 #define K0BASE_ADDR	((char *)K0BASE)
 #define K1BASE_ADDR	((char *)K1BASE)
 #else
-#define K0BASE          0xFFFFFFFF80000000
-#define K1BASE		0xFFFFFFFFA0000000
+#define K1BASE		0xFFFFFFFFA0000000LL
 #define K0BASE_ADDR	((char *)0xFFFFFFFF80000000LL)
-#define K1BASE_ADDR	((char *)0xFFFFFFFFA0000000LL)
+#define K1BASE_ADDR	((char *)K1BASE)
 #endif
 
 #define PHYS_TO_K1(a)   ((unsigned)(a) | K1BASE)
diff --git a/libgloss/mn10200/eval.ld b/libgloss/mn10200/eval.ld
index c5c958b95..7c91ed770 100644
--- a/libgloss/mn10200/eval.ld
+++ b/libgloss/mn10200/eval.ld
@@ -144,7 +144,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mn10200/sim.ld b/libgloss/mn10200/sim.ld
index 4c7516961..90c9e5798 100644
--- a/libgloss/mn10200/sim.ld
+++ b/libgloss/mn10200/sim.ld
@@ -140,7 +140,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mn10300/asb2303.ld b/libgloss/mn10300/asb2303.ld
index 0fe2784da..fcc686594 100644
--- a/libgloss/mn10300/asb2303.ld
+++ b/libgloss/mn10300/asb2303.ld
@@ -137,7 +137,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mn10300/asb2305.ld b/libgloss/mn10300/asb2305.ld
index b82746907..e4655eeb9 100644
--- a/libgloss/mn10300/asb2305.ld
+++ b/libgloss/mn10300/asb2305.ld
@@ -137,7 +137,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mn10300/eval.ld b/libgloss/mn10300/eval.ld
index f26f582b4..ca5494939 100644
--- a/libgloss/mn10300/eval.ld
+++ b/libgloss/mn10300/eval.ld
@@ -137,7 +137,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mn10300/sim.ld b/libgloss/mn10300/sim.ld
index 97fe4548d..0bfa27840 100644
--- a/libgloss/mn10300/sim.ld
+++ b/libgloss/mn10300/sim.ld
@@ -135,7 +135,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mt/16-002.ld b/libgloss/mt/16-002.ld
deleted file mode 100644
index 9dfd62eff..000000000
--- a/libgloss/mt/16-002.ld
+++ /dev/null
@@ -1,248 +0,0 @@
-OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
-OUTPUT_ARCH(mt)
-ENTRY(__boot_start)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY
-{
-  ram (rwx) : ORIGIN = 0x0, LENGTH = 128K
-  frame-buffer (w) : ORIGIN = 0xde0000, LENGTH = 40K
-  ports (w) : ORIGIN = 0xfff000, LENGTH = 4K
-  dma-ram (w) : ORIGIN = 0x1000000, LENGTH = 16M-4K
-}
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0x0;
-  PROVIDE(__executable_start = 0x0);
-  .interp         : { *(.interp) }
-  .hash           : { *(.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.init       : { *(.rel.init) }
-  .rela.init      : { *(.rela.init) }
-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rel.fini       : { *(.rel.fini) }
-  .rela.fini      : { *(.rela.fini) }
-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rel.data.rel.ro  : { *(.rel.data.rel.ro*) }
-  .rela.data.rel.ro : { *(.rela.data.rel.ro*) }
-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rel.tdata      : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-  .rela.tdata     : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rel.tbss       : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-  .rela.tbss      : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rel.ctors      : { *(.rel.ctors) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rel.dtors      : { *(.rel.dtors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rel.got        : { *(.rel.got) }
-  .rela.got       : { *(.rela.got) }
-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-
-  .startup        : { *startup-16-002.o(.startup) } >ram =0 
-  . = 0x40 ;
-
-  .init           : { KEEP (*(.init)) } >ram =0 
-  .plt            : { *(.plt) } >ram
-  .text           :
-  {
-    *startup-16-002.o(.text)
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } >ram =0
-  .fini           : { KEEP (*(.fini)) } >ram =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >ram
-  .rodata1        : { *(.rodata1) } >ram
-  .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } >ram
-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >ram
-  .eh_frame_hdr   : { *(.eh_frame_hdr) } >ram
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(256) + (. & (256 - 1));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table   : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Thread Local Storage sections  */
-  .tdata          : { *(.tdata .tdata.* .gnu.linkonce.td.*) } >ram
-  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >ram
-  /* Ensure the __preinit_array_start label is properly aligned.  We
-     could instead move the label definition inside the section, but
-     the linker would then create the section even if it turns out to
-     be empty, which isn't pretty.  */
-  . = ALIGN(32 / 8);
-  PROVIDE (__preinit_array_start = .);
-  .preinit_array  : { *(.preinit_array) } >ram
-  PROVIDE (__preinit_array_end = .);
-  PROVIDE (__init_array_start = .);
-  .init_array     : { *(.init_array) } >ram
-  PROVIDE (__init_array_end = .);
-  PROVIDE (__fini_array_start = .);
-  .fini_array     : { *(.fini_array) } >ram
-  PROVIDE (__fini_array_end = .);
-  .ctors :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } >ram
-  .dtors :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } >ram
-  .jcr            : { KEEP (*(.jcr)) } >ram
-  .data.rel.ro    : { *(.data.rel.ro.local) *(.data.rel.ro*) } >ram
-  .dynamic        : { *(.dynamic) } >ram
-
-  /* DJK - Re-align the data section from the read-only section. */
-  . = ALIGN(16) + (. & (16 - 1));
-  PROVIDE (_data = .);
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    SORT(CONSTRUCTORS)
-  } >ram
-  .data1          : { *(.data1) } >ram
-  .got            : { *(.got.plt) *(.got) } >ram
-
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata          : { *(.sdata .sdata.* .gnu.linkonce.s.*) } >ram
-  _edata = .;
-  PROVIDE ( edata = . ) ;
-  .sbss           :
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  } >ram
-  .bss            :
-  {
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    /* Align here to ensure that the .bss section occupies space up to
-       _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-    . = ALIGN(32 / 8);
-  } >ram
-  . = ALIGN(32 / 8);
-  __bss_start = ADDR ( .sbss ) ;
-  __bss_end = __bss_start + SIZEOF ( .sbss ) + SIZEOF ( .bss ) - 4 ;
-  _end = .;
-  PROVIDE (end = .);
-
-  /* DJK - Initialized frame buffer data is copied from RAM to FB. */
-  .auxbss         : AT (ADDR(.bss) + SIZEOF(.bss)) { *(.auxbss) } >frame-buffer
-  .auxdata        : AT (LOADADDR(.auxbss) + SIZEOF(.auxbss))
-  {
-    *(.auxdata)
-  } >frame-buffer
-
-  _fbbss_start = ADDR ( .auxbss );
-  _fbbss_end = _fbbss_start + SIZEOF ( .auxbss ) - 4;
-  _fbdata_start = LOADADDR ( .auxdata );
-  _fbdata_end = _fbdata_start + SIZEOF ( .auxdata ) ;
-  _fbdata_vma = ADDR ( .auxdata );
-
-  PROVIDE (__FRAME_BUFFER_START = ADDR(.auxbss) );
-  PROVIDE (__FRAME_BUFFER_SIZE = 0xa000);
-  PROVIDE (__FRAME_BUFFER_END = __FRAME_BUFFER_START + __FRAME_BUFFER_SIZE);
-
-  .dma            : { _dma_start = .; *(.dma) _dma_end = .; } >dma-ram
-  .internal_io (NOLOAD) : { *(.internal_io) } >ports 
-
-  /* Stabs debugging sections.  */
-  .stab            0 : { *(.stab) }
-  .stabstr         0 : { *(.stabstr) }
-  .stab.excl       0 : { *(.stab.excl) }
-  .stab.exclstr    0 : { *(.stab.exclstr) }
-  .stab.index      0 : { *(.stab.index) }
-  .stab.indexstr   0 : { *(.stab.indexstr) }
-  .comment         0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug           0 : { *(.debug) }
-  .line            0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo   0 : { *(.debug_srcinfo) }
-  .debug_sfnames   0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges   0 : { *(.debug_aranges) }
-  .debug_pubnames  0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info      0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev    0 : { *(.debug_abbrev) }
-  .debug_line      0 : { *(.debug_line) }
-  .debug_frame     0 : { *(.debug_frame) }
-  .debug_str       0 : { *(.debug_str) }
-  .debug_loc       0 : { *(.debug_loc) }
-  .debug_macinfo   0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-  /* In a multi-core environment, each core is given its own stack space
-     equal to __stack_size. */
-  PROVIDE (__stack = 0x1fff0);
-  PROVIDE (__stack_size = 0x800);
-
-  .stack (DEFINED(__stack) ? __stack : 0x007ffff0) :
-  {
-     __stack = .;
-    *(.stack)
-    LONG(0xdeaddead)
-  }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/mt/16-003.ld b/libgloss/mt/16-003.ld
deleted file mode 100644
index c837b7540..000000000
--- a/libgloss/mt/16-003.ld
+++ /dev/null
@@ -1,258 +0,0 @@
-OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
-OUTPUT_ARCH(mt)
-ENTRY(__boot_start)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY
-{
-  ram (rwx) : ORIGIN = 0x0, LENGTH = 608K
-  frame-buffer (w) : ORIGIN = 0xff000000, LENGTH = 80K
-  dma-ram (w) : ORIGIN = 0x1000000, LENGTH = 16M-4K
-  ports (w) : ORIGIN = 0xfffff000, LENGTH = 4K
-}
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0x0;
-  PROVIDE(__executable_start = 0x0);
-  .interp         : { *(.interp) }
-  .hash           : { *(.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.init       : { *(.rel.init) }
-  .rela.init      : { *(.rela.init) }
-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rel.fini       : { *(.rel.fini) }
-  .rela.fini      : { *(.rela.fini) }
-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rel.data.rel.ro  : { *(.rel.data.rel.ro*) }
-  .rela.data.rel.ro : { *(.rela.data.rel.ro*) }
-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rel.tdata      : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-  .rela.tdata     : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rel.tbss       : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-  .rela.tbss      : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rel.ctors      : { *(.rel.ctors) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rel.dtors      : { *(.rel.dtors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rel.got        : { *(.rel.got) }
-  .rela.got       : { *(.rela.got) }
-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-
-  .startup        : { *startup-16-003.o(.startup) } >ram =0
-  . = 0x40;
-
-  .init           : { KEEP (*(.init)) } >ram =0
-  .plt            : { *(.plt) } >ram
-  .text           :
-  {
-    *startup-16-003.o(.text);
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } >ram =0
-  .fini           : { KEEP (*(.fini)) } >ram =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >ram
-  .rodata1        : { *(.rodata1) } >ram
-  .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } >ram
-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >ram
-  .eh_frame_hdr   : { *(.eh_frame_hdr) } >ram
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(256) + (. & (256 - 1));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table   : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Thread Local Storage sections  */
-  .tdata          : { *(.tdata .tdata.* .gnu.linkonce.td.*) } >ram
-  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >ram
-  /* Ensure the __preinit_array_start label is properly aligned.  We
-     could instead move the label definition inside the section, but
-     the linker would then create the section even if it turns out to
-     be empty, which isn't pretty.  */
-  . = ALIGN(32 / 8);
-  PROVIDE (__preinit_array_start = .);
-  .preinit_array  : { *(.preinit_array) } >ram
-  PROVIDE (__preinit_array_end = .);
-  PROVIDE (__init_array_start = .);
-  .init_array     : { *(.init_array) } >ram
-  PROVIDE (__init_array_end = .);
-  PROVIDE (__fini_array_start = .);
-  .fini_array     : { *(.fini_array) } >ram
-  PROVIDE (__fini_array_end = .);
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } >ram
-  .dtors          :
-  {
-    KEEP (*crtbegin*.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } >ram
-  .jcr            : { KEEP (*(.jcr)) } >ram
-  .data.rel.ro    : { *(.data.rel.ro.local) *(.data.rel.ro*) } >ram
-  .dynamic        : { *(.dynamic) } >ram
-
-  /* DJK - Re-align the data section from the read-only section. */
-  . = ALIGN(16) + (. & (16 - 1));
-  PROVIDE (_data = .);
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  } >ram
-  .data1          : { *(.data1) } >ram
-  .got            : { *(.got.plt) *(.got) } >ram
-
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata          : { *(.sdata .sdata.* .gnu.linkonce.s.*) } >ram
-  _edata = .;
-  PROVIDE ( edata = . );
-  .sbss           :
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  } >ram
-  .bss            :
-  {
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    /* Align here to ensure that the .bss section occupies space up to
-       _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-    . = ALIGN(32 / 8);
-  } >ram
-  . = ALIGN(32 / 8);
-  __bss_start = ADDR ( .sbss ) ;
-  __bss_end = __bss_start + SIZEOF ( .sbss ) + SIZEOF ( .bss ) - 4 ;
-  _end = .;
-  PROVIDE (end = .);
-
-  /* DJK - Initialized frame buffer data is copied from RAM to FB. */
-  .auxbss         : AT (ADDR(.bss) + SIZEOF(.bss)) { *(.auxbss) } >frame-buffer
-  .auxdata        : AT (LOADADDR(.auxbss) + SIZEOF(.auxbss))
-  {
-    *(.auxdata.bank0)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank1)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank2)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank3)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank4)
-    *(.auxdata)
-  } >frame-buffer
-
-  _fbbss_start = ADDR ( .auxbss );
-  _fbbss_end = _fbbss_start + SIZEOF ( .auxbss ) - 4;
-  _fbdata_start = LOADADDR ( .auxdata );
-  _fbdata_end = _fbdata_start + SIZEOF ( .auxdata ) ;
-  _fbdata_vma = ADDR ( .auxdata );
-  
-  PROVIDE (__FRAME_BUFFER_START = ADDR(.auxbss) );
-  PROVIDE (__FRAME_BUFFER_SIZE = 0x14000);
-  PROVIDE (__FRAME_BUFFER_END = __FRAME_BUFFER_START + __FRAME_BUFFER_SIZE);
-
-  .dma            : { _dma_start = .; *(.dma) _dma_end = .; } >dma-ram
-  .internal_io (NOLOAD) : { *(.internal_io) } >ports
-
-  /* Stabs debugging sections.  */
-  .stab            0 : { *(.stab) }
-  .stabstr         0 : { *(.stabstr) }
-  .stab.excl       0 : { *(.stab.excl) }
-  .stab.exclstr    0 : { *(.stab.exclstr) }
-  .stab.index      0 : { *(.stab.index) }
-  .stab.indexstr   0 : { *(.stab.indexstr) }
-  .comment         0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug           0 : { *(.debug) }
-  .line            0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo   0 : { *(.debug_srcinfo) }
-  .debug_sfnames   0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges   0 : { *(.debug_aranges) }
-  .debug_pubnames  0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info      0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev    0 : { *(.debug_abbrev) }
-  .debug_line      0 : { *(.debug_line) }
-  .debug_frame     0 : { *(.debug_frame) }
-  .debug_str       0 : { *(.debug_str) }
-  .debug_loc       0 : { *(.debug_loc) }
-  .debug_macinfo   0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-  /* In a multi-core environment, each core is given its own stack space
-     equal to __stack_size, growing downwards. */
-  PROVIDE (__stack = 0x97ff0);
-  PROVIDE (__stack_size = 0x800);
-
-  .stack (DEFINED(__stack) ? __stack : 0x007ffff0) :
-  {
-     __stack = .;
-    *(.stack)
-    LONG(0xdeaddead)
-  }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/mt/64-001.ld b/libgloss/mt/64-001.ld
deleted file mode 100644
index 501ec32f8..000000000
--- a/libgloss/mt/64-001.ld
+++ /dev/null
@@ -1,282 +0,0 @@
-OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
-OUTPUT_ARCH(mt)
-ENTRY(__boot_start)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY
-{
-  rom (rx) : ORIGIN = 0x000000, LENGTH = 8M
-  frame-buffer (w) : ORIGIN = 0x800000, LENGTH = 64K
-  ram (w) : ORIGIN = 0xc00000, LENGTH = 4M
-  dma-ram (w) : ORIGIN = 0x1000000, LENGTH = 16M
-}
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x0); . = 0x0;
-  .interp         : { *(.interp) }
-  .hash           : { *(.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.init       : { *(.rel.init) }
-  .rela.init      : { *(.rela.init) }
-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rel.fini       : { *(.rel.fini) }
-  .rela.fini      : { *(.rela.fini) }
-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rel.data.rel.ro  : { *(.rel.data.rel.ro*) }
-  .rela.data.rel.ro : { *(.rel.data.rel.ro*) }
-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rel.tdata      : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-  .rela.tdata     : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rel.tbss       : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-  .rela.tbss      : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rel.ctors      : { *(.rel.ctors) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rel.dtors      : { *(.rel.dtors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rel.got        : { *(.rel.got) }
-  .rela.got       : { *(.rela.got) }
-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-
-  .startup        : { *startup-64-001.o(.startup) } >rom =0
-
-  .init           : { KEEP (*(.init)) } >rom =0
-  .plt            : { *(.plt) } >rom 
-  .text           :
-  {
-    *startup-64-001.o(.text)
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } >rom =0
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } >rom =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >rom
-  .rodata1        : { *(.rodata1) } >rom
-
-  /* Data starting here needs to be copied from ROM to the frame buffer. */
-  /* Section .sdata2 is used as the beginning marker of the frame buffer
-     address as well as the start of the data that needs to be copied.   */
-  .sdata2         : AT (ADDR(.rodata1) + SIZEOF(.rodata1))
-                    { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } >frame-buffer
-  .sbss2          : AT (LOADADDR(.sdata2) + SIZEOF(.sdata2))
-                    { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >frame-buffer
-  .eh_frame_hdr   : AT (LOADADDR(.sbss2) + SIZEOF(.sbss2))
-                    { *(.eh_frame_hdr) } >frame-buffer
-  .eh_frame       : AT (LOADADDR(.eh_frame_hdr) + SIZEOF(.eh_frame_hdr))
-                    ONLY_IF_RO { KEEP (*(.eh_frame)) } >frame-buffer 
-  .gcc_except_table : AT (LOADADDR(.eh_frame) + SIZEOF(.eh_frame))
-                    ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >frame-buffer
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(256) + (. & (256 - 1));
-  /* Exception handling */
-  .eh_frame       : AT (LOADADDR(.eh_frame_hdr) + SIZEOF(.eh_frame_hdr))
-                    ONLY_IF_RW { KEEP (*(.eh_frame)) } >frame-buffer 
-  .gcc_except_table : AT (LOADADDR(.eh_frame) + SIZEOF(.eh_frame))
-                    ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >frame-buffer
-  /* Thread Local Storage sections  */
-  .tdata          : AT (LOADADDR(.gcc_except_table) + SIZEOF(.gcc_except_table))
-                    { *(.tdata .tdata.* .gnu.linkonce.td.*) } >frame-buffer
-  .tbss           : AT (LOADADDR(.tdata) + SIZEOF(.tdata))
-                    { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >frame-buffer
-  /* Ensure the __preinit_array_start label is properly aligned.  We
-     could instead move the label definition inside the section, but
-     the linker would then create the section even if it turns out to
-     be empty, which isn't pretty.  */
-  . = ALIGN(32 / 8);
-  PROVIDE (__preinit_array_start = .);
-  .preinit_array  : AT (LOADADDR(.tbss) + SIZEOF(.tbss))
-                    { *(.preinit_array) } >frame-buffer
-  PROVIDE (__preinit_array_end = .);
-  PROVIDE (__init_array_start = .);
-  .init_array     : AT (LOADADDR(.preinit_array) + SIZEOF(.preinit_array))
-                    { *(.init_array) } >frame-buffer
-  PROVIDE (__init_array_end = .);
-  PROVIDE (__fini_array_start = .);
-  .fini_array     : AT (LOADADDR(.init_array) + SIZEOF(.init_array))
-                    { *(.fini_array) } >frame-buffer
-  PROVIDE (__fini_array_end = .);
-  .ctors          : AT (LOADADDR(.fini_array) + SIZEOF(.fini_array))
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin*.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } >frame-buffer
-  .dtors : AT (LOADADDR(.ctors) + SIZEOF(.ctors))
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } >frame-buffer
-  .jcr            : AT (LOADADDR(.dtors) + SIZEOF(.dtors))
-                    { KEEP (*(.jcr)) } >frame-buffer
-  .data.rel.ro    : AT (LOADADDR(.jcr) + SIZEOF(.jcr))
-                    { *(.data.rel.ro.local) *(.data.rel.ro*) } >frame-buffer
-  .dynamic        : AT (LOADADDR(.data.rel.ro) + SIZEOF(.data.rel.ro))
-                    { *(.dynamic) } >frame-buffer
-
-  /* DJK - Re-align the data section from the read-only section. */
-  . = ALIGN(16) + (. & (16 - 1));
-  PROVIDE (_data = .);
-  .data           : AT (LOADADDR(.dynamic) + SIZEOF(.dynamic))
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  } >frame-buffer
-  .data1          : AT (LOADADDR(.data) + SIZEOF(.data))
-                    { *(.data1) } >frame-buffer
-  .got            : AT (LOADADDR(.data1) + SIZEOF(.data1))
-                    { *(.got.plt) *(.got) }
-
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata          : AT (LOADADDR(.got) + SIZEOF(.got))
-                    { *(.sdata .sdata.* .gnu.linkonce.s.*) } >frame-buffer
-  _edata = .;
-  PROVIDE ( edata = . ) ;
-
-  _fbdata_start = LOADADDR(.sdata2) ;
-  _fbdata_end = LOADADDR(.sdata) + SIZEOF(.sdata) - 4 ;
-
-  PROVIDE (__FRAME_BUFFER_START = ADDR(.sdata2));
-  PROVIDE (__FRAME_BUFFER_SIZE = 0x10000);
-  PROVIDE (__FRAME_BUFFER_END = __FRAME_BUFFER_START + __FRAME_BUFFER_SIZE);
-  
-  .sbss           : AT (LOADADDR(.sdata) + SIZEOF(.sdata))
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  } >frame-buffer
-  .bss            : AT (LOADADDR(.sbss) + SIZEOF(.sbss))
-  {
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    /* Align here to ensure that the .bss section occupies space up to
-       _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-    . = ALIGN(32 / 8);
-  } >frame-buffer
-  . = ALIGN(32 / 8);
-  __bss_start = ADDR(.sbss) ;
-  __bss_end = __bss_start + SIZEOF(.sbss) + SIZEOF(.bss) - 4 ;
-  _end = .;
-  PROVIDE (end = .);
-
-  PROVIDE ( _extdata_start = ADDR(.bss) + SIZEOF(.bss));
-  .extdata        : AT ( LOADADDR(.bss) + SIZEOF(.bss))
-  {
-    *(.extdata)
-  }  >ram
-  PROVIDE (_extdata_end = _extdata_start + SIZEOF(.extdata) - 4 );
-
-  .extbss         : AT ( LOADADDR(.extdata) + SIZEOF(.extdata))
-  {
-    _extbss_start = .;
-    *(.extbss);
-    . = ALIGN(4);
-    _extbss_end = .;
-  } >ram
-  . = ALIGN(4);
-
-  PROVIDE (__EXTERNAL_MEMORY_START = 0xc00000);
-
-  .dma :
-  {
-    _dma_start = .;
-    *(.dma)
-    _dma_end = .;
-  } >dma-ram
-
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug         0 : { *(.debug) }
-  .line          0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo 0 : { *(.debug_srcinfo) }
-  .debug_sfnames 0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges 0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info    0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev  0 : { *(.debug_abbrev) }
-  .debug_line    0 : { *(.debug_line) }
-  .debug_frame   0 : { *(.debug_frame) }
-  .debug_str     0 : { *(.debug_str) }
-  .debug_loc     0 : { *(.debug_loc) }
-  .debug_macinfo 0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-
-  PROVIDE (__stack = 0x80fff0);
-
-  .stack (DEFINED(__stack) ? __stack : 0x7FFFF0) :
-  {
-    __stack = .;
-    *(.stack)
-    LONG(0xdeaddead)
-  }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/mt/Makefile.in b/libgloss/mt/Makefile.in
deleted file mode 100644
index 031c864ba..000000000
--- a/libgloss/mt/Makefile.in
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (c) 2001, 2005 Red Hat, Inc.
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-
-# Makefile for libgloss/mt. This is the board support for the Morpho mt.
-
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL = /bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-AR_FLAGS = rc
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-SCRIPTS = 16-002.ld  16-003.ld  64-001.ld ms2.ld
-CRT0 = crt0.o crt0-64-001.o crt0-16-002.o crt0-16-003.o crt0-ms2.o \
-	startup-64-001.o startup-16-002.o startup-16-003.o startup-ms2.o \
-	exit.o exit-64-001.o exit-16-002.o exit-16-003.o exit-ms2.o
-
-SIM_BSP = libsim.a
-SIM_OBJS = access.o chmod.o close.o \
-	fstat.o getpid.o gettime.o isatty.o kill.o lseek.o open.o \
-	read.o sbrk.o stat.o time.o times.o trap.o unlink.o utime.o write.o
-
-#### Host specific Makefile fragment comes in here.
-@host_makefile_frag@
-
-all: $(CRT0) $(SIM_BSP)
-
-$(SIM_BSP): $(SIM_OBJS)
-	$(AR) $(ARFLAGS) $@ $?
-	$(RANLIB) $@
-
-access.o: $(srcdir)/access.c
-chmod.o: $(srcdir)/chmod.c
-close.o: $(srcdir)/close.c
-fstat.o: $(srcdir)/fstat.c
-getpid.o: $(srcdir)/getpid.c
-gettime.o: $(srcdir)/gettime.c
-isatty.o: $(srcdir)/isatty.c
-kill.o: $(srcdir)/kill.c
-lseek.o: $(srcdir)/lseek.c
-open.o: $(srcdir)/open.c
-read.o: $(srcdir)/read.c
-sbrk.o: $(srcdir)/sbrk.c
-stat.o: $(srcdir)/stat.c
-time.o: $(srcdir)/time.c
-times.o: $(srcdir)/times.c
-unlink.o: $(srcdir)/unlink.c
-utime.o: $(srcdir)/utime.c
-write.o: $(srcdir)/write.c
-crt0.o: $(srcdir)/crt0.S
-crt0-16-002.o: $(srcdir)/crt0-16-002.S
-crt0-16-003.o: $(srcdir)/crt0-16-003.S
-crt0-64-001.o: $(srcdir)/crt0-64-001.S
-crt0-ms2.o: $(srcdir)/crt0-ms2.S
-
-trap.o:	$(srcdir)/trap.S
-
-install: $($(CPU)_INSTALL)
-	for c in $(CRT0); do \
-	  $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$c ; \
-	done; 
-	$(INSTALL_DATA) $(SIM_BSP) $(tooldir)/lib${MULTISUBDIR}/$(SIM_BSP)
-	for c in $(SCRIPTS); do \
-	  $(INSTALL_DATA) $(srcdir)/$$c $(tooldir)/lib/$$c ; \
-	done;
-
-clean mostlyclean:
-	rm -f *.o *.a
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.cache config.log config.status
-
-.PHONY: info dvi doc install-info clean-info
-info doc dvi:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/mt/access.c b/libgloss/mt/access.c
deleted file mode 100644
index 8e08b3a7f..000000000
--- a/libgloss/mt/access.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This is file ACCESS.C */
-/*
- * Copyright (C) 1993 DJ Delorie
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms is permitted
- * provided that the above copyright notice and following paragraph are
- * duplicated in all such forms.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-int access(const char *fn, int flags)
-{
-  struct stat s;
-  if (stat(fn, &s))
-    return -1;
-  if (s.st_mode & S_IFDIR)
-    return 0;
-  if (flags & W_OK)
-  {
-    if (s.st_mode & S_IWRITE)
-      return 0;
-    return -1;
-  }
-  return 0;
-}
-	
diff --git a/libgloss/mt/chmod.c b/libgloss/mt/chmod.c
deleted file mode 100644
index 8200506fe..000000000
--- a/libgloss/mt/chmod.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-chmod (const char *path, mode_t mode)
-{
-  return TRAP0 (SYS_chmod, path, mode, 0);
-}
diff --git a/libgloss/mt/close.c b/libgloss/mt/close.c
deleted file mode 100644
index 02ee07287..000000000
--- a/libgloss/mt/close.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-close (int file)
-{
-  return TRAP0 (SYS_close, file, 0, 0);
-}
diff --git a/libgloss/mt/configure b/libgloss/mt/configure
deleted file mode 100755
index 5d272c9f8..000000000
--- a/libgloss/mt/configure
+++ /dev/null
@@ -1,1204 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=crt0.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:744: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:823: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:884: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/mt/configure.in b/libgloss/mt/configure.in
deleted file mode 100644
index 877f6a06e..000000000
--- a/libgloss/mt/configure.in
+++ /dev/null
@@ -1,90 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(crt0.S)
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
diff --git a/libgloss/mt/crt0-16-002.S b/libgloss/mt/crt0-16-002.S
deleted file mode 100644
index ac2727e66..000000000
--- a/libgloss/mt/crt0-16-002.S
+++ /dev/null
@@ -1,111 +0,0 @@
-; crt0_2.s - Startup code for the mrisc1. This code initializes the C
-;              run-time model.
-;
-; Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-;
-;  The authors hereby grant permission to use, copy, modify, distribute,
-;  and license this software and its documentation for any purpose, provided
-;  that existing copyright notices are retained in all copies and that this
-;  notice is included verbatim in any distributions. No written agreement,
-;  license, or royalty fee is required for any of the authorized uses.
-;  Modifications to this software may be copyrighted by their authors
-;  and need not follow the licensing terms described here, provided that
-;  the new terms are clearly indicated on the first page of each file where
-;  they apply.
-;
-
-	; Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.text
-	.global	_start
-_start:
-	;; Initialize the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-	;; Zero the bss space
-	ldui	r9, #%hi16(__bss_start)
-	addui	r9, r9, #%lo16(__bss_start)
-	ldui	r10, #%hi16(__bss_end)
-	addui	r10, r10, #%lo16(__bss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext1
-	or	r0, r0, r0
-.Lcpy0:	
-	stw	r0, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .Lcpy0
-	or	r0, r0, r0	; nop
-
-.Lnext1:
-	;; Copy data from ROM to Frame Buffer (on-chip memory)
-	ldui	r9, #%hi16(_fbdata_start)
-	ori	r9, r9, #%lo16(_fbdata_start)
-	ldui	r10, #%hi16(_fbdata_end)
-	ori	r10, r10, #%lo16(_fbdata_end)
-	ldui	r11, #%hi16(_fbdata_vma)
-	brle	r10, r9, .Lnext2
-	ori	r11, r11, #%lo16(_fbdata_vma)
-.Lcpy1:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy1
-	addi	r11, r11, #$4
-
-.Lnext2:
-	;; Zero the frame buffer bss section
-        ldui    r9, #%hi16(_fbbss_start)
-        ori     r9, r9, #%lo16(_fbbss_start)
-        ldui    r10, #%hi16(_fbbss_end)
-        ori     r10, r10, #%lo16(_fbbss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext3
-	or	r0, r0, r0
-.Lcpy2:
-        stw     r0, r9, #$0
-        addi    r9, r9, #$4
-        or      r0, r0, r0
-        brle    r9, r10, .Lcpy2
-        or      r0, r0, r0
-
-.Lnext3:
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	ori	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	ori	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; DJK - Added 12Nov01. Pass main's return value to exit.
-	or	r1, r11, r0
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	ori	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Exit does not return, however, this code is to catch an
-	;;   error if it does. Set the processor into sleep mode.
-	ori	r1, r0, #$1
-	stw	r1, r0, #%lo16(_DEBUG_HALT_REG)
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-.Lend:
-	jmp .Lend
-	or	r0, r0, r0
diff --git a/libgloss/mt/crt0-16-003.S b/libgloss/mt/crt0-16-003.S
deleted file mode 100644
index bd88bcc54..000000000
--- a/libgloss/mt/crt0-16-003.S
+++ /dev/null
@@ -1,112 +0,0 @@
-; crt0.s - Startup code for the mrisc1. This code initializes the C
-;              run-time model.
-;
-;
-; Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-;
-;  The authors hereby grant permission to use, copy, modify, distribute,
-;  and license this software and its documentation for any purpose, provided
-;  that existing copyright notices are retained in all copies and that this
-;  notice is included verbatim in any distributions. No written agreement,
-;  license, or royalty fee is required for any of the authorized uses.
-;  Modifications to this software may be copyrighted by their authors
-;  and need not follow the licensing terms described here, provided that
-;  the new terms are clearly indicated on the first page of each file where
-;  they apply.
-;
-
-	; Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.text
-	.global	_start
-_start:
-	;; Initialize the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-	;; Zero the bss space
-	ldui	r9, #%hi16(__bss_start)
-	addui	r9, r9, #%lo16(__bss_start)
-	ldui	r10, #%hi16(__bss_end)
-	addui	r10, r10, #%lo16(__bss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext1
-	or	r0, r0, r0
-.Lcpy0:	
-	stw	r0, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .Lcpy0
-	or	r0, r0, r0	; nop
-
-.Lnext1:
-	;; Copy data from ROM to Frame Buffer (on-chip memory)
-	ldui	r9, #%hi16(_fbdata_start)
-	ori	r9, r9, #%lo16(_fbdata_start)
-	ldui	r10, #%hi16(_fbdata_end)
-	ori	r10, r10, #%lo16(_fbdata_end)
-	ldui	r11, #%hi16(_fbdata_vma)
-	brle	r10, r9, .Lnext2
-	ori	r11, r11, #%lo16(_fbdata_vma)
-.Lcpy1:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy1
-	addi	r11, r11, #$4
-
-.Lnext2:
-	;; Zero the frame buffer bss section
-        ldui    r9, #%hi16(_fbbss_start)
-        ori     r9, r9, #%lo16(_fbbss_start)
-        ldui    r10, #%hi16(_fbbss_end)
-        ori     r10, r10, #%lo16(_fbbss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext3
-	or	r0, r0, r0
-.Lcpy2:
-        stw     r0, r9, #$0
-        addi    r9, r9, #$4
-        or      r0, r0, r0
-        brle    r9, r10, .Lcpy2
-        or      r0, r0, r0
-
-.Lnext3:
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	ori	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	ori	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; DJK - Added 12Nov01. Pass main's return value to exit.
-	or	r1, r11, r0
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	ori	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Exit does not return, however, this code is to catch an
-	;;   error if it does. Set the processor into sleep mode.
-	ori	r1, r0, #$1
-	stw	r1, r0, #%lo16(_DEBUG_HALT_REG)
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-.Lend:
-	jmp .Lend
-	or	r0, r0, r0
diff --git a/libgloss/mt/crt0-64-001.S b/libgloss/mt/crt0-64-001.S
deleted file mode 100644
index b78e7808e..000000000
--- a/libgloss/mt/crt0-64-001.S
+++ /dev/null
@@ -1,144 +0,0 @@
-; crt0_2.s - Startup code for the mrisc1. This code initializes the C
-;              run-time model.
-;
-; 12Nov01 (DJK) - The return code from main was not being passed to exit().
-;                   Now it is passed as a parameter in R1.
-;
-; 10Sep01 (DJK) - The function exit() does not return. However, in the
-;                   the case of device error (if the halt bit does not
-;                   function properly, for instance), then a catch loop
-;                   has been added.
-;
-;
-; Copyright 2001, 2002, 2003, 2004 Morpho Technologies, Inc.
-;
-
-	; Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.equ	HALT_REG, 0x300
-	.section .text
-	.global	_start
-_start:
-	;; Initialize the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-
-	;; Copy data from ROM to Frame Buffer (on-chip memory)
-	ldui	r9, #%hi16(_fbdata_start)
-	ori	r9, r9, #%lo16(_fbdata_start)
-	ldui	r10, #%hi16(_fbdata_end)
-	ori	r10, r10, #%lo16(_fbdata_end)
-	ldui	r11, #%hi16(__FRAME_BUFFER_START)
-	brle	r10, r9, .Lnext1
-	ori	r11, r11, #%lo16(__FRAME_BUFFER_START)
-.Lcpy0:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy0
-	addi	r11, r11, #$4
-
-.Lnext1:
-	;; Copy data from ROM to External Memory (off-chip memory)
-	ldui	r9, #%hi16(_extdata_start)
-	ori	r9, r9, #%lo16(_extdata_start)
-	ldui	r10, #%hi16(_extdata_end)
-	ori	r10, r10, #%lo16(_extdata_end)
-	ldui	r11, #%hi16(__EXTERNAL_MEMORY_START)
-	brle	r10, r9, .Lnext2
-	ori	r11, r11, #%lo16(__EXTERNAL_MEMORY_START)
-.Lcpy1:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy1
-	addi	r11, r11, #$4
-
-
-.Lnext2:
-	;; Zero the bss space
-	ldui	r9, #%hi16(__bss_start)
-	addui	r9, r9, #%lo16(__bss_start)
-	ldui	r10, #%hi16(__bss_end)
-	addui	r10, r10, #%lo16(__bss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext3
-	or	r0, r0, r0
-.Lcpy2:	
-	stw	r0, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .Lcpy2
-	or	r0, r0, r0	; nop
-
-.Lnext3:
-	;; Zero the external memory bss section
-        ldui    r9, #%hi16(_extbss_start)
-        ori     r9, r9, #%lo16(_extbss_start)
-        ldui    r10, #%hi16(_extbss_end)
-        ori     r10, r10, #%lo16(_extbss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext4
-	or	r0, r0, r0
-.Lcpy3:
-        stw     r0, r9, #$0
-        addi    r9, r9, #$4
-        or      r0, r0, r0
-        brle    r9, r10, .Lcpy3
-        or      r0, r0, r0
-
-.Lnext4:
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	ori	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;;  Setup destructors to be called from exit.
-	;;  (Just in case main never returns....)
-	ldui	r10, #%hi16(atexit)
-	ori	r10, r10, #%lo16(atexit)
-	ldui	r1, #%hi16(_fini)
-	ori	r1, r1, #%lo16(_fini)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;;  Initialise argc, argv and envp to empty
-	addi	r1, r0, #0
-	addi	r2, r0, #0
-	addi	r3, r0, #0
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	ori	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; DJK - Added 12Nov01. Pass main's return value to exit.
-	or	r1, r11, r0
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	ori	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Exit does not return, however, this code is to catch an
-	;;   error if it does. Set the processor into sleep mode.
-	ori	r1, r0, #$1
-	stw	r1, r0, #HALT_REG
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-.Lend:
-	jmp .Lend
-	or	r0, r0, r0
diff --git a/libgloss/mt/crt0-ms2.S b/libgloss/mt/crt0-ms2.S
deleted file mode 100644
index 2efaebdea..000000000
--- a/libgloss/mt/crt0-ms2.S
+++ /dev/null
@@ -1,121 +0,0 @@
-; crt0.s - Startup code for the ms2. This code initializes the C
-;              run-time model.
-;
-;
-; Copyright 2001, 2002, 2003, 2004 Morpho Technologies
-;
-
-	; Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.text
-	.global	_start
-_start:
-	;; Initialize the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-	;; Zero the bss space
-	ldui	r9, #%hi16(__bss_start)
-	addui	r9, r9, #%lo16(__bss_start)
-	ldui	r10, #%hi16(__bss_end)
-	addui	r10, r10, #%lo16(__bss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext1
-	or	r0, r0, r0
-.Lcpy0:	
-	stw	r0, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .Lcpy0
-	or	r0, r0, r0	; nop
-
-.Lnext1:
-	;; Copy data from ROM to Frame Buffer (on-chip memory)
-	ldui	r9, #%hi16(_fbdata_start)
-	ori	r9, r9, #%lo16(_fbdata_start)
-	ldui	r10, #%hi16(_fbdata_end)
-	ori	r10, r10, #%lo16(_fbdata_end)
-	ldui	r11, #%hi16(_fbdata_vma)
-	brle	r10, r9, .Lnext2
-	ori	r11, r11, #%lo16(_fbdata_vma)
-.Lcpy1:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy1
-	addi	r11, r11, #$4
-
-.Lnext2:
-	;; Zero the frame buffer bss section
-        ldui    r9, #%hi16(_fbbss_start)
-        ori     r9, r9, #%lo16(_fbbss_start)
-        ldui    r10, #%hi16(_fbbss_end)
-        ori     r10, r10, #%lo16(_fbbss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext3
-	or	r0, r0, r0
-.Lcpy2:
-        stw     r0, r9, #$0
-        addi    r9, r9, #$4
-        or      r0, r0, r0
-        brle    r9, r10, .Lcpy2
-        or      r0, r0, r0
-
-.Lnext3:
-	;; Copy data from ROM to SRAM (another on-chip memory)
-	ldui	r9, #%hi16(_sram_data_start)
-	ori	r9, r9, #%lo16(_sram_data_start)
-	ldui	r10, #%hi16(_sram_data_end)
-	ori	r10, r10, #%lo16(_sram_data_end)
-	ldui	r11, #%hi16(_sram_data_vma)
-	brle	r10, r9, .Lnext4
-	ori	r11, r11, #%lo16(_sram_data_vma)
-.Lcpy3:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy3
-	addi	r11, r11, #$4
-
-.Lnext4:
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	ori	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	or	r0, r0, r0	; nop, added 06Sep05
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	ori	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	or	r0, r0, r0	; nop, added 06Sep05
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; DJK - Added 12Nov01. Pass main's return value to exit.
-	or	r1, r11, r0
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	ori	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	or	r0, r0, r0	; nop, added 06Sep05
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Exit does not return, however, this code is to catch an
-	;;   error if it does. Set the processor into sleep mode.
-	ori	r1, r0, #$1
-	stw	r1, r0, #%lo16(_DEBUG_HALT_REG)
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-.Lend:
-	jmp .Lend
-	or	r0, r0, r0
diff --git a/libgloss/mt/crt0.S b/libgloss/mt/crt0.S
deleted file mode 100644
index ba5249e01..000000000
--- a/libgloss/mt/crt0.S
+++ /dev/null
@@ -1,63 +0,0 @@
-# Startup Code for the Morpho mt
-
-# Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.section .text
-	.global	_start
-_start:
-	
-	;; Initialise the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-
-	;; Zero the data space
-	ldui	r9, #%hi16(_edata)
-	addui	r9, r9, #%lo16(_edata)
-	ldui	r10, #%hi16(_end)
-	addui	r10, r10, #%lo16(_end)
-	addi	r5,  r0, #0
-
-.L0:	
-	stw	r5, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .L0
-	or	r0, r0, r0	; nop
-
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	addui	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-	;;  Setup destructors to be called from exit.
-	;;  (Just in case main never returns....)
-	ldui	r10, #%hi16(atexit)
-	addui	r10, r10, #%lo16(atexit)
-	ldui	r1, #%hi16(_fini)
-	addui	r1, r1, #%lo16(_fini)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;;  Initialise argc, argv and envp to empty
-	addi	r1, r0, #0
-	addi	r2, r0, #0
-	addi	r3, r0, #0
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	addui	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	addui	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
diff --git a/libgloss/mt/exit-16-002.c b/libgloss/mt/exit-16-002.c
deleted file mode 100644
index ba048d977..000000000
--- a/libgloss/mt/exit-16-002.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-void _exit (n)
-{
-  /* Set bit #0 in the _DEBUG_HALT_REG to trigger program exit to
-     the simulator. (The simulator will return a SIGQUIT signal.)  */
-  asm("ori r1, r0, #$1\n");
-  asm("stw r1, r0, #$fffff300\n");
-}
diff --git a/libgloss/mt/exit-16-003.c b/libgloss/mt/exit-16-003.c
deleted file mode 100644
index ba048d977..000000000
--- a/libgloss/mt/exit-16-003.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-void _exit (n)
-{
-  /* Set bit #0 in the _DEBUG_HALT_REG to trigger program exit to
-     the simulator. (The simulator will return a SIGQUIT signal.)  */
-  asm("ori r1, r0, #$1\n");
-  asm("stw r1, r0, #$fffff300\n");
-}
diff --git a/libgloss/mt/exit-64-001.c b/libgloss/mt/exit-64-001.c
deleted file mode 100644
index 97c7b8ce7..000000000
--- a/libgloss/mt/exit-64-001.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-void _exit (n)
-{
-  /* Set bit #0 in the _DEBUG_HALT_REG to trigger program exit to
-     the simulator. (The simulator will return a SIGQUIT signal.)  */
-  asm("ori r1, r0, #$1\n");
-  asm("stw r1, r0, #$300\n");
-}
diff --git a/libgloss/mt/exit-ms2.c b/libgloss/mt/exit-ms2.c
deleted file mode 100644
index 93a3f852b..000000000
--- a/libgloss/mt/exit-ms2.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-void _exit (n)
-{
-  // Set bit #0 in the _DEBUG_HALT_REG to trigger program exit to
-  // the simulator. (The simulator will return a SIGQUIT signal.)
-  asm("ori r1, r0, #$1\n");
-  asm("stw r1, r0, #$fffff300\n");
-}  // exit
diff --git a/libgloss/mt/exit.c b/libgloss/mt/exit.c
deleted file mode 100644
index cc7983b3f..000000000
--- a/libgloss/mt/exit.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-void _exit (n)
-{
-  TRAP0 (SYS_exit, n, 0, 0);
-}
diff --git a/libgloss/mt/fstat.c b/libgloss/mt/fstat.c
deleted file mode 100644
index 1d7d2dcf5..000000000
--- a/libgloss/mt/fstat.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-fstat (int file,
-	struct stat *st)
-{
-  st->st_mode = S_IFCHR;
-  st->st_blksize = 4096;
-  return 0;
-}
diff --git a/libgloss/mt/getpid.c b/libgloss/mt/getpid.c
deleted file mode 100644
index 8d686b86a..000000000
--- a/libgloss/mt/getpid.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-getpid (n)
-{
-  return 1;
-}
diff --git a/libgloss/mt/gettime.c b/libgloss/mt/gettime.c
deleted file mode 100644
index 1a0426744..000000000
--- a/libgloss/mt/gettime.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-#include "sys/time.h"
-
-
-int
-_gettimeofday (struct timeval *tp, void *tzp)
-{
-  return TRAP0 (SYS_gettimeofday, tp, tzp, 0);
-}
diff --git a/libgloss/mt/isatty.c b/libgloss/mt/isatty.c
deleted file mode 100644
index 0930a531e..000000000
--- a/libgloss/mt/isatty.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-isatty (fd)
-     int fd;
-{
-  return 1;
-}
diff --git a/libgloss/mt/kill.c b/libgloss/mt/kill.c
deleted file mode 100644
index e8ea43769..000000000
--- a/libgloss/mt/kill.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-kill (n, m)
-{
-  return TRAP0 (SYS_exit, 0xdead, 0, 0);
-}
-
diff --git a/libgloss/mt/lseek.c b/libgloss/mt/lseek.c
deleted file mode 100644
index 783909104..000000000
--- a/libgloss/mt/lseek.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/unistd.h>
-#include "trap.h"
-
-
-off_t
-lseek (int file,
-	off_t ptr,
-	int dir)
-{
-  return TRAP0 (SYS_lseek, file, ptr, dir);
-}
diff --git a/libgloss/mt/ms2.ld b/libgloss/mt/ms2.ld
deleted file mode 100644
index 3dac307af..000000000
--- a/libgloss/mt/ms2.ld
+++ /dev/null
@@ -1,271 +0,0 @@
-OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
-OUTPUT_ARCH(mt)
-ENTRY(__boot_start)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY
-{
-  ram (rwx) : ORIGIN = 0x0, LENGTH = 16M
-  sram (wx) : ORIGIN = 0xfef00000, LENGTH = 64K
-  frame-buffer (w) : ORIGIN = 0xff000000, LENGTH = 80K
-  dma-ram (w) : ORIGIN = 0x1000000, LENGTH = 32M
-  ports (w) : ORIGIN = 0xfffff000, LENGTH = 4K
-}
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0x0;
-  PROVIDE(__executable_start = 0x0);
-  .interp         : { *(.interp) }
-  .hash           : { *(.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.init       : { *(.rel.init) }
-  .rela.init      : { *(.rela.init) }
-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rel.fini       : { *(.rel.fini) }
-  .rela.fini      : { *(.rela.fini) }
-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rel.data.rel.ro  : { *(.rel.data.rel.ro*) }
-  .rela.data.rel.ro : { *(.rela.data.rel.ro*) }
-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rel.tdata      : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-  .rela.tdata     : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rel.tbss       : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-  .rela.tbss      : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rel.ctors      : { *(.rel.ctors) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rel.dtors      : { *(.rel.dtors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rel.got        : { *(.rel.got) }
-  .rela.got       : { *(.rela.got) }
-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-
-  .startup        : { *startup-16-003.o(.startup) } >ram =0
-  . = 0x40;
-
-  .init           : { KEEP (*(.init)) } >ram =0
-  .plt            : { *(.plt) } >ram
-  .text           :
-  {
-    *startup-16-004.o(.text);
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } >ram =0
-  .fini           : { KEEP (*(.fini)) } >ram =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >ram
-  .rodata1        : { *(.rodata1) } >ram
-  .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } >ram
-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >ram
-  .eh_frame_hdr   : { *(.eh_frame_hdr) } >ram
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(256) + (. & (256 - 1));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table   : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Thread Local Storage sections  */
-  .tdata          : { *(.tdata .tdata.* .gnu.linkonce.td.*) } >ram
-  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >ram
-  /* Ensure the __preinit_array_start label is properly aligned.  We
-     could instead move the label definition inside the section, but
-     the linker would then create the section even if it turns out to
-     be empty, which isn't pretty.  */
-  . = ALIGN(32 / 8);
-  PROVIDE (__preinit_array_start = .);
-  .preinit_array  : { *(.preinit_array) } >ram
-  PROVIDE (__preinit_array_end = .);
-  PROVIDE (__init_array_start = .);
-  .init_array     : { *(.init_array) } >ram
-  PROVIDE (__init_array_end = .);
-  PROVIDE (__fini_array_start = .);
-  .fini_array     : { *(.fini_array) } >ram
-  PROVIDE (__fini_array_end = .);
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } >ram
-  .dtors          :
-  {
-    KEEP (*crtbegin*.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } >ram
-  .jcr            : { KEEP (*(.jcr)) } >ram
-  .data.rel.ro    : { *(.data.rel.ro.local) *(.data.rel.ro*) } >ram
-  .dynamic        : { *(.dynamic) } >ram
-
-  /* DJK - Re-align the data section from the read-only section. */
-  . = ALIGN(16) + (. & (16 - 1));
-  PROVIDE (_data = .);
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  } >ram
-  .data1          : { *(.data1) } >ram
-  .got            : { *(.got.plt) *(.got) } >ram
-
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata          : { *(.sdata .sdata.* .gnu.linkonce.s.*) } >ram
-  _edata = .;
-  PROVIDE ( edata = . );
-  .sbss           :
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  } >ram
-  .bss            :
-  {
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    /* Align here to ensure that the .bss section occupies space up to
-       _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-    . = ALIGN(32 / 8);
-  } >ram
-  . = ALIGN(32 / 8);
-  __bss_start = ADDR ( .sbss ) ;
-  __bss_end = __bss_start + SIZEOF ( .sbss ) + SIZEOF ( .bss ) - 4 ;
-  _end = .;
-  PROVIDE (end = .);
-
-  /* DJK - Initialized frame buffer data is copied from RAM to FB. */
-  .auxbss         : AT (ADDR(.bss) + SIZEOF(.bss)) { *(.auxbss) } >frame-buffer
-  .auxdata        : AT (LOADADDR(.auxbss) + SIZEOF(.auxbss))
-  {
-    *(.auxdata.bank0)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank1)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank2)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank3)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank4)
-    *(.auxdata)
-  } >frame-buffer
-
-  _fbbss_start = ADDR ( .auxbss );
-  _fbbss_end = _fbbss_start + SIZEOF ( .auxbss ) - 4;
-  _fbdata_start = LOADADDR ( .auxdata );
-  _fbdata_end = _fbdata_start + SIZEOF ( .auxdata ) ;
-  _fbdata_vma = ADDR ( .auxdata );
-
-  PROVIDE (__FRAME_BUFFER_START = ADDR(.auxbss) );
-  PROVIDE (__FRAME_BUFFER_SIZE = 0x14000);
-  PROVIDE (__FRAME_BUFFER_END = __FRAME_BUFFER_START + __FRAME_BUFFER_SIZE);
-
-  /* For now, locate data ahead of code in onchip sram/memory. */
-  .sram           : AT (LOADADDR(.auxdata) + SIZEOF(.auxdata))
-  {
-    *(.sram.data)
-    . = ALIGN(4) ; /* Make sure that instructions are aligned... */
-    *(.sram.text)
-  } >sram
-  
-  _sram_data_start = LOADADDR ( .sram );
-  _sram_data_end = _sram_data_start + SIZEOF ( .sram ) ;
-  _sram_data_vma = ADDR ( .sram );
-
-  .dma            : { _dma_start = .; *(.dma) _dma_end = .; } >dma-ram
-  .internal_io (NOLOAD) : { *(.internal_io) } >ports
-
-  /* Stabs debugging sections.  */
-  .stab            0 : { *(.stab) }
-  .stabstr         0 : { *(.stabstr) }
-  .stab.excl       0 : { *(.stab.excl) }
-  .stab.exclstr    0 : { *(.stab.exclstr) }
-  .stab.index      0 : { *(.stab.index) }
-  .stab.indexstr   0 : { *(.stab.indexstr) }
-  .comment         0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug           0 : { *(.debug) }
-  .line            0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo   0 : { *(.debug_srcinfo) }
-  .debug_sfnames   0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges   0 : { *(.debug_aranges) }
-  .debug_pubnames  0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info      0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev    0 : { *(.debug_abbrev) }
-  .debug_line      0 : { *(.debug_line) }
-  .debug_frame     0 : { *(.debug_frame) }
-  .debug_str       0 : { *(.debug_str) }
-  .debug_loc       0 : { *(.debug_loc) }
-  .debug_macinfo   0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-  /* In a multi-core environment, each core is given its own stack space
-     equal to __stack_size, growing downwards. */
-  PROVIDE (__stack = 0x97ff0);
-  PROVIDE (__stack_size = 0x800);
-
-  .stack (DEFINED(__stack) ? __stack : 0x007ffff0) :
-  {
-     __stack = .;
-    *(.stack)
-    LONG(0xdeaddead)
-  }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/mt/open.c b/libgloss/mt/open.c
deleted file mode 100644
index d727bdd9f..000000000
--- a/libgloss/mt/open.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-open (const char *path, int flags, int mode)
-{
-  return TRAP0 (SYS_open, path, flags, mode);
-}
diff --git a/libgloss/mt/read.c b/libgloss/mt/read.c
deleted file mode 100644
index e7f37fafa..000000000
--- a/libgloss/mt/read.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-read (int file,
-       char *ptr,
-       size_t len)
-{
-  return TRAP0 (SYS_read, file, ptr, len);
-}
diff --git a/libgloss/mt/sbrk.c b/libgloss/mt/sbrk.c
deleted file mode 100644
index 1f959c084..000000000
--- a/libgloss/mt/sbrk.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-caddr_t
-sbrk (size_t incr)
-{
-  extern char end;		/* Defined by the linker */
-  static char *heap_end;
-  char *prev_heap_end;
-
-  char *sp = (char *) &sp;
-
-  if (heap_end == 0)
-    {
-      heap_end = &end;
-    }
-  prev_heap_end = heap_end;
-  heap_end += incr;
-
-  return (caddr_t) prev_heap_end;
-}
diff --git a/libgloss/mt/startup-16-002.S b/libgloss/mt/startup-16-002.S
deleted file mode 100644
index 475a120bd..000000000
--- a/libgloss/mt/startup-16-002.S
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * interrupt_vectors.s -- the interrupt handler jump table. 
- *
- *
- * There are a total of 32 interrupt vector possible, however, only
- *   11 of those are currently used (the others are reserved). The
- *   order of vectors is as follows:
- *
- *     1. Boot Vector. Vector for power-on/reset.
- *     2. Software Vector. Vector for handling the SI instruction (an
- *          explicit interrupt caused by software).
- *     3. Break Vector. Vector for handling the Break instruction.
- *     4. Device 0 Vector. Service vector for device zero. 
- *     5. Device 1 Vector. Service vector for device one. 
- *     6. Device 2 Vector. Service vector for device two. 
- *     7. Device 3 Vector. Service vector for device three. 
- *     8. Device 4 Vector. Service vector for device four. 
- *     9. Device 5 Vector. Service vector for device five. 
- *    10. Device 6 Vector. Service vector for device six. 
- *    11. Device 7 Vector. Service vector for device seven. 
- *
- *   The rest of the interrupt vectors are reserved for future use.
- *
- *
- * Each jump table entry consists of the following two instructions:
- *
- *   jmp Label		; Label as appropriate
- *   nop 		; implemented as or r0,r0,r0
- *
- *   The following labels are reserved for the vectors named above,
- *   respectively:
- *
- *     _BOOTIVEC, _SOFTIVEC, _BRKIVEC, _DEV0IVEC, _DEV1IVEC, _DEV2IVEC,
- *     _DEV3IVEC, _DEV4IVEC, _DEV5IVEC, _DEV6IVEC, _DEV7IVEC
- *
- *
- *
- * Copyright (c) 2001, 2002, 2003, 2004 Morpho Technologies
- *
- */
-
-	.section .startup, "a", @progbits
-	.global __boot_start
-__boot_start:
-_INTERRUPT_VECTOR_TABLE:
-	jmp	_BOOTIVEC		; Boot vector
-	or	r0, r0, r0
-	jmp	_SOFTIVEC		; Vector for SI instruction
-	or	r0,r0,r0
-	jmp	_BRKIVEC		; Vector for Break instruction
-	or	r0,r0,r0
-	; The illegal instruction trap is not implemented.
-_RESERVED1_IVEC:
-        jmp	_RESERVED1_IVEC		; Vector for illegal instruction
-        or	r0,r0,r0
-	jmp	_OVFIVEC		; Vector for overflow exception
-	or	r0,r0,r0
-_RESERVED2_IVEC:
-        jmp	_RESERVED2_IVEC
-        or	r0,r0,r0
-_RESERVED3_IVEC:
-        jmp	_RESERVED3_IVEC
-        or	r0,r0,r0
-_RESERVED4_IVEC:
-        jmp	_RESERVED4_IVEC
-        or	r0,r0,r0
-
-	.text
-
-	.equ SI_IOPORT_ADR, _DEBUG_SW_SYSREQ_REG
-	.equ SI_IOPORT_BIT, 0x1
-	.equ BRK_IOPORT_ADR, _DEBUG_BREAK_REG
-	.equ BRK_IOPORT_BIT, 0x1
-
-	.global _BOOTIVEC
-_BOOTIVEC:
-	; Initialize the interrupt controller's interrupt vector registers
-	ldui	r1, #%hi16(_IVEC_DEFAULT)
-	ori	r1, r1, #%lo16(_IVEC_DEFAULT)
-	stw	r1, r0, #%lo16(_DEV0_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV1_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV2_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV3_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV4_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV5_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV6_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV7_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV8_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV9_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV10_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV11_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV12_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV13_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV14_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV15_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV16_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV17_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV18_INTERRUPT_REG)
-
-	; Statically initialized data must be copied from ROM to RAM.
-	; This is done in the C run-time start-up code (crt0.o).
-
-	; Jump to the beginning of the application and enable interrupts.
-	jmp	_start
-	ei
-
-
-
-	; Handler for the SI instruction. To perform a system call, the
-	; C model uses a trapping mechanism which executes an SI instruction.
-	; The Morpho Technologies simulator simply performs a branch to
-	; this vector to simulate the SI instruction (this is as the hardware
-	; behaves). In order to trigger the simulator that a system call
-	; is needed a write into the I/O register at address $40005 to
-	; set bit #2 (0x4) is necessary.
-	;
-	; The above address has been changed to 0x00031C and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	.global _SOFTIVEC
-_SOFTIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(SI_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(SI_IOPORT_ADR)
-	ori	r10, r0, #SI_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0	; SYS_call is handled by simulator here...
-	ldw	r10, sp, #$0
-	or	r0, r0, r0
-	ldw	r9, sp, #$4
-	reti	r14
-	addi	sp, sp, #$8
-
-
-
-	; Handler for BREAK instruction. This handler triggers the simulator
-	; to send a SIGTRAP signal to gdb by writing to the I/O register at
-	; address $40005, setting bit #0 (0x1).
-	;
-	; The above address has been changed to 0x000304 and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	.global _BRKIVEC
-_BRKIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(BRK_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(BRK_IOPORT_ADR)
-	ori	r10, r0, #BRK_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	ldw	r9, sp, #$4
-	reti	r15
-	addi	sp, sp, #$8
-
-
-	; The documentation is lacking in the specification of the Overflow
-	;   Exception generation. The address of the instruction causing the
-	;   overflow is placed into R15 and the overflow exception interrupt
-	;   is triggered. So, to continue execution, return to the address
-	;   of the next instruction (i.e., R15 + one instruction).
-_OVFIVEC:
-	addi    r15, r15, #$4
-	or      r0, r0, r0
-	reti    r15
-	or      r0, r0, r0
-
-
-	.global _IVEC_DEFAULT
-_IVEC_DEFAULT:
-	reti	r15
-	or	r0, r0, r0
-
-
-	.section .internal_io, "a", @progbits
-	.fill 256		; Fill the first page.
-
-	; This is the memory-mapped I/O region.
-
-	; Hardware Interrupt Registers
-	;.org 0xfff100
-	.global _DEV0_INTERRUPT_REG
-_DEV0_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV1_INTERRUPT_REG
-_DEV1_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV2_INTERRUPT_REG
-_DEV2_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV3_INTERRUPT_REG
-_DEV3_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV4_INTERRUPT_REG
-_DEV4_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV5_INTERRUPT_REG
-_DEV5_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV6_INTERRUPT_REG
-_DEV6_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV7_INTERRUPT_REG
-_DEV7_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV8_INTERRUPT_REG
-_DEV8_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV9_INTERRUPT_REG
-_DEV9_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV10_INTERRUPT_REG
-_DEV10_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV11_INTERRUPT_REG
-_DEV11_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV12_INTERRUPT_REG
-_DEV12_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV13_INTERRUPT_REG
-_DEV13_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV14_INTERRUPT_REG
-_DEV14_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV15_INTERRUPT_REG
-_DEV15_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV16_INTERRUPT_REG
-_DEV16_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV17_INTERRUPT_REG
-_DEV17_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV18_INTERRUPT_REG
-_DEV18_INTERRUPT_REG:
-	.word 0x00000000
-
-	; 128 bytes minus ten registers (four bytes per register)
-	.fill (128 - 19 * 4)
-
-	.global	_INTERRUPT_MASK_REG
-_INTERRUPT_MASK_REG:
-	.word 0x00000000
-
-	; 128 bytes minus one register (four bytes per register)
-	.fill (128 - 1 * 4)
-
-
-	;.org 0xfff200
-	; MorphoSys Decoder Registers
-	.global _MS_DEC_CIRC_BUFF_SEL_REG
-_MS_DEC_CIRC_BUFF_SEL_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_SKIP_FACTOR_REG
-_MS_DEC_SKIP_FACTOR_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CUSTOM_PERM_REG
-_MS_DEC_CUSTOM_PERM_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CTXT_BASE_REG
-_MS_DEC_CTXT_BASE_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_LOOKUP_TBL_REG
-_MS_DEC_LOOKUP_TBL_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF0_END_REG
-_MS_CIRC_BUFF0_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF0_SIZE_REG
-_MS_CIRC_BUFF0_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK0_END_REG
-_MS_DATA_BLK0_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK0_SIZE_REG
-_MS_DATA_BLK0_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF1_END_REG
-_MS_CIRC_BUFF1_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF1_SIZE_REG
-_MS_CIRC_BUFF1_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK1_END_REG
-_MS_DATA_BLK1_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK1_SIZE_REG
-_MS_DATA_BLK1_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF2_END_REG
-_MS_CIRC_BUFF2_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF2_SIZE_REG
-_MS_CIRC_BUFF2_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK2_END_REG
-_MS_DATA_BLK2_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK2_SIZE_REG
-_MS_DATA_BLK2_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF3_END_REG
-_MS_CIRC_BUFF3_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF3_SIZE_REG
-_MS_CIRC_BUFF3_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK3_END_REG
-_MS_DATA_BLK3_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK3_SIZE_REG
-_MS_DATA_BLK3_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF4_END_REG
-_MS_CIRC_BUFF4_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF4_SIZE_REG
-_MS_CIRC_BUFF4_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK4_END_REG
-_MS_DATA_BLK4_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK4_SIZE_REG
-_MS_DATA_BLK4_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF5_END_REG
-_MS_CIRC_BUFF5_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF5_SIZE_REG
-_MS_CIRC_BUFF5_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK5_END_REG
-_MS_DATA_BLK5_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK5_SIZE_REG
-_MS_DATA_BLK5_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF6_END_REG
-_MS_CIRC_BUFF6_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF6_SIZE_REG
-_MS_CIRC_BUFF6_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK6_END_REG
-_MS_DATA_BLK6_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK6_SIZE_REG
-_MS_DATA_BLK6_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF7_END_REG
-_MS_CIRC_BUFF7_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF7_SIZE_REG
-_MS_CIRC_BUFF7_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK7_END_REG
-_MS_DATA_BLK7_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK7_SIZE_REG
-_MS_DATA_BLK7_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC0_REG
-_MS_DEC_AUTO_INC0_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC1_REG
-_MS_DEC_AUTO_INC1_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC2_REG
-_MS_DEC_AUTO_INC2_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC3_REG
-_MS_DEC_AUTO_INC3_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC4_REG
-_MS_DEC_AUTO_INC4_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC5_REG
-_MS_DEC_AUTO_INC5_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC6_REG
-_MS_DEC_AUTO_INC6_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC7_REG
-_MS_DEC_AUTO_INC7_REG:
-	.word 0x00000000
-
-
-	; 256 bytes minus forty-five registers (four bytes per register)
-	.fill (256 - 45 * 4)
-
-
-
-	;.org 0xfff300
-	; Debug Registers
-	.global _DEBUG_HALT_REG
-_DEBUG_HALT_REG:
-	.word 0x00000000
-
-	.global _DEBUG_BREAK_REG
-_DEBUG_BREAK_REG:
-	.word 0x00000000
-
-	; There are five reserved registers.
-	.fill (5 * 4)
-
-        .global _DEBUG_SW_SYSREQ_REG
-_DEBUG_SW_SYSREQ_REG:
-        .word 0x00000000
-
-        ; 256 bytes minus eight registers (four bytes per register)
-        .fill (256 - 8 * 4)
-
-
-
-	;.org 0xfff400
-	; Sequence Generator Registers
-	.global _SEQ_GEN_CTRL_REG
-_SEQ_GEN_CTRL_REG:
-	.word 0x00000000
-
-	.global _SEQ_GEN_MASK_REGS
-_SEQ_GEN_MASK_REGS:
-	; The mask registers consume two pages (less one control register).
-	; 512 bytes minus one register (four bytes per register).
-	.fill (256 + 256 - 1 * 4)
-
-
-
-        ;.org 0xfff600
-	; Timer Registers
-        .global _TIMER0_VAL_REG
-_TIMER0_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER1_VAL_REG
-_TIMER1_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER2_VAL_REG
-_TIMER2_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER3_VAL_REG
-_TIMER3_VAL_REG:
-        .word 0x00000000
-
-	; 256 bytes minus four registers (four bytes per register)
-	.fill (256 - 4 * 4)
-
-
-
-	;.org 0xfff700
-	; Output Line Control Registers
-	.global _OUTPUT0_CTRL
-_OUTPUT0_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT1_CTRL
-_OUTPUT1_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT2_CTRL
-_OUTPUT2_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT3_CTRL
-_OUTPUT3_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT4_CTRL
-_OUTPUT4_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT5_CTRL
-_OUTPUT5_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT6_CTRL
-_OUTPUT6_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT7_CTRL
-_OUTPUT7_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT8_CTRL
-_OUTPUT8_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT9_CTRL
-_OUTPUT9_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT10_CTRL
-_OUTPUT10_CTRL:
-	.word 0x00000000
-
-	;; 128 bytes minus eleven registers (four bytes per register)
-	;.fill (128 - 11 * 4)
-
-	.global _INPUT0_CTRL
-_INPUT0_CTRL:
-	.word 0x00000000
-
-	;; 128 bytes minus one register (four bytes per register)
-	;.fill (128 - 1 * 4)
-	; 256 bytes minus twelve registers (four bytes per register)
-	.fill (256 - 12 * 4)
-
-
-
-	;.org 0xfff800
-	; IQ Buffer Registers
-	.global _IQ_BUFF_CTRL_REG
-_IQ_BUFF_CTRL_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_PARAMETER1_REG
-_IQ_BUFF_PARAMETER1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_DATA_SIZE1_REG
-_IQ_BUFF_DATA_SIZE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE1_REG
-_IQ_BUFF_TRANSFER_SIZE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_ADDR1_REG
-_IQ_BUFF_FB_ADDR1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_PARAMETER2_REG
-_IQ_BUFF_PARAMETER2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_DATA_SIZE2_REG
-_IQ_BUFF_DATA_SIZE2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE2_REG
-_IQ_BUFF_TRANSFER_SIZE2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_ADDR2_REG
-_IQ_BUFF_FB_ADDR2_REG:
-	.word 0x00000000
-
-	; 256 bytes minus nine registers (four bytes per register)
-	.fill (256 - 9 * 4)
-
-
-	;.org 0xfff900
-	; Reserved memory-mapped space.
-	.fill (0x1000 - 0x900)
diff --git a/libgloss/mt/startup-16-003.S b/libgloss/mt/startup-16-003.S
deleted file mode 100644
index 9f65f5d4d..000000000
--- a/libgloss/mt/startup-16-003.S
+++ /dev/null
@@ -1,838 +0,0 @@
-/*
- * $Header$
- *
- * interrupt_vectors.s -- the interrupt handler jump table. 
- *
- *
- * There are a total of 32 interrupt vector possible, however, only
- *   11 of those are currently used (the others are reserved). The
- *   order of vectors is as follows:
- *
- *     1. Boot Vector. Vector for power-on/reset.
- *     2. Software Vector. Vector for handling the SI instruction (an
- *          explicit interrupt caused by software).
- *     3. Break Vector. Vector for handling the Break instruction.
- *     4. Device 0 Vector. Service vector for device zero. 
- *     5. Device 1 Vector. Service vector for device one. 
- *     6. Device 2 Vector. Service vector for device two. 
- *     7. Device 3 Vector. Service vector for device three. 
- *     8. Device 4 Vector. Service vector for device four. 
- *     9. Device 5 Vector. Service vector for device five. 
- *    10. Device 6 Vector. Service vector for device six. 
- *    11. Device 7 Vector. Service vector for device seven. 
- *
- *   The rest of the interrupt vectors are reserved for future use.
- *
- *
- * Each jump table entry consists of the following two instructions:
- *
- *   jmp Label		; Label as appropriate
- *   nop 		; implemented as or r0,r0,r0
- *
- *   The following labels are reserved for the vectors named above,
- *   respectively:
- *
- *     _BOOTIVEC, _SOFTIVEC, _BRKIVEC, _DEV0IVEC, _DEV1IVEC, _DEV2IVEC,
- *     _DEV3IVEC, _DEV4IVEC, _DEV5IVEC, _DEV6IVEC, _DEV7IVEC
- *
- *   09Jan04 (DJK) Modified internal I/O port definitions for the
- *                   MS1-16-003.
- *
- *   10Oct01 (DJK) The memory map is finalized and the first 4K of address
- *                   space is now reserved for memory-mapped I/O devices.
- *                   (There is over 2K unused, reserved space in this area.)
- *
- *   26Sep01 (DJK) The memory map is changed and the device interrupts are
- *                   now memory-mapped.
- *
- *
- *
- * Copyright (c) 2001, 2002, 2003, 2004 Morpho Technologies
- *
- */
-
-	.section .startup, "a", @progbits
-	.global __boot_start
-__boot_start:
-_INTERRUPT_VECTOR_TABLE:
-	jmp	_BOOTIVEC		; Boot vector
-	or	r0, r0, r0
-	jmp	_SOFTIVEC		; Vector for SI instruction
-	or	r0,r0,r0
-	jmp	_BRKIVEC		; Vector for Break instruction
-	or	r0,r0,r0
-	; The illegal instruction trap is not implemented.
-	;jmp	_ILLIVEC		; Vector for illegal instruction
-	or	r0,r0,r0
-	or	r0,r0,r0
-_RESERVED1_IVEC:
-        jmp	_RESERVED1_IVEC
-        or	r0,r0,r0
-_RESERVED2_IVEC:
-        jmp	_RESERVED2_IVEC
-        or	r0,r0,r0
-_RESERVED3_IVEC:
-        jmp	_RESERVED3_IVEC
-        or	r0,r0,r0
-_RESERVED4_IVEC:
-        jmp	_RESERVED4_IVEC
-        or	r0,r0,r0
-
-
-	.text
-
-	.equ SI_IOPORT_ADR, _DEBUG_SW_SYSREQ_REG
-	.equ SI_IOPORT_BIT, 0x1
-	.equ BRK_IOPORT_ADR, _DEBUG_BREAK_REG
-	.equ BRK_IOPORT_BIT, 0x1
-
-	.global _BOOTIVEC
-_BOOTIVEC:
-	; Initialize the interrupt controller's interrupt vector registers
-	ldui	r1, #%hi16(_IVEC_DEFAULT)
-	ori	r1, r1, #%lo16(_IVEC_DEFAULT)
-	stw	r1, r0, #%lo16(_DEV0_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV1_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV2_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV3_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV4_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV5_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV6_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV7_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV8_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV9_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV10_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV11_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV12_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV13_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV14_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV15_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV16_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV17_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV18_INTERRUPT_REG)
-
-	; Statically initialized data must be copied from ROM to RAM.
-	; This is done in the C run-time start-up code (crt0.o).
-
-	; Jump to the beginning of the application and enable interrupts.
-	jmp	_start
-	ei
-
-
-	; Handler for the SI instruction. To perform a system call, the
-	; C model uses a trapping mechanism which executes an SI instruction.
-	; The Morpho Technologies simulator simply performs a branch to
-	; this vector to simulate the SI instruction (this is as the hardware
-	; behaves). In order to trigger the simulator that a system call
-	; is needed a write into the I/O register at address $40005 to
-	; set bit #2 (0x4) is necessary.
-	;
-	; The above address has been changed to 0x00031C and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	.global _SOFTIVEC
-_SOFTIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(SI_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(SI_IOPORT_ADR)
-	ori	r10, r0, #SI_IOPORT_BIT
-	stw	r10, r9, #$0
-	; SYS_call is handled by simulator here...
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	or	r0, r0, r0
-	ldw	r9, sp, #$4
-	reti	r14
-	addi	sp, sp, #$8
-
-
-
-	.global _BRKIVEC
-_BRKIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(BRK_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(BRK_IOPORT_ADR)
-	ori	r10, r0, #BRK_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	ldw	r9, sp, #$4
-	reti	r15
-	addi	sp, sp, #$8
-
-
-.if 0
-	; Handler for illegal instruction.
-	.global _ILLIVEC
-_ILLIVEC:
-	reti r15
-	or r0, r0, r0
-.endif
-
-
-	.global _IVEC_DEFAULT
-_IVEC_DEFAULT:
-	reti	r15
-	or	r0, r0, r0
-
-
-	.section .internal_io, "a", @progbits
-	.fill 256		; Fill the first page.
-
-	; This is the memory-mapped I/O region.
-
-	; Hardware Interrupt Registers
-	;.org 0xfffff100
-	.global _DEV0_INTERRUPT_REG
-_DEV0_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV1_INTERRUPT_REG
-_DEV1_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV2_INTERRUPT_REG
-_DEV2_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV3_INTERRUPT_REG
-_DEV3_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV4_INTERRUPT_REG
-_DEV4_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV5_INTERRUPT_REG
-_DEV5_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV6_INTERRUPT_REG
-_DEV6_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV7_INTERRUPT_REG
-_DEV7_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV8_INTERRUPT_REG
-_DEV8_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV9_INTERRUPT_REG
-_DEV9_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV10_INTERRUPT_REG
-_DEV10_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV11_INTERRUPT_REG
-_DEV11_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV12_INTERRUPT_REG
-_DEV12_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV13_INTERRUPT_REG
-_DEV13_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV14_INTERRUPT_REG
-_DEV14_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV15_INTERRUPT_REG
-_DEV15_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV16_INTERRUPT_REG
-_DEV16_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV17_INTERRUPT_REG
-_DEV17_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV18_INTERRUPT_REG
-_DEV18_INTERRUPT_REG:
-	.word 0x00000000
-
-	; 128 bytes minus nineteen registers (four bytes per register)
-	.fill (128 - 19 * 4)
-
-	.global	_INTERRUPT_MASK_REG
-_INTERRUPT_MASK_REG:
-	.word 0x00000000
-
-	.global	_INTERRUPT_PENDING_REG
-_INTERRUPT_PENDING_REG:
-	.word 0x00000000
-
-	; 16 bytes minus two registers (four bytes per register)
-	.fill (16 - 2 * 4)
-
-	.global _DEV0_INTERRUPT_LEVEL_REG
-_DEV0_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV1_INTERRUPT_LEVEL_REG
-_DEV1_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV2_INTERRUPT_LEVEL_REG
-_DEV2_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV3_INTERRUPT_LEVEL_REG
-_DEV3_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV4_INTERRUPT_LEVEL_REG
-_DEV4_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV5_INTERRUPT_LEVEL_REG
-_DEV5_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV6_INTERRUPT_LEVEL_REG
-_DEV6_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV7_INTERRUPT_LEVEL_REG
-_DEV7_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV8_INTERRUPT_LEVEL_REG
-_DEV8_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV9_INTERRUPT_LEVEL_REG
-_DEV9_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV10_INTERRUPT_LEVEL_REG
-_DEV10_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV11_INTERRUPT_LEVEL_REG
-_DEV11_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV12_INTERRUPT_LEVEL_REG
-_DEV12_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV13_INTERRUPT_LEVEL_REG
-_DEV13_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV14_INTERRUPT_LEVEL_REG
-_DEV14_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV15_INTERRUPT_LEVEL_REG
-_DEV15_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV16_INTERRUPT_LEVEL_REG
-_DEV16_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV17_INTERRUPT_LEVEL_REG
-_DEV17_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV18_INTERRUPT_LEVEL_REG
-_DEV18_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	; 128 bytes minus twenty-three registers (four bytes per register)
-	.fill (128 - 23 * 4)
-
-
-	;.org 0xfffff200
-	; MorphoSys Decoder Registers
-	.global _MS_DEC_CIRC_BUFF_SEL_REG
-_MS_DEC_CIRC_BUFF_SEL_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_SKIP_FACTOR_REG
-_MS_DEC_SKIP_FACTOR_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CUSTOM_PERM_REG
-_MS_DEC_CUSTOM_PERM_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CTXT_BASE_REG
-_MS_DEC_CTXT_BASE_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_LOOKUP_TBL_REG
-_MS_DEC_LOOKUP_TBL_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF0_I_REG
-_MS_CIRC_BUFF0_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF0_P_REG
-_MS_CIRC_BUFF0_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF0_B_REG
-_MS_DATA_BUFF0_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF0_S_REG
-_MS_DATA_BUFF0_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF1_I_REG
-_MS_CIRC_BUFF1_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF1_P_REG
-_MS_CIRC_BUFF1_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF1_B_REG
-_MS_DATA_BUFF1_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF1_S_REG
-_MS_DATA_BUFF1_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF2_I_REG
-_MS_CIRC_BUFF2_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF2_P_REG
-_MS_CIRC_BUFF2_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF2_B_REG
-_MS_DATA_BUFF2_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF2_S_REG
-_MS_DATA_BUFF2_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF3_I_REG
-_MS_CIRC_BUFF3_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF3_P_REG
-_MS_CIRC_BUFF3_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF3_B_REG
-_MS_DATA_BUFF3_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF3_S_REG
-_MS_DATA_BUFF3_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF4_I_REG
-_MS_CIRC_BUFF4_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF4_P_REG
-_MS_CIRC_BUFF4_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF4_B_REG
-_MS_DATA_BUFF4_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF4_S_REG
-_MS_DATA_BUFF4_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF5_I_REG
-_MS_CIRC_BUFF5_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF5_P_REG
-_MS_CIRC_BUFF5_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF5_B_REG
-_MS_DATA_BUFF5_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF5_S_REG
-_MS_DATA_BUFF5_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF6_I_REG
-_MS_CIRC_BUFF6_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF6_P_REG
-_MS_CIRC_BUFF6_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF6_B_REG
-_MS_DATA_BUFF6_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF6_S_REG
-_MS_DATA_BUFF6_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF7_I_REG
-_MS_CIRC_BUFF7_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF7_P_REG
-_MS_CIRC_BUFF7_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF7_B_REG
-_MS_DATA_BUFF7_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF7_S_REG
-_MS_DATA_BUFF7_S_REG:
-	.word 0x00000000
-
-	.global _MS_OMEGA_PERM1_REG
-_MS_OMEGA_PERM1_REG:
-	.word 0x00000000
-
-	.global _MS_WRITE_FB_ADDR_REG
-_MS_WRITE_FB_ADDR_REG:
-	.word 0x00000000
-
-	.global _MS_OMEGA_PERM2_REG
-_MS_OMEGA_PERM2_REG:
-	.word 0x00000000
-
-
-	; 256 bytes minus forty registers (four bytes per register)
-	.fill (256 - 40 * 4)
-
-
-
-	;.org 0xfffff300
-	; Debug Registers
-	.global _DEBUG_HALT_REG
-_DEBUG_HALT_REG:
-	.word 0x00000000
-
-	.global _DEBUG_BREAK_REG
-_DEBUG_BREAK_REG:
-	.word 0x00000000
-
-	.global _DEBUG_CRITICAL_REG
-_DEBUG_OWNERSHIP_REG:
-	.word 0x00000000
-
-	.global _DEBUG_KERNEL_ID_REG
-_DEBUG_KERNEL_ID_REG:
-	.word 0x00000000
-
-	.global _DEBUG_IRQ_STATUS_REG
-_DEBUG_IRQ_STATUS_REG:
-	.word 0x00000000
-
-	; There are two reserved registers.
-	.fill (2 * 4)
-
-        .global _DEBUG_SW_SYSREQ_REG
-_DEBUG_SW_SYSREQ_REG:
-        .word 0x00000000
-
-	; 128 bytes minus eight registers (four bytes per register)
-	.fill (128 - 8 * 4)
-
-	.global _EXTENDED_GP0_REG
-_EXTENDED_GP0_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP1_REG
-_EXTENDED_GP1_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP2_REG
-_EXTENDED_GP2_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP3_REG
-_EXTENDED_GP3_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP4_REG
-_EXTENDED_GP4_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP5_REG
-_EXTENDED_GP5_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP6_REG
-_EXTENDED_GP6_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP7_REG
-_EXTENDED_GP7_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_EN_NC_MEM_REG
-_MEM_CTRL_EN_NC_MEM_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_BASE0_ADDR_REG
-_MEM_CTRL_BASE0_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_MASK0_ADDR_REG
-_MEM_CTRL_MASK0_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_BASE1_ADDR_REG
-_MEM_CTRL_BASE1_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_MASK1_ADDR_REG
-_MEM_CTRL_MASK1_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_BASE2_ADDR_REG
-_MEM_CTRL_BASE2_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_MASK2_ADDR_REG
-_MEM_CTRL_MASK2_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_BASE3_ADDR_REG
-_MEM_CTRL_BASE3_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_MASK3_ADDR_REG
-_MEM_CTRL_MASK3_ADDR_REG:
-	.word 0x00000000
-
-        ; 128 bytes minus seventeen registers (four bytes per register)
-        .fill (128 - 17 * 4)
-
-
-
-	; Reserved memory-map space
-	.fill (256 + 256)
-
-
-
-        ;.org 0xfffff600
-	; Timer Registers
-        .global _TIMER0_VAL_REG
-_TIMER0_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER1_VAL_REG
-_TIMER1_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER2_VAL_REG
-_TIMER2_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER3_VAL_REG
-_TIMER3_VAL_REG:
-        .word 0x00000000
-
-	; 256 bytes minus four registers (four bytes per register)
-	.fill (256 - 4 * 4)
-
-
-
-	;.org 0xfffff700
-	; Output Line Control Registers
-	.global _OUTPUT0_CTRL
-_OUTPUT0_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT1_CTRL
-_OUTPUT1_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT2_CTRL
-_OUTPUT2_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT3_CTRL
-_OUTPUT3_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT4_CTRL
-_OUTPUT4_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT5_CTRL
-_OUTPUT5_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT6_CTRL
-_OUTPUT6_CTRL:
-	.word 0x00000000
-
-	; 128 bytes minus seven registers (four bytes per register)
-	.fill (128 - 7 * 4)
-
-	.global _INPUT0_CTRL
-_INPUT0_CTRL:
-	.word 0x00000000
-
-	; 128 bytes minus one register (four bytes per register)
-	.fill (128 - 1 * 4)
-
-
-
-	;.org 0xfffff800
-	; IQ Buffer Registers
-	.global _IQ_BUFF_CTRL_REG
-_IQ_BUFF_CTRL_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_STATUS_REG
-_IQ_BUFF_STATUS_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_PARAMETER1_REG
-_IQ_BUFF_PARAMETER1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE1_REG
-_IQ_BUFF_TRANSFER_SIZE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_BASE1_REG
-_IQ_BUFF_FB_BASE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_SIZE1_REG
-_IQ_BUFF_FB_SIZE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_PARAMETER2_REG
-_IQ_BUFF_PARAMETER2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE2_REG
-_IQ_BUFF_TRANSFER_SIZE2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_BASE2_REG
-_IQ_BUFF_FB_BASE2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_SIZE2_REG
-_IQ_BUFF_FB_SIZE2_REG:
-	.word 0x00000000
-
-	; 256 bytes minus ten registers (four bytes per register)
-	.fill (256 - 10 * 4)
-
-
-
-	;.org 0xfffff900
-	; DMA Controller
-	.global _DMA_CTRL_REG
-_DMA_CTRL_REG:
-	.word 0x00000000
-
-	.global _DMA_STATUS_REG
-_DMA_STATUS_REG:
-	.word 0x00000000
-
-	.global _DMA_CH0_EADDR_REG
-_DMA_CH0_EADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH0_IADDR_REG
-_DMA_CH0_IADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH0_SIZE_REG
-_DMA_CH0_SIZE_REG:
-	.word 0x00000000
-
-	.global _DMA_CH1_EADDR_REG
-_DMA_CH1_EADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH1_IADDR_REG
-_DMA_CH1_IADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH1_SIZE_REG
-_DMA_CH1_SIZE_REG:
-	.word 0x00000000
-
-	.global _DMA_CH2_EADDR_REG
-_DMA_CH2_EADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH2_IADDR_REG
-_DMA_CH2_IADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH2_SIZE_REG
-_DMA_CH2_SIZE_REG:
-	.word 0x00000000
-
-	.global _DMA_CH3_EADDR_REG
-_DMA_CH3_EADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH3_IADDR_REG
-_DMA_CH3_IADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH3_SIZE_REG
-_DMA_CH3_SIZE_REG:
-	.word 0x00000000
-
-	; 256 bytes minus fourteen registers (four bytes per register)
-	.fill (256 - 14 * 4)
-
-
-
-	;.org 0xfffffa00
-	; Sequence Generator
-	.global _SEQ_GEN_CTRL_STATUS_REG
-_SEQ_GEN_CTRL_STATUS_REG:
-	.word 0x00000000
-
-	.global _SEQ_GEN_MASK_REGS
-_SEQ_GEN_MASK_REGS:
-	.fill (302 * 4)
-
-	.global _SEQ_GEN_SHIFT_REG
-_SEQ_GEN_SHIFT_REG:
-	.word 0x00000000
-
-	; 256 bytes minus seven registers (four bytes per register)
-	.fill (256 - 48 * 4)
-
-
-
-	; Reserved memory-map space
-	.fill (0x1000 - 0xf00)
diff --git a/libgloss/mt/startup-64-001.S b/libgloss/mt/startup-64-001.S
deleted file mode 100644
index 5ceb42b36..000000000
--- a/libgloss/mt/startup-64-001.S
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * $Header$
- *
- * interrupt_vectors.s -- the interrupt handler jump table. 
- *
- *
- * There are a total of 32 interrupt vector possible, however, only
- *   11 of those are currently used (the others are reserved). The
- *   order of vectors is as follows:
- *
- *     1. Boot Vector. Vector for power-on/reset.
- *     2. Software Vector. Vector for handling the SI instruction (an
- *          explicit interrupt caused by software).
- *     3. Break Vector. Vector for handling the Break instruction.
- *     4. Device 0 Vector. Service vector for device zero. 
- *     5. Device 1 Vector. Service vector for device one. 
- *     6. Device 2 Vector. Service vector for device two. 
- *     7. Device 3 Vector. Service vector for device three. 
- *     8. Device 4 Vector. Service vector for device four. 
- *     9. Device 5 Vector. Service vector for device five. 
- *    10. Device 6 Vector. Service vector for device six. 
- *    11. Device 7 Vector. Service vector for device seven. 
- *
- *   The rest of the interrupt vectors are reserved for future use.
- *
- *
- * Each jump table entry consists of the following two instructions:
- *
- *   jmp Label		; Label as appropriate
- *   nop 		; implemented as or r0,r0,r0
- *
- *   The following labels are reserved for the vectors named above,
- *   respectively:
- *
- *     _BOOTIVEC, _SOFTIVEC, _BRKIVEC, _DEV0IVEC, _DEV1IVEC, _DEV2IVEC,
- *     _DEV3IVEC, _DEV4IVEC, _DEV5IVEC, _DEV6IVEC, _DEV7IVEC
- *
- *
- *   26Sep01 (DJK) The memory map is changed and the device interrupts are
- *                   now memory-mapped.
- *
- *   10Oct01 (DJK) The memory map is finalized and the first 4K of address
- *                   space is now reserved for memory-mapped I/O devices.
- *                   (There is over 2K unused, reserved space in this area.)
- *
- *   27Jul02 (DJK) Fixed the address for the interrupt mask register. Old
- *                   documentation stated the port address as 0x140, but
- *                   the implementation uses 0x13c.
- *
- *   30Jul02 (DJK) Added support for printf. This only supports output to
- *                   stderr and stdout. Using the message box interface,
- *                   a (newly defined) message or series of messages is
- *                   passed to the controller to output bytes as text to
- *                   the debug console. These messages are constructed in
- *                   the interrupt handler for the SI instruction.
- *                   With this implementation, the user is unable to
- *                   utilize the message box interface in applications as
- *                   specialized interrupt handlers for the external
- *                   interrupts are necessary.
- *
- *
- *
- * Copyright (c) 2001, 2002, 2003, 2004 Morpho Technologies, Inc.
- *
- */
-
-	.section .startup, "a", @progbits
-	.global __boot_start
-_INTERRUPT_VECTOR_TABLE:
-__boot_start:
-	jmp	_BOOTIVEC		; Boot vector
-	or	r0, r0, r0
-	jmp	_SOFTIVEC		; Vector for SI instruction
-	or	r0,r0,r0
-	jmp	_BRKIVEC		; Vector for Break instruction
-	or	r0,r0,r0
-
-
-	; This is the memory-mapped I/O region.
-
-	; Hardware Interrupt Registers
-	.org 0x100
-	.global _DEV0_INTERRUPT_REG
-_DEV0_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV1_INTERRUPT_REG
-_DEV1_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV2_INTERRUPT_REG
-_DEV2_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV3_INTERRUPT_REG
-_DEV3_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV4_INTERRUPT_REG
-_DEV4_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV5_INTERRUPT_REG
-_DEV5_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV6_INTERRUPT_REG
-_DEV6_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV7_INTERRUPT_REG
-_DEV7_INTERRUPT_REG:
-	.word 0x00000000
-
-	; 60 bytes minus eight registers (four bytes per register)
-	.fill (60 - 8 * 4)
-
-	.global _INTERRUPT_MASK_REG
-_INTERRUPT_MASK_REG:
-	.word 0x00000000
-
-	; 256 bytes minus sixteen registers (four bytes per register)
-	.fill (256 - 16 * 4)
-
-
-
-	.org 0x200
-	; MorphoSys Decoder Registers
-	.global _MS_DEC_AUTO_INCREMENT_REG
-_MS_DEC_AUTO_INCREMENT_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_SKIP_FACTOR_REG
-_MS_DEC_SKIP_FACTOR_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CUSTOM_PERMUTATION_REG
-_MS_DEC_CUSTOM_PERMUTATION_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CONTEXT_BASE_REG
-_MS_DEC_CONTEXT_BASE_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_LOOKUP_TABLE_BASE_REG
-_MS_DEC_LOOKUP_TABLE_BASE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRCULAR_BUFFER_END_REG
-_MS_CIRCULAR_BUFFER_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRCULAR_BUFFER_SIZE_REG
-_MS_CIRCULAR_BUFFER_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLOCK_END_REG
-_MS_DATA_BLOCK_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLOCK_SIZE_REG
-_MS_DATA_BLOCK_SIZE_REG:
-	.word 0x00000000
-
-	; 256 bytes minus nine registers (four bytes per register)
-	.fill (256 - 9 * 4)
-
-
-
-	.org 0x300
-	; Debug Registers
-	.global _DEBUG_HALT_REG
-_DEBUG_HALT_REG:
-	.word 0x00000000
-
-	.global _DEBUG_BREAK_REG
-_DEBUG_BREAK_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED0_REG
-_DEBUG_HW_RESERVED0_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED1_REG
-_DEBUG_HW_RESERVED1_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED2_REG
-_DEBUG_HW_RESERVED2_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED3_REG
-_DEBUG_HW_RESERVED3_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED4_REG
-_DEBUG_HW_RESERVED4_REG:
-	.word 0x00000000
-
-	.global _DEBUG_SW_SYSREQ_REG
-_DEBUG_SW_SYSREQ_REG:
-	.word 0x00000000
-
-	; 256 bytes minus eight registers (four bytes per register)
-	.fill (256 - 8 * 4)
-
-
-
-	.org 0x400
-	; Sequence Generator Registers
-_SEQ_GEN_REGS:
-	.fill 256
-
-
-
-	.org 0x500
-_RESERVED_SEQ_GEN_REGS:
-	.fill 256
-
-
-
-        .org 0x600
-        .global _TIMER0_VAL_REG
-_TIMER0_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER0_CTRL_REG
-_TIMER0_CTRL_REG:
-        .word 0x00000000
-
-        .global _TIMER1_VAL_REG
-_TIMER1_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER1_CTRL_REG
-_TIMER1_CTRL_REG:
-        .word 0x00000000
-
-        .global _TIMER2_VAL_REG
-_TIMER2_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER2_CTRL_REG
-_TIMER2_CTRL_REG:
-        .word 0x00000000
-
-	; 256 bytes minus six registers (four bytes per register)
-	.fill (256 - 6 * 4)
-
-
-
-	.org 0x700
-	.global _OUTPUT0_CONTROL
-_OUTPUT0_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT1_CONTROL
-_OUTPUT1_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT2_CONTROL
-_OUTPUT2_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT3_CONTROL
-_OUTPUT3_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT4_CONTROL
-_OUTPUT4_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT5_CONTROL
-_OUTPUT5_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT6_CONTROL
-_OUTPUT6_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT7_CONTROL
-_OUTPUT7_CONTROL:
-	.word 0x00000000
-
-	; 256 bytes minus eight registers (four bytes per register)
-	.fill (256 - 8 * 4)
-
-
-
-	.org 0x800
-	; Reserved memory-mapped space.
-	.fill (0x1000 - 0x800)
-
-
-
-	.text
-
-	.equ SI_IOPORT_ADR, _DEBUG_SW_SYSREQ_REG
-	.equ SI_IOPORT_BIT, 0x1
-	.equ BRK_IOPORT_ADR, _DEBUG_BREAK_REG
-	.equ BRK_IOPORT_BIT, 0x1
-
-	.global _BOOTIVEC
-_BOOTIVEC:
-
-	; Initialize the interrupt controller's interrupt vector registers
-	; for devices zero through seven.
-	ldui    r1, #%hi16(_IVEC_DEFAULT)
-	ori     r1, r1, #%lo16(_IVEC_DEFAULT)
-	stw     r1, r0, #%lo16(_DEV0_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV1_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV2_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV3_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV4_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV5_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV6_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV7_INTERRUPT_REG)
-
-	; Jump to the beginning of the application and enable interrupts.
-	jmp	_start
-	ei
-
-
-
-	; Handler for the SI instruction. To perform a system call, the
-	; C model uses a trapping mechanism which executes an SI instruction.
-	; The Morpho Technologies simulator simply performs a branch to
-	; this vector to simulate the SI instruction (this is as the hardware
-	; behaves). In order to trigger the simulator that a system call
-	; is needed, a write into the I/O register at address $40005 to
-	; set bit #2 (0x4) is necessary.
-	;
-	; The above address has been changed to 0x31C and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	;
-	.global _SOFTIVEC
-_SOFTIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(SI_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(SI_IOPORT_ADR)
-	ori	r10, r0, #SI_IOPORT_BIT
-	stw	r10, r9, #$0
-	; SYS_call is handled by simulator here...
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	or	r0, r0, r0
-	ldw	r9, sp, #$4
-	reti	r14
-	addi	sp, sp, #$8
-
-
-
-	.global _BRKIVEC
-_BRKIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(BRK_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(BRK_IOPORT_ADR)
-	ori	r10, r0, #BRK_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	subi	r15, r15, #$4		; Backup to address of break
-	ldw	r9, sp, #$4
-	reti	r15
-	addi	sp, sp, #$8
-
-
-
-	.global _IVEC_DEFAULT
-_IVEC_DEFAULT:
-	reti	r15
-	or	r0, r0, r0
diff --git a/libgloss/mt/startup-ms2.S b/libgloss/mt/startup-ms2.S
deleted file mode 100644
index f11e3fa6a..000000000
--- a/libgloss/mt/startup-ms2.S
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- *
- * interrupt_vectors.s -- the interrupt handler jump table. 
- *
- *
- * There are a total of 32 interrupt vector possible, however, only
- *   11 of those are currently used (the others are reserved). The
- *   order of vectors is as follows:
- *
- *     1. Boot Vector. Vector for power-on/reset.
- *     2. Software Vector. Vector for handling the SI instruction (an
- *          explicit interrupt caused by software).
- *     3. Break Vector. Vector for handling the Break instruction.
- *     4. Device 0 Vector. Service vector for device zero. 
- *     5. Device 1 Vector. Service vector for device one. 
- *     6. Device 2 Vector. Service vector for device two. 
- *     7. Device 3 Vector. Service vector for device three. 
- *     8. Device 4 Vector. Service vector for device four. 
- *     9. Device 5 Vector. Service vector for device five. 
- *    10. Device 6 Vector. Service vector for device six. 
- *    11. Device 7 Vector. Service vector for device seven. 
- *
- *   The rest of the interrupt vectors are reserved for future use.
- *
- *
- * Each jump table entry consists of the following two instructions:
- *
- *   jmp Label		; Label as appropriate
- *   nop 		; implemented as or r0,r0,r0
- *
- *   The following labels are reserved for the vectors named above,
- *   respectively:
- *
- *     _BOOTIVEC, _SOFTIVEC, _BRKIVEC, _DEV0IVEC, _DEV1IVEC, _DEV2IVEC,
- *     _DEV3IVEC, _DEV4IVEC, _DEV5IVEC, _DEV6IVEC, _DEV7IVEC
- *
- *   28Apr05 (DJK) Added support for the overflow vector.
- *
- *   XXXXXXX (DJK) Modified for the MS2 target
- *
- *   09Jan04 (DJK) Modified internal I/O port definitions for the
- *                   MS1-16-003.
- *
- *   10Oct01 (DJK) The memory map is finalized and the first 4K of address
- *                   space is now reserved for memory-mapped I/O devices.
- *                   (There is over 2K unused, reserved space in this area.)
- *
- *   26Sep01 (DJK) The memory map is changed and the device interrupts are
- *                   now memory-mapped.
- *
- *
- *
- * Copyright (c) 2001, 2002, 2003, 2004 Morpho Technologies
- *
- */
-
-	.section .startup, "a", @progbits
-	.global __boot_start
-__boot_start:
-_INTERRUPT_VECTOR_TABLE:
-	jmp	_BOOTIVEC		; Boot vector
-	or	r0, r0, r0
-	jmp	_SOFTIVEC		; Vector for SI instruction
-	or	r0, r0, r0
-	jmp	_BRKIVEC		; Vector for Break instruction
-	or	r0, r0, r0
-	; The illegal instruction trap is not implemented.
-_RESERVED1_IVEC:
-	jmp	_RESERVED1_IVEC
-	or	r0, r0, r0
-	jmp	_OVFIVEC
-	or	r0, r0, r0
-_RESERVED2_IVEC:
-	jmp	_RESERVED2_IVEC
-	or	r0, r0, r0
-_RESERVED3_IVEC:
-	jmp	_RESERVED3_IVEC
-	or	r0, r0, r0
-_RESERVED4_IVEC:
-	jmp	_RESERVED4_IVEC
-	or	r0, r0, r0
-
-
-	.text
-
-	.equ SI_IOPORT_ADR, _DEBUG_SW_SYSREQ_REG
-	.equ SI_IOPORT_BIT, 0x1
-	.equ BRK_IOPORT_ADR, _DEBUG_BREAK_REG
-	.equ BRK_IOPORT_BIT, 0x1
-
-	.global _BOOTIVEC
-_BOOTIVEC:
-	; Initialize the interrupt controller's interrupt vector registers
-	ldui	r1, #%hi16(_IVEC_DEFAULT)
-	ori	r1, r1, #%lo16(_IVEC_DEFAULT)
-	stw	r1, r0, #%lo16(_DEV0_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV1_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV2_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV3_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV4_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV5_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV6_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV7_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV8_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV9_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV10_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV11_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV12_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV13_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV14_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV15_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV16_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV17_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV18_INTERRUPT_REG)
-
-	; Statically initialized data must be copied from ROM to RAM.
-	; This is done in the C run-time start-up code (crt0.o).
-
-	; Jump to the beginning of the application and enable interrupts.
-	jmp	_start
-	ei
-
-
-	; Handler for the SI instruction. To perform a system call, the
-	; C model uses a trapping mechanism which executes an SI instruction.
-	; The Morpho Technologies simulator simply performs a branch to
-	; this vector to simulate the SI instruction (this is as the hardware
-	; behaves). In order to trigger the simulator that a system call
-	; is needed a write into the I/O register at address $40005 to
-	; set bit #2 (0x4) is necessary.
-	;
-	; The above address has been changed to 0x00031C and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	.global _SOFTIVEC
-_SOFTIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(SI_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(SI_IOPORT_ADR)
-	ori	r10, r0, #SI_IOPORT_BIT
-	stw	r10, r9, #$0
-	; SYS_call is handled by simulator here...
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	or	r0, r0, r0
-	ldw	r9, sp, #$4
-	reti	r14
-	addi	sp, sp, #$8
-
-
-
-	.global _BRKIVEC
-_BRKIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(BRK_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(BRK_IOPORT_ADR)
-	ori	r10, r0, #BRK_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	ldw	r9, sp, #$4
-	reti	r15
-	addi	sp, sp, #$8
-
-
-	.global _OVFIVEC
-_OVFIVEC:
-	addi	r15, r15, #$4
-	or	r0, r0, r0
-	or	r0, r0, r0	; added 06Sep05
-	reti	r15
-	or	r0, r0, r0
-
-
-	.global _IVEC_DEFAULT
-_IVEC_DEFAULT:
-	reti	r15
-	or	r0, r0, r0
-
-
-	.section .internal_io, "a", @progbits
-	.fill 256		; Fill the first page.
-
-	; This is the memory-mapped I/O region.
-
-	; Hardware Interrupt Registers
-	;.org 0xfffff100
-	.global _DEV0_INTERRUPT_REG
-_DEV0_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV1_INTERRUPT_REG
-_DEV1_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV2_INTERRUPT_REG
-_DEV2_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV3_INTERRUPT_REG
-_DEV3_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV4_INTERRUPT_REG
-_DEV4_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV5_INTERRUPT_REG
-_DEV5_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV6_INTERRUPT_REG
-_DEV6_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV7_INTERRUPT_REG
-_DEV7_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV8_INTERRUPT_REG
-_DEV8_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV9_INTERRUPT_REG
-_DEV9_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV10_INTERRUPT_REG
-_DEV10_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV11_INTERRUPT_REG
-_DEV11_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV12_INTERRUPT_REG
-_DEV12_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV13_INTERRUPT_REG
-_DEV13_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV14_INTERRUPT_REG
-_DEV14_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV15_INTERRUPT_REG
-_DEV15_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV16_INTERRUPT_REG
-_DEV16_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV17_INTERRUPT_REG
-_DEV17_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV18_INTERRUPT_REG
-_DEV18_INTERRUPT_REG:
-	.word	0x00000000
-
-	; 128 bytes minus nineteen registers (four bytes per register)
-	.fill (128 - 19 * 4)
-
-	.global	_INTERRUPT_MASK_REG
-_INTERRUPT_MASK_REG:
-	.word	0x00000000
-
-	.global	_INTERRUPT_PENDING_REG
-_INTERRUPT_PENDING_REG:
-	.word	0x00000000
-
-	; 16 bytes minus two registers (four bytes per register)
-	.fill (16 - 2 * 4)
-
-	.global _DEV0_INTERRUPT_LEVEL_REG
-_DEV0_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV1_INTERRUPT_LEVEL_REG
-_DEV1_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV2_INTERRUPT_LEVEL_REG
-_DEV2_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV3_INTERRUPT_LEVEL_REG
-_DEV3_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV4_INTERRUPT_LEVEL_REG
-_DEV4_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV5_INTERRUPT_LEVEL_REG
-_DEV5_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV6_INTERRUPT_LEVEL_REG
-_DEV6_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV7_INTERRUPT_LEVEL_REG
-_DEV7_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV8_INTERRUPT_LEVEL_REG
-_DEV8_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV9_INTERRUPT_LEVEL_REG
-_DEV9_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV10_INTERRUPT_LEVEL_REG
-_DEV10_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV11_INTERRUPT_LEVEL_REG
-_DEV11_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV12_INTERRUPT_LEVEL_REG
-_DEV12_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV13_INTERRUPT_LEVEL_REG
-_DEV13_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV14_INTERRUPT_LEVEL_REG
-_DEV14_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV15_INTERRUPT_LEVEL_REG
-_DEV15_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV16_INTERRUPT_LEVEL_REG
-_DEV16_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV17_INTERRUPT_LEVEL_REG
-_DEV17_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV18_INTERRUPT_LEVEL_REG
-_DEV18_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	; 128 bytes minus twenty-three registers (four bytes per register)
-	.fill (128 - 23 * 4)
-
-
-	;.org 0xfffff200
-	; MorphoSys Decoder Registers
-	.global _MS_DEC_CIRC_BUFF_SEL_REG
-_MS_DEC_CIRC_BUFF_SEL_REG:
-	.word	0x00000000
-
-	.global _MS_DEC_SKIP_FACTOR_REG
-_MS_DEC_SKIP_FACTOR_REG:
-	.word	0x00000000
-
-	.global _MS_DEC_CUSTOM_PERM_REG
-_MS_DEC_CUSTOM_PERM_REG:
-	.word	0x00000000
-
-	.global _MS_DEC_CTXT_BASE_REG
-_MS_DEC_CTXT_BASE_REG:
-	.word	0x00000000
-
-	.global _MS_DEC_LOOKUP_TBL_REG
-_MS_DEC_LOOKUP_TBL_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF0_I_REG
-_MS_CIRC_BUFF0_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF0_P_REG
-_MS_CIRC_BUFF0_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF0_B_REG
-_MS_DATA_BUFF0_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF0_S_REG
-_MS_DATA_BUFF0_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF1_I_REG
-_MS_CIRC_BUFF1_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF1_P_REG
-_MS_CIRC_BUFF1_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF1_B_REG
-_MS_DATA_BUFF1_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF1_S_REG
-_MS_DATA_BUFF1_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF2_I_REG
-_MS_CIRC_BUFF2_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF2_P_REG
-_MS_CIRC_BUFF2_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF2_B_REG
-_MS_DATA_BUFF2_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF2_S_REG
-_MS_DATA_BUFF2_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF3_I_REG
-_MS_CIRC_BUFF3_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF3_P_REG
-_MS_CIRC_BUFF3_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF3_B_REG
-_MS_DATA_BUFF3_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF3_S_REG
-_MS_DATA_BUFF3_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF4_I_REG
-_MS_CIRC_BUFF4_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF4_P_REG
-_MS_CIRC_BUFF4_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF4_B_REG
-_MS_DATA_BUFF4_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF4_S_REG
-_MS_DATA_BUFF4_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF5_I_REG
-_MS_CIRC_BUFF5_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF5_P_REG
-_MS_CIRC_BUFF5_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF5_B_REG
-_MS_DATA_BUFF5_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF5_S_REG
-_MS_DATA_BUFF5_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF6_I_REG
-_MS_CIRC_BUFF6_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF6_P_REG
-_MS_CIRC_BUFF6_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF6_B_REG
-_MS_DATA_BUFF6_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF6_S_REG
-_MS_DATA_BUFF6_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF7_I_REG
-_MS_CIRC_BUFF7_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF7_P_REG
-_MS_CIRC_BUFF7_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF7_B_REG
-_MS_DATA_BUFF7_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF7_S_REG
-_MS_DATA_BUFF7_S_REG:
-	.word	0x00000000
-
-	.global _MS_OMEGA_PERM1_REG
-_MS_OMEGA_PERM1_REG:
-	.word	0x00000000
-
-	.global _MS_WRITE_FB_ADDR_REG
-_MS_WRITE_FB_ADDR_REG:
-	.word	0x00000000
-
-	.global _MS_OMEGA_PERM2_REG
-_MS_OMEGA_PERM2_REG:
-	.word	0x00000000
-
-
-	; 256 bytes minus forty registers (four bytes per register)
-	.fill (256 - 40 * 4)
-
-
-
-	;.org 0xfffff300
-	; Debug Registers
-	.global _DEBUG_HALT_REG
-_DEBUG_HALT_REG:
-	.word	0x00000000
-
-	.global _DEBUG_BREAK_REG
-_DEBUG_BREAK_REG:
-	.word	0x00000000
-
-	.global _DEBUG_CRITICAL_REG
-_DEBUG_OWNERSHIP_REG:
-	.word	0x00000000
-
-	.global _DEBUG_KERNEL_ID_REG
-_DEBUG_KERNEL_ID_REG:
-	.word	0x00000000
-
-	.global _DEBUG_IRQ_STATUS_REG
-_DEBUG_IRQ_STATUS_REG:
-	.word	0x00000000
-
-	; There are two reserved registers.
-	.fill (2 * 4)
-
-	.global _DEBUG_SW_SYSREQ_REG
-_DEBUG_SW_SYSREQ_REG:
-	.word	0x00000000
-
-	; 128 bytes minus eight registers (four bytes per register)
-	.fill (128 - 8 * 4)
-
-	.global _EXTENDED_GP0_REG
-_EXTENDED_GP0_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP1_REG
-_EXTENDED_GP1_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP2_REG
-_EXTENDED_GP2_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP3_REG
-_EXTENDED_GP3_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP4_REG
-_EXTENDED_GP4_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP5_REG
-_EXTENDED_GP5_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP6_REG
-_EXTENDED_GP6_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP7_REG
-_EXTENDED_GP7_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_EN_NC_MEM_REG
-_MEM_CTRL_EN_NC_MEM_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_BASE0_ADDR_REG
-_MEM_CTRL_BASE0_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_MASK0_ADDR_REG
-_MEM_CTRL_MASK0_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_BASE1_ADDR_REG
-_MEM_CTRL_BASE1_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_MASK1_ADDR_REG
-_MEM_CTRL_MASK1_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_BASE2_ADDR_REG
-_MEM_CTRL_BASE2_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_MASK2_ADDR_REG
-_MEM_CTRL_MASK2_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_BASE3_ADDR_REG
-_MEM_CTRL_BASE3_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_MASK3_ADDR_REG
-_MEM_CTRL_MASK3_ADDR_REG:
-	.word	0x00000000
-
-	; 128 bytes minus seventeen registers (four bytes per register)
-	.fill (128 - 17 * 4)
-
-
-
-	; Reserved memory-map space
-	.fill (256 + 256)
-
-
-
-	;.org 0xfffff600
-	; Timer Registers
-	.global _TIMER0_VAL_REG
-_TIMER0_VAL_REG:
-	.word	0x00000000
-
-	.global _TIMER1_VAL_REG
-_TIMER1_VAL_REG:
-	.word	0x00000000
-
-	.global _TIMER2_VAL_REG
-_TIMER2_VAL_REG:
-	.word	0x00000000
-
-	.global _TIMER3_VAL_REG
-_TIMER3_VAL_REG:
-	.word	0x00000000
-
-	; 256 bytes minus four registers (four bytes per register)
-	.fill (256 - 4 * 4)
-
-
-
-	;.org 0xfffff700
-	; Output Line Control Registers
-	.global _OUTPUT0_CTRL
-_OUTPUT0_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT1_CTRL
-_OUTPUT1_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT2_CTRL
-_OUTPUT2_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT3_CTRL
-_OUTPUT3_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT4_CTRL
-_OUTPUT4_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT5_CTRL
-_OUTPUT5_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT6_CTRL
-_OUTPUT6_CTRL:
-	.word	0x00000000
-
-	; 128 bytes minus seven registers (four bytes per register)
-	.fill (128 - 7 * 4)
-
-	.global _INPUT0_CTRL
-_INPUT0_CTRL:
-	.word	0x00000000
-
-	; 128 bytes minus one register (four bytes per register)
-	.fill (128 - 1 * 4)
-
-
-
-	;.org 0xfffff800
-	; IQ Buffer Registers
-	.global _IQ_BUFF_CTRL_REG
-_IQ_BUFF_CTRL_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_STATUS_REG
-_IQ_BUFF_STATUS_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_PARAMETER1_REG
-_IQ_BUFF_PARAMETER1_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE1_REG
-_IQ_BUFF_TRANSFER_SIZE1_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_FB_BASE1_REG
-_IQ_BUFF_FB_BASE1_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_FB_SIZE1_REG
-_IQ_BUFF_FB_SIZE1_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_PARAMETER2_REG
-_IQ_BUFF_PARAMETER2_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE2_REG
-_IQ_BUFF_TRANSFER_SIZE2_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_FB_BASE2_REG
-_IQ_BUFF_FB_BASE2_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_FB_SIZE2_REG
-_IQ_BUFF_FB_SIZE2_REG:
-	.word	0x00000000
-
-	; 256 bytes minus ten registers (four bytes per register)
-	.fill (256 - 10 * 4)
-
-
-
-	;.org 0xfffff900
-	; DMA Controller
-	.global _DMA_CTRL_REG
-_DMA_CTRL_REG:
-	.word	0x00000000
-
-	.global _DMA_STATUS_REG
-_DMA_STATUS_REG:
-	.word	0x00000000
-
-	.global _DMA_CH0_EADDR_REG
-_DMA_CH0_EADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH0_IADDR_REG
-_DMA_CH0_IADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH0_SIZE_REG
-_DMA_CH0_SIZE_REG:
-	.word	0x00000000
-
-	.global _DMA_CH1_EADDR_REG
-_DMA_CH1_EADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH1_IADDR_REG
-_DMA_CH1_IADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH1_SIZE_REG
-_DMA_CH1_SIZE_REG:
-	.word	0x00000000
-
-	.global _DMA_CH2_EADDR_REG
-_DMA_CH2_EADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH2_IADDR_REG
-_DMA_CH2_IADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH2_SIZE_REG
-_DMA_CH2_SIZE_REG:
-	.word	0x00000000
-
-	.global _DMA_CH3_EADDR_REG
-_DMA_CH3_EADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH3_IADDR_REG
-_DMA_CH3_IADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH3_SIZE_REG
-_DMA_CH3_SIZE_REG:
-	.word	0x00000000
-
-	; 256 bytes minus fourteen registers (four bytes per register)
-	.fill (256 - 14 * 4)
-
-
-
-	;.org 0xfffffa00
-	; Sequence Generator
-	.global _SEQ_GEN_CTRL_STATUS_REG
-_SEQ_GEN_CTRL_STATUS_REG:
-	.word	0x00000000
-
-	.global _SEQ_GEN_MASK_REGS
-_SEQ_GEN_MASK_REGS:
-	.fill (302 * 4)
-
-	.global _SEQ_GEN_SHIFT_REG
-_SEQ_GEN_SHIFT_REG:
-	.word	0x00000000
-
-	; 256 bytes minus seven registers (four bytes per register)
-	.fill (256 - 48 * 4)
-
-
-
-	; Reserved memory-map space
-	.fill (0x1000 - 0xf00)
diff --git a/libgloss/mt/stat.c b/libgloss/mt/stat.c
deleted file mode 100644
index 9a6ca7ca0..000000000
--- a/libgloss/mt/stat.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-stat (const char *path, struct stat *st)
-
-{
-  return TRAP0 (SYS_stat, path, st, 0);
-}
diff --git a/libgloss/mt/time.c b/libgloss/mt/time.c
deleted file mode 100644
index 2df8d48d2..000000000
--- a/libgloss/mt/time.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-time_t
-time (time_t *tloc)
-{
-  return TRAP0 (SYS_time, tloc, 0, 0);
-}
diff --git a/libgloss/mt/times.c b/libgloss/mt/times.c
deleted file mode 100644
index b804be4cd..000000000
--- a/libgloss/mt/times.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-#include "sys/times.h"
-
-
-clock_t
-times (struct tms *buffer)
-{
-  return TRAP0 (SYS_times, buffer, 0, 0);
-}
diff --git a/libgloss/mt/trap.S b/libgloss/mt/trap.S
deleted file mode 100644
index 9fca7204e..000000000
--- a/libgloss/mt/trap.S
+++ /dev/null
@@ -1,34 +0,0 @@
-;;
-;;  The errno will be in r5 if r11 is -1.
-;;
-	.text
-	.global __trap0
-__trap0:
-	;; non-leaf function so need to create stack frame to
-	;; store ra and fp
-	subi	sp, sp, #16
-	stw	ra, sp, #12
-	or	r0, r0, r0		;; nop
-	stw	fp, sp, #8
-	or	fp, sp, sp
-	stw	r5, sp, #4
-	or	r0, r0, r0		;; nop
-	stw	r6, sp, #0
-	addi	r6, r0, #$-1
-	si	r14
-	or	r0, r0, r0		;; nop
-	brne	r11, r6, .L0
-	ldui	r6, #%hi16(errno)
-	addui	r6, r6, #%lo16(errno)
-	stw	r5, r6, #0
-	or	r0, r0, r0		;; nop
-.L0:
-	ldw	r6, sp, #0
-	or	r0, r0, r0		;; nop
-	ldw	r5, sp, #4
-	or	r0, r0, r0		;; nop
-	ldw	ra, sp, #12
-	or	r0, r0, r0		;; nop
-	ldw	fp, sp, #8
-	jal	r0, r14
-	addi	sp, sp, #16
diff --git a/libgloss/mt/trap.h b/libgloss/mt/trap.h
deleted file mode 100644
index 27636c004..000000000
--- a/libgloss/mt/trap.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "syscall.h"
-
-int __trap0 ();
-
-#define TRAP0(f, p1, p2, p3) __trap0(f, (p1), (p2), (p3))
diff --git a/libgloss/mt/unlink.c b/libgloss/mt/unlink.c
deleted file mode 100644
index a620e89dd..000000000
--- a/libgloss/mt/unlink.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-unlink ()
-{
-  return -1;
-}
diff --git a/libgloss/mt/utime.c b/libgloss/mt/utime.c
deleted file mode 100644
index 3fce7e364..000000000
--- a/libgloss/mt/utime.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-utime (path, times)
-     const char *path;
-     char *times;
-{
-  return TRAP0 (SYS_utime, path, times, 0);
-}
diff --git a/libgloss/mt/write.c b/libgloss/mt/write.c
deleted file mode 100644
index 88b5ff83d..000000000
--- a/libgloss/mt/write.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-write ( int file,
-	 char *ptr,
-	 size_t len)
-{
-  return TRAP0 (SYS_write, file, ptr, len);
-}
diff --git a/libgloss/rs6000/Makefile.in b/libgloss/rs6000/Makefile.in
index 3c41ef0b0..65c8c9ec3 100644
--- a/libgloss/rs6000/Makefile.in
+++ b/libgloss/rs6000/Makefile.in
@@ -16,7 +16,7 @@
 #
 
 DESTDIR =
-VPATH = @srcdir@:@srcdir@/..
+VPATH = @srcdir@ @srcdir@/..
 srcdir = @srcdir@
 objdir = .
 srcroot = $(srcdir)/../..
@@ -68,7 +68,7 @@ SIM_SCRIPTS	=
 SIM_LDFLAGS	=
 SIM_BSP		= libsim.a
 SIM_CRT0	= sim-crt0.o
-SIM_OBJS	= sim-print.o sim-inbyte.o sim-sbrk.o sim-abort.o sim-errno.o simulator.o sim-getrusage.o
+SIM_OBJS	= sim-print.o sim-inbyte.o sim-sbrk.o sim-abort.o sim-errno.o simulator.o
 SIM_TEST	= sim-test
 SIM_INSTALL	= install-sim
 
@@ -270,7 +270,6 @@ mbx-test.srec:	mbx-test.x
 crt0.o: crt0.S
 
 simulator.o: simulator.S
-sim-getrusage.o: sim-getrusage.S
 sim-crt0.o: sim-crt0.S
 mount.o: mount.S
 
diff --git a/libgloss/rs6000/ads.ld b/libgloss/rs6000/ads.ld
index ef5038e68..1fe80d870 100644
--- a/libgloss/rs6000/ads.ld
+++ b/libgloss/rs6000/ads.ld
@@ -145,7 +145,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/rs6000/mbx.ld b/libgloss/rs6000/mbx.ld
index cedf4e867..7ba3db9ed 100644
--- a/libgloss/rs6000/mbx.ld
+++ b/libgloss/rs6000/mbx.ld
@@ -125,7 +125,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/rs6000/sim-getrusage.S b/libgloss/rs6000/sim-getrusage.S
deleted file mode 100644
index 20f1c6242..000000000
--- a/libgloss/rs6000/sim-getrusage.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * sim-getrusage.S -- PowerPC simulator getrusage call.
- *
- * Copyright (c) 1995, 2000, 2001 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include "ppc-asm.h"
-
-FUNC_START(getrusage)
-	li	r0,117
-	sc
-	bns+	0f
-	b	FUNC_NAME(_cerror)
-0:	blr
-FUNC_END(getrusage)
diff --git a/libgloss/rs6000/simulator.S b/libgloss/rs6000/simulator.S
index 914a761ab..4e8becb28 100644
--- a/libgloss/rs6000/simulator.S
+++ b/libgloss/rs6000/simulator.S
@@ -87,6 +87,14 @@ FUNC_START(gettimeofday)
 0:	blr
 FUNC_END(gettimeofday)
 
+FUNC_START(getrusage)
+	li	r0,117
+	sc
+	bns+	0f
+	b	FUNC_NAME(_cerror)
+0:	blr
+FUNC_END(getrusage)
+
 FUNC_START(lseek)
 	li	r0,199
 	sc
diff --git a/libgloss/rs6000/yellowknife.ld b/libgloss/rs6000/yellowknife.ld
index 36c30092d..96c426072 100644
--- a/libgloss/rs6000/yellowknife.ld
+++ b/libgloss/rs6000/yellowknife.ld
@@ -137,7 +137,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sh/sh1lcevb.ld b/libgloss/sh/sh1lcevb.ld
index b2979d75d..efe9ab3c7 100644
--- a/libgloss/sh/sh1lcevb.ld
+++ b/libgloss/sh/sh1lcevb.ld
@@ -105,7 +105,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sh/sh2lcevb.ld b/libgloss/sh/sh2lcevb.ld
index 06a85adc3..8ae7f316a 100644
--- a/libgloss/sh/sh2lcevb.ld
+++ b/libgloss/sh/sh2lcevb.ld
@@ -101,7 +101,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sh/sh3bb.ld b/libgloss/sh/sh3bb.ld
index f2a33191f..c3fc6574e 100644
--- a/libgloss/sh/sh3bb.ld
+++ b/libgloss/sh/sh3bb.ld
@@ -103,7 +103,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sh/sh3lcevb.ld b/libgloss/sh/sh3lcevb.ld
index d41c65faf..0129921b1 100644
--- a/libgloss/sh/sh3lcevb.ld
+++ b/libgloss/sh/sh3lcevb.ld
@@ -101,7 +101,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/elfsim.ld b/libgloss/sparc/elfsim.ld
index a047a050f..ef04d0329 100644
--- a/libgloss/sparc/elfsim.ld
+++ b/libgloss/sparc/elfsim.ld
@@ -193,7 +193,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/ex930.ld b/libgloss/sparc/ex930.ld
index 9822dca91..b501b2eb8 100644
--- a/libgloss/sparc/ex930.ld
+++ b/libgloss/sparc/ex930.ld
@@ -151,7 +151,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/ex931.ld b/libgloss/sparc/ex931.ld
index b3e610730..26ffb4d6d 100644
--- a/libgloss/sparc/ex931.ld
+++ b/libgloss/sparc/ex931.ld
@@ -151,7 +151,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/ex934.ld b/libgloss/sparc/ex934.ld
index ff2f91b20..7d1d5edf8 100644
--- a/libgloss/sparc/ex934.ld
+++ b/libgloss/sparc/ex934.ld
@@ -151,7 +151,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/sparc86x.ld b/libgloss/sparc/sparc86x.ld
index 585b16cad..f4eaf98ba 100644
--- a/libgloss/sparc/sparc86x.ld
+++ b/libgloss/sparc/sparc86x.ld
@@ -168,7 +168,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/xstormy16/eva_app.ld b/libgloss/xstormy16/eva_app.ld
index 6699b05a1..5afc2b494 100644
--- a/libgloss/xstormy16/eva_app.ld
+++ b/libgloss/xstormy16/eva_app.ld
@@ -123,7 +123,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/xstormy16/eva_stub.ld b/libgloss/xstormy16/eva_stub.ld
index 34f3b91b0..725e623cb 100644
--- a/libgloss/xstormy16/eva_stub.ld
+++ b/libgloss/xstormy16/eva_stub.ld
@@ -132,7 +132,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/xstormy16/sim_high.ld b/libgloss/xstormy16/sim_high.ld
index a7f4aa09f..abeb01f3c 100644
--- a/libgloss/xstormy16/sim_high.ld
+++ b/libgloss/xstormy16/sim_high.ld
@@ -125,7 +125,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/xstormy16/sim_rom.ld b/libgloss/xstormy16/sim_rom.ld
index e7ef6fb89..c8f5a8d16 100644
--- a/libgloss/xstormy16/sim_rom.ld
+++ b/libgloss/xstormy16/sim_rom.ld
@@ -129,7 +129,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libtool.m4 b/libtool.m4
index cbd74d571..7e4a2eec4 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -15,7 +15,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ##
 ## As a special exception to the GNU General Public License, if you
 ## distribute this file as part of a program that contains a
@@ -103,8 +103,6 @@ AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -191,48 +189,6 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
@@ -281,65 +237,6 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
 esac
 ])
 
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-  esac
-])
-if test -n "$lt_cv_sys_max_cmd_len" ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
 AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
@@ -668,7 +565,6 @@ cygwin* | mingw* |pw32*)
   ;;
 
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
   lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   case "$host_os" in
@@ -679,7 +575,6 @@ darwin* | rhapsody*)
     lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
     ;;
   esac
-  lt_cv_deplibs_check_method=pass_all
   ;;
 
 freebsd* | kfreebsd*-gnu)
@@ -740,7 +635,14 @@ irix5* | irix6*)
 
 # This must be Linux ELF.
 linux-gnu*)
-  lt_cv_deplibs_check_method=pass_all
+  case $host_cpu in
+  alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+    lt_cv_deplibs_check_method=pass_all ;;
+  *)
+    # glibc up to 2.1.1 does not perform some relocations on ARM
+    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
+  esac
+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   ;;
 
 netbsd* | knetbsd*-gnu)
@@ -836,9 +738,8 @@ AC_DEFUN([AC_CHECK_LIBM],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cygwin* | *-*-pw32*)
   # These system don't have libm
-  # on darwin the libm is a symbolic link to libSystem.dylib
   ;;
 *-ncr-sysv4.3*)
   AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
diff --git a/ltcf-c.sh b/ltcf-c.sh
index 7a91c40a5..2b02417c4 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index fa8dbd08d..620b318e0 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh
index 51faf0459..95c6fcd35 100644
--- a/ltcf-gcj.sh
+++ b/ltcf-gcj.sh
@@ -20,7 +20,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/ltconfig b/ltconfig
index 15f986c76..2fec9afa1 100755
--- a/ltconfig
+++ b/ltconfig
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -2211,7 +2211,7 @@ case $ltmain in
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -2635,7 +2635,7 @@ EOF
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #  */
 #
 #  #include <stdio.h>		/* for printf() */
diff --git a/ltmain.sh b/ltmain.sh
index d5173bc46..2f4d17312 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -3550,7 +3550,7 @@ EOF
       # Now hardcode the library paths
       rpath=
       hardcode_libdirs=
-      for libdir in $compile_rpath; do
+      for libdir in $compile_rpath $finalize_rpath; do
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
diff --git a/missing b/missing
index 894e786e1..64b5f901d 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2004-09-07.08
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -19,8 +19,8 @@ scriptversion=2005-06-08.21
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@ Supported PROGRAM values:
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Send bug reports to <bug-automake@gnu.org>."
-    exit $?
+    exit 0
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
-    exit $?
+    exit 0
     ;;
 
   -*)
@@ -288,18 +288,11 @@ WARNING: \`$1' is $msg.  You should only need it if
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
     fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
     touch $file
     ;;
 
diff --git a/mkinstalldirs b/mkinstalldirs
index 259dbfcd3..6fbe5e117 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2005-06-29.22
+scriptversion=2004-02-15.20
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -12,7 +12,7 @@ scriptversion=2005-06-29.22
 # <automake-patches@gnu.org>.
 
 errstatus=0
-dirmode=
+dirmode=""
 
 usage="\
 Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
@@ -27,7 +27,7 @@ while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
       echo "$usage"
-      exit $?
+      exit 0
       ;;
     -m)                         # -m PERM arg
       shift
@@ -37,7 +37,7 @@ while test $# -gt 0 ; do
       ;;
     --version)
       echo "$0 $scriptversion"
-      exit $?
+      exit 0
       ;;
     --)                         # stop option processing
       shift
@@ -103,21 +103,13 @@ esac
 
 for file
 do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
   shift
-  IFS=$oIFS
 
+  pathcomp=
   for d
   do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
+    pathcomp="$pathcomp$d"
     case $pathcomp in
       -*) pathcomp=./$pathcomp ;;
     esac
@@ -132,7 +124,7 @@ do
       else
 	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
+	  lasterr=""
 	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 
 	  if test ! -z "$lasterr"; then
@@ -142,7 +134,7 @@ do
       fi
     fi
 
-    pathcomp=$pathcomp/
+    pathcomp="$pathcomp/"
   done
 done
 
diff --git a/move-if-change b/move-if-change
index ff74a556d..ee1b348be 100755
--- a/move-if-change
+++ b/move-if-change
@@ -1,22 +1,32 @@
 #!/bin/sh
-# Like mv $1 $2, but if the files are the same, just delete $1.
-# Status is zero if successful, nonzero otherwise.
 
-usage="$0: usage: $0 SOURCE DEST"
+# Copyright (C) 1996 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-case $# in
-2) ;;
-*) echo "$usage" >&2; exit 1;;
-esac
-
-for arg in "$1" "$2"; do
-  case $arg in
-   -*) echo "$usage" >&2; exit 1;;
-  esac
-done
-
-if test -r "$2" && cmp -s "$1" "$2"; then
-  rm -f "$1"
+if
+test -r $2
+then
+if
+cmp $1 $2 > /dev/null
+then
+echo $2 is unchanged
+rm -f $1
+else
+mv -f $1 $2
+fi
 else
-  mv -f "$1" "$2"
+mv -f $1 $2
 fi
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index fec04f0b7..e42500fcc 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,873 +1,3 @@
-2006-03-20  Mark Mitchell  <mark@codesourcery.com>
-
-	* acconfig.h (_ATEXIT_DYNAMIC_ALLOC): Undef.
-	* configure.in (--disable-newlib-atexit-dynamic-alloc): New
-	option. 
-	* configure: Regenerated.
-	* newlib.hin: Regenerated.
-	* libc/stdlib/__atexit.c (__register_exitproc): Don't call malloc
-	if _ATEXIT_DYNAMIC_ALLOC is undefined.
-	* libc/stdlib/__call_atexit.c (__call_exitprocs): Don't call free
-	if _ATEXIT_DYNAMIC_ALLOC is undefined.
-
-2006-03-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/linuxthreads/config.h: Remove definition
-	of UINT32_C.
-
-2006-03-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/wsetup.c (__swsetup): Don't make a buffer
-	for a string I/O file that isn't using the asprintf family.
-
-2006-03-07  Eric Blake  <ebb9@byu.net>
-
-	* libc/stdio/freopen.c (_freopen_r) [HAVE_FCNTL]: For NULL
-	filename, allow read-only or write-only FILE atop O_RDWR file
-	descriptor.
-	* libc/stdio64/freopen64.c (_freopen64_r) [HAVE_FCNTL]: Likewise.
-
-2006-03-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libm/common/sf_isinf.c[_DOUBLE_IS_32BITS]: Undef isinf.
-	* libm/common/sf_isnan.c[_DOUBLE_IS_32BITS]: Undef isnan.
-
-2006-03-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libm/math/math.tex: Fix reference to sisnan.def which
-	is now in common subdirectory.
-	* libm/mathfp/mathfp.tex: Ditto.
-
-2006-02-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am (MATHOBJS_IN_LIBC): Add s_isinfd, sf_isinff, 
-	s_isnand, and sf_isnanf object files.
-	* Makefile.in: Regenerated.
-	* libc/include/ieeefp.h: Undef isnan and isinf to avoid
-	conflict if <math.h> has previously been included.
-	* libc/include/math.h
-	* libc/include/math.h: Make isnan and isinf macros to
-	conform to C99.
-	(__isinfd, __isinff, __isnand, __isnanf): New functions.
-	* libm/common/Makefile.am: Add new s_isinfd, s_isnand, sf_isinff,
-	and sf_isnanf files.  Also support s_isnan, sf_isnan, s_isinf, and
-	sf_isinf files which have been moved from math/mathfp directories. 
-	* libm/common/Makefile.in: Regenerated.
-	* libm/common/s_isinfd.c: New file.
-	* libm/common/s_isnand.c: Ditto.
-	* libm/common/sf_isinff.c: Ditto.
-	* libm/common/sf_isnanf.c: Ditto.
-	* libm/common/s_isinf.c: Moved from libm/math directory.
-	* libm/common/s_isnan.c: Ditto.
-	* libm/common/sf_isinf.c: Ditto.
-	* libm/common/sf_isnan.c: Ditto.
-	* libm/math/Makefile.am: Remove isinf and isnan family functions
-	which have been moved into common directory.
-	* libm/mathfp/Makefile.am: Ditto.
-	* libm/math/Makefile.in: Regenerated.
-	* libm/mathfp/Makefile.in: Ditto.
-	* libm/math/s_isinf.c: Removed.
-	* libm/math/s_isnan.c: Ditto.
-	* libm/math/sf_isinf.c: Ditto.
-	* libm/math/sf_isnan.c: Ditto.
-	* libm/mathfp/s_isinf.c: Ditto.
-	* libm/mathfp/s_isnan.c: Ditto.
-	* libm/mathfp/sf_isinf.c: Ditto.
-	* libm/mathfp/sf_isnan.c: Ditto.
-
-2006-02-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/fflush.c (fflush): For an fflush on a read-only
-	stream, turn off fseek/rewind optimization as per POSIX/SUSv3.
-	* libc/stdio/fseek.c (_fseek_r): After a successful unoptimized
-	seek, turn off the __SNPT no-optimization flag.
-
-2006-02-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/aio.c: Define _GNU_SOURCE so struct aioinit
-	will be defined.
-	* libc/sys/linux/sys/types.h: Move <sys/config.h> ahead of
-	<features.h> to preset special flags.
-
-2006-02-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/time.h (struct timeval): Change member types
-	according to SUSv3.
-	* libc/include/sys/types.h (useconds_t): Change to unsigned
-	according to SUSv3.
-	(suseconds_t): Define type.
-
-2006-02-13  Jeff Johnston  <jjohnstn@redhat.com>
-	    David Carne  <davidcarne@gmail.com>
-
-	* libc/string/strndup_r.c (_strndup_r): Use strnlen logic
-	instead of strlen to determine number of bytes to copy.
-	* libc/string/strnlen.c (strnlen): Fix so check for max limit occurs
-	before looking at storage location.
-
-2006-02-07  Paul Brook  <paul@codesourcery.com>
-
-	* libc/machine/arm/setjmp.S: Add Thumb-2 support.
-	* libc/sys/arm/crt0.S: Add Thumb-2 startup code.
-	* libc/sys/arm/libcfunc.c (do_AngelSWI): Use AngelSWIInsn.
-	* libc/sys/arm/swi.h (AngelSWIInsn, AngelSWIAsm): Define.
-	* libc/sys/arm/trap.S: Disable for Thumb-2.
-
-2006-01-31  Leif Ekblad  <leif@rdos.net>
-
-	* configure.host: RDOS support added
-	* libc/include/sys/config.h: Ditto.
-	* libc/sys/rdos/Makefile.am, libc/sys/rdos/Makefile.in: New files.
-	* libc/sys/rdos/aclocal.m4, libc/sys/rdos/chown.c: Ditto.
-	* libc/sys/rdos/close.c, libc/sys/rdos/config.h: Ditto.
-	* libc/sys/rdos/configure, libc/sys/rdos/configure.in: Ditto.
-	* libc/sys/rdos/crt0.S, libc/sys/rdos/execve.c: Ditto.
-	* libc/sys/rdos/fork.c, libc/sys/rdos/fstat.c: Ditto.
-	* libc/sys/rdos/getenv.c, libc/sys/rdos/getpid.c: Ditto.
-	* libc/sys/rdos/gettod.c, libc/sys/rdos/isatty.c: Ditto.
-	* libc/sys/rdos/kill.c, libc/sys/rdos/link.c: Ditto.
-	* libc/sys/rdos/lseek.c, libc/sys/rdos/open.c: Ditto.
-	* libc/sys/rdos/rdos.S, libc/sys/rdos/rdos.h: Ditto.
-	* libc/sys/rdos/rdoshelp.c, libc/sys/rdos/read.c: Ditto.
-	* libc/sys/rdos/readlink.c, libc/sys/rdos/sbrk.c: Ditto.
-	* libc/sys/rdos/stat.c, libc/sys/rdos/symlink.c: Ditto.
-	* libc/sys/rdos/times.c, libc/sys/rdos/unlink.c: Ditto.
-	* libc/sys/rdos/user.def, libc/sys/rdos/wait.c: Ditto.
-	* libc/sys/rdos/write.c: Ditto.
-
-2006-01-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* acinclude.m4: Add nodefine to AM_INIT_AUTOMAKE macro invocation
-	so as not to define PACKAGE and VERSION in newlib.h.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* newlib.hin: Ditto.
-
-2006-01-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* acconfig.h: New file to generate newlib.hin from.
-	* newlib.hin: Regenerated.
-	* stamp-h.in: Regenerated.
-	* Makefile.am: Add ACLOCAL_AMFLAGS so aclocal can be
-	called automatically.
-	* Makefile.in: Regenerated.
-	* acinclude.m4: Add proper comment for hack in previous change.
-	* aclocal.m4 */aclocal.m4: Regenerated.
-	* configure */configure: Regenerated.
-
-2006-01-11  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* acinclude.m4: Add hack to prevent INSTALL in subdirs
-	from being set to "../".
-	* Makefile.am: Pass INSTALL in AM_MAKEFLAGS.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* Makefile.in: Ditto.
-	* doc/aclocal.m4: Ditto.
-	* doc/configure: Ditto.
-	* iconvdata/aclocal.m4: Ditto.
-	* iconvdata/configure: Ditto.
-	* libc/*/aclocal.m4: Ditto.
-	* libc/*/configure: Ditto.
-	* libc/libc.texinfo: Ditto.
-	* libm/*/aclocal.m4: Ditto.
-	* libm/*/configure: Ditto.
-
-2006-01-10  Eric Blake  <ebb9@byu.net>
-
-	* libc/stdio/freopen.c (_freopen_r): Fix use of oflags.
-	* libc/stdio64/freopen64.c (_freopen64_r): Likewise.
-
-2006-01-10  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libm/mathfp/s_frexp.c: Check for special values on
-	the original input, not the manipulated output value.
-	* libm/mathfp/sf_frexp.c: Ditto.
-	* libm/mathfp/s_atangent.c: Don't use local value branch
-	when checking for quadrant.
-	* libm/mathfp/sf_atangent.c: Ditto.
-
-2006-01-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/freopen.c: Switch to use isatty instead of _isatty.
-	* libc/stdio64/freopen64.c: Ditto.
-
-2006-01-09  Eric Blake  <ebb9@byu.net>
-
-	* libc/stdio/freopen.c (_freopen_r): Accept NULL filename.
-	* libc/stdio64/freopen64.c (_freopen64_r): Likewise.
-
-2006-01-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/getopt.h: Add macros needed by
-	new version of getopt.c in libc/stdlib.
-
-2006-01-04  Gregory Pietsch  <gpietsch@comcast.net>
-
-	* libc/stdlib/getopt.c: Replaced with version
-	that adds getopt_long and getopt_long_only support.
-	* libc/include/getopt.h: New file.
-
-2005-12-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* NEWS: Update with 1.14.0 info.
-	* README: Ditto.
-	* acinclude.m4: Change version number to 1.14.0.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* doc/aclocal.m4: Ditto.
-	* doc/configure: Ditto.
-	* libc/*/aclocal.m4: Ditto.
-	* libc/*/configure: Ditto.
-	* libc/libc.texinfo: Ditto.
-	* libm/*/aclocal.m4: Ditto.
-	* libm/*/configure: Ditto.
-	* libm/libm.texinfo: Ditto.
-	* libc/sys/linux/shared.ld: Add VERS_1.14.
-
-2005-12-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/sys/stat.h: Change *stat64 prototypes to
-	take a pointer to struct stat64 rather than struct stat.
-
-2005-12-16  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Prefer long over int for int32_t.
-	Use __have_long32 to set up int32_t.
-	* libc/include/inttypes.h: Use "#if xxx" instead of "#ifdef xxx"
-	(Sync with stdint.h).
-
-2005-12-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/fcntl.h: Define O_SYNC unconditionally.  Fix
-	typo in O_NDELAY comment.
-
-2005-12-13  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* libc/include/machine/ieeefp.h (__mt__): Renamed from __ms1__.
-	* libc/include/machine/setjmp.h (__mt__): Likewise.
-	* libc/machine/mt/setjmp.S: Rename ms1 reference to mt.
-	* libc/machine/configure.in: Ditto.
-
-2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* configure.host: Replace ms1 arch with mt arch.
-	* libc/machine/mt: Renamed from ms1 dir.
-
-2005-12-08  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/sys/types.h: Remove the ifdef armour around
-	standard POSIX types.
-
-2005-12-06  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/sys/rtems/crt0.c: Add rtems_gxx_key_create,
-	rtems_gxx_key_delete, rtems_gxx_getspecific,
-	rtems_gxx_setspecific, rtems_gxx_mutex_trylock, 
-	rtems_gxx_recursive_mutex_init, rtems_gxx_recursive_mutex_lock, 
-	rtems_gxx_recursive_mutex_trylock, rtems_gxx_recursive_mutex_unlock.
-
-2005-12-05  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/stdlib.h: Move cygwin declarations to cygwin-specific
-	file.  Declare unsetenv and _unsetenv_r when not cygwin.
-
-2005-11-18  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/time/strptime.c (strptime): Don't abort for %c and %Z.
-	Treat %c as "%a %b %e %H:%M:%S %Y" and ignore %Z.
-
-2005-11-18  Christopher Faylor  <cgf@timesys.com>
-
-	* include/sys/time.h: Move more cygwin stuff to cygwin-specific header.
-
-2005-11-18  Christopher Faylor  <cgf@timesys.com>
-
-	* include/time.h: Remove more cygwin-specific stuff.
-
-2005-11-18  Christopher Faylor  <cgf@timesys.com>
-
-	* include/time.h: Move cygwin declarations to cygwin-specific header.
-	* include/sys/time.h: Rename cygwin include to "sys_time.h".
-
-2005-11-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/dl/dl-local.h: New file based on old dlfcn.h
-	in libc/sys/linux/include.
-	* libc/sys/linux/dl/dlfcn.h: Moved to libc/sys/linux/include.
-	* libc/sys/linux/dl/ldsodefs.h: Include dl-local.h instead of dlfcn.h.
-	* libc/sys/linux/include/dlfcn.h: Replaced with dlfcn.h formerly
-	in libc/sys/linux/dl.
-
-2005-11-11  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/sys/time.h: For cygwin, use general header rather than
-	specific "sys/select.h".
-
-2005-11-08  Tom Walsh  <tom@openhardware.net>
-
-	* libc/time/tzvars.c: New file.
-	* libc/time/tzset_r.c: Moved globals into tzvars.c
-	so other time functions needn't link in __tzset_r and its
-	dependencies.
-	* libc/time/Makefile.am: Add the new file.
-	* libc/time/Makefile.in: Regenerated.
-
-2005-11-08  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/string.h: Add cygwin-specific function declaration.
-
-2005-11-07  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/ieeefp.h: Add C++ guards.
-
-2005-11-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/unix/getcwd.c: Don't use non-reentrant syscall names.
-	* libc/unix/getlogin.c: Ditto.
-	* libc/unix/getpass.c: Ditto.
-	* libc/unix/getut.c: Ditto.
-	* libc/unix/ttyname.c: Ditto.
-
-2005-11-03  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/sys/unistd.h (readlink, symlink): Provide these
-	prototypes by default.
-	* libc/sys/linux/include/unistd.h (readlink): Remove this
-	prototype.
-	* libc/sys/linux/sys/unistd.h (readlink, symlink): New
-	prototypes.
-
-2005-11-01  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Cleanup #if vs. #ifdef.
-
-2005-10-31  Darin Johnson  <darin@usa.net>
-
-	* libm/mathfp/s_mathcnst.c: Fix endian-ness check to be
-	correct for constants.
-
-2005-10-28  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/stdio/siprintf.c: Wrap long lines in ANSI_SYNOPSIS.
-	* libc/stdio/siscanf.c: Likewise.
-	* libc/stdio/sprintf.c: Likewise.
-	* libc/stdio/sscanf.c: Likewise.
-	* libc/stdio/vfprintf.c: Likewise.
-	* libc/stdio/vfscanf.c: Likewise.
-	* libc/stdio/viprintf.c: Likewise.
-	* libc/stdio/viscanf.c: Likewise.
-
-2005-10-28  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/sys.tex (Stubs): Format examples consistently.   Change sbrk
-	example to use "_end" symbol instead of "end".  Change write  example
-	to use "outbyte" instead of "writechar".
-
-2005-10-28  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/ctype/ctype.tex: Use hyphens as appropriate, but not  otherwise.
-	* libc/ctype/islower.c: Likewise.
-	* libc/ctype/isupper.c: Likewise.
-	* libc/ctype/iswalnum.c: Likewise.
-	* libc/ctype/iswalpha.c: Likewise.
-	* libc/ctype/iswblank.c: Likewise.
-	* libc/ctype/iswcntrl.c: Likewise.
-	* libc/ctype/iswdigit.c: Likewise.
-	* libc/ctype/iswgraph.c: Likewise.
-	* libc/ctype/iswlower.c: Likewise.
-	* libc/ctype/iswprint.c: Likewise.
-	* libc/ctype/iswpunct.c: Likewise.
-	* libc/ctype/iswspace.c: Likewise.
-	* libc/ctype/iswupper.c: Likewise.
-	* libc/ctype/iswxdigit.c: Likewise.
-	* libc/ctype/tolower.c: Likewise.
-	* libc/ctype/toupper.c: Likewise.
-	* libc/ctype/towctrans.c: Likewise.
-	* libc/ctype/towlower.c: Likewise.
-	* libc/ctype/towupper.c: Likewise.
-	* libc/string/strcasecmp.c: Likewise.
-	* libc/string/strcoll.c: Likewise.
-	* libc/string/strings.tex: Likewise.
-	* libc/string/strlwr.c: Likewise.
-	* libc/string/strncasecmp.c: Likewise.
-	* libc/string/strupr.c: Likewise.
-	* libc/string/wcscoll.c: Likewise.
-	* libc/string/wcslcat.c: Likewise.
-	* libc/string/wcslcpy.c: Likewise.
-	* libc/string/wcsnlen.c: Likewise.
-	* libc/string/wcsstr.c: Likewise.
-	* libc/string/wcstrings.tex: Likewise.
-	* libc/string/wmemchr.c: Likewise.
-	* libc/string/wmemcmp.c: Likewise.
-	* libc/string/wmemcpy.c: Likewise.
-	* libc/string/wmemmove.c: Likewise.
-	* libc/string/wmemset.c: Likewise. 
-
-2005-10-28  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/misc/unctrl.c: Replace FUNCTION description.
-	* libc/signal/signal.c: Remove documentation for raise and  _raise_r.
-	* libc/stdio/getdelim.c: Fix spelling errors.
-	* libc/stdio/getw.c: Put RETURNS on a separate line.  Fix  punctuation.
-	* libc/stdio/putw.c: Likewise.
-	* libc/stdlib/a64l.c: Fix formatting, spelling and  punctuation in
-        documentation.
-	* libc/stdlib/assert.c: Do not capitalize FUNCTION description.
-	* libc/stdlib/efgcvt.c: Add spaces to FUNCTION description.
-	* libc/stdlib/envlock.c: Use em-dash in FUNCTION description.
-	* libc/stdlib/mlock.c: Likewise.
-	* libc/stdlib/mstats.c: Likewise.
-	* libc/time/tzlock.c: Likewise.
-	* libc/stdlib/rand.c: Use "multi-threaded" and "thread-safe"  in NOTES.
-	* libc/stdlib/rand48.c: Remove extra space in FUNCTION  description
-        and hyphenate "pseudo-random".
-	* libc/string/bcmp.c: Remove extra blank lines in  documentation.
-	* libc/string/strncat.c: Likewise.
-	* libc/string/memchr.c: Remove extra ">" character in  documentation.
-	* libc/string/strcspn.c: Use "characters" instead of "chars".
-	* libc/string/strpbrk.c: Likewise.
-	* libc/string/strerror_r.c: Capitalize "GNU".
-	* libc/string/strnlen.c: Likewise.
-	* libc/string/strtok.c: Fix formatting, spelling and  punctuation in
-        documentation.  Use "multi-threaded" and "thread-safe" in  NOTES.
-	* libc/string/wcscat.c: Split PORTABILITY into two paragraphs.
-	* libc/string/wcschr.c: Likewise.
-	* libc/string/wcscmp.c: Likewise.
-	* libc/string/wcscpy.c: Likewise.
-	* libc/string/wcscspn.c: Likewise.
-	* libc/string/wcslen.c: Likewise.
-	* libc/string/wcsncat.c: Likewise.
-	* libc/string/wcsncmp.c: Likewise.
-	* libc/string/wcsncpy.c: Likewise.
-	* libc/string/wcsnlen.c: Likewise.
-	* libc/string/wcspbrk.c: Likewise.
-	* libc/string/wcsrchr.c: Likewise.
-	* libc/string/wcsspn.c: Likewise.
-	* libc/string/wmemchr.c: Likewise.
-	* libc/string/wmemcmp.c: Likewise.
-	* libc/string/wmemcpy.c: Likewise.
-	* libc/string/wmemset.c: Likewise.
-	* libc/string/wmemmove.c: Likewise.  Also fix FUNCTION  description.
-	* libc/string/wcswidth.c: Formatting and punctuation in  documentation.
-	* libc/string/wcwidth.c: Likewise.
-	* libm/common/s_modf.c: Remove extra period from documentation.
-	* libm/math/s_isnan.c: Fix formatting, grammar and  punctuation in
-        documentation.
-	* libm/mathfp/s_isnan.c: Likewise.
-	* libm/math/s_ldexp.c: Fix punctuation.
-	* libm/mathfp/s_ldexp.c: Likewise.
-	* libm/math/w_log.c: Likewise.
-	* libm/mathfp/s_logarithm.c: Likewise.
-	* libm/math/w_j0.c: Add spaces to FUNCTION description.
-	* libm/mathfp/w_jn.c: Likewise. 
-
-2005-10-26  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/posix/scandir.c (scandir): Update the function
-	prototype to match the header.
-	* libc/sys/linux/linuxthreads/bits/libc-lock.h: Remove an
-	extraneous #endif.
-	* libc/sys/linux/sys/lock.h: Do not include
-	machine/weakalias.h, since it's not used by this file.
-
-2005-10-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/Makefile.am: Reorder SUBLIBS so machine and sys
-	directories can override properly.
-
-2005-10-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/math.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): When
-	gcc is 3.3 or greater, use special gcc builtins.
-
-2005-10-20  Corinna Vinschen <corinna@vinschen.de>
-
-	* libc/include/sys/time.h: Declare futimes and lutimes for Cygwin.
-
-2005-10-18  Corinna Vinschen <corinna@vinschen.de>
-
-	* libc/include/sys/features.h: Define _POSIX_MEMLOCK_RANGE for Cygwin.
-
-2005-10-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/math.h (HUGE_VALF, HUGE_VALL): New.
-	* libm/common/Makefile.am: Add s_infconst.c support.
-	* libm/common/Makefile.in: Regenerated.
-	* libm/common/s_infconst.c: New file with float and
-	long double infinity support added.
-	* libm/math/Makefile.am: Remove s_infconst.c support.
-	* libm/math/Makefile.in: Regenerated.
-	* libm/math/s_infconst.c: Moved to common directory.
-	* libm/mathfp/Makefile.am: Remove s_infconst.c support.
-	* libm/mathfp/Makefile.in: Regenerated.
-	* libm/mathfp/s_infconst.c: Moved to common directory.
-
-2005-10-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/net/gethostbydns.c (dprintf): Rename to
-	dbgprintf to prevent conflict with new dprintf function.
-
-2005-10-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Fix up "inf" and
-	"nan" processing for systems that have long double support.
-
-2005-10-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/sys/types.h (int8_t): Add type.
-
-2005-10-14  Bob Wilson  <bob.wilson@acm.org>
-
-        * libm/common/Makefile.am (doc): Do not append to $(TARGETDOC).
-        * libm/common/Makefile.in: Regenerate.
-        * libm/common/common.tex: Delete file.
-        * libm/math/math.tex: Include .def files from common/.
-        * libm/mathfp/mathfp.tex: Likewise.
-
-2005-10-14  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/libc.texinfo (Top): Surround this node with @ifnottex
-	instead of @ifinfo.  Update menu to add Introduction and match
-	SUBDIRS order.
-        (Introduction): New section.
-
-2005-10-14  Bob Wilson  <bob.wilson@acm.org>
-
-        * libc/reent/reent.tex (Reentrancy): Replace "Cygnus C Library"
-        with "Red Hat newlib C Library".
-        * libc/sys.tex (Stubs): Likewise.
-        * libm/math/math.tex (Math): Likewise.
-        * libm/mathfp/mathfp.tex (Math): Likewise.
-
-2005-10-11  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/stdio.h (dprintf): New declaration.
-	(vdprintf): Ditto.
-	* libc/stdio/Makefile.am (GENERAL_SOURCES): Add dprintf.c
-	and vdprintf.c.
-	* libc/stdio/Makefile.in: Regenerate.
-	* libc/stdio/dprintf.c: New file.
-	* libc/stdio/vdprintf.c: New file.
-	* libc/stdio/stdio.tex (dprintf): New entry.
-
-2005-10-11  David Weatherford  <weath@tensilica.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Recognize 'F' format.
-	Print "inf" and "nan" in lowercase for e/f/g formats and in 
-	uppercase for E/F/G formats.
-
-2005-10-07  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/stdlib/mallocr.c (mALLOc, rEALLOCc, mEMALIGn): Set errno
-	to ENOMEM on failure.
-
-2005-10-06  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Add [u]int_fast<N>_t types.
-
-2005-10-04  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Move magic to set __have_long* to the
-	beginning.  Use #if __have* instead of #if defined(__have*).
-	Minor typo fixes.
-
-2005-10-04  James E Wilson  <wilson@specifix.com>
-
-	* libc/include/sys/dirent.h (_DIRENT_H_): Delete #include_next.  Add
-	#error.
-
-2005-10-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/stdint.h: Include <sys/types.h> and
-	incorporate Ralf's change below.
-
-2005-10-03  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: 
-	Use __INTMAX_TYPE__ to derive intmax_t.
-	Use __UINTMAX_TYPE__ to derive uintmax_t.
-	Fix minor typo.
-
-2005-09-27  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Correct __STDINT_EXP macro incorrectly 
-	handling GCC >= 4.
-
-2005-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/stdint.h: Update to match functionality
-	of generic newlib stdint.h.
-
-2005-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdint.h (__EXP): Rename to __STDINT_EXP
-	and do not #undef the macro after it is used.  Fix typos.
-	Also change 64-bit constants to use the __have_long64 and
-	__have_longlong64 flags to determine if long or long long
-	constants should be used.
-	* libc/include/inttypes.h: Include stddef.h to get wchar_t
-	type defined.
-
-2005-09-20  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/stdint.h: Fix typo in names of
-	LEAST macros.
-
-2005-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/rtems/include/inttypes.h: Moved to...
-	* libc/include/inttypes.h: ...here.
-
-2005-09-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/rtems/include/stdint.h: Moved to...
-	* libc/include/stdint.h: ...here.
-
-2005-09-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am: Add include files under bits sub-directory.
-	* Makefile.in: Regenerated.
-	* libc/sys/linux/argp/argp-fs-xinl.c: Set __OPTIMIZE__ to
-	actual value of 1 to be compatible with newer glibc headers.
-	* libc/sys/linux/sys/cdefs.h: Fix to be compatible with newer
-	glibc headers.
-	* libc/sys/linux/sys/dirent.h: Ditto.
-	* libc/sys/linux/argp/argp-xinl.c: Ditto.
-	* libc/sys/linux/dl/dl-runtime.c: Make sure fixup and
-	profile_fixup routines are marked used so they won't be
-	optimized away.
-	* libc/sys/linux/dl/dl-cache.c: Don't use weak_extern macro
-	to mark functions as weak.
-	* libc/sys/linux/dl/dl-open.c: Ditto.
-	* libc/sys/linux/iconv/gconv_open.c: Fix to obey new gcc4
-	rules about lvalues.
-	* libc/sys/linux/iconv/gconv_simple.c: Ditto.
-	* libc/sys/linux/linuxthreads/bits/libc-lock.h: Don't use
-	weak_extern macro to mark functions as weak.  Instead always
-	use #pragma weak.
-	* iconvdata/jis0208.h: Fix to work with gcc4.
-	* libc/sys/linux/dl/dl-load.c: Ditto.
-	* libc/sys/linux/dl/dl-reloc.c: Ditto.
-	* libc/sys/linux/dl/do-rel.h: Ditto.
-	* libc/sys/linux/dl/dynamic-link.h: Ditto.
-	* libc/sys/linux/include/ltdl.h: Ditto.
-	* libc/sys/linux/machine/i386/dl-machine.h: Ditto.
-	* libc/sys/linux/machine/i386/weakalias.h: Ditto.
-	* libc/sys/linux/net/ns_ntoa.c: Ditto.
-	* libc/sys/linux/bits/initspin.h: New file.
-	* libc/sys/linux/bits/libc-lock.h: Ditto.
-	* libc/sys/linux/bits/pthreadtypes.h: Ditto.
-	* libc/sys/linux/bits/typesizes.h: Ditto.
-
-2005-09-08  Eric Blake  <ebb9@byu.net>
-
-	* libc/argz/argz_insert.c (argz_insert): Don't die with EINVAL when
-	before is NULL.
-
-2005-09-08  Brian Dessent  <brian@dessent.net>
-
-	* sf_lrint.c (lrintf): Mask 'i0' correctly when extracting
-	mantissa.
-	* s_lrint.c: Ditto.
-
-2005-09-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdio.h: Add prototype for viprintf.
-
-2005-09-01  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libm/mathfp/s_pow.c: (pow): Change code so 0 raised to
-	any positive power results in 0.
-	* libm/mathfp/sf_pow.c (powf): Ditto.
-
-2005-08-31  Paul Brook  <paul@codesourcery.com>
-
-	* configure.host: Set have_crt0 to no for Arm targts when not
-	providing syscalls.  Set sys_dir=arm unconditionally.
-	Default have_crt0 based on sys_dir.
-	* configure.in: Use have_crt0.
-	* libc/configure.in: Ditto.
-	* libc/sys/configure.in: Ditto.
-	* configure: Regenerate.
-	* libc/configure: Regenerate.
-	* libc/sys/configure: Regenerate.
-	* libc/sys/arm/Makefile.am (lib_a_SOURCES): Add aeabi_atexit.c.
-	Only build other files when providing syscalls.
-	* libc/sys/arm/Makefile.in: Regenerate.
-	* libc/sys/arm/aeabi_atexit.c: New file.
-
-2005-08-26  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/string.h: Revert previous change.
-
-2005-08-25  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/string.h: For Cygwin, Define strerror_r as per ISO C.
-
-2005-08-22  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/_syslist.h: If HAVE_OPENDIR is not defined,
-	define _opendir as opendir, _readdir as readdir, and
-	_closedir as closedir so that the implementations in
-	libc/posix will be used.
-
-2005-08-10  DJ Delorie  <dj@redhat.com>
-
-	* MAINTAINERS (CPU Ports): Add CPU port maintainer section.
-
-2005-08-10  Stephen Huw Clarke  <stephen.clarke@st.com>
-
-	* libm/common/sf_fmax.c: Fix to properly handle NaNs.
-	* libm/common/s_max.c: Ditto.
-	* libm/common/sf_fmin.c: Ditto.
-	* libm/common/s_min.c: Ditto.
-
-2005-08-10  DJ Delorie  <dj@redhat.com>
-
-	* configure.host: Add m32c support.
-	* libc/include/machine/ieeefp.h: Likewise.
-	* libc/include/machine/setjmp.h: Likewise.
-	* libc/include/sys/config.h: Likewise.
-	* libc/machine/m32c: New directory, Renesas R8C/M16C/M32C support.
-	* libc/machine/m32c/aclocal.m4: New file.
-	* libc/machine/m32c/configure: Ditto.
-	* libc/machine/m32c/configure.in: Ditto.
-	* libc/machine/m32c/Makefile.am: Ditto.
-	* libc/machine/m32c/Makefile.in: Ditto.
-	* libc/machine/m32c/setjmp.S: Ditto.
-
-2005-08-02  Bob Wilson  <bob.wilson@acm.org>
-
-        * libm/math/ef_hypot.c (__ieee754_hypotf): Add missing exponent bias
-        to the value for 2^126.
-
-2005-07-26  Hans-Peter Nilsson  <hp@bitrange.com>
-
-	* libc/machine/cris/libcdtor.c (defaultors): Mark artificially as
-	used.
-
-2005-07-20  Bob Wilson  <bob.wilson@acm.org>
-           Darin Petkov <darin@tensilica.com>
-
-       * libm/math/ef_atan2.c (pi, pi_lo): Use round-to-nearest value of pi.
-
-2005-07-19  Paul Brook  <paul@codesourcery.com>
-
-	* libc/sys/arm/crt0.S: Ensure doubleword stack alignment.
-
-2005-07-18  Joseph S. Myers  <joseph@codesourcery.com>
-
-	* testsuite/lib/checkoutput.exp (newlib_check_output): Use test
-	names after PASS and FAIL which do not depend on source directory
-	name or on whether test passed or failed.
-	* testsuite/lib/passfail.exp (newlib_pass_fail): Likewise.
-
-2005-07-08  Ola Hugosson   <Ola.Hugosson@anoto.com>
-
-	* libc/string/wcsspn.c (wcsspn): Add missing increment of q.
-
-2005-07-07  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/unix/ttyname.c (ttyname): Avoid calling _closedir
-	twice for the same directory. _closedir calls free, and freeing
-	the same pointer twice may cause a crash.
-
-2005-07-06  Aldy Hernandez  <aldyh@redhat.com>
-
-        * configure.host: Added entry for ms1*.
-        * libc/include/machine/ieeefp.h: Handle ms1.
-        * libc/include/machine/setjmp.h (_JBLEN): Define for ms1.
-        * libc/machine/ms1/aclocal.m4: New.
-        * libc/machine/ms1/configure: New.
-        * libc/machine/ms1/configure.in: New.
-        * libc/machine/ms1/Makefile.am: New.
-        * libc/machine/ms1/Makefile.in: New.
-        * libc/machine/ms1/setjmp.S: New.
-
-2005-07-04  Mark Mitchell  <mark@codesourcery.com>
-
-	* Makefile.am (site.exp): Set tmpdir.
-	* Makefile.in: Regenerated.
-	* testsuite/lib/checkoutput.exp (newlib_check_output): Put
-	executables in $tmpdir.
-	* testsuite/lib/flags.exp (libgloss_link_flags): Use the original
-	libgloss version if not running in the build directory.
-	* testsuite/lib/newlib.exp (newlib_init): Put testglue.o in
-	$tmpdir.
-	* testsuite/lib/passfail.exp (newlib_pass_fail): Put executables
-	in $tmpdir.
-
-2005-06-28  Dave Korn  <dave.korn@artimi.com>
-
-	* libm/common/s_lrint.c (lrint):  Fix signed-vs-unsigned comparison
-	and miscalculation caused by fp representation of zero.
-	* libm/common/sf_lrint.c (lrintf):  Likewise.
-
-2005-06-16  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/stdio/vfprintf.c (cvt): Don't rely on pointer aliasing to
-	determine characteristics of long double.  Use a union instead.
-	* ldtoa.c (_ldtoa_r): Ditto.
-	(_ldcheck): Ditto.
-	(_strtold): Ditto.
-	(union uconv): New union.
-
-2005-06-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/mallocr.c (MALLOC_COPY): Switch to use memmove
-	instead of memcpy.
-
-2005-05-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host (mn10300-*): Add long long I/O support by default.
-
-2005-05-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/getpwuid.c: Removed.
-	* libc/sys/linux/getpwnam.c: Removed.
-	* libc/sys/linux/getpwent.c: New file containing logic
-	from files removed above.  This allows overriding of file
-	in libc/unix.
-	* libc/sys/linux/Makefile.am: Support changes above.
-	* libc/sys/linux/Makefile.in: Regenerated.
-
-2005-04-28  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r): Fix code thinko
-	when checking for multiple flags.
-
-2005-04-18  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.host <cris-*-* | crisv32-*-*>: Set
-        default_newlib_io_long_long="yes".
-
-2005-04-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/libgen.h: New file.
-
-2005-04-08  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/unix/Makefile.am: Add support for basename and dirname.
-	* libc/unix/Makefile.in: Regenerated.
-	* libc/unix/basename.c: New file.
-	* libc/unix/dirname.c: New file.
-
-2005-04-07  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/sys/linux/inode.c (lchown): New function.
-
-2005-04-07  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/unix/Makefile.am (LIB_OBJS): Include all the ELIX objects if no
-	ELIX level is defined.
-	* libc/unix/Makefile.in: Regenerated.
-
-2005-04-05  Dave Korn  <dave.korn@artimi.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r): If an error occurs processing
-	something that looks like a "NaN", put back the characters processed.
-
 2005-04-01  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/stdlib/strtod.c (_strtod_r): Never change s00.
diff --git a/newlib/MAINTAINERS b/newlib/MAINTAINERS
index cca33c390..b2c4e48e1 100644
--- a/newlib/MAINTAINERS
+++ b/newlib/MAINTAINERS
@@ -28,13 +28,6 @@ Cygwin:				cgf@redhat.com
 Web pages:			jjohnstn@redhat.com
 
 
-			CPU Port Maintainers	(CPU alphabetical order)
-
-CPU port maintainers may make changes in cpu-specific directories, as
-well as cpu-specific portions of the build system, without approval.
-
-m32c port		DJ Delorie		dj@redhat.com
-
 
 			Write After Approval
 
diff --git a/newlib/Makefile.am b/newlib/Makefile.am
index 9da9349cb..afebb6b18 100644
--- a/newlib/Makefile.am
+++ b/newlib/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 
 AUTOMAKE_OPTIONS = cygnus dejagnu
-ACLOCAL_AMFLAGS = -I .
 
 # Multilib support variables.
 MULTISRCTOP =
@@ -28,7 +27,6 @@ AM_MAKEFLAGS = \
 	"CFLAGS=$(CFLAGS)" \
 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-	"INSTALL=$(INSTALL)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"LIBCFLAGS=$(LIBCFLAGS)" \
 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
@@ -91,8 +89,6 @@ toollib_DATA = $(CRT0) $(CRT1)
 MATHOBJS_IN_LIBC = \
 	s_isinf.$(oext) sf_isinf.$(oext) \
 	s_isnan.$(oext) sf_isnan.$(oext) \
-	s_isinfd.$(oext) sf_isinff.$(oext) \
-	s_isnand.$(oext) sf_isnanf.$(oext) \
 	s_nan.$(oext) sf_nan.$(oext) \
 	s_ldexp.$(oext) sf_ldexp.$(oext) \
 	s_frexp.$(oext) sf_frexp.$(oext) \
@@ -193,7 +189,7 @@ all-recursive: stmp-targ-include
 # used while building.
 stmp-targ-include: config.status
 	-rm -rf targ-include stmp-targ-include
-	mkdir targ-include targ-include/sys targ-include/machine targ-include/bits
+	mkdir targ-include targ-include/sys targ-include/machine
 	cp newlib.h targ-include/newlib.h
 	-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
@@ -220,11 +216,6 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/bits/`basename $$i`; \
-	    else true; fi ; \
-	  done
 	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/machine/`basename $$i`; \
@@ -285,12 +276,6 @@ endif
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
-	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/bits; \
-	  for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/bits/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
@@ -357,7 +342,6 @@ site.exp: Makefile
 	@echo 'set tool_version $(VERSION)' >> $@-t
 	@echo 'set srcdir $(srcdir)/testsuite' >> $@-t
 	@echo 'set objdir' `pwd` >> $@-t
-	@echo 'set tmpdir' `pwd`/testsuite >> $@-t
 	@echo 'set multibuildtop ./$(MULTIBUILDTOP)' >> $@-t
 	@echo 'set host_alias $(build_alias)' >> $@-t
 	@echo 'set host_triplet $(build_triplet)' >> $@-t
diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index ce3f148b7..caaa6f767 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -112,7 +112,6 @@ oext = @oext@
 sys_dir = @sys_dir@
 
 AUTOMAKE_OPTIONS = cygnus dejagnu
-ACLOCAL_AMFLAGS = -I .
 
 # Multilib support variables.
 MULTISRCTOP = 
@@ -129,7 +128,7 @@ LIBTOOL_VERSION_INFO = 0:0:0
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
-AM_MAKEFLAGS =  	"AR_FLAGS=$(AR_FLAGS)" 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" 	"CFLAGS=$(CFLAGS)" 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" 	"INSTALL=$(INSTALL)" 	"LDFLAGS=$(LDFLAGS)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" 	"MAKE=$(MAKE)" 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 	"PICFLAG=$(PICFLAG)" 	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" 	"SHELL=$(SHELL)" 	"EXPECT=$(EXPECT)" 	"RUNTEST=$(RUNTEST)" 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" 	"exec_prefix=$(exec_prefix)" 	"infodir=$(infodir)" 	"libdir=$(libdir)" 	"prefix=$(prefix)" 	"tooldir=$(tooldir)" 	"top_toollibdir=$(toollibdir)" 	"AR=$(AR)" 	"AS=$(AS)" 	"CC=$(CC_FOR_NEWLIB)" 	"LD=$(LD)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"NM=$(NM)" 	"PICFLAG=$(PICFLAG)" 	"RANLIB=$(RANLIB)" 	"DESTDIR=$(DESTDIR)"
+AM_MAKEFLAGS =  	"AR_FLAGS=$(AR_FLAGS)" 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" 	"CFLAGS=$(CFLAGS)" 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" 	"LDFLAGS=$(LDFLAGS)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" 	"MAKE=$(MAKE)" 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 	"PICFLAG=$(PICFLAG)" 	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" 	"SHELL=$(SHELL)" 	"EXPECT=$(EXPECT)" 	"RUNTEST=$(RUNTEST)" 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" 	"exec_prefix=$(exec_prefix)" 	"infodir=$(infodir)" 	"libdir=$(libdir)" 	"prefix=$(prefix)" 	"tooldir=$(tooldir)" 	"top_toollibdir=$(toollibdir)" 	"AR=$(AR)" 	"AS=$(AS)" 	"CC=$(CC_FOR_NEWLIB)" 	"LD=$(LD)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"NM=$(NM)" 	"PICFLAG=$(PICFLAG)" 	"RANLIB=$(RANLIB)" 	"DESTDIR=$(DESTDIR)"
 
 
 FLAGS_TO_PASS = $(AM_MAKEFLAGS)
@@ -154,7 +153,7 @@ toollib_DATA = $(CRT0) $(CRT1)
 # The functions ldexp, frexp and modf are traditionally supplied in
 # both libc.a and libm.a.  We build them in libm.a and copy them over,
 # along with some required supporting routines.
-MATHOBJS_IN_LIBC =  	s_isinf.$(oext) sf_isinf.$(oext) 	s_isnan.$(oext) sf_isnan.$(oext) 	s_isinfd.$(oext) sf_isinff.$(oext) 	s_isnand.$(oext) sf_isnanf.$(oext) 	s_nan.$(oext) sf_nan.$(oext) 	s_ldexp.$(oext) sf_ldexp.$(oext) 	s_frexp.$(oext) sf_frexp.$(oext) 	s_modf.$(oext) 	sf_modf.$(oext) s_scalbn.$(oext) 	sf_scalbn.$(oext) 	s_finite.$(oext) sf_finite.$(oext) 	s_copysign.$(oext) sf_copysign.$(oext) 	s_infconst.$(oext)
+MATHOBJS_IN_LIBC =  	s_isinf.$(oext) sf_isinf.$(oext) 	s_isnan.$(oext) sf_isnan.$(oext) 	s_nan.$(oext) sf_nan.$(oext) 	s_ldexp.$(oext) sf_ldexp.$(oext) 	s_frexp.$(oext) sf_frexp.$(oext) 	s_modf.$(oext) 	sf_modf.$(oext) s_scalbn.$(oext) 	sf_scalbn.$(oext) 	s_finite.$(oext) sf_finite.$(oext) 	s_copysign.$(oext) sf_copysign.$(oext) 	s_infconst.$(oext)
 
 
 LIBC_OBJECTLISTS =  	$(POSIX_OBJECTLIST) 	$(SIGNAL_OBJECTLIST) 	$(SYSCALL_OBJECTLIST) 	$(UNIX_OBJECTLIST) 	$(STDIO64_OBJECTLIST) 	libc/argz/objectlist.awk.in 	libc/stdlib/objectlist.awk.in 	libc/time/objectlist.awk.in 	libc/ctype/objectlist.awk.in 	libc/search/objectlist.awk.in 	libc/string/objectlist.awk.in 	libc/locale/objectlist.awk.in 	libc/misc/objectlist.awk.in 	libc/reent/objectlist.awk.in 	libc/errno/objectlist.awk.in 	libc/stdio/objectlist.awk.in 	$(MACHINE_OBJECTLIST) 	$(SYS_OBJECTLIST) 	$(SYS_MACH_OBJECTLIST)
@@ -212,8 +211,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DATA =  $(noinst_DATA) $(toollib_DATA)
 
 DIST_COMMON =  README ./stamp-h.in ChangeLog Makefile.am Makefile.in \
-NEWS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \
-newlib.hin
+NEWS acinclude.m4 aclocal.m4 configure configure.in newlib.hin
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -236,9 +234,8 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4 \
-		./acinclude.m4 ./aclocal.m4 ./libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
+	cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -260,7 +257,7 @@ $(srcdir)/newlib.hin: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
 		rm -f $(srcdir)/stamp-h.in; \
 		$(MAKE) $(srcdir)/stamp-h.in; \
 	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
 
@@ -703,7 +700,7 @@ all-recursive: stmp-targ-include
 # used while building.
 stmp-targ-include: config.status
 	-rm -rf targ-include stmp-targ-include
-	mkdir targ-include targ-include/sys targ-include/machine targ-include/bits
+	mkdir targ-include targ-include/sys targ-include/machine
 	cp newlib.h targ-include/newlib.h
 	-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
@@ -730,11 +727,6 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/bits/`basename $$i`; \
-	    else true; fi ; \
-	  done
 	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/machine/`basename $$i`; \
@@ -790,12 +782,6 @@ install-data-local:	install-toollibLIBRARIES
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
-	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/bits; \
-	  for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/bits/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
@@ -854,7 +840,6 @@ site.exp: Makefile
 	@echo 'set tool_version $(VERSION)' >> $@-t
 	@echo 'set srcdir $(srcdir)/testsuite' >> $@-t
 	@echo 'set objdir' `pwd` >> $@-t
-	@echo 'set tmpdir' `pwd`/testsuite >> $@-t
 	@echo 'set multibuildtop ./$(MULTIBUILDTOP)' >> $@-t
 	@echo 'set host_alias $(build_alias)' >> $@-t
 	@echo 'set host_triplet $(build_triplet)' >> $@-t
diff --git a/newlib/NEWS b/newlib/NEWS
index 3b8f9cf0e..f7d9c0a4f 100644
--- a/newlib/NEWS
+++ b/newlib/NEWS
@@ -1,14 +1,3 @@
-*** Major changes in newlib version 1.14.0:
-
-* new platforms added (cris, mt, m32c)
-* more locking protection macros added
-* various C99/POSIX/SUSV3 compliance issue improvements
-* reentrancy cleanup
-* header file improvements (e.g. adding RTEMS stdint.h/inttypes.h)
-* various math fixes
-* changes made to allow use of gcc4 to build newlib
-* general bug fixes and cleanups
-
 *** Major changes in newlib version 1.13.0:
 
 * optimized iconv support
diff --git a/newlib/README b/newlib/README
index 7e8cef756..f74c7af03 100644
--- a/newlib/README
+++ b/newlib/README
@@ -1,4 +1,4 @@
-                        README for newlib-1.14.0 release
+                        README for newlib-1.13.0 release
            (mostly cribbed from the README in the gdb-4.13 release)
 
 This is `newlib', a simple ANSI C library, math library, and collection
@@ -17,8 +17,8 @@ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 Unpacking and Installation -- quick overview
 ==========================
 
-When you unpack the newlib-1.14.0.tar.gz file, you'll find a directory
-called `newlib-1.14.0', which contains:
+When you unpack the newlib-1.13.0.tar.gz file, you'll find a directory
+called `newlib-1.13.0', which contains:
 
 COPYING          config/          install-sh*      mpw-configure
 COPYING.LIB      config-ml.in     libgloss/        mpw-install
@@ -94,13 +94,13 @@ directory.  If the path to `configure' would be the same as the
 argument to `--srcdir', you can leave out the `--srcdir' option; it
 will be assumed.)
 
-   For example, with version 1.14.0, you can build NEWLIB in a separate
+   For example, with version 1.13.0, you can build NEWLIB in a separate
 directory for a Sun 4 cross m68k-aout environment like this:
 
-     cd newlib-1.14.0
+     cd newlib-1.13.0
      mkdir ../newlib-m68k-aout
      cd ../newlib-m68k-aout
-     ../newlib-1.14.0/configure --host=sun4 --target=m68k-aout
+     ../newlib-1.13.0/configure --host=sun4 --target=m68k-aout
      make
 
    When `configure' builds a configuration using a remote source
@@ -116,8 +116,8 @@ called `configure' (or one of its subdirectories).
 
    The `Makefile' that `configure' generates in each source directory
 also runs recursively.  If you type `make' in a source directory such
-as `newlib-1.14.0' (or in a separate configured directory configured with
-`--srcdir=PATH/newlib-1.14.0'), you will build all the required libraries.
+as `newlib-1.13.0' (or in a separate configured directory configured with
+`--srcdir=PATH/newlib-1.13.0'), you will build all the required libraries.
 
    When you have multiple hosts or targets configured in separate
 directories, you can run `make' on them in parallel (for example, if
@@ -310,7 +310,7 @@ Reporting Bugs
 
 The correct address for reporting bugs found in NEWLIB is
 "newlib@sources.redhat.com".  Please email all bug reports to that
-address.  Please include the NEWLIB version number (e.g., newlib-1.14.0),
+address.  Please include the NEWLIB version number (e.g., newlib-1.13.0),
 and how you configured it (e.g., "sun4 host and m68k-aout target").
 Since NEWLIB supports many different configurations, it is important
 that you be precise about this.
diff --git a/newlib/acconfig.h b/newlib/acconfig.h
deleted file mode 100644
index 86f484ec4..000000000
--- a/newlib/acconfig.h
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef __NEWLIB_H__
-
-#define __NEWLIB_H__ 1
-@TOP@
-
-/* EL/IX level */
-#undef _ELIX_LEVEL
-
-/* Newlib version */
-#undef _NEWLIB_VERSION
-
-/* long long type support in IO functions like printf/scanf enabled */
-#undef _WANT_IO_LONG_LONG
-
-/* long double type support in IO functions like printf/scanf enabled */
-#undef _WANT_IO_LONG_DOUBLE
-
-/* Positional argument support in printf functions enabled.  */
-#undef _WANT_IO_POS_ARGS
-
-/* Multibyte supported */
-#undef _MB_CAPABLE
-
-/* MB_LEN_MAX */
-#undef _MB_LEN_MAX
-
-/* ICONV enabled */
-#undef _ICONV_ENABLED
-
-/* Enable ICONV external CCS files loading capabilities */
-#undef _ICONV_ENABLE_EXTERNAL_CCS
-
-/* Define if the linker supports .preinit_array/.init_array/.fini_array
- * sections.  */
-#undef  HAVE_INITFINI_ARRAY
-
-/* True if atexit() may dynamically allocate space for cleanup
-   functions.  */
-#undef  _ATEXIT_DYNAMIC_ALLOC
-
-/* Define if the compiler supports aliasing an array to an address.  */
-#undef  _HAVE_ARRAY_ALIASING
-@BOTTOM@
-/*
- * Iconv encodings enabled ("to" direction)
- */
-#undef _ICONV_TO_ENCODING_BIG5
-#undef _ICONV_TO_ENCODING_CP775
-#undef _ICONV_TO_ENCODING_CP850
-#undef _ICONV_TO_ENCODING_CP852
-#undef _ICONV_TO_ENCODING_CP855
-#undef _ICONV_TO_ENCODING_CP866
-#undef _ICONV_TO_ENCODING_EUC_JP
-#undef _ICONV_TO_ENCODING_EUC_TW
-#undef _ICONV_TO_ENCODING_EUC_KR
-#undef _ICONV_TO_ENCODING_ISO_8859_1
-#undef _ICONV_TO_ENCODING_ISO_8859_10
-#undef _ICONV_TO_ENCODING_ISO_8859_11
-#undef _ICONV_TO_ENCODING_ISO_8859_13
-#undef _ICONV_TO_ENCODING_ISO_8859_14
-#undef _ICONV_TO_ENCODING_ISO_8859_15
-#undef _ICONV_TO_ENCODING_ISO_8859_2
-#undef _ICONV_TO_ENCODING_ISO_8859_3
-#undef _ICONV_TO_ENCODING_ISO_8859_4
-#undef _ICONV_TO_ENCODING_ISO_8859_5
-#undef _ICONV_TO_ENCODING_ISO_8859_6
-#undef _ICONV_TO_ENCODING_ISO_8859_7
-#undef _ICONV_TO_ENCODING_ISO_8859_8
-#undef _ICONV_TO_ENCODING_ISO_8859_9
-#undef _ICONV_TO_ENCODING_ISO_IR_111
-#undef _ICONV_TO_ENCODING_KOI8_R
-#undef _ICONV_TO_ENCODING_KOI8_RU
-#undef _ICONV_TO_ENCODING_KOI8_U
-#undef _ICONV_TO_ENCODING_KOI8_UNI
-#undef _ICONV_TO_ENCODING_UCS_2
-#undef _ICONV_TO_ENCODING_UCS_2_INTERNAL
-#undef _ICONV_TO_ENCODING_UCS_2BE
-#undef _ICONV_TO_ENCODING_UCS_2LE
-#undef _ICONV_TO_ENCODING_UCS_4
-#undef _ICONV_TO_ENCODING_UCS_4_INTERNAL
-#undef _ICONV_TO_ENCODING_UCS_4BE
-#undef _ICONV_TO_ENCODING_UCS_4LE
-#undef _ICONV_TO_ENCODING_US_ASCII
-#undef _ICONV_TO_ENCODING_UTF_16
-#undef _ICONV_TO_ENCODING_UTF_16BE
-#undef _ICONV_TO_ENCODING_UTF_16LE
-#undef _ICONV_TO_ENCODING_UTF_8
-#undef _ICONV_TO_ENCODING_WIN_1250
-#undef _ICONV_TO_ENCODING_WIN_1251
-#undef _ICONV_TO_ENCODING_WIN_1252
-#undef _ICONV_TO_ENCODING_WIN_1253
-#undef _ICONV_TO_ENCODING_WIN_1254
-#undef _ICONV_TO_ENCODING_WIN_1255
-#undef _ICONV_TO_ENCODING_WIN_1256
-#undef _ICONV_TO_ENCODING_WIN_1257
-#undef _ICONV_TO_ENCODING_WIN_1258
-
-/*
- * Iconv encodings enabled ("from" direction)
- */
-#undef _ICONV_FROM_ENCODING_BIG5
-#undef _ICONV_FROM_ENCODING_CP775
-#undef _ICONV_FROM_ENCODING_CP850
-#undef _ICONV_FROM_ENCODING_CP852
-#undef _ICONV_FROM_ENCODING_CP855
-#undef _ICONV_FROM_ENCODING_CP866
-#undef _ICONV_FROM_ENCODING_EUC_JP
-#undef _ICONV_FROM_ENCODING_EUC_TW
-#undef _ICONV_FROM_ENCODING_EUC_KR
-#undef _ICONV_FROM_ENCODING_ISO_8859_1
-#undef _ICONV_FROM_ENCODING_ISO_8859_10
-#undef _ICONV_FROM_ENCODING_ISO_8859_11
-#undef _ICONV_FROM_ENCODING_ISO_8859_13
-#undef _ICONV_FROM_ENCODING_ISO_8859_14
-#undef _ICONV_FROM_ENCODING_ISO_8859_15
-#undef _ICONV_FROM_ENCODING_ISO_8859_2
-#undef _ICONV_FROM_ENCODING_ISO_8859_3
-#undef _ICONV_FROM_ENCODING_ISO_8859_4
-#undef _ICONV_FROM_ENCODING_ISO_8859_5
-#undef _ICONV_FROM_ENCODING_ISO_8859_6
-#undef _ICONV_FROM_ENCODING_ISO_8859_7
-#undef _ICONV_FROM_ENCODING_ISO_8859_8
-#undef _ICONV_FROM_ENCODING_ISO_8859_9
-#undef _ICONV_FROM_ENCODING_ISO_IR_111
-#undef _ICONV_FROM_ENCODING_KOI8_R
-#undef _ICONV_FROM_ENCODING_KOI8_RU
-#undef _ICONV_FROM_ENCODING_KOI8_U
-#undef _ICONV_FROM_ENCODING_KOI8_UNI
-#undef _ICONV_FROM_ENCODING_UCS_2
-#undef _ICONV_FROM_ENCODING_UCS_2_INTERNAL
-#undef _ICONV_FROM_ENCODING_UCS_2BE
-#undef _ICONV_FROM_ENCODING_UCS_2LE
-#undef _ICONV_FROM_ENCODING_UCS_4
-#undef _ICONV_FROM_ENCODING_UCS_4_INTERNAL
-#undef _ICONV_FROM_ENCODING_UCS_4BE
-#undef _ICONV_FROM_ENCODING_UCS_4LE
-#undef _ICONV_FROM_ENCODING_US_ASCII
-#undef _ICONV_FROM_ENCODING_UTF_16
-#undef _ICONV_FROM_ENCODING_UTF_16BE
-#undef _ICONV_FROM_ENCODING_UTF_16LE
-#undef _ICONV_FROM_ENCODING_UTF_8
-#undef _ICONV_FROM_ENCODING_WIN_1250
-#undef _ICONV_FROM_ENCODING_WIN_1251
-#undef _ICONV_FROM_ENCODING_WIN_1252
-#undef _ICONV_FROM_ENCODING_WIN_1253
-#undef _ICONV_FROM_ENCODING_WIN_1254
-#undef _ICONV_FROM_ENCODING_WIN_1255
-#undef _ICONV_FROM_ENCODING_WIN_1256
-#undef _ICONV_FROM_ENCODING_WIN_1257
-#undef _ICONV_FROM_ENCODING_WIN_1258
-
-#endif /* !__NEWLIB_H__ */
-
diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 0b6b8edbd..adb571021 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -105,7 +105,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -153,9 +153,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/aclocal.m4 b/newlib/aclocal.m4
index 5303ae452..138422458 100644
--- a/newlib/aclocal.m4
+++ b/newlib/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/configure b/newlib/configure
index ce9246a31..f43bcb115 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -28,8 +28,6 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-newlib-iconv-external-ccs     enable capabilities to load external CCS files for iconv"
 ac_help="$ac_help
-  --disable-newlib-atexit-alloc    disable dynamic allocation of atexit entries"
-ac_help="$ac_help
   --enable-multilib         build many library versions (default)"
 ac_help="$ac_help
   --enable-target-optspace  optimize for space"
@@ -694,20 +692,6 @@ else
   newlib_iconv_external_ccs=${newlib_iconv_external_ccs}
 fi
 
-# Check whether --enable-newlib-atexit-dynamic-alloc or --disable-newlib-atexit-dynamic-alloc was given.
-if test "${enable_newlib_atexit_dynamic_alloc+set}" = set; then
-  enableval="$enable_newlib_atexit_dynamic_alloc"
-  if test "${newlib_atexit_dynamic_alloc+set}" != set; then
-  case "${enableval}" in
-    yes) newlib_atexit_dynamic_alloc=yes ;;
-    no)  newlib_atexit_dynamic_alloc=no  ;;
-    *)   { echo "configure: error: bad value ${enableval} for newlib-atexit-dynamic-alloc option" 1>&2; exit 1; } ;;
-  esac
- fi
-else
-  newlib_atexit_dynamic_alloc=yes
-fi
-
 am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -721,7 +705,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:725: checking for a BSD compatible install" >&5
+echo "configure:709: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -774,7 +758,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:778: checking whether build environment is sane" >&5
+echo "configure:762: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -831,7 +815,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:835: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:819: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -864,12 +848,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:868: checking for Cygwin environment" >&5
+echo "configure:852: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 873 "configure"
+#line 857 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -880,7 +864,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -897,19 +881,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:901: checking for mingw32 environment" >&5
+echo "configure:885: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 906 "configure"
+#line 890 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -1079,7 +1063,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1083: checking host system type" >&5
+echo "configure:1067: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1100,7 +1084,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1104: checking target system type" >&5
+echo "configure:1088: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -1118,7 +1102,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1122: checking build system type" >&5
+echo "configure:1106: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1144,17 +1128,24 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
 fi
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
 
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1158: checking for working aclocal-${am__api_version}" >&5
+echo "configure:1149: checking for working aclocal-${am__api_version}" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1167,7 +1158,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1171: checking for working autoconf" >&5
+echo "configure:1162: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1180,7 +1171,7 @@ else
 fi
 
 echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1184: checking for working automake-${am__api_version}" >&5
+echo "configure:1175: checking for working automake-${am__api_version}" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1193,7 +1184,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1197: checking for working autoheader" >&5
+echo "configure:1188: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1206,7 +1197,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1210: checking for working makeinfo" >&5
+echo "configure:1201: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1231,7 +1222,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1235: checking for $ac_word" >&5
+echo "configure:1226: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1261,7 +1252,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1265: checking for $ac_word" >&5
+echo "configure:1256: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1310,7 +1301,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1314: checking whether we are using GNU C" >&5
+echo "configure:1305: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1319,7 +1310,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1334,7 +1325,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1338: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1329: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1365,7 +1356,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1369: checking for $ac_word" >&5
+echo "configure:1360: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1397,7 +1388,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1401: checking for $ac_word" >&5
+echo "configure:1392: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1429,7 +1420,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1433: checking for $ac_word" >&5
+echo "configure:1424: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1461,7 +1452,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1465: checking for $ac_word" >&5
+echo "configure:1456: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1506,7 +1497,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1510: checking for a BSD compatible install" >&5
+echo "configure:1501: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1559,11 +1550,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1567: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1555: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1597,7 +1585,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1601: checking for executable suffix" >&5
+echo "configure:1589: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1607,7 +1595,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1782,7 +1770,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1786: checking for $ac_word" >&5
+echo "configure:1774: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1812,7 +1800,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1816: checking for $ac_word" >&5
+echo "configure:1804: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1863,7 +1851,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1867: checking for $ac_word" >&5
+echo "configure:1855: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1895,7 +1883,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1887: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1906,12 +1894,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1910 "configure"
+#line 1898 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1937,12 +1925,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1941: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1929: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1946: checking whether we are using GNU C" >&5
+echo "configure:1934: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1951,7 +1939,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1970,7 +1958,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1974: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1962: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2013,7 +2001,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:2017: checking for ld used by GCC" >&5
+echo "configure:2005: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -2043,10 +2031,10 @@ echo "configure:2017: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:2047: checking for GNU ld" >&5
+echo "configure:2035: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:2050: checking for non-GNU ld" >&5
+echo "configure:2038: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2081,7 +2069,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:2085: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:2073: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2098,7 +2086,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:2102: checking for $LD option to reload object files" >&5
+echo "configure:2090: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2110,7 +2098,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2114: checking for BSD-compatible nm" >&5
+echo "configure:2102: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2148,7 +2136,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2152: checking whether ln -s works" >&5
+echo "configure:2140: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2169,7 +2157,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2173: checking how to recognise dependant libraries" >&5
+echo "configure:2161: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2342,13 +2330,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2346: checking for object suffix" >&5
+echo "configure:2334: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2372,7 +2360,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2376: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2364: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2434,7 +2422,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2438: checking for file" >&5
+echo "configure:2426: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2505,7 +2493,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2509: checking for $ac_word" >&5
+echo "configure:2497: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2537,7 +2525,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2541: checking for $ac_word" >&5
+echo "configure:2529: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2572,7 +2560,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2576: checking for $ac_word" >&5
+echo "configure:2564: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2604,7 +2592,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2608: checking for $ac_word" >&5
+echo "configure:2596: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2671,8 +2659,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2675 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2663 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2691,7 +2679,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2709,7 +2697,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2713: checking whether the C compiler needs -belf" >&5
+echo "configure:2701: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2722,14 +2710,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2726 "configure"
+#line 2714 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2759,7 +2747,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2763: checking for $ac_word" >&5
+echo "configure:2751: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2791,7 +2779,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2795: checking for $ac_word" >&5
+echo "configure:2783: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2826,7 +2814,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2830: checking for $ac_word" >&5
+echo "configure:2818: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2858,7 +2846,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2862: checking for $ac_word" >&5
+echo "configure:2850: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2893,7 +2881,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2897: checking for $ac_word" >&5
+echo "configure:2885: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2925,7 +2913,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2929: checking for $ac_word" >&5
+echo "configure:2917: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2961,12 +2949,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2965: checking if libtool should supply DllMain function" >&5
+echo "configure:2953: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2970 "configure"
+#line 2958 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2974,7 +2962,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2995,19 +2983,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2999: checking how to link DLLs" >&5
+echo "configure:2987: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3004 "configure"
+#line 2992 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
@@ -3116,12 +3104,12 @@ exec 5>>./config.log
   
 	 
 	 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3125: checking for $ac_word" >&5
+echo "configure:3113: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3217,7 +3205,7 @@ subdirs="${configdirs}"
 
 CRT0=
 CRT0_DIR=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
   CRT0_DIR=libc/
 fi
@@ -3334,13 +3322,6 @@ EOF
 
 fi
 
-if test "${newlib_atexit_dynamic_alloc}" = "yes"; then
-cat >> confdefs.h <<EOF
-#define _ATEXIT_DYNAMIC_ALLOC 1
-EOF
-
-fi
-
 cat >> confdefs.h <<EOF
 #define _NEWLIB_VERSION "$VERSION"
 EOF
@@ -3445,7 +3426,7 @@ EOF
 fi;
 
 echo $ac_n "checking for .preinit_array/.init_array/.fini_array support""... $ac_c" 1>&6
-echo "configure:3449: checking for .preinit_array/.init_array/.fini_array support" >&5
+echo "configure:3430: checking for .preinit_array/.init_array/.fini_array support" >&5
 if eval "test \"`echo '$''{'libc_cv_initfinit_array'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3456,7 +3437,7 @@ int foo (void) { return 1; }
 int (*fp) (void) __attribute__ ((section (".init_array"))) = foo;
 EOF
 if { ac_try='${CC} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c
-		   -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+		   -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
 then
   if readelf -S conftest | grep -e INIT_ARRAY > /dev/null; then
     libc_cv_initfinit_array=yes
@@ -3479,7 +3460,7 @@ EOF
 fi
 
 echo $ac_n "checking for array aliasing support""... $ac_c" 1>&6
-echo "configure:3483: checking for array aliasing support" >&5
+echo "configure:3464: checking for array aliasing support" >&5
 if eval "test \"`echo '$''{'libc_cv_array_aliasing'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3488,7 +3469,7 @@ char x3 = { 'a', 'b', 'c' };
 extern char y2 __attribute__((alias ("x+1")));
 EOF
 if { ac_try='${CC} $CFLAGS $CPPFLAGS -c conftest.c
-		   1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+		   1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
 then
   libc_cv_array_aliasing=yes
 else
diff --git a/newlib/configure.host b/newlib/configure.host
index d85e8ad2c..19c3d5911 100644
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -42,8 +42,6 @@
 #   oext                object file extension - needed for libtool support
 #   crt1                name of crt1 object if one is provided
 #   crt1_dir            directory where crt1 object is found
-#   have_crt0		"yes"/"no" if crt0 is/isn't provided.
-#			"" if crt0 is provided when sys_dir is set
 
 newlib_cflags=
 libm_machine_dir=
@@ -57,7 +55,6 @@ unix_dir=
 mach_add_setjmp=
 crt1=
 crt1_dir=
-have_crt0=
 use_libtool=no
 have_sys_mach_dir=no
 default_newlib_io_long_long=no
@@ -70,7 +67,7 @@ case "${target_optspace}:${host}" in
   yes:*)
     newlib_cflags="${newlib_cflags} -Os"
     ;;
-  :m32r-* | :d10v-* | :d30v-* | :avr-* | :m32c-* )
+  :m32r-* | :d10v-* | :d30v-* | :avr-*)
     newlib_cflags="${newlib_cflags} -Os"
     ;;
   no:* | :*)
@@ -148,11 +145,6 @@ case "${host_cpu}" in
   iq2000)
 	machine_dir=iq2000
 	;;
-  m32c)
-	machine_dir=m32c
-	newlib_cflags="${newlib_cflags} -DPREFER_SIZE_OVER_SPEED -DABORT_PROVIDED -DSMALL_MEMORY"
-	;;
-
   m32r*)
 	machine_dir=m32r
 	;;
@@ -186,12 +178,8 @@ case "${host_cpu}" in
 	machine_dir=mn10200
 	;;
   mn10300)
-	default_newlib_io_long_long="yes"
 	machine_dir=mn10300
 	;;
-  mt*)
-        machine_dir=mt
-        ;;
   or16)
 	;;
   or32)
@@ -321,9 +309,8 @@ case "${host}" in
 	sys_dir=arc
 	;;
   arm-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
+	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
+	  sys_dir=arm
 	fi
 	;;
   crx*)
@@ -336,9 +323,8 @@ case "${host}" in
 	sys_dir=
 	;;
   ep9312-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
+	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
+	  sys_dir=arm
 	fi
 	;;
   frv*)
@@ -362,10 +348,6 @@ case "${host}" in
   h8500-*-elf*)
 	sys_dir=h8500hms
 	;;
-  i[34567]86-*-rdos*)
-	sys_dir=rdos
-	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
-	;;
   i[34567]86-*-sco*)
 	sys_dir=sysvi386
 	unix_dir=unix
@@ -422,15 +404,13 @@ case "${host}" in
 	unix_dir=unix
 	;;
   strongarm-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
+	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
+	  sys_dir=arm
 	fi
 	;;
   thumb-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
+	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
+	  sys_dir=arm
 	fi
 	;;
   tic80*)
@@ -455,9 +435,8 @@ case "${host}" in
 	sys_dir=w65
 	;;
   xscale-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
+	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
+	  sys_dir=arm
 	fi
 	;;
   z8k-*-coff)
@@ -531,7 +510,6 @@ case "${host}" in
 	newlib_cflags="${newlib_cflags} -DNO_EXEC -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES"
 	;;
   cris-*-* | crisv32-*-*)
-	default_newlib_io_long_long="yes"
 	newlib_cflags="${newlib_cflags} -DHAVE_RENAME -DHAVE_GETTIMEOFDAY -D_USE_WRITE -DCOMPACT_CTYPE"
 	syscall_dir=syscalls
 	;;
@@ -737,7 +715,3 @@ if [ "x${newlib_io_pos_args}" = "x" ]; then
 		newlib_io_pos_args="yes";
 	fi
 fi
-
-if test -z "${have_crt0}" && test -n "${sys_dir}"; then
-  have_crt0="yes"
-fi
diff --git a/newlib/configure.in b/newlib/configure.in
index c8dc21176..84e1f745a 100644
--- a/newlib/configure.in
+++ b/newlib/configure.in
@@ -85,17 +85,6 @@ AC_ARG_ENABLE(newlib-iconv-external-ccs,
    esac
  fi], [newlib_iconv_external_ccs=${newlib_iconv_external_ccs}])dnl
 
-dnl Support --disable-newlib-atexit-dynamic-alloc
-AC_ARG_ENABLE(newlib-atexit-dynamic-alloc,
-[  --disable-newlib-atexit-alloc    disable dynamic allocation of atexit entries],
-[if test "${newlib_atexit_dynamic_alloc+set}" != set; then
-  case "${enableval}" in
-    yes) newlib_atexit_dynamic_alloc=yes ;;
-    no)  newlib_atexit_dynamic_alloc=no  ;;
-    *)   AC_MSG_ERROR(bad value ${enableval} for newlib-atexit-dynamic-alloc option) ;;
-  esac
- fi], [newlib_atexit_dynamic_alloc=yes])dnl
-
 NEWLIB_CONFIGURE(.)
 
 dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
@@ -150,7 +139,7 @@ AC_CONFIG_SUBDIRS(${configdirs})
 
 CRT0=
 CRT0_DIR=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
   CRT0_DIR=libc/
 fi
@@ -243,10 +232,6 @@ if test "${newlib_iconv_external_ccs}" = "yes"; then
 AC_DEFINE_UNQUOTED(_ICONV_ENABLE_EXTERNAL_CCS)
 fi
 
-if test "${newlib_atexit_dynamic_alloc}" = "yes"; then
-AC_DEFINE_UNQUOTED(_ATEXIT_DYNAMIC_ALLOC)
-fi
-
 AC_DEFINE_UNQUOTED(_NEWLIB_VERSION,"$VERSION")
 
 if test "${multilib}" = "yes"; then
diff --git a/newlib/doc/aclocal.m4 b/newlib/doc/aclocal.m4
index b03b0d2ed..0a1490998 100644
--- a/newlib/doc/aclocal.m4
+++ b/newlib/doc/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/doc/configure b/newlib/doc/configure
index 47e58888c..07b7af236 100755
--- a/newlib/doc/configure
+++ b/newlib/doc/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1583,7 +1580,7 @@ if test "x$cross_compiling" = "xno"; then
   EXEEXT_FOR_BUILD='$(EXEEXT)'
 else
   echo $ac_n "checking for build system executable suffix""... $ac_c" 1>&6
-echo "configure:1587: checking for build system executable suffix" >&5
+echo "configure:1584: checking for build system executable suffix" >&5
 if eval "test \"`echo '$''{'newlib_cv_build_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/newlib/iconvdata/aclocal.m4 b/newlib/iconvdata/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/iconvdata/aclocal.m4
+++ b/newlib/iconvdata/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/iconvdata/configure b/newlib/iconvdata/configure
index a4f8cf471..3b26283f2 100755
--- a/newlib/iconvdata/configure
+++ b/newlib/iconvdata/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1655,7 +1652,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1682,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1765,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1886,7 +1883,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
+echo "configure:1887: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1917: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1920: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1954,7 +1951,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
+echo "configure:1972: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:2022: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2042,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
+echo "configure:2043: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
+echo "configure:2216: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2245,7 +2242,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2246: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2304,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
+echo "configure:2308: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2378,7 +2375,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
+echo "configure:2379: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
+echo "configure:2411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,7 +2442,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
+echo "configure:2446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
+echo "configure:2478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2545 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2564,7 +2561,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2582,7 +2579,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:2583: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2596 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:2633: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2696,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2732: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2763,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2799: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2834,12 +2831,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
+echo "configure:2835: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
+echo "configure:2869: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
diff --git a/newlib/iconvdata/jis0208.h b/newlib/iconvdata/jis0208.h
index 131a5c562..ef6b891eb 100644
--- a/newlib/iconvdata/jis0208.h
+++ b/newlib/iconvdata/jis0208.h
@@ -24,6 +24,15 @@
 #include <gconv.h>
 #include <stdint.h>
 
+/* Conversion table.  */
+extern const uint16_t __jis0208_to_ucs[];
+
+extern const char __jisx0208_from_ucs4_lat1[256][2];
+extern const char __jisx0208_from_ucs4_greek[0xc1][2];
+extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
+extern const char __jisx0208_from_ucs_tab[][2];
+
+
 /* Struct for table with indeces in UCS mapping table.  */
 struct jisx0208_ucs_idx
 {
@@ -32,13 +41,6 @@ struct jisx0208_ucs_idx
   uint16_t idx;
 };
 
-/* Conversion table.  */
-extern const uint16_t __jis0208_to_ucs[];
-
-extern const char __jisx0208_from_ucs4_lat1[256][2];
-extern const char __jisx0208_from_ucs4_greek[0xc1][2];
-extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
-extern const char __jisx0208_from_ucs_tab[][2];
 
 static inline uint32_t
 jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index feba1b101..8fd0581bb 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -50,15 +50,15 @@ SUBLIBS = \
 	$(LIBC_SIGNAL_LIB) \
 	time/libtime.$(aext) \
 	locale/liblocale.$(aext) \
+	$(LIBC_SYS_LIB) \
 	reent/libreent.$(aext) \
 	$(LIBC_EXTRA_LIB) \
 	errno/liberrno.$(aext) \
 	misc/libmisc.$(aext) \
+	$(LIBC_MACHINE_LIB) \
 	$(LIBC_UNIX_LIB) \
 	$(LIBC_POSIX_LIB) \
-	$(LIBC_SYSCALL_LIB) \
-	$(LIBC_MACHINE_LIB) \
-	$(LIBC_SYS_LIB)
+	$(LIBC_SYSCALL_LIB)
 else
 noinst_LIBRARIES = libc.a
 SUBLIBS = \
@@ -72,16 +72,16 @@ SUBLIBS = \
 	$(LIBC_SIGNAL_LIB) \
 	time/lib.$(aext) \
 	locale/lib.$(aext) \
+	$(LIBC_SYS_LIB) \
 	reent/lib.$(aext) \
 	$(LIBC_EXTRA_LIB) \
 	errno/lib.$(aext) \
 	misc/lib.$(aext) \
+	$(LIBC_MACHINE_LIB) \
 	$(LIBC_UNIX_LIB) \
 	$(LIBC_POSIX_LIB) \
 	$(LIBC_SYSCALL_LIB) \
-        $(NEWLIB_ICONV_LIBS) \
-	$(LIBC_MACHINE_LIB) \
-	$(LIBC_SYS_LIB)
+        $(NEWLIB_ICONV_LIBS)
 endif
 
 libc_la_LDFLAGS = -Xcompiler -nostdlib
diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in
index f94585cd0..b84885821 100644
--- a/newlib/libc/Makefile.in
+++ b/newlib/libc/Makefile.in
@@ -129,8 +129,8 @@ SUBDIRS = argz stdlib ctype search stdio $(STDIO64_SUBDIR) string $(SIGNAL_SUBDI
 noinst_DATA = $(CRT0)
 
 @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libc.la
-@USE_LIBTOOL_TRUE@SUBLIBS = 	argz/libargz.$(aext) 	stdlib/libstdlib.$(aext) 	ctype/libctype.$(aext) 	search/libsearch.$(aext) 	stdio/libstdio.$(aext) 	$(LIBC_STDIO64_LIB) 	string/libstring.$(aext) 	$(LIBC_SIGNAL_LIB) 	time/libtime.$(aext) 	locale/liblocale.$(aext) 	reent/libreent.$(aext) 	$(LIBC_EXTRA_LIB) 	errno/liberrno.$(aext) 	misc/libmisc.$(aext) 	$(LIBC_UNIX_LIB) 	$(LIBC_POSIX_LIB) 	$(LIBC_SYSCALL_LIB) 	$(LIBC_MACHINE_LIB) 	$(LIBC_SYS_LIB)
-@USE_LIBTOOL_FALSE@SUBLIBS = 	argz/lib.$(aext) 	stdlib/lib.$(aext) 	ctype/lib.$(aext) 	search/lib.$(aext) 	stdio/lib.$(aext) 	$(LIBC_STDIO64_LIB) 	string/lib.$(aext) 	$(LIBC_SIGNAL_LIB) 	time/lib.$(aext) 	locale/lib.$(aext) 	reent/lib.$(aext) 	$(LIBC_EXTRA_LIB) 	errno/lib.$(aext) 	misc/lib.$(aext) 	$(LIBC_UNIX_LIB) 	$(LIBC_POSIX_LIB) 	$(LIBC_SYSCALL_LIB)         $(NEWLIB_ICONV_LIBS) 	$(LIBC_MACHINE_LIB) 	$(LIBC_SYS_LIB)
+@USE_LIBTOOL_TRUE@SUBLIBS = 	argz/libargz.$(aext) 	stdlib/libstdlib.$(aext) 	ctype/libctype.$(aext) 	search/libsearch.$(aext) 	stdio/libstdio.$(aext) 	$(LIBC_STDIO64_LIB) 	string/libstring.$(aext) 	$(LIBC_SIGNAL_LIB) 	time/libtime.$(aext) 	locale/liblocale.$(aext) 	$(LIBC_SYS_LIB) 	reent/libreent.$(aext) 	$(LIBC_EXTRA_LIB) 	errno/liberrno.$(aext) 	misc/libmisc.$(aext) 	$(LIBC_MACHINE_LIB) 	$(LIBC_UNIX_LIB) 	$(LIBC_POSIX_LIB) 	$(LIBC_SYSCALL_LIB)
+@USE_LIBTOOL_FALSE@SUBLIBS = 	argz/lib.$(aext) 	stdlib/lib.$(aext) 	ctype/lib.$(aext) 	search/lib.$(aext) 	stdio/lib.$(aext) 	$(LIBC_STDIO64_LIB) 	string/lib.$(aext) 	$(LIBC_SIGNAL_LIB) 	time/lib.$(aext) 	locale/lib.$(aext) 	$(LIBC_SYS_LIB) 	reent/lib.$(aext) 	$(LIBC_EXTRA_LIB) 	errno/lib.$(aext) 	misc/lib.$(aext) 	$(LIBC_MACHINE_LIB) 	$(LIBC_UNIX_LIB) 	$(LIBC_POSIX_LIB) 	$(LIBC_SYSCALL_LIB)         $(NEWLIB_ICONV_LIBS)
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = libc.a
 
 libc_la_LDFLAGS = -Xcompiler -nostdlib
diff --git a/newlib/libc/aclocal.m4 b/newlib/libc/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/aclocal.m4
+++ b/newlib/libc/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/argz/argz_insert.c b/newlib/libc/argz/argz_insert.c
index 8a9fb19b2..043a10193 100644
--- a/newlib/libc/argz/argz_insert.c
+++ b/newlib/libc/argz/argz_insert.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2005 by  Red Hat, Incorporated. All rights reserved.
+/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this software
  * is freely granted, provided that this notice is preserved.
@@ -20,7 +20,7 @@ _DEFUN (argz_insert, (argz, argz_len, before, entry),
   int len = 0;
 
   if (before == NULL)
-    return argz_add(argz, argz_len, entry);
+    argz_add(argz, argz_len, entry);
 
   if (before < *argz || before >= *argz + *argz_len)
     return EINVAL;
diff --git a/newlib/libc/configure b/newlib/libc/configure
index ac29def3c..bf5a25f9b 100755
--- a/newlib/libc/configure
+++ b/newlib/libc/configure
@@ -1023,7 +1023,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1445,11 +1445,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1453: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1450: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1483,7 +1480,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1487: checking for executable suffix" >&5
+echo "configure:1484: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1493,7 +1490,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1669,7 +1666,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1673: checking for $ac_word" >&5
+echo "configure:1670: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1699,7 +1696,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1703: checking for $ac_word" >&5
+echo "configure:1700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1750,7 +1747,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1754: checking for $ac_word" >&5
+echo "configure:1751: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1782,7 +1779,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1786: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1783: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1793,12 +1790,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1797 "configure"
+#line 1794 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1824,12 +1821,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1828: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1825: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1833: checking whether we are using GNU C" >&5
+echo "configure:1830: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1838,7 +1835,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1857,7 +1854,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1861: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1858: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1900,7 +1897,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1904: checking for ld used by GCC" >&5
+echo "configure:1901: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1930,10 +1927,10 @@ echo "configure:1904: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1934: checking for GNU ld" >&5
+echo "configure:1931: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1937: checking for non-GNU ld" >&5
+echo "configure:1934: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1968,7 +1965,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1972: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1969: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1985,7 +1982,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1989: checking for $LD option to reload object files" >&5
+echo "configure:1986: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1997,7 +1994,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2001: checking for BSD-compatible nm" >&5
+echo "configure:1998: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2035,7 +2032,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2039: checking whether ln -s works" >&5
+echo "configure:2036: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2056,7 +2053,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2060: checking how to recognise dependant libraries" >&5
+echo "configure:2057: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2229,13 +2226,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2233: checking for object suffix" >&5
+echo "configure:2230: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2259,7 +2256,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2263: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2260: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2321,7 +2318,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2325: checking for file" >&5
+echo "configure:2322: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2392,7 +2389,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2396: checking for $ac_word" >&5
+echo "configure:2393: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2424,7 +2421,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2428: checking for $ac_word" >&5
+echo "configure:2425: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2459,7 +2456,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2463: checking for $ac_word" >&5
+echo "configure:2460: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2491,7 +2488,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2495: checking for $ac_word" >&5
+echo "configure:2492: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2558,8 +2555,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2562 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2559 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2578,7 +2575,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2596,7 +2593,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2600: checking whether the C compiler needs -belf" >&5
+echo "configure:2597: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2609,14 +2606,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2613 "configure"
+#line 2610 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2646,7 +2643,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2650: checking for $ac_word" >&5
+echo "configure:2647: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2678,7 +2675,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2682: checking for $ac_word" >&5
+echo "configure:2679: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2713,7 +2710,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2717: checking for $ac_word" >&5
+echo "configure:2714: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2745,7 +2742,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2749: checking for $ac_word" >&5
+echo "configure:2746: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2780,7 +2777,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2784: checking for $ac_word" >&5
+echo "configure:2781: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2812,7 +2809,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2816: checking for $ac_word" >&5
+echo "configure:2813: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2848,12 +2845,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2852: checking if libtool should supply DllMain function" >&5
+echo "configure:2849: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2857 "configure"
+#line 2854 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2861,7 +2858,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2882,19 +2879,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2886: checking how to link DLLs" >&5
+echo "configure:2883: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2891 "configure"
+#line 2888 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
@@ -3009,7 +3006,7 @@ subdirs="machine sys"
 
 
 CRT0=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
 fi
 
diff --git a/newlib/libc/configure.in b/newlib/libc/configure.in
index d114eb5c7..0b6f276c1 100644
--- a/newlib/libc/configure.in
+++ b/newlib/libc/configure.in
@@ -30,7 +30,7 @@ fi
 AC_CONFIG_SUBDIRS(machine sys)
 
 CRT0=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
 fi
 AC_SUBST(CRT0)
diff --git a/newlib/libc/ctype/ctype.tex b/newlib/libc/ctype/ctype.tex
index d15e86b30..bfdc929f7 100644
--- a/newlib/libc/ctype/ctype.tex
+++ b/newlib/libc/ctype/ctype.tex
@@ -12,32 +12,32 @@ The header file @file{ctype.h} defines the macros.
 * isascii::   ASCII character predicate
 * iscntrl::   Control character predicate
 * isdigit::   Decimal digit predicate
-* islower::   Lowercase character predicate
+* islower::   Lower-case character predicate
 * isprint::   Printable character predicates (isprint, isgraph)
 * ispunct::   Punctuation character predicate
 * isspace::   Whitespace character predicate
 * isupper::   Uppercase character predicate
 * isxdigit::  Hexadecimal digit predicate
 * toascii::   Force integers to ASCII range
-* tolower::   Translate characters to lowercase
-* toupper::   Translate characters to uppercase
-* iswalnum::  Alphanumeric wide character predicate
-* iswalpha::  Alphabetic wide character predicate
-* iswblank::  Blank wide character predicate
-* iswcntrl::  Control wide character predicate
-* iswdigit::  Decimal digit wide character predicate
-* iswgraph::  Graphic wide character predicate
-* iswlower::  Lowercase wide character predicate
-* iswprint::  Printable wide character predicate
-* iswpunct::  Punctuation wide character predicate
-* iswspace::  Whitespace wide character predicate
-* iswupper::  Uppercase wide character predicate
-* iswxdigit:: Hexadecimal digit wide character predicate
+* tolower::   Translate characters to lower case
+* toupper::   Translate characters to upper case
+* iswalnum::  Alphanumeric wide-character predicate
+* iswalpha::  Alphabetic wide-character predicate
+* iswblank::  Blank wide-character predicate
+* iswcntrl::  Control wide-character predicate
+* iswdigit::  Decimal digit wide-character predicate
+* iswgraph::  Graphic wide-character predicate
+* iswlower::  Lower-case wide-character predicate
+* iswprint::  Printable wide-character predicate
+* iswpunct::  Punctuation wide-character predicate
+* iswspace::  Whitespace wide-character predicate
+* iswupper::  Uppercase wide-character predicate
+* iswxdigit:: Hexadecimal digit wide-character predicate
 * iswctype::  Extensible wide-character test
 * wctype::    Compute wide-character test type
-* towlower::  Translate wide characters to lowercase
-* towupper::  Translate wide characters to uppercase
-* towctrans:: Extensible wide-character translation
+* towlower::  Translate wide-characters to lower case
+* towupper::  Translate wide-characters to upper case
+* towctrans:: Extensible wide-character case mapping
 * wctrans::   Compute wide-character translation type
 @end menu
 
diff --git a/newlib/libc/ctype/islower.c b/newlib/libc/ctype/islower.c
index cda484367..81ad0bb27 100644
--- a/newlib/libc/ctype/islower.c
+++ b/newlib/libc/ctype/islower.c
@@ -1,7 +1,7 @@
 
 /*
 FUNCTION
-<<islower>>---lowercase character predicate
+<<islower>>---lower-case character predicate
 
 INDEX
 islower
@@ -17,14 +17,14 @@ int islower(<[c]>);
 DESCRIPTION
 <<islower>> is a macro which classifies ASCII integer values by table
 lookup.  It is a predicate returning non-zero for minuscules
-(lowercase alphabetic characters), and 0 for other characters.
+(lower-case alphabetic characters), and 0 for other characters.
 It is defined only when <<isascii>>(<[c]>) is true or <[c]> is EOF.
 
 You can use a compiled subroutine instead of the macro definition by
 undefining the macro using `<<#undef islower>>'.
 
 RETURNS
-<<islower>> returns non-zero if <[c]> is a lowercase letter (<<a>>--<<z>>).
+<<islower>> returns non-zero if <[c]> is a lower case letter (<<a>>--<<z>>).
 
 PORTABILITY
 <<islower>> is ANSI C.
diff --git a/newlib/libc/ctype/isupper.c b/newlib/libc/ctype/isupper.c
index 4cf9e9a2d..8127e25da 100644
--- a/newlib/libc/ctype/isupper.c
+++ b/newlib/libc/ctype/isupper.c
@@ -16,7 +16,7 @@ int isupper(<[c]>);
 
 DESCRIPTION
 <<isupper>> is a macro which classifies ASCII integer values by table
-lookup.  It is a predicate returning non-zero for uppercase letters
+lookup.  It is a predicate returning non-zero for upper-case letters
 (<<A>>--<<Z>>), and 0 for other characters.  It is defined only when
 <<isascii>>(<[c]>) is true or <[c]> is EOF.
 
@@ -24,7 +24,7 @@ You can use a compiled subroutine instead of the macro definition by
 undefining the macro using `<<#undef isupper>>'.
 
 RETURNS
-<<isupper>> returns non-zero if <[c]> is a uppercase letter (A-Z).
+<<isupper>> returns non-zero if <[c]> is a upper case letter (A-Z).
 
 PORTABILITY
 <<isupper>> is ANSI C.
diff --git a/newlib/libc/ctype/iswalnum.c b/newlib/libc/ctype/iswalnum.c
index c417cb31e..12613c7a1 100644
--- a/newlib/libc/ctype/iswalnum.c
+++ b/newlib/libc/ctype/iswalnum.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<iswalnum>>---alphanumeric wide character test
+	<<iswalnum>>---alpha-numeric wide-character test
 
 INDEX
 	iswalnum
@@ -16,10 +16,10 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 <<iswalnum>> is a function which classifies wide-character values that
-are alphanumeric.
+are alpha-numeric.
 
 RETURNS
-<<iswalnum>> returns non-zero if <[c]> is a alphanumeric wide character.
+<<iswalnum>> returns non-zero if <[c]> is a alpha-numeric wide-character.
 
 PORTABILITY
 <<iswalnum>> is C99.
diff --git a/newlib/libc/ctype/iswalpha.c b/newlib/libc/ctype/iswalpha.c
index 7f8de8e59..0e987a992 100644
--- a/newlib/libc/ctype/iswalpha.c
+++ b/newlib/libc/ctype/iswalpha.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<iswalpha>>---alphabetic wide character test
+	<<iswalpha>>---alphabetic wide-character test
 
 INDEX
 	iswalpha
@@ -48,7 +48,7 @@ DESCRIPTION
 are alphabetic.
 
 RETURNS
-<<iswalpha>> returns non-zero if <[c]> is an alphabetic wide character.
+<<iswalpha>> returns non-zero if <[c]> is an alphabetic wide-character.
 
 PORTABILITY
 <<iswalpha>> is C99.
diff --git a/newlib/libc/ctype/iswblank.c b/newlib/libc/ctype/iswblank.c
index 48205bb17..b10756d5e 100644
--- a/newlib/libc/ctype/iswblank.c
+++ b/newlib/libc/ctype/iswblank.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<iswblank>>---blank wide character test
+	<<iswblank>>---wide-character blank test
 
 INDEX
 	iswblank
@@ -48,7 +48,7 @@ DESCRIPTION
 are categorized as blank.
 
 RETURNS
-<<iswblank>> returns non-zero if <[c]> is a blank wide character.
+<<iswblank>> returns non-zero if <[c]> is a blank wide-character.
 
 PORTABILITY
 <<iswblank>> is C99.
diff --git a/newlib/libc/ctype/iswcntrl.c b/newlib/libc/ctype/iswcntrl.c
index 15ff1fa67..d09295225 100644
--- a/newlib/libc/ctype/iswcntrl.c
+++ b/newlib/libc/ctype/iswcntrl.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<iswcntrl>>---control wide character test
+	<<iswcntrl>>---wide-character cntrl test
 
 INDEX
 	iswcntrl
@@ -45,10 +45,10 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 <<iswcntrl>> is a function which classifies wide-character values that
-are categorized as control characters.
+are categorized as a control character.
 
 RETURNS
-<<iswcntrl>> returns non-zero if <[c]> is a control wide character.
+<<iswcntrl>> returns non-zero if <[c]> is a control wide-character.
 
 PORTABILITY
 <<iswcntrl>> is C99.
diff --git a/newlib/libc/ctype/iswdigit.c b/newlib/libc/ctype/iswdigit.c
index 8ba5d5f0e..94c74ae9c 100644
--- a/newlib/libc/ctype/iswdigit.c
+++ b/newlib/libc/ctype/iswdigit.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<iswdigit>>---decimal digit wide character test
+	<<iswdigit>>---decimal digit wide-character test
 
 INDEX
 	iswdigit
@@ -19,7 +19,7 @@ DESCRIPTION
 are decimal digits.
 
 RETURNS
-<<iswdigit>> returns non-zero if <[c]> is a decimal digit wide character.
+<<iswdigit>> returns non-zero if <[c]> is a decimal digit wide-character.
 
 PORTABILITY
 <<iswdigit>> is C99.
diff --git a/newlib/libc/ctype/iswgraph.c b/newlib/libc/ctype/iswgraph.c
index bb1e519f1..880c66478 100644
--- a/newlib/libc/ctype/iswgraph.c
+++ b/newlib/libc/ctype/iswgraph.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<iswgraph>>---graphic wide character test
+	<<iswgraph>>---graphic wide-character test
 
 INDEX
 	iswgraph
@@ -48,7 +48,7 @@ DESCRIPTION
 are graphic.
 
 RETURNS
-<<iswgraph>> returns non-zero if <[c]> is a graphic wide character.
+<<iswgraph>> returns non-zero if <[c]> is a graphic wide-character.
 
 PORTABILITY
 <<iswgraph>> is C99.
diff --git a/newlib/libc/ctype/iswlower.c b/newlib/libc/ctype/iswlower.c
index 683a9cbb0..d320486a9 100644
--- a/newlib/libc/ctype/iswlower.c
+++ b/newlib/libc/ctype/iswlower.c
@@ -1,7 +1,7 @@
 
 /*
 FUNCTION
-	<<iswlower>>---lowercase wide character test
+	<<iswlower>>---lower-case wide-character test
 
 INDEX
 	iswlower
@@ -17,10 +17,10 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 <<iswlower>> is a function which classifies wide-character values that
-have uppercase translations.
+have an upper-case translation.
 
 RETURNS
-<<iswlower>> returns non-zero if <[c]> is a lowercase wide character.
+<<iswlower>> returns non-zero if <[c]> is a lower-case wide-character.
 
 PORTABILITY
 <<iswlower>> is C99.
diff --git a/newlib/libc/ctype/iswprint.c b/newlib/libc/ctype/iswprint.c
index 6c0cc553d..f4ec08752 100644
--- a/newlib/libc/ctype/iswprint.c
+++ b/newlib/libc/ctype/iswprint.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<iswprint>>---printable wide character test
+	<<iswprint>>---printable wide-character test
 
 INDEX
 	iswprint
@@ -48,7 +48,7 @@ DESCRIPTION
 are printable.
 
 RETURNS
-<<iswprint>> returns non-zero if <[c]> is a printable wide character.
+<<iswprint>> returns non-zero if <[c]> is a printable wide-character.
 
 PORTABILITY
 <<iswprint>> is C99.
diff --git a/newlib/libc/ctype/iswpunct.c b/newlib/libc/ctype/iswpunct.c
index c6a4eda83..88442b6ca 100644
--- a/newlib/libc/ctype/iswpunct.c
+++ b/newlib/libc/ctype/iswpunct.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<iswpunct>>---punctuation wide character test
+	<<iswpunct>>---punctuation wide-character test
 
 INDEX
 	iswpunct
@@ -48,7 +48,7 @@ DESCRIPTION
 are punctuation.
 
 RETURNS
-<<iswpunct>> returns non-zero if <[c]> is a punctuation wide character.
+<<iswpunct>> returns non-zero if <[c]> is a punctuation wide-character.
 
 PORTABILITY
 <<iswpunct>> is C99.
diff --git a/newlib/libc/ctype/iswspace.c b/newlib/libc/ctype/iswspace.c
index e10a35df6..f4d0a0b91 100644
--- a/newlib/libc/ctype/iswspace.c
+++ b/newlib/libc/ctype/iswspace.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<iswspace>>---whitespace wide character test
+	<<iswspace>>---wide-character space test
 
 INDEX
 	iswspace
@@ -45,10 +45,10 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 <<iswspace>> is a function which classifies wide-character values that
-are categorized as whitespace.
+are categorized as white-space.
 
 RETURNS
-<<iswspace>> returns non-zero if <[c]> is a whitespace wide character.
+<<iswspace>> returns non-zero if <[c]> is a white-space wide-character.
 
 PORTABILITY
 <<iswspace>> is C99.
diff --git a/newlib/libc/ctype/iswupper.c b/newlib/libc/ctype/iswupper.c
index 424d65240..872475da2 100644
--- a/newlib/libc/ctype/iswupper.c
+++ b/newlib/libc/ctype/iswupper.c
@@ -1,7 +1,7 @@
 
 /*
 FUNCTION
-	<<iswupper>>---uppercase wide character test
+	<<iswupper>>---upper-case wide-character test
 
 INDEX
 	iswupper
@@ -17,10 +17,10 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 <<iswupper>> is a function which classifies wide-character values that
-have uppercase translations.
+have an upper-case translation.
 
 RETURNS
-<<iswupper>> returns non-zero if <[c]> is a uppercase wide character.
+<<iswupper>> returns non-zero if <[c]> is a upper-case wide-character.
 
 PORTABILITY
 <<iswupper>> is C99.
diff --git a/newlib/libc/ctype/iswxdigit.c b/newlib/libc/ctype/iswxdigit.c
index 4cf76fa25..73d8fa445 100644
--- a/newlib/libc/ctype/iswxdigit.c
+++ b/newlib/libc/ctype/iswxdigit.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<iswxdigit>>---hexadecimal digit wide character test
+	<<iswxdigit>>---hexadecimal digit wide-character test
 
 INDEX
 	iswxdigit
@@ -15,11 +15,11 @@ TRAD_SYNOPSIS
 	wint_t <[c]>;
 
 DESCRIPTION
-<<iswxdigit>> is a function which classifies wide character values that
+<<iswxdigit>> is a function which classifies wide-character values that
 are hexadecimal digits.
 
 RETURNS
-<<iswxdigit>> returns non-zero if <[c]> is a hexadecimal digit wide character.
+<<iswxdigit>> returns non-zero if <[c]> is a hexadecimal digit wide-character.
 
 PORTABILITY
 <<iswxdigit>> is C99.
diff --git a/newlib/libc/ctype/tolower.c b/newlib/libc/ctype/tolower.c
index bdd22bfc5..e43fa6c9d 100644
--- a/newlib/libc/ctype/tolower.c
+++ b/newlib/libc/ctype/tolower.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<tolower>>---translate characters to lowercase
+	<<tolower>>---translate characters to lower case
 
 INDEX
 	tolower
@@ -19,8 +19,8 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-<<tolower>> is a macro which converts uppercase characters to lowercase,
-leaving all other characters unchanged.  It is only defined when
+<<tolower>> is a macro which converts upper-case characters to lower
+case, leaving all other characters unchanged.  It is only defined when
 <[c]> is an integer in the range <<EOF>> to <<255>>.
 
 You can use a compiled subroutine instead of the macro definition by
@@ -30,10 +30,10 @@ undefining this macro using `<<#undef tolower>>'.
 only be used when <[c]> is known to be an uppercase character (<<A>>--<<Z>>).
 
 RETURNS
-<<tolower>> returns the lowercase equivalent of <[c]> when it is a
+<<tolower>> returns the lower-case equivalent of <[c]> when it is a
 character between <<A>> and <<Z>>, and <[c]> otherwise.
 
-<<_tolower>> returns the lowercase equivalent of <[c]> when it is a
+<<_tolower>> returns the lower-case equivalent of <[c]> when it is a
 character between <<A>> and <<Z>>.  If <[c]> is not one of these
 characters, the behaviour of <<_tolower>> is undefined.
 
diff --git a/newlib/libc/ctype/toupper.c b/newlib/libc/ctype/toupper.c
index 26f64b6dc..7977beb79 100644
--- a/newlib/libc/ctype/toupper.c
+++ b/newlib/libc/ctype/toupper.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<toupper>>---translate characters to uppercase
+	<<toupper>>---translate characters to upper case
 
 INDEX
 	toupper
@@ -19,8 +19,8 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-<<toupper>> is a macro which converts lowercase characters to uppercase,
-leaving all other characters unchanged.  It is only defined when
+<<toupper>> is a macro which converts lower-case characters to upper
+case, leaving all other characters unchanged.  It is only defined when
 <[c]> is an integer in the range <<EOF>> to <<255>>.
 
 You can use a compiled subroutine instead of the macro definition by
@@ -30,10 +30,10 @@ undefining this macro using `<<#undef toupper>>'.
 only be used when <[c]> is known to be a lowercase character (<<a>>--<<z>>).
 
 RETURNS
-<<toupper>> returns the uppercase equivalent of <[c]> when it is a
+<<toupper>> returns the upper-case equivalent of <[c]> when it is a
 character between <<a>> and <<z>>, and <[c]> otherwise.
 
-<<_toupper>> returns the uppercase equivalent of <[c]> when it is a
+<<_toupper>> returns the upper-case equivalent of <[c]> when it is a
 character between <<a>> and <<z>>.  If <[c]> is not one of these
 characters, the behaviour of <<_toupper>> is undefined.
 
diff --git a/newlib/libc/ctype/towctrans.c b/newlib/libc/ctype/towctrans.c
index 416a491d3..cf2162670 100644
--- a/newlib/libc/ctype/towctrans.c
+++ b/newlib/libc/ctype/towctrans.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<towctrans>>---extensible wide-character translation
+	<<towctrans>>---extensible wide-character case mapping
 
 INDEX
 	towctrans
@@ -46,7 +46,7 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-<<towctrans>> is a function which converts wide characters based on
+<<towctrans>> is a function which converts wide-characters based on
 a specified translation type <[w]>.  If the translation type is
 invalid or cannot be applied to the current character, no change
 to the character is made.
diff --git a/newlib/libc/ctype/towlower.c b/newlib/libc/ctype/towlower.c
index 89873c2f1..5c36a31a6 100644
--- a/newlib/libc/ctype/towlower.c
+++ b/newlib/libc/ctype/towlower.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<towlower>>---translate wide characters to lowercase
+	<<towlower>>---translate wide-characters to lower case
 
 INDEX
 	towlower
@@ -45,12 +45,12 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-<<towlower>> is a function which converts uppercase wide characters to
-lowercase, leaving all other characters unchanged.
+<<towlower>> is a function which converts upper-case wide-characters to lower
+case, leaving all other characters unchanged.
 
 RETURNS
-<<towlower>> returns the lowercase equivalent of <[c]> when it is a
-uppercase wide character; otherwise, it returns the input character.
+<<towlower>> returns the lower-case equivalent of <[c]> when it is a
+upper-case wide-character, otherwise, it returns the input character.
 
 PORTABILITY
 <<towlower>> is C99.
diff --git a/newlib/libc/ctype/towupper.c b/newlib/libc/ctype/towupper.c
index ec6c4ffa4..530aebf3a 100644
--- a/newlib/libc/ctype/towupper.c
+++ b/newlib/libc/ctype/towupper.c
@@ -29,7 +29,7 @@
 
 /*
 FUNCTION
-	<<towupper>>---translate wide characters to uppercase
+	<<towupper>>---translate wide-characters to upper case
 
 INDEX
 	towupper
@@ -45,12 +45,12 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-<<towupper>> is a function which converts lowercase wide characters to
-uppercase, leaving all other characters unchanged.
+<<towupper>> is a function which converts lower-case wide-characters to upper
+case, leaving all other characters unchanged.
 
 RETURNS
-<<towupper>> returns the uppercase equivalent of <[c]> when it is a
-lowercase wide character, otherwise, it returns the input character.
+<<towupper>> returns the upper-case equivalent of <[c]> when it is a
+lower-case wide-character, otherwise, it returns the input character.
 
 PORTABILITY
 <<towupper>> is C99.
diff --git a/newlib/libc/include/_syslist.h b/newlib/libc/include/_syslist.h
index 0bf76e108..fa552fb60 100644
--- a/newlib/libc/include/_syslist.h
+++ b/newlib/libc/include/_syslist.h
@@ -2,7 +2,6 @@
    and only provide C names, so that we end up in violation of ANSI */
 #ifndef __SYSLIST_H
 #define __SYSLIST_H
-
 #ifdef MISSING_SYSCALL_NAMES
 #define _close close
 #define _execve execve
@@ -22,17 +21,9 @@
 #define _unlink unlink
 #define _wait wait
 #define _write write
-#endif /* MISSING_SYSCALL_NAMES */
-
-#if defined MISSING_SYSCALL_NAMES || !defined HAVE_OPENDIR
-/* If the system call interface is missing opendir, readdir, and
-   closedir, there is an implementation of these functions in
-   libc/posix that is implemented using open, getdents, and close. 
-   Note, these functions are currently not in the libc/syscalls
-   directory.  */
+/* functions not yet sysfaked */
 #define _opendir opendir
 #define _readdir readdir
 #define _closedir closedir
-#endif /* MISSING_SYSCALL_NAMES || !HAVE_OPENDIR */
-
-#endif /* !__SYSLIST_H_ */
+#endif
+#endif
diff --git a/newlib/libc/include/getopt.h b/newlib/libc/include/getopt.h
deleted file mode 100644
index 7179298ae..000000000
--- a/newlib/libc/include/getopt.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
-
-getopt.h - Read command line options
-
-AUTHOR: Gregory Pietsch
-CREATED Thu Jan 09 22:37:00 1997
-
-DESCRIPTION:
-
-The getopt() function parses the command line arguments.  Its arguments argc
-and argv are the argument count and array as passed to the main() function
-on program invocation.  The argument optstring is a list of available option
-characters.  If such a character is followed by a colon (`:'), the option
-takes an argument, which is placed in optarg.  If such a character is
-followed by two colons, the option takes an optional argument, which is
-placed in optarg.  If the option does not take an argument, optarg is NULL.
-
-The external variable optind is the index of the next array element of argv
-to be processed; it communicates from one call to the next which element to
-process.
-
-The getopt_long() function works like getopt() except that it also accepts
-long options started by two dashes `--'.  If these take values, it is either
-in the form
-
---arg=value
-
- or
-
---arg value
-
-It takes the additional arguments longopts which is a pointer to the first
-element of an array of type GETOPT_LONG_OPTION_T, defined below.  The last
-element of the array has to be filled with NULL for the name field.
-
-The longind pointer points to the index of the current long option relative
-to longopts if it is non-NULL.
-
-The getopt() function returns the option character if the option was found
-successfully, `:' if there was a missing parameter for one of the options,
-`?' for an unknown option character, and EOF for the end of the option list.
-
-The getopt_long() function's return value is described below.
-
-The function getopt_long_only() is identical to getopt_long(), except that a
-plus sign `+' can introduce long options as well as `--'.
-
-Describe how to deal with options that follow non-option ARGV-elements.
-
-If the caller did not specify anything, the default is REQUIRE_ORDER if the
-environment variable POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-REQUIRE_ORDER means don't recognize them as options; stop option processing
-when the first non-option is seen.  This is what Unix does.  This mode of
-operation is selected by either setting the environment variable
-POSIXLY_CORRECT, or using `+' as the first character of the optstring
-parameter.
-
-PERMUTE is the default.  We permute the contents of ARGV as we scan, so that
-eventually all the non-options are at the end.  This allows options to be
-given in any order, even with programs that were not written to expect this.
-
-RETURN_IN_ORDER is an option available to programs that were written to
-expect options and other ARGV-elements in any order and that care about the
-ordering of the two.  We describe each non-option ARGV-element as if it were
-the argument of an option with character code 1.  Using `-' as the first
-character of the optstring parameter selects this mode of operation.
-
-The special argument `--' forces an end of option-scanning regardless of the
-value of `ordering'.  In the case of RETURN_IN_ORDER, only `--' can cause
-getopt() and friends to return EOF with optind != argc.
-
-COPYRIGHT NOTICE AND DISCLAIMER:
-
-Copyright (C) 1997 Gregory Pietsch
-
-This file and the accompanying getopt.c implementation file are hereby 
-placed in the public domain without restrictions.  Just give the author 
-credit, don't claim you wrote it or prevent anyone else from using it.
-
-Gregory Pietsch's current e-mail address:
-gpietsch@comcast.net
-****************************************************************************/
-
-#ifndef GETOPT_H
-#define GETOPT_H
-
-#include <_ansi.h>
-
-/* include files needed by this include file */
-
-/* macros defined by this include file */
-#define NO_ARG          0
-#define REQUIRED_ARG    1
-#define OPTIONAL_ARG    2
-
-/* types defined by this include file */
-
-struct option
-{
-  char *name;                   /* the name of the long option */
-  int has_arg;                  /* one of the above macros */
-  int *flag;                    /* determines if getopt_long() returns a
-                                 * value for a long option; if it is
-                                 * non-NULL, 0 is returned as a function
-                                 * value and the value of val is stored in
-                                 * the area pointed to by flag.  Otherwise,
-                                 * val is returned. */
-  int val;                      /* determines the value to return if flag is
-                                 * NULL. */
-};
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-  /* externally-defined variables */
-  extern char *optarg;
-  extern int optind;
-  extern int opterr;
-  extern int optopt;
-
-  /* function prototypes */
-  int _EXFUN (getopt, (int __argc, char *const __argv[], const char *__optstring));
-  int _EXFUN (getopt_long, (int __argc, char *const __argv[], const char *__shortopts, const struct option *__longopts, int *__longind));
-  int _EXFUN (getopt_long_only, (int __argc, char *const __argv[], const char *__shortopts, const struct option *__longopts, int *__longind));
-
-#ifdef __cplusplus
-};
-
-#endif
-
-#endif /* GETOPT_H */
-
-/* END OF FILE getopt.h */
diff --git a/newlib/libc/include/ieeefp.h b/newlib/libc/include/ieeefp.h
index e08fd0885..78bb5bf62 100644
--- a/newlib/libc/include/ieeefp.h
+++ b/newlib/libc/include/ieeefp.h
@@ -5,8 +5,6 @@
 
 #include <machine/ieeefp.h>
 
-_BEGIN_STD_C
-
 /* FIXME FIXME FIXME:
    Neither of __ieee_{float,double}_shape_tape seem to be used anywhere
    except in libm/test.  If that is the case, please delete these from here.
@@ -184,9 +182,6 @@ typedef int fp_rdi;
 fp_rdi _EXFUN(fpgetroundtoi,(void));
 fp_rdi _EXFUN(fpsetroundtoi,(fp_rdi));
 
-#undef isnan
-#undef isinf
-
 int _EXFUN(isnan, (double));
 int _EXFUN(isinf, (double));
 int _EXFUN(finite, (double));
@@ -243,6 +238,4 @@ int _EXFUN(finitef, (float));
 
 #endif /* _DOUBLE_IS_32BITS */
 
-_END_STD_C
-
 #endif /* _IEEE_FP_H_ */
diff --git a/newlib/libc/include/libgen.h b/newlib/libc/include/libgen.h
deleted file mode 100644
index abfab0e5c..000000000
--- a/newlib/libc/include/libgen.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * libgen.h - defined by XPG4
- */
-
-#ifndef _LIBGEN_H_
-#define _LIBGEN_H_
-
-#include "_ansi.h"
-#include <sys/reent.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-char      *_EXFUN(basename,     (char *));
-char      *_EXFUN(dirname,     (char *));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LIBGEN_H_ */
-
diff --git a/newlib/libc/include/machine/ieeefp.h b/newlib/libc/include/machine/ieeefp.h
index dcd6cdf3a..1377e5af5 100644
--- a/newlib/libc/include/machine/ieeefp.h
+++ b/newlib/libc/include/machine/ieeefp.h
@@ -226,10 +226,6 @@
 #define __IEEE_BIG_ENDIAN
 #endif
 
-#ifdef __mt__
-#define __IEEE_BIG_ENDIAN
-#endif
-
 #ifdef __frv__
 #define __IEEE_BIG_ENDIAN
 #endif
@@ -269,11 +265,6 @@
 #endif /* __ARMEL__ */
 #endif /* __MAVERICK__ */
 
-#ifdef __m32c__
-#define __IEEE_LITTLE_ENDIAN
-#define __SMALL_BITFIELDS
-#endif
-
 #ifdef __CRIS__
 #define __IEEE_LITTLE_ENDIAN
 #endif
diff --git a/newlib/libc/include/machine/setjmp.h b/newlib/libc/include/machine/setjmp.h
index b74808f9c..fe05ee1ee 100644
--- a/newlib/libc/include/machine/setjmp.h
+++ b/newlib/libc/include/machine/setjmp.h
@@ -200,10 +200,6 @@ _BEGIN_STD_C
 #define _JBTYPE unsigned long
 #endif
 
-#ifdef __mt__
-#define _JBLEN 16
-#endif
-
 #ifdef __xstormy16__
 /* 4 GPRs plus SP plus PC. */
 #define _JBLEN 8
@@ -213,15 +209,6 @@ _BEGIN_STD_C
 #define _JBLEN 18
 #endif
 
-#ifdef __m32c__
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define _JBLEN (22/2)
-#else
-#define _JBLEN (34/2)
-#endif
-#define _JBTYPE unsigned short
-#endif /* __m32c__ */
-
 #ifdef _JBLEN
 #ifdef _JBTYPE
 typedef	_JBTYPE jmp_buf[_JBLEN];
diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
index 41ce752b3..36766809e 100644
--- a/newlib/libc/include/math.h
+++ b/newlib/libc/include/math.h
@@ -1,3 +1,4 @@
+/* math.h -- Definitions for the math floating point package.  */
 
 #ifndef  _MATH_H_
 #define  _MATH_H_
@@ -8,65 +9,25 @@
 
 _BEGIN_STD_C
 
+#ifndef HUGE_VAL
+
+/* Define HUGE_VAL as infinity, unless HUGE_VAL is already defined
+   (which might have been done by something like math-68881.h).  */
+
 union __dmath
 {
   __ULong i[2];
   double d;
 };
- 
-union __fmath
-{
-  __ULong i[1];
-  float f;
-};
- 
-union __ldmath
-{
-  __ULong i[4];
-  _LONG_DOUBLE ld;
-};
-
-#if defined(__GNUC__) && \
-  ( (__GNUC__ >= 4) || \
-    ( (__GNUC__ >= 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 3) ) )
-
- /* gcc >= 3.3 implicitly defines builtins for HUGE_VALx values.  */
-
- #ifndef HUGE_VAL
-  #define HUGE_VAL (__builtin_huge_val())
- #endif
 
- #ifndef HUGE_VALF
-  #define HUGE_VALF (__builtin_huge_valf())
- #endif
+/* Declare this as an array without bounds so that no matter what small data
+   support a port and/or library has, this reference will be via the general
+   method for accessing globals. */
+extern __IMPORT const union __dmath __infinity[];
 
- #ifndef HUGE_VALL
-  #define HUGE_VALL (__builtin_huge_vall())
- #endif
+#define HUGE_VAL (__infinity[0].d)
 
-#else /* !gcc >= 3.3  */
-
- /* No builtins.  Use floating-point unions instead.  Declare as an array 
-    without bounds so no matter what small data support a port and/or 
-    library has, the reference will be via the general method for accessing 
-    globals. */
-
- #ifndef HUGE_VAL
-  extern __IMPORT const union __dmath __infinity[];
-  #define HUGE_VAL (__infinity[0].d)
- #endif
-
- #ifndef HUGE_VALF
-  extern __IMPORT const union __fmath __infinityf[];
-  #define HUGE_VALF (__infinityf[0].f)
- #endif
-
- #ifndef HUGE_VALL
-  extern __IMPORT const union __ldmath __infinityld[];
-  #define HUGE_VALL (__infinityld[0].ld)
- #endif
-
-#endif /* !gcc >= 3.3  */
+#endif /* ! defined (HUGE_VAL) */
 
 /* Reentrant ANSI C functions.  */
 
@@ -118,10 +79,6 @@ typedef double double_t;
 #define FP_SUBNORMAL   3
 #define FP_NORMAL      4
 
-extern int __isinff (float x);
-extern int __isinfd (double x);
-extern int __isnanf (float x);
-extern int __isnand (double x);
 extern int __fpclassifyf (float x);
 extern int __fpclassifyd (double x);
 extern int __signbitf (float x);
@@ -134,19 +91,9 @@ extern int __signbitd (double x);
 #define isfinite(y) \
           (__extension__ ({__typeof__(y) __y = (y); \
                            fpclassify(__y) != FP_INFINITE && fpclassify(__y) != FP_NAN;}))
-
-/* Note: isinf and isnan were once functions in newlib that took double
- *       arguments.  C99 specifies that these names are reserved for macros
- *       supporting multiple floating point types.  Thus, they are
- *       now defined as macros.  Implementations of the old functions
- *       taking double arguments still exist for compatibility purposes.  */
-#define isinf(x) \
-          (__extension__ ({__typeof__(x) __x = (x); \
-                           (sizeof (__x) == sizeof (float))  ? __isinff(__x) : __isinfd(__x);}))
-#define isnan(x) \
-          (__extension__ ({__typeof__(x) __x = (x); \
-                           (sizeof (__x) == sizeof (float))  ? __isnanf(__x) : __isnand(__x);}))
-#define isnormal(y) (fpclassify(y) == FP_NORMAL)
+#define isnormal(z) \
+          (__extension__ ({__typeof__(z) __z = (z); \
+                           fpclassify(__z) == FP_NORMAL;}))
 #define signbit(x) \
           (__extension__ ({__typeof__(x) __x = (x); \
                            (sizeof(__x) == sizeof(float)) ? __signbitf(__x) : __signbitd(__x);}))
@@ -175,6 +122,8 @@ extern int __signbitd (double x);
 
 extern double infinity _PARAMS((void));
 extern double nan _PARAMS((const char *));
+extern int isnan _PARAMS((double));
+extern int isinf _PARAMS((double));
 extern int finite _PARAMS((double));
 extern double copysign _PARAMS((double, double));
 extern int ilogb _PARAMS((double));
diff --git a/newlib/libc/include/stdint.h b/newlib/libc/include/stdint.h
deleted file mode 100644
index 328b094c9..000000000
--- a/newlib/libc/include/stdint.h
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 by
- * Ralf Corsepius, Ulm/Germany. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-/*
- * @todo - Add support for wint_t types.
- */
-
-#ifndef _STDINT_H
-#define _STDINT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__GNUC__) && \
-  ( (__GNUC__ >= 4) || \
-    ( (__GNUC__ >= 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ > 2) ) )
-/* gcc > 3.2 implicitly defines the values we are interested */
-#define __STDINT_EXP(x) __##x##__
-#else
-#define __STDINT_EXP(x) x
-#include <limits.h>
-#endif
-
-/* Check if "long long" is 64bit wide */
-/* Modern GCCs provide __LONG_LONG_MAX__, SUSv3 wants LLONG_MAX */
-#if ( defined(__LONG_LONG_MAX__) && (__LONG_LONG_MAX__ > 0x7fffffff) ) \
-  || ( defined(LLONG_MAX) && (LLONG_MAX > 0x7fffffff) )
-#define __have_longlong64 1
-#endif
-
-/* Check if "long" is 64bit or 32bit wide */
-#if __STDINT_EXP(LONG_MAX) > 0x7fffffff
-#define __have_long64 1
-#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff
-#define __have_long32 1
-#endif
-
-#if __STDINT_EXP(SCHAR_MAX) == 0x7f
-typedef signed char int8_t ;
-typedef unsigned char uint8_t ;
-#define __int8_t_defined 1
-#endif
-
-#if __int8_t_defined
-typedef signed char int_least8_t;
-typedef unsigned char uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#if __STDINT_EXP(SHRT_MAX) == 0x7fff
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-#define __int16_t_defined 1
-#elif __STDINT_EXP(INT_MAX) == 0x7fff
-typedef signed int int16_t;
-typedef unsigned int uint16_t;
-#define __int16_t_defined 1
-#elif __STDINT_EXP(SCHAR_MAX) == 0x7fff
-typedef signed char int16_t;
-typedef unsigned char uint16_t;
-#define __int16_t_defined 1
-#endif
-
-#if __int16_t_defined
-typedef int16_t   	int_least16_t;
-typedef uint16_t 	uint_least16_t;
-#define __int_least16_t_defined 1
-
-#if !__int_least8_t_defined
-typedef int16_t	   	int_least8_t;
-typedef uint16_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-#endif
-
-#if __have_long32
-typedef signed long int32_t;
-typedef unsigned long uint32_t;
-#define __int32_t_defined 1
-#elif __STDINT_EXP(INT_MAX) == 0x7fffffffL
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-#define __int32_t_defined 1
-#elif __STDINT_EXP(SHRT_MAX) == 0x7fffffffL
-typedef signed short int32_t;
-typedef unsigned short uint32_t;
-#define __int32_t_defined 1
-#elif __STDINT_EXP(SCHAR_MAX) == 0x7fffffffL
-typedef signed char int32_t;
-typedef unsigned char uint32_t;
-#define __int32_t_defined 1
-#endif
-
-#if __int32_t_defined
-typedef int32_t   	int_least32_t;
-typedef uint32_t 	uint_least32_t;
-#define __int_least32_t_defined 1
-
-#if !__int_least8_t_defined
-typedef int32_t	   	int_least8_t;
-typedef uint32_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#if !__int_least16_t_defined
-typedef int32_t	   	int_least16_t;
-typedef uint32_t  	uint_least16_t;
-#define __int_least16_t_defined 1
-#endif
-#endif
-
-#if __have_long64
-typedef signed long int64_t;
-typedef unsigned long uint64_t;
-#define __int64_t_defined 1
-#elif __have_longlong64
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-#define __int64_t_defined 1
-#elif  __STDINT_EXP(INT_MAX) > 0x7fffffff
-typedef signed int int64_t;
-typedef unsigned int uint64_t;
-#define __int64_t_defined 1
-#endif
-
-#if __int64_t_defined
-typedef int64_t   	int_least64_t;
-typedef uint64_t 	uint_least64_t;
-#define __int_least64_t_defined 1
-
-#if !__int_least8_t_defined
-typedef int64_t	   	int_least8_t;
-typedef uint64_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#if !__int_least16_t_defined
-typedef int64_t	   	int_least16_t;
-typedef uint64_t  	uint_least16_t;
-#define __int_least16_t_defined 1
-#endif
-
-#if !__int_least32_t_defined
-typedef int64_t	   	int_least32_t;
-typedef uint64_t  	uint_least32_t;
-#define __int_least32_t_defined 1
-#endif
-#endif
-
-/*
- * Fastest minimum-width integer types
- *
- * Assume int to be the fastest type for all types with a width 
- * less than __INT_MAX__ rsp. INT_MAX
- */
-#if __STDINT_EXP(INT_MAX) >= 0x7f
-  typedef signed int int_fast8_t;
-  typedef unsigned int uint_fast8_t;
-#define __int_fast8_t_defined 1
-#endif
-
-#if __STDINT_EXP(INT_MAX) >= 0x7fff
-  typedef signed int int_fast16_t;
-  typedef unsigned int uint_fast16_t;
-#define __int_fast16_t_defined 1
-#endif
-
-#if __STDINT_EXP(INT_MAX) >= 0x7fffffff
-  typedef signed int int_fast32_t;
-  typedef unsigned int uint_fast32_t;
-#define __int_fast32_t_defined 1
-#endif
-
-#if __STDINT_EXP(INT_MAX) > 0x7fffffff
-  typedef signed int int_fast64_t;
-  typedef unsigned int uint_fast64_t;
-#define __int_fast64_t_defined 1
-#endif
-
-/*
- * Fall back to [u]int_least<N>_t for [u]int_fast<N>_t types
- * not having been defined, yet.
- * Leave undefined, if [u]int_least<N>_t should not be available.
- */
-#if !__int_fast8_t_defined
-#if __int_least8_t_defined
-  typedef int_least8_t int_fast8_t;
-  typedef uint_least8_t uint_fast8_t;
-#define __int_fast8_t_defined 1
-#endif
-#endif
-
-#if !__int_fast16_t_defined
-#if __int_least16_t_defined
-  typedef int_least16_t int_fast16_t;
-  typedef uint_least16_t uint_fast16_t;
-#define __int_fast16_t_defined 1
-#endif
-#endif
-
-#if !__int_fast32_t_defined
-#if __int_least32_t_defined
-  typedef int_least32_t int_fast32_t;
-  typedef uint_least32_t uint_fast32_t;
-#define __int_fast32_t_defined 1
-#endif
-#endif
-
-#if !__int_fast64_t_defined
-#if __int_least64_t_defined
-  typedef int_least64_t int_fast64_t;
-  typedef uint_least64_t uint_fast64_t;
-#define __int_fast64_t_defined 1
-#endif
-#endif
-
-/* Greatest-width integer types */
-/* Modern GCCs provide __INTMAX_TYPE__ */
-#if defined(__INTMAX_TYPE__)
-  typedef __INTMAX_TYPE__ intmax_t;
-#elif __have_longlong64
-  typedef signed long long intmax_t;
-#else
-  typedef signed long intmax_t;
-#endif
-
-/* Modern GCCs provide __UINTMAX_TYPE__ */
-#if defined(__UINTMAX_TYPE__)
-  typedef __UINTMAX_TYPE__ uintmax_t;
-#elif __have_longlong64
-  typedef unsigned long long uintmax_t;
-#else
-  typedef unsigned long uintmax_t;
-#endif
-
-/*
- * GCC doesn't provide an appropriate macro for [u]intptr_t
- * For now, use __PTRDIFF_TYPE__
- */
-#if defined(__PTRDIFF_TYPE__)
-typedef signed __PTRDIFF_TYPE__ intptr_t;
-typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
-#else
-/*
- * Fallback to hardcoded values, 
- * should be valid on cpu's with 32bit int/32bit void*
- */
-typedef signed long intptr_t;
-typedef unsigned long uintptr_t;
-#endif
-
-/* Limits of Specified-Width Integer Types */
-
-#if __int8_t_defined
-#define INT8_MIN 	-128
-#define INT8_MAX 	 127
-#define UINT8_MAX 	 255
-#endif
-
-#if __int_least8_t_defined
-#define INT_LEAST8_MIN 	-128
-#define INT_LEAST8_MAX 	 127
-#define UINT_LEAST8_MAX	 255
-#else
-#error required type int_least8_t missing
-#endif
-
-#if __int16_t_defined
-#define INT16_MIN 	-32768
-#define INT16_MAX 	 32767
-#define UINT16_MAX 	 65535
-#endif
-
-#if __int_least16_t_defined
-#define INT_LEAST16_MIN	-32768
-#define INT_LEAST16_MAX	 32767
-#define UINT_LEAST16_MAX 65535
-#else
-#error required type int_least16_t missing
-#endif
-
-#if __int32_t_defined
-#define INT32_MIN 	 (-2147483647-1)
-#define INT32_MAX 	 2147483647
-#define UINT32_MAX       4294967295U
-#endif
-
-#if __int_least32_t_defined
-#define INT_LEAST32_MIN  (-2147483647-1)
-#define INT_LEAST32_MAX  2147483647
-#define UINT_LEAST32_MAX 4294967295U
-#else
-#error required type int_least32_t missing
-#endif
-
-#if __int64_t_defined
-#if __have_long64
-#define INT64_MIN 	(-9223372036854775807L-1L)
-#define INT64_MAX 	 9223372036854775807L
-#define UINT64_MAX 	18446744073709551615U
-#elif __have_longlong64
-#define INT64_MIN 	(-9223372036854775807LL-1LL)
-#define INT64_MAX 	 9223372036854775807LL
-#define UINT64_MAX 	18446744073709551615ULL
-#endif
-#endif
-
-#if __int_least64_t_defined
-#if __have_long64
-#define INT_LEAST64_MIN  (-9223372036854775807L-1L)
-#define INT_LEAST64_MAX  9223372036854775807L
-#define UINT_LEAST64_MAX 18446744073709551615U
-#elif __have_longlong64
-#define INT_LEAST64_MIN  (-9223372036854775807LL-1LL)
-#define INT_LEAST64_MAX  9223372036854775807LL
-#define UINT_LEAST64_MAX 18446744073709551615ULL
-#endif
-#endif
-
-#if __int_fast8_t_defined
-#define INT_FAST8_MIN	INT8_MIN
-#define INT_FAST8_MAX	INT8_MAX
-#define UINT_FAST8_MAX	UINT8_MAX
-#endif
-
-#if __int_fast16_t_defined
-#define INT_FAST16_MIN	INT16_MIN
-#define INT_FAST16_MAX	INT16_MAX
-#define UINT_FAST16_MAX	UINT16_MAX
-#endif
-
-#if __int_fast32_t_defined
-#define INT_FAST32_MIN	INT32_MIN
-#define INT_FAST32_MAX	INT32_MAX
-#define UINT_FAST32_MAX	UINT32_MAX
-#endif
-
-#if __int_fast64_t_defined
-#define INT_FAST64_MIN	INT64_MIN
-#define INT_FAST64_MAX	INT64_MAX
-#define UINT_FAST64_MAX	UINT64_MAX
-#endif
-
-/* This must match size_t in stddef.h, currently long unsigned int */
-#define SIZE_MIN (-__STDINT_EXP(LONG_MAX) - 1L)
-#define SIZE_MAX __STDINT_EXP(LONG_MAX)
-
-/* This must match sig_atomic_t in <signal.h> (currently int) */
-#define SIG_ATOMIC_MIN (-__STDINT_EXP(INT_MAX) - 1)
-#define SIG_ATOMIC_MAX __STDINT_EXP(INT_MAX)
-
-/* This must match ptrdiff_t  in <stddef.h> (currently long int) */
-#define PTRDIFF_MIN (-__STDINT_EXP(LONG_MAX) - 1L)
-#define PTRDIFF_MAX __STDINT_EXP(LONG_MAX)
-
-/** Macros for minimum-width integer constant expressions */
-#define INT8_C(x)	x
-#define UINT8_C(x)	x##U
-
-#define INT16_C(x)	x
-#define UINT16_C(x)	x##U
-
-#if __have_long32
-#define INT32_C(x)	x##L
-#define UINT32_C(x)	x##UL
-#else
-#define INT32_C(x)	x
-#define UINT32_C(x)	x##U
-#endif
-
-#if __int64_t_defined
-#if __have_longlong64
-#define INT64_C(x)	x##LL
-#define UINT64_C(x)	x##ULL
-#else
-#define INT64_C(x)	x##L
-#define UINT64_C(x)	x##UL
-#endif
-#endif
-
-/** Macros for greatest-width integer constant expression */
-#if __have_longlong64
-#define INTMAX_C(x)	x##LL
-#define UINTMAX_C(x)	x##ULL
-#else
-#define INTMAX_C(x)	x##L
-#define UINTMAX_C(x)	x##UL
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _STDINT_H */
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index ef8c2db18..b70772ab0 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -229,7 +229,6 @@ off_t	_EXFUN(ftello, ( FILE *));
 #ifndef _REENT_ONLY
 int	_EXFUN(asiprintf, (char **, const char *, ...));
 int	_EXFUN(asprintf, (char **, const char *, ...));
-int	_EXFUN(dprintf, (int, const char *, ...));
 int	_EXFUN(fcloseall, (_VOID));
 int	_EXFUN(fiprintf, (FILE *, const char *, ...));
 int	_EXFUN(iprintf, (const char *, ...));
@@ -239,13 +238,11 @@ int	_EXFUN(sniprintf, (char *, size_t, const char *, ...));
 char *	_EXFUN(tempnam, (const char *, const char *));
 int	_EXFUN(vasiprintf, (char **, const char *, __VALIST));
 int	_EXFUN(vasprintf, (char **, const char *, __VALIST));
-int	_EXFUN(vdprintf, (int, const char *, __VALIST));
 int	_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST));
 int	_EXFUN(vsnprintf, (char *, size_t, const char *, __VALIST));
 int	_EXFUN(vfiprintf, (FILE *, const char *, __VALIST));
 int	_EXFUN(vfiscanf, (FILE *, const char *, __VALIST));
 int	_EXFUN(vfscanf, (FILE *, const char *, __VALIST));
-int	_EXFUN(viprintf, (const char *, __VALIST));
 int	_EXFUN(viscanf, (const char *, __VALIST));
 int	_EXFUN(vscanf, (const char *, __VALIST));
 int	_EXFUN(vsiscanf, (const char *, const char *, __VALIST));
@@ -283,7 +280,6 @@ int	_EXFUN(putchar_unlocked, (int));
 
 int	_EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...));
 int	_EXFUN(_asprintf_r, (struct _reent *, char **, const char *, ...));
-int	_EXFUN(_dprintf_r, (struct _reent *, int, const char *, ...));
 int	_EXFUN(_fcloseall_r, (struct _reent *));
 FILE *	_EXFUN(_fdopen_r, (struct _reent *, int, const char *));
 FILE *	_EXFUN(_fopen_r, (struct _reent *, const char *, const char *));
@@ -318,7 +314,6 @@ char *	_EXFUN(_tmpnam_r, (struct _reent *, char *));
 int	_EXFUN(_ungetc_r, (struct _reent *, int, FILE *));
 int	_EXFUN(_vasiprintf_r, (struct _reent *, char **, const char *, __VALIST));
 int	_EXFUN(_vasprintf_r, (struct _reent *, char **, const char *, __VALIST));
-int	_EXFUN(_vdprintf_r, (struct _reent *, int, const char *, __VALIST));
 int	_EXFUN(_vfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST));
 int	_EXFUN(_vfprintf_r, (struct _reent *, FILE *, const char *, __VALIST));
 int	_EXFUN(_viprintf_r, (struct _reent *, const char *, __VALIST));
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index 9bee3b187..e75558d27 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -19,10 +19,6 @@
 #include <alloca.h>
 #endif
 
-#ifdef __CYGWIN__
-#include <cygwin/stdlib.h>
-#endif
-
 _BEGIN_STD_C
 
 typedef struct 
@@ -80,6 +76,9 @@ _VOID	_EXFUN(exit,(int __status) _ATTRIBUTE ((noreturn)));
 _VOID	_EXFUN(free,(_PTR));
 char *  _EXFUN(getenv,(const char *__string));
 char *	_EXFUN(_getenv_r,(struct _reent *, const char *__string));
+#ifdef __CYGWIN__
+const char *_EXFUN(getprogname,(void));
+#endif
 char *	_EXFUN(_findenv,(_CONST char *, int *));
 char *	_EXFUN(_findenv_r,(struct _reent *, _CONST char *, int *));
 long	_EXFUN(labs,(long));
@@ -104,6 +103,9 @@ char *  _EXFUN(mktemp,(char *));
 _VOID	_EXFUN(qsort,(_PTR __base, size_t __nmemb, size_t __size, int(*_compar)(const _PTR, const _PTR)));
 int	_EXFUN(rand,(_VOID));
 _PTR	_EXFUN(realloc,(_PTR __r, size_t __size));
+#ifdef __CYGWIN__
+void	_EXFUN(setprogname,(const char *));
+#endif
 _VOID	_EXFUN(srand,(unsigned __seed));
 double	_EXFUN(strtod,(const char *__n, char **__end_PTR));
 double	_EXFUN(_strtod_r,(struct _reent *,const char *__n, char **__end_PTR));
@@ -174,8 +176,15 @@ unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__n, char **
 
 #ifndef __CYGWIN__
 _VOID	_EXFUN(cfree,(_PTR));
+#else
+char *	_EXFUN(realpath,(const char *, char *));
 void	_EXFUN(unsetenv,(const char *__string));
 void	_EXFUN(_unsetenv_r,(struct _reent *, const char *__string));
+int	_EXFUN(random,(_VOID));
+long	_EXFUN(srandom,(unsigned __seed));
+char *  _EXFUN(ptsname, (int));
+int     _EXFUN(grantpt, (int));
+int     _EXFUN(unlockpt,(int));
 #endif
 
 #endif /* ! __STRICT_ANSI__ */
@@ -192,6 +201,35 @@ int	_EXFUN(_system_r,(struct _reent *, const char *));
 
 _VOID	_EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
 
+#ifdef __CYGWIN__
+#undef _malloc_r
+#define _malloc_r(r, s) malloc (s)
+#undef _free_r
+#define _free_r(r, p) free (p)
+#undef _realloc_r
+#define _realloc_r(r, p, s) realloc (p, s)
+#undef _calloc_r
+#define _calloc_r(r, s1, s2) calloc (s1, s2);
+#undef _memalign_r
+#define _memalign_r(r, s1, s2) memalign (s1, s2);
+#undef _mallinfo_r
+#define _mallinfo_r(r) mallinfo ()
+#undef _malloc_stats_r
+#define _malloc_stats_r(r) malloc_stats ()
+#undef _mallopt_r
+#define _mallopt_r(i1, i2) mallopt (i1, i2)
+#undef _malloc_usable_size_r
+#define _malloc_usable_size_r(r, p) malloc_usable_size (p)
+#undef _valloc_r
+#define _valloc_r(r, s) valloc (s)
+#undef _pvalloc_r
+#define _pvalloc_r(r, s) pvalloc (s)
+#undef _malloc_trim_r
+#define _malloc_trim_r(r, s) malloc_trim (s)
+#undef _mstats_r
+#define _mstats_r(r, p) mstats (p)
+#endif
+
 _END_STD_C
 
 #endif /* _STDLIB_H_ */
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index 55a86b374..30756b7ca 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -56,9 +56,6 @@ int	 _EXFUN(ffs,(int));
 char 	*_EXFUN(index,(const char *, int));
 _PTR	 _EXFUN(memccpy,(_PTR, const _PTR, int, size_t));
 _PTR	 _EXFUN(mempcpy,(_PTR, const _PTR, size_t));
-#ifdef __CYGWIN__
-extern void *memmem (__const void *, size_t,  __const void *, size_t);
-#endif
 char 	*_EXFUN(rindex,(const char *, int));
 int	 _EXFUN(strcasecmp,(const char *, const char *));
 char 	*_EXFUN(strdup,(const char *));
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
index c4e4dba9a..1dd045498 100644
--- a/newlib/libc/include/sys/config.h
+++ b/newlib/libc/include/sys/config.h
@@ -59,7 +59,7 @@
 /* in other words, go32 */
 #define _FLOAT_RET double
 #endif
-#if defined(__linux__) || defined(__RDOS__)
+#ifdef __linux__
 /* we want the reentrancy structure to be returned by a function */
 #define __DYNAMIC_REENT__
 #define HAVE_GETDATE
@@ -105,22 +105,6 @@
 #define __BUFSIZ__ 16
 #define _REENT_SMALL
 #endif
-#ifdef __m32c__
-#define __SMALL_BITFIELDS
-#undef INT_MAX
-#undef UINT_MAX
-#define INT_MAX __INT_MAX__
-#define UINT_MAX (__INT_MAX__ * 2U + 1)
-#define MALLOC_ALIGNMENT 8
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define _POINTER_INT short
-#else
-#define _POINTER_INT long
-#endif
-#define __BUFSIZ__ 16
-#define _REENT_SMALL
-#endif /* __m32c__ */
-
 
 /* This block should be kept in sync with GCC's limits.h.  The point
    of having these definitions here is to not include limits.h, which
diff --git a/newlib/libc/include/sys/dirent.h b/newlib/libc/include/sys/dirent.h
index a3fb5c02c..f2f2342d5 100644
--- a/newlib/libc/include/sys/dirent.h
+++ b/newlib/libc/include/sys/dirent.h
@@ -1,13 +1,15 @@
 /* <dirent.h> includes <sys/dirent.h>, which is this file.  On a
    system which supports <dirent.h>, this file is overridden by
    dirent.h in the libc/sys/.../sys directory.  On a system which does
-   not support <dirent.h>, we will get this file which uses #error to force
-   an error.  */
+   not support <dirent.h>, we will get this file which tries to find
+   any other <dirent.h> which may be lurking around.  If there isn't
+   one, the user will get an error indicating that there is no
+   <dirent.h>.  */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-#error "<dirent.h> not supported"
+#include_next <dirent.h>
 #ifdef __cplusplus
 }
 #endif
diff --git a/newlib/libc/include/sys/fcntl.h b/newlib/libc/include/sys/fcntl.h
index fd8917d1e..0a680a1da 100644
--- a/newlib/libc/include/sys/fcntl.h
+++ b/newlib/libc/include/sys/fcntl.h
@@ -37,9 +37,9 @@ extern "C" {
 #define	O_CREAT		_FCREAT
 #define	O_TRUNC		_FTRUNC
 #define	O_EXCL		_FEXCL
-#define O_SYNC		_FSYNC
+/*	O_SYNC		_FSYNC		not posix, defined below */
 /*	O_NDELAY	_FNDELAY 	set in include/fcntl.h */
-/*	O_NDELAY	_FNBIO 		set in include/fcntl.h */
+/*	O_NDELAY	_FNBIO 		set in 5include/fcntl.h */
 #define	O_NONBLOCK	_FNONBLOCK
 #define	O_NOCTTY	_FNOCTTY
 /* For machines which care - */
@@ -68,6 +68,8 @@ extern "C" {
 
 #ifndef	_POSIX_SOURCE
 
+#define	O_SYNC		_FSYNC
+
 /*
  * Flags that work for fcntl(fd, F_SETFL, FXXXX)
  */
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
index 6754f1e9d..af31ce670 100644
--- a/newlib/libc/include/sys/features.h
+++ b/newlib/libc/include/sys/features.h
@@ -88,7 +88,6 @@ extern "C" {
 # define _POSIX_THREAD_ATTR_STACKSIZE           1
 # define _POSIX_SEMAPHORES                      1
 # define _POSIX_TIMERS				1
-# define _POSIX_MEMLOCK_RANGE			1
 #endif
 
 #ifdef __cplusplus
diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h
index df3164941..4771f5798 100644
--- a/newlib/libc/include/sys/time.h
+++ b/newlib/libc/include/sys/time.h
@@ -14,8 +14,8 @@ extern "C" {
 
 #ifndef _WINSOCK_H
 struct timeval {
-  time_t      tv_sec;
-  suseconds_t tv_usec;
+  long tv_sec;
+  long tv_usec;
 };
 
 struct timezone {
@@ -24,7 +24,7 @@ struct timezone {
 };
 
 #ifdef __CYGWIN__
-#include <cygwin/sys_time.h>
+#include <sys/select.h>
 #endif /* __CYGWIN__ */
 
 #endif /* _WINSOCK_H */
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index bf08616ab..5c288bfc0 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -251,6 +251,11 @@ typedef	struct _types_fd_set {
 #undef __MS_types__
 #undef _ST_INT32
 
+/* The following are actually standard POSIX 1003.1b-1993 threads, mutexes,
+   condition variables, and keys.  But since RTEMS is currently the only
+   newlib user of these, the ifdef is just on RTEMS. */
+
+#if defined(__rtems__) || defined(__CYGWIN__)
 
 #ifndef __clockid_t_defined
 typedef _CLOCKID_T_ clockid_t;
@@ -262,8 +267,9 @@ typedef _TIMER_T_ timer_t;
 #define __timer_t_defined
 #endif
 
-typedef unsigned long useconds_t;
-typedef long suseconds_t;
+#if defined(__CYGWIN__) || defined(__rtems__)
+typedef long useconds_t;
+#endif
 
 #include <sys/features.h>
 
@@ -374,6 +380,8 @@ typedef struct {
 #endif
 #endif /* defined(_POSIX_THREADS) */
 
+#endif  /* defined(__rtems__) */
+
 #endif  /* !__need_inttypes */
 
 #undef __need_inttypes
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index a670dd735..e9215e24d 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -211,9 +211,9 @@ void    _EXFUN(sync, (void));
 #else /* defined(__rtems__) */
 int     _EXFUN(sync, (void));
 #endif
-#endif
 int     _EXFUN(readlink, (const char *__path, char *__buf, int __buflen));
 int     _EXFUN(symlink, (const char *__name1, const char *__name2));
+#endif
 
 #define	F_OK	0
 #define	R_OK	4
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index 8d3a30c8a..0ef5e958e 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -123,6 +123,20 @@ extern __IMPORT char *_tzname[2];
 #ifndef tzname
 #define tzname _tzname
 #endif
+
+/* CYGWIN also exposes daylight and timezone in the name space */
+#ifdef __CYGWIN__
+#ifndef daylight
+#define daylight _daylight
+#endif
+#ifdef timezonevar
+#ifndef timezone
+#define timezone _timezone
+#endif
+#else
+char *_EXFUN(timezone, (void));
+#endif
+#endif /* __CYGWIN__ */
 #endif /* !__STRICT_ANSI__ */
 
 #ifdef __cplusplus
@@ -131,10 +145,6 @@ extern __IMPORT char *_tzname[2];
 
 #include <sys/features.h>
 
-#ifdef __CYGWIN__
-#include <cygwin/time.h>
-#endif /*__CYGWIN__*/
-
 #if defined(_POSIX_TIMERS)
 
 #include <signal.h>
@@ -173,6 +183,16 @@ int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
 #ifdef __cplusplus
 }
 #endif
+#else
+#ifdef __CYGWIN__
+#ifdef __cplusplus
+extern "C" {
+#endif
+int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
+#ifdef __cplusplus
+}
+#endif
+#endif /* __CYGWIN__ */
 #endif /* _POSIX_TIMERS */
 
 #ifdef __cplusplus
@@ -203,6 +223,10 @@ extern "C" {
    associated with a time.  */
 
 #define TIMER_ABSTIME	4
+#ifdef __CYGWIN__
+# define TIMER_RELTIME	0	/* For compatibility with HP/UX, Solaris,
+				   others? */
+#endif
 
 /* Manifest Constants, P1003.4b/D8, p. 55 */
 
diff --git a/newlib/libc/libc.texinfo b/newlib/libc/libc.texinfo
index b3ce3e9eb..02d75958d 100644
--- a/newlib/libc/libc.texinfo
+++ b/newlib/libc/libc.texinfo
@@ -84,8 +84,8 @@ into another language, under the above conditions for modified versions.
 @title The Red Hat newlib C Library
 @subtitle Full Configuration
 @sp 1
-@subtitle @code{libc} 1.14.0
-@subtitle December 2005
+@subtitle @code{libc} 1.13.0
+@subtitle January 2004
 @author {Steve Chamberlain}
 @author {Roland Pesch}
 @author {Red Hat Support}
@@ -143,7 +143,7 @@ into another language, under the above conditions for modified versions.
 @end titlepage
 @end iftex
 
-@ifnottex
+@ifinfo
 @node Top
 @top The Red Hat newlib C Library
 
@@ -158,7 +158,6 @@ into another language, under the above conditions for modified versions.
 @include iconvset.texi
 
 @menu
-* Introduction::
 * Stdlib::
 * Ctype::
 * Stdio::
@@ -174,36 +173,18 @@ into another language, under the above conditions for modified versions.
 
 * Timefns::
 * Locale::
-* Reentrancy::
+* Syscalls::
 
 * Misc::
-* Syscalls::
 * Arglists::
+* Reentrancy::
 @ifset ICONV
 * Iconv::
 @end ifset
 
 * Library Index::
 @end menu
-@end ifnottex
-
-@node Introduction
-@chapter Introduction
-
-This reference manual describes the functions provided by the Red Hat
-``newlib'' version of the standard ANSI C library.  This document is not
-intended as an overview or a tutorial for the C library.  Each library
-function is listed with a synopsis of its use, a brief description,
-return values (including error handling), and portability issues.
-
-Some of the library functions depend on support from the underlying
-operating system and may not be available on every platform.  For
-embedded systems in particular, many of these underlying operating
-system services may not be available or may not be fully functional.
-The specific operating system subroutines required for a particular
-library function are listed in the ``Portability'' section of the
-function description.  @xref{Syscalls}, for a description of the
-relevant operating system calls.
+@end ifinfo
 
 @include targetdep.tex
 
diff --git a/newlib/libc/machine/a29k/aclocal.m4 b/newlib/libc/machine/a29k/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/a29k/aclocal.m4
+++ b/newlib/libc/machine/a29k/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/a29k/configure b/newlib/libc/machine/a29k/configure
index 028b7b4fa..bba10b075 100755
--- a/newlib/libc/machine/a29k/configure
+++ b/newlib/libc/machine/a29k/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/aclocal.m4 b/newlib/libc/machine/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/machine/aclocal.m4
+++ b/newlib/libc/machine/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/arm/aclocal.m4 b/newlib/libc/machine/arm/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/arm/aclocal.m4
+++ b/newlib/libc/machine/arm/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/arm/configure b/newlib/libc/machine/arm/configure
index 028b7b4fa..bba10b075 100755
--- a/newlib/libc/machine/arm/configure
+++ b/newlib/libc/machine/arm/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/arm/machine/endian.h b/newlib/libc/machine/arm/machine/endian.h
deleted file mode 100644
index 54844278b..000000000
--- a/newlib/libc/machine/arm/machine/endian.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* ARM configuration file */
-
-#ifndef _MACHINE_ENDIAN_H
-# define _MACHINE_ENDIAN_H
-
-#ifdef __ARMEB__
-#define BYTE_ORDER BIG_ENDIAN
-#else
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
-#endif
diff --git a/newlib/libc/machine/arm/machine/param.h b/newlib/libc/machine/arm/machine/param.h
deleted file mode 100644
index 595294cf3..000000000
--- a/newlib/libc/machine/arm/machine/param.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* ARM configuration file; HZ is 100 rather than the default 60 */
-
-#ifndef _MACHINE_PARAM_H
-# define _MACHINE_PARAM_H
-
-# define HZ (100)
-
-#ifdef __ARMEB__
-#define BYTE_ORDER BIG_ENDIAN
-#else
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
-#endif
diff --git a/newlib/libc/machine/arm/setjmp.S b/newlib/libc/machine/arm/setjmp.S
index 84e7cd70b..d37486090 100644
--- a/newlib/libc/machine/arm/setjmp.S
+++ b/newlib/libc/machine/arm/setjmp.S
@@ -51,39 +51,17 @@
    Function entry is much simpler.  If we are compiling for the Thumb we 
    just switch into ARM mode and then drop through into the rest of the
    function.  The function exit code will take care of the restore to
-   Thumb mode.
-   
-   For Thumb-2 do everything in Thumb mode.  */
+   Thumb mode.  */
 
 #ifdef __APCS_26__
 #define RET	movs		pc, lr
-#elif defined(__thumb2__)
-#define RET	bx lr
 #else
 #define RET	tst		lr, #1; \
 	        moveq		pc, lr ; \
 .word           0xe12fff1e	/* bx lr */
 #endif
 
-#ifdef __thumb2__
-.macro COND where when 
-	i\where	\when
-.endm
-#else
-.macro COND where when 
-.endm
-#endif
-
-#if defined(__thumb2__)
-.syntax unified
-.macro MODE
-	.thumb
-	.thumb_func
-.endm
-.macro PROLOGUE name
-.endm
-
-#elif defined(__thumb__)
+#ifdef __thumb__
 #define	MODE		.thumb_func
 .macro PROLOGUE name
 	.code 16
@@ -92,7 +70,7 @@
 	.code 32
 SYM (.arm_start_of.\name):
 .endm
-#else /* Arm */
+#else
 #define	MODE		.code 32
 .macro PROLOGUE name
 .endm
@@ -153,9 +131,6 @@ SYM (\name):
 	/* Put the return value into the integer result register.
 	   But if it is zero then return 1 instead.  */	
 	movs		a1, a2
-#ifdef __thumb2__
-	it		eq
-#endif
 	moveq		a1, #1
 
 	FUNC_END longjmp
diff --git a/newlib/libc/machine/configure b/newlib/libc/machine/configure
index 72835683d..912104daa 100755
--- a/newlib/libc/machine/configure
+++ b/newlib/libc/machine/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1655,7 +1652,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1682,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1765,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1886,7 +1883,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
+echo "configure:1887: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1917: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1920: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1954,7 +1951,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
+echo "configure:1972: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:2022: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2042,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
+echo "configure:2043: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
+echo "configure:2216: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2245,7 +2242,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2246: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2304,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
+echo "configure:2308: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2378,7 +2375,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
+echo "configure:2379: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
+echo "configure:2411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,7 +2442,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
+echo "configure:2446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
+echo "configure:2478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2545 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2564,7 +2561,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2582,7 +2579,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:2583: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2596 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:2633: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2696,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2732: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2763,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2799: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2834,12 +2831,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
+echo "configure:2835: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
+echo "configure:2869: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
diff --git a/newlib/libc/machine/cris/Makefile.am b/newlib/libc/machine/cris/Makefile.am
deleted file mode 100644
index 2c746fa6c..000000000
--- a/newlib/libc/machine/cris/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-# We also make a library with just the useful
-# machine-but-not-system-specific functions, usable as an add-on
-# by itself together with e.g. uclibc.
-toollib_LIBRARIES = libic.a
-
-lib_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
-
-libic_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
-tooldir = $(exec_prefix)/$(host_alias)
-toollibdir = $(tooldir)/lib$(MULTISUBDIR)
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/cris/Makefile.in b/newlib/libc/machine/cris/Makefile.in
deleted file mode 100644
index 97d7eced1..000000000
--- a/newlib/libc/machine/cris/Makefile.in
+++ /dev/null
@@ -1,382 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-# We also make a library with just the useful
-# machine-but-not-system-specific functions, usable as an add-on
-# by itself together with e.g. uclibc.
-toollib_LIBRARIES = libic.a
-
-lib_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
-
-libic_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
-tooldir = $(exec_prefix)/$(host_alias)
-toollibdir = $(tooldir)/lib$(MULTISUBDIR)
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES) $(toollib_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o memcpy.o memset.o memmove.o libcdtor.o
-libic_a_LIBADD = 
-libic_a_OBJECTS =  setjmp.o memcpy.o memset.o memmove.o libcdtor.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libic_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libic_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-mostlyclean-toollibLIBRARIES:
-
-clean-toollibLIBRARIES:
-	-test -z "$(toollib_LIBRARIES)" || rm -f $(toollib_LIBRARIES)
-
-distclean-toollibLIBRARIES:
-
-maintainer-clean-toollibLIBRARIES:
-
-install-toollibLIBRARIES: $(toollib_LIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(toollibdir)
-	@list='$(toollib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(toollibdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(toollibdir)/$$p; \
-	  else :; fi; \
-	done
-	@$(POST_INSTALL)
-	@list='$(toollib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(RANLIB) $(DESTDIR)$(toollibdir)/$$p"; \
-	    $(RANLIB) $(DESTDIR)$(toollibdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-toollibLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(toollib_LIBRARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(toollibdir)/$$p; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-libic.a: $(libic_a_OBJECTS) $(libic_a_DEPENDENCIES)
-	-rm -f libic.a
-	$(AR) cru libic.a $(libic_a_OBJECTS) $(libic_a_LIBADD)
-	$(RANLIB) libic.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-toollibLIBRARIES
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-toollibLIBRARIES
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(toollibdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES \
-		mostlyclean-toollibLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-toollibLIBRARIES clean-compile \
-		clean-tags clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-toollibLIBRARIES \
-		distclean-compile distclean-tags distclean-generic \
-		clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-toollibLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-toollibLIBRARIES distclean-toollibLIBRARIES \
-clean-toollibLIBRARIES maintainer-clean-toollibLIBRARIES \
-uninstall-toollibLIBRARIES install-toollibLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-info-am install-info install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/cris/aclocal.m4 b/newlib/libc/machine/cris/aclocal.m4
deleted file mode 100644
index 55d5e67ce..000000000
--- a/newlib/libc/machine/cris/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/cris/configure b/newlib/libc/machine/cris/configure
deleted file mode 100755
index 55475a5a9..000000000
--- a/newlib/libc/machine/cris/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=setjmp.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/cris/configure.in b/newlib/libc/machine/cris/configure.in
deleted file mode 100644
index 7764a7a7a..000000000
--- a/newlib/libc/machine/cris/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/cris configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(setjmp.c)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/cris/include/pthread.h b/newlib/libc/machine/cris/include/pthread.h
deleted file mode 100644
index d872d040e..000000000
--- a/newlib/libc/machine/cris/include/pthread.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* pthread.h dummy.
-   Copyright (C) 2001, 2004, 2005 Axis Communications AB.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* Simple fallback-include to enable thread-enabled exception support
-   for libgcc, but with posix-interface to a default-dummy, so a posix
-   library can optionally be linked in, which isn't possible if
-   gthr-single.h is used.  No other use is supported; *DO NOT* think
-   this gives you a valid pthread interface to use in your applications.  */
-
-#ifndef _PTHREAD_FAKE
-#define _PTHREAD_FAKE
-
-#ifdef __cplusplus
-extern "C" {
-# ifndef __THROW
-#  define __THROW throw ()
-# endif
-#else
-# ifndef __THROW
-#  define __THROW
-# endif
-#endif
-
-typedef int pthread_once_t;
-typedef unsigned int pthread_key_t;
-
-/* This must be layout-compatible with the linuxthreads type.  */
-typedef struct
-{
-  int a, b;
-  void *c;
-  int d;
-  struct { long int e; int f; } g;
-} pthread_mutex_t;
-
-/* This give bits equal to the linuxthreads initializer.  */
-#define PTHREAD_MUTEX_INITIALIZER \
-  {0, 0, 0, 0, {0, 0}}
-
-#define PTHREAD_ONCE_INIT 0
-
-/* This isn't the right prototype, but it let's us get away with not
-   defining a lot of datatypes.  */
-extern int pthread_create (void) __THROW;
-
-extern int pthread_once (pthread_once_t *, void (*) (void)) __THROW;
-
-extern int pthread_key_create (pthread_key_t *, void (*) (void *)) __THROW;
-
-extern int pthread_setspecific (pthread_key_t, const void *) __THROW;
-
-extern void *pthread_getspecific (pthread_key_t) __THROW;
-
-extern int pthread_mutex_lock (pthread_mutex_t *) __THROW;
-
-extern int pthread_key_delete (pthread_key_t) __THROW;
-
-extern int pthread_mutex_trylock (pthread_mutex_t *) __THROW;
-
-extern int pthread_mutex_unlock (pthread_mutex_t *) __THROW;
-
-#ifdef __cplusplus
-}
-#endif
-
-#undef __THROW
-
-#endif /* not _PTHREAD_FAKE */
diff --git a/newlib/libc/machine/cris/libcdtor.c b/newlib/libc/machine/cris/libcdtor.c
deleted file mode 100644
index 327347782..000000000
--- a/newlib/libc/machine/cris/libcdtor.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Call ctors and dtors from elinux a.out shared libraries.
-   Copyright (C) 1999, 2000, 2003, 2004, 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-typedef void (*vfnp) (void);
-
-/* The guts of the _Libctors and _Libdtors is "optimized" away into
-   empty functions when the definition is visible as well.  Simplest
-   solution is to emit the definitions as asm.  We have no .previous
-   directive in a.out, so we rely on the fact that everything in this
-   file goes into the .text section.  */
-__asm__
-(
- ".text\n\t.global .$global.lib.ctors\n.$global.lib.ctors:\n\t.dword 0"
-);
-__asm__
-(
- ".text\n\t.global .$global.lib.dtors\n.$global.lib.dtors:\n\t.dword 0"
-);
-
-extern vfnp * const _Ctors asm(".$global.lib.ctors");
-extern vfnp * const _Dtors asm(".$global.lib.dtors");
-
-/* We better provide weak empty ctor and dtor lists, since they are
-   not created if the main program does not have ctor/dtors.  Because
-   it's otherwise not used, GCC trunk "Mon Jul 25 22:33:14 UTC 2005"
-   thinks it can remove defaultors, so we need to artificially mark it
-   as used.  FIXME: Perhaps a GCC bug.  */
-
-static vfnp const defaultors[] __attribute__ ((__used__)) = {0, 0};
-
-extern vfnp * __CTOR_LIST__ __attribute__ ((weak, alias ("defaultors")));
-extern vfnp * __DTOR_LIST__ __attribute__ ((weak, alias ("defaultors")));
-
-void
-_Libctors (void)
-{
-  const vfnp *firstor = _Ctors;
-  const vfnp *ctors;
-
-  /* Have to find the last ctor; they will run in opposite order as in
-     the table. */
-  if (firstor != 0 && *firstor != 0)
-    {
-      for (ctors = firstor; *ctors != 0; ctors++)
-	;
-
-      while (--ctors != firstor)
-	{
-	  (**ctors)();
-	}
-
-      (**ctors)();
-    }
-}
-
-void
-_Libdtors(void)
-{
-  const vfnp *dtors = _Dtors;
-
-  if (dtors)
-    while (*dtors != 0)
-      {
-	(**dtors++) ();
-      }
-}
diff --git a/newlib/libc/machine/cris/memcpy.c b/newlib/libc/machine/cris/memcpy.c
deleted file mode 100644
index c7bd6ebdc..000000000
--- a/newlib/libc/machine/cris/memcpy.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* A memcpy for CRIS.
-   Copyright (C) 1994-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* FIXME: This file should really only be used for reference, as the
-   result is somewhat depending on gcc generating what we expect rather
-   than what we describe.  An assembly file should be used instead.  */
-
-#include <stddef.h>
-
-/* Break even between movem and move16 is really at 38.7 * 2, but
-   modulo 44, so up to the next multiple of 44, we use ordinary code.  */
-#define MEMCPY_BY_BLOCK_THRESHOLD (44 * 2)
-
-/* No name ambiguities in this file.  */
-__asm__ (".syntax no_register_prefix");
-
-void *
-memcpy(void *pdst, const void *psrc, size_t pn)
-{
-  /* Now we want the parameters put in special registers.
-     Make sure the compiler is able to make something useful of this.
-     As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
-
-     If gcc was allright, it really would need no temporaries, and no
-     stack space to save stuff on.  */
-
-  register void *return_dst __asm__ ("r10") = pdst;
-  register unsigned char *dst __asm__ ("r13") = pdst;
-  register unsigned const char *src __asm__ ("r11") = psrc;
-  register int n __asm__ ("r12") = pn;
-
-  /* When src is aligned but not dst, this makes a few extra needless
-     cycles.  I believe it would take as many to check that the
-     re-alignment was unnecessary.  */
-  if (((unsigned long) dst & 3) != 0
-      /* Don't align if we wouldn't copy more than a few bytes; so we
-	 don't have to check further for overflows.  */
-      && n >= 3)
-  {
-    if ((unsigned long) dst & 1)
-      {
-	n--;
-	*dst = *src;
-	src++;
-	dst++;
-      }
-
-    if ((unsigned long) dst & 2)
-      {
-	n -= 2;
-	*(short *) dst = *(short *) src;
-	src += 2;
-	dst += 2;
-      }
-  }
-
-  /* Decide which copying method to use.  */
-  if (n >= MEMCPY_BY_BLOCK_THRESHOLD)
-    {
-      /* It is not optimal to tell the compiler about clobbering any
-	 registers; that will move the saving/restoring of those registers
-	 to the function prologue/epilogue, and make non-movem sizes
-	 suboptimal.  */
-      __asm__ volatile
-	("\
-	 ;; GCC does promise correct register allocations, but let's	\n\
-	 ;; make sure it keeps its promises.				\n\
-	 .ifnc %0-%1-%2,$r13-$r11-$r12					\n\
-	 .error \"GCC reg alloc bug: %0-%1-%4 != $r13-$r12-$r11\"	\n\
-	 .endif								\n\
-									\n\
-	 ;; Save the registers we'll use in the movem process		\n\
-	 ;; on the stack.						\n\
-	 subq	11*4,sp							\n\
-	 movem	r10,[sp]						\n\
-									\n\
-	 ;; Now we've got this:						\n\
-	 ;; r11 - src							\n\
-	 ;; r13 - dst							\n\
-	 ;; r12 - n							\n\
-									\n\
-	 ;; Update n for the first loop.				\n\
-	 subq	 44,r12							\n\
-0:									\n\
-"
-#ifdef __arch_common_v10_v32
-	 /* Cater to branch offset difference between v32 and v10.  We
-	    assume the branch below has an 8-bit offset.  */
-"	 setf\n"
-#endif
-"	 movem	[r11+],r10						\n\
-	 subq	44,r12							\n\
-	 bge	 0b							\n\
-	 movem	r10,[r13+]						\n\
-									\n\
-	 ;; Compensate for last loop underflowing n.			\n\
-	 addq	44,r12							\n\
-									\n\
-	 ;; Restore registers from stack.				\n\
-	 movem [sp+],r10"
-
-	 /* Outputs.  */
-	 : "=r" (dst), "=r" (src), "=r" (n)
-
-	 /* Inputs.  */
-	 : "0" (dst), "1" (src), "2" (n));
-    }
-
-  while (n >= 16)
-    {
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-
-      n -= 16;
-    }
-
-  switch (n)
-    {
-    case 0:
-      break;
-
-    case 1:
-      *dst = *src;
-      break;
-
-    case 2:
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 3:
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 4:
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 5:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 6:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 7:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 8:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 9:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 10:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 11:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 12:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 13:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 14:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 15:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-    }
-
-  return return_dst;
-}
diff --git a/newlib/libc/machine/cris/memmove.c b/newlib/libc/machine/cris/memmove.c
deleted file mode 100644
index b022eaa92..000000000
--- a/newlib/libc/machine/cris/memmove.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* A memmove for CRIS.
-   Copyright (C) 2000-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* FIXME: This file should really only be used for reference, as the
-   result is somewhat depending on gcc generating what we expect rather
-   than what we describe.  An assembly file should be used instead.
-
-   Even worse, we base it on memcpy, on the assumption that overlapping
-   moves are rare, and we will do no worse than the generic memmove.  */
-
-#include <stddef.h>
-
-/* Break even between movem and move16 is really at 38.7 * 2, but
-   modulo 44, so up to the next multiple of 44, we use ordinary code.  */
-#define MEMMOVE_BY_BLOCK_THRESHOLD (44 * 2)
-
-/* No name ambiguities in this file.  */
-__asm__ (".syntax no_register_prefix");
-
-void *
-memmove(void *pdst, const void *psrc, size_t pn)
-{
-  /* Now we want the parameters put in special registers.
-     Make sure the compiler is able to make something useful of this.
-     As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
-
-     If gcc was allright, it really would need no temporaries, and no
-     stack space to save stuff on.  */
-
-  register void *return_dst __asm__ ("r10") = pdst;
-  register unsigned char *dst __asm__ ("r13") = pdst;
-  register unsigned const char *src __asm__ ("r11") = psrc;
-  register int n __asm__ ("r12") = pn;
-
-  /* Check and handle overlap.  */
-  if (src < dst && dst < src + n)
-    {
-      /* Destructive overlap.  We could optimize this, but we don't (for
-	 the moment).  */
-      src += n;
-      dst += n;
-      while (n--)
-	{
-	  *--dst = *--src;
-	}
-
-      return return_dst;
-    }
-  /* Whew, no overlap.  Proceed as with memcpy.  We could call it instead
-     of having a copy here.  That would spoil some of the optimization, so
-     we take the trouble with having two copies.  */
-
-  /* When src is aligned but not dst, this makes a few extra needless
-     cycles.  I believe it would take as many to check that the
-     re-alignment was unnecessary.  */
-  if (((unsigned long) dst & 3) != 0
-      /* Don't align if we wouldn't copy more than a few bytes; so we
-	 don't have to check further for overflows.  */
-      && n >= 3)
-  {
-    if ((unsigned long) dst & 1)
-      {
-	n--;
-	*dst = *src;
-	src++;
-	dst++;
-      }
-
-    if ((unsigned long) dst & 2)
-      {
-	n -= 2;
-	*(short *) dst = *(short *) src;
-	src += 2;
-	dst += 2;
-      }
-  }
-
-  /* Decide which copying method to use.  */
-  if (n >= MEMMOVE_BY_BLOCK_THRESHOLD)
-    {
-      /* It is not optimal to tell the compiler about clobbering any
-	 registers; that will move the saving/restoring of those registers
-	 to the function prologue/epilogue, and make non-movem sizes
-	 suboptimal.  */
-      __asm__ volatile
-	("\
-	 ;; GCC does promise correct register allocations, but let's	\n\
-	 ;; make sure it keeps its promises.				\n\
-	 .ifnc %0-%1-%2,$r13-$r11-$r12					\n\
-	 .error \"GCC reg alloc bug: %0-%1-%4 != $r13-$r12-$r11\"	\n\
-	 .endif								\n\
-									\n\
-	 ;; Save the registers we'll use in the movem process		\n\
-	 ;; on the stack.						\n\
-	 subq	11*4,sp							\n\
-	 movem	r10,[sp]						\n\
-									\n\
-	 ;; Now we've got this:						\n\
-	 ;; r11 - src							\n\
-	 ;; r13 - dst							\n\
-	 ;; r12 - n							\n\
-									\n\
-	 ;; Update n for the first loop.				\n\
-	 subq	 44,r12							\n\
-0:									\n\
-"
-#ifdef __arch_common_v10_v32
-	 /* Cater to branch offset difference between v32 and v10.  We
-	    assume the branch below has an 8-bit offset.  */
-"	 setf\n"
-#endif
-"	 movem	[r11+],r10						\n\
-	 subq	44,r12							\n\
-	 bge	 0b							\n\
-	 movem	r10,[r13+]						\n\
-									\n\
-	 ;; Compensate for last loop underflowing n.			\n\
-	 addq	44,r12							\n\
-									\n\
-	 ;; Restore registers from stack.				\n\
-	 movem [sp+],r10"
-
-	 /* Outputs.  */
-	 : "=r" (dst), "=r" (src), "=r" (n)
-
-	 /* Inputs.  */
-	 : "0" (dst), "1" (src), "2" (n));
-    }
-
-  while (n >= 16)
-    {
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-
-      n -= 16;
-    }
-
-  switch (n)
-    {
-    case 0:
-      break;
-
-    case 1:
-      *dst = *src;
-      break;
-
-    case 2:
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 3:
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 4:
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 5:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 6:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 7:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 8:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 9:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 10:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 11:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 12:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 13:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 14:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 15:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-    }
-
-  return return_dst;
-}
diff --git a/newlib/libc/machine/cris/memset.c b/newlib/libc/machine/cris/memset.c
deleted file mode 100644
index c94ea9b3e..000000000
--- a/newlib/libc/machine/cris/memset.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* A memset for CRIS.
-   Copyright (C) 1999-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* FIXME: This file should really only be used for reference, as the
-   result is somewhat depending on gcc generating what we expect rather
-   than what we describe.  An assembly file should be used instead.  */
-
-/* Note the multiple occurrence of the expression "12*4", including the
-   asm.  It is hard to get it into the asm in a good way.  Thus better to
-   expose the problem everywhere: no macro.  */
-
-/* Assuming one cycle per dword written or read (ok, not really true; the
-   world is not ideal), and one cycle per instruction, then 43+3*(n/48-1)
-   <= 24+24*(n/48-1) so n >= 45.7; n >= 0.9; we win on the first full
-   48-byte block to set.  */
-
-#define MEMSET_BY_BLOCK_THRESHOLD (1 * 48)
-
-/* No name ambiguities in this file.  */
-__asm__ (".syntax no_register_prefix");
-
-void *memset(void *pdst, int c, unsigned int plen)
-{
-  /* Now we want the parameters in special registers.  Make sure the
-     compiler does something usable with this.  */
-
-  register char *return_dst __asm__ ("r10") = pdst;
-  register int n __asm__ ("r12") = plen;
-  register int lc __asm__ ("r11") = c;
-
-  /* Most apps use memset sanely.  Memsetting about 3..4 bytes or less get
-     penalized here compared to the generic implementation.  */
-
-  /* This is fragile performancewise at best.  Check with newer GCC
-     releases, if they compile cascaded "x |= x << 8" to sane code.  */
-  __asm__("movu.b %0,r13						\n\
-	   lslq 8,r13							\n\
-	   move.b %0,r13						\n\
-	   move.d r13,%0						\n\
-	   lslq 16,r13							\n\
-	   or.d r13,%0"
-          : "=r" (lc)		/* Inputs.  */
-	  : "0" (lc)		/* Outputs.  */
-	  : "r13");		/* Trash.  */
-
-  {
-    register char *dst __asm__ ("r13") = pdst;
-
-    if (((unsigned long) pdst & 3) != 0
-	/* Oops! n = 0 must be a valid call, regardless of alignment.  */
-	&& n >= 3)
-      {
-	if ((unsigned long) dst & 1)
-	  {
-	    *dst = (char) lc;
-	    n--;
-	    dst++;
-	  }
-
-	if ((unsigned long) dst & 2)
-	  {
-	    *(short *) dst = lc;
-	    n -= 2;
-	    dst += 2;
-	  }
-      }
-
-    /* Decide which setting method to use.  */
-    if (n >= MEMSET_BY_BLOCK_THRESHOLD)
-      {
-	/* It is not optimal to tell the compiler about clobbering any
-	   registers; that will move the saving/restoring of those registers
-	   to the function prologue/epilogue, and make non-block sizes
-	   suboptimal.  */
-	__asm__ volatile
-	  ("\
-	   ;; GCC does promise correct register allocations, but let's	\n\
-	   ;; make sure it keeps its promises.				\n\
-	   .ifnc %0-%1-%4,$r13-$r12-$r11				\n\
-	   .error \"GCC reg alloc bug: %0-%1-%4 != $r13-$r12-$r11\"	\n\
-	   .endif							\n\
-									\n\
-	   ;; Save the registers we'll clobber in the movem process	\n\
-	   ;; on the stack.  Don't mention them to gcc, it will only be	\n\
-	   ;; upset.							\n\
-	   subq	   11*4,sp						\n\
-	   movem   r10,[sp]						\n\
-									\n\
-	   move.d  r11,r0						\n\
-	   move.d  r11,r1						\n\
-	   move.d  r11,r2						\n\
-	   move.d  r11,r3						\n\
-	   move.d  r11,r4						\n\
-	   move.d  r11,r5						\n\
-	   move.d  r11,r6						\n\
-	   move.d  r11,r7						\n\
-	   move.d  r11,r8						\n\
-	   move.d  r11,r9						\n\
-	   move.d  r11,r10						\n\
-									\n\
-	   ;; Now we've got this:					\n\
-	   ;; r13 - dst							\n\
-	   ;; r12 - n							\n\
-									\n\
-	   ;; Update n for the first loop				\n\
-	   subq	   12*4,r12						\n\
-0:									\n\
-"
-#ifdef __arch_common_v10_v32
-	   /* Cater to branch offset difference between v32 and v10.  We
-	      assume the branch below has an 8-bit offset.  */
-"	   setf\n"
-#endif
-"	   subq	  12*4,r12						\n\
-	   bge	   0b							\n\
-	   movem	r11,[r13+]					\n\
-									\n\
-	   ;; Compensate for last loop underflowing n.			\n\
-	   addq	  12*4,r12						\n\
-									\n\
-	   ;; Restore registers from stack.				\n\
-	   movem [sp+],r10"
-
-	   /* Outputs.	*/
-	   : "=r" (dst), "=r" (n)
-
-	   /* Inputs.  */
-	   : "0" (dst), "1" (n), "r" (lc));
-      }
-
-    /* An ad-hoc unroll, used for 4*12-1..16 bytes. */
-    while (n >= 16)
-      {
-	*(long *) dst = lc; dst += 4;
-	*(long *) dst = lc; dst += 4;
-	*(long *) dst = lc; dst += 4;
-	*(long *) dst = lc; dst += 4;
-	n -= 16;
-      }
-
-    switch (n)
-      {
-      case 0:
-        break;
-
-      case 1:
-        *dst = (char) lc;
-        break;
-
-      case 2:
-        *(short *) dst = (short) lc;
-        break;
-
-      case 3:
-        *(short *) dst = (short) lc; dst += 2;
-        *dst = (char) lc;
-        break;
-
-      case 4:
-        *(long *) dst = lc;
-        break;
-
-      case 5:
-        *(long *) dst = lc; dst += 4;
-        *dst = (char) lc;
-        break;
-
-      case 6:
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc;
-        break;
-
-      case 7:
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc; dst += 2;
-        *dst = (char) lc;
-        break;
-
-      case 8:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc;
-        break;
-
-      case 9:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *dst = (char) lc;
-        break;
-
-      case 10:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc;
-        break;
-
-      case 11:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc; dst += 2;
-        *dst = (char) lc;
-        break;
-
-      case 12:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc;
-        break;
-
-      case 13:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *dst = (char) lc;
-        break;
-
-      case 14:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc;
-        break;
-
-      case 15:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc; dst += 2;
-        *dst = (char) lc;
-        break;
-      }
-  }
-
-  return return_dst;
-}
diff --git a/newlib/libc/machine/cris/setjmp.c b/newlib/libc/machine/cris/setjmp.c
deleted file mode 100644
index ca544942f..000000000
--- a/newlib/libc/machine/cris/setjmp.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* A setjmp.c for CRIS
-   Copyright (C) 1993-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* For benefit of CRIS v0..v3, we save and restore CCR to be able to
-   correctly handle DI/EI; otherwise there would be no reason to save it.
-   Note also that the "move x,ccr" does NOT affect
-   the DMA enable bits (E and D) of v0..v3.
-
-   We do not save mof; it is call-clobbered.  It also does not exist in
-   v0..v8; it should be safe to read or write to it there, but better not.
-
-   jmp_buf[0] - PC
-   jmp_buf[1] - SP (R14)
-   jmp_buf[2] - R13
-   jmp_buf[3] - R12
-   jmp_buf[4] - R11
-   jmp_buf[5] - R10
-   jmp_buf[6] - R9
-   jmp_buf[7] - R8
-   jmp_buf[8] - R7
-   jmp_buf[9] - R6
-   jmp_buf[10] - R5
-   jmp_buf[11] - R4
-   jmp_buf[12] - R3
-   jmp_buf[13] - R2
-   jmp_buf[14] - R1
-   jmp_buf[15] - R0
-   jmp_buf[16] - SRP
-   jmp_buf[17] - CCR
-   */
-
-#include <setjmp.h>
-
-int
-setjmp (jmp_buf buf)
-{
-  int ret;
-#if defined (__arch_common_v10_v32) || defined (__arch_v32)
-  /* No offsets in the compatibility mode.  Also, movem saves in
-     different order on v10 than on v32, so we use single move
-     instructions instead, this not being a speed-prioritized operation.
-     And we don't save CCR or CCS; since long unuseful.  */
-  __asm__ __volatile__
-    ("move.d %1,$r13							\n\
-      move 0f,$mof							\n\
-      move $mof,[$r13+]							\n\
-      move.d $sp,[$r13+]						\n\
-      clear.d [$r13+]							\n\
-      move.d $r12,[$r13+]						\n\
-      move.d $r11,[$r13+]						\n\
-      move.d $r10,[$r13+]						\n\
-      moveq 1,$r9							\n\
-      move.d $r9,[$r13+]						\n\
-      move.d $r8,[$r13+]						\n\
-      move.d $r7,[$r13+]						\n\
-      move.d $r6,[$r13+]						\n\
-      move.d $r5,[$r13+]						\n\
-      move.d $r4,[$r13+]						\n\
-      move.d $r3,[$r13+]						\n\
-      move.d $r2,[$r13+]						\n\
-      move.d $r1,[$r13+]						\n\
-      move.d $r0,[$r13+]						\n\
-      move $srp,[$r13+]							\n\
-      clear.d [$r13+]							\n\
-      clear.d $r9							\n\
-0:									\n\
-      move.d $r9,%0"
-
-     /* Output.  */
-     : "=&r" (ret)
-
-     /* Input.  */
-     : "r" (buf)
-
-     /* Clobber.  */
-     : "r9", "r13", "memory");
-#else /* not __arch_common_v10_v32 or __arch_v32 */
-#ifdef __PIC__
-  __asm__ __volatile__
-    ("moveq 1,$r9							\n\
-      movem $sp,[%1+1*4]						\n\
-      move.d $pc,$r9							\n\
-      addq 0f-.,$r9							\n\
-      move.d $r9,[%1]							\n\
-      move $srp,[%1+16*4]						\n\
-      move $ccr,[%1+17*4]						\n\
-      clear.d $r9							\n\
-0:									\n\
-      move.d $r9,%0"
-
-     /* Output.  */
-     : "=&r" (ret)
-
-     /* Input.  */
-     : "r" (buf)
-
-     /* Clobber.  */
-     : "r9", "memory");
-#else  /* not PIC */
-  __asm__ __volatile__
-    ("moveq 1,$r9							\n\
-      movem $sp,[%1+1*4]						\n\
-      move.d 0f,$r9							\n\
-      move.d $r9,[%1]							\n\
-      move $srp,[%1+16*4]						\n\
-      move $ccr,[%1+17*4]						\n\
-      clear.d $r9							\n\
-0:									\n\
-      move.d $r9,%0"
-
-     /* Output.  */
-     : "=&r" (ret)
-
-     /* Input.  */
-     : "r" (buf)
-
-     /* Clobber.  */
-     : "r9");
-#endif /* not PIC */
-#endif /* not __arch_common_v10_v32 or __arch_v32 */
-  return ret;
-}
-
-void
-longjmp(jmp_buf buf, int val)
-{
-#if defined (__arch_common_v10_v32) || defined (__arch_v32)
-  __asm__ __volatile__
-    ("cmpq 0,%1								\n\
-      beq 0f								\n\
-      move.d %0,$r13	; In delay-slot.				\n\
-      addq 6*4,$r13							\n\
-      move.d %1,[$r13]							\n\
-      subq 6*4,$r13							\n\
-0:\n"
-#ifdef __arch_common_v10_v32
-     /* Cater to branch offset difference between v32 and v10.  We
-	assume the branch above is 8-bit.  */
-"     setf\n"
-#endif
-"     move [$r13+],$mof							\n\
-      move.d [$r13+],$sp						\n\
-      addq 4,$r13							\n\
-      move.d [$r13+],$r12						\n\
-      move.d [$r13+],$r11						\n\
-      move.d [$r13+],$r10						\n\
-      move.d [$r13+],$r9						\n\
-      move.d [$r13+],$r8						\n\
-      move.d [$r13+],$r7						\n\
-      move.d [$r13+],$r6						\n\
-      move.d [$r13+],$r5						\n\
-      move.d [$r13+],$r4						\n\
-      move.d [$r13+],$r3						\n\
-      move.d [$r13+],$r2						\n\
-      move.d [$r13+],$r1						\n\
-      move.d [$r13+],$r0						\n\
-      move [$r13+],$srp							\n\
-      move $mof,$r13							\n\
-      jump $r13								\n\
-      setf"
-
-     /* No outputs.  */
-     :
-
-     /* Inputs.  */
-     : "r" (buf), "r" (val)
-     : "r13", "memory");
-
-#else /* not __arch_common_v10_v32 or __arch_v32 */
-  __asm__ __volatile__
-    ("move [%0+17*4],$ccr						\n\
-      move [%0+16*4],$srp						\n\
-      test.d %1								\n\
-      beq 0f								\n\
-      nop								\n\
-      move.d %1,[%0+6*4]	; Offset for r9.			\n\
-0:									\n\
-      movem [%0],$pc"
-
-     /* No outputs.  */
-     :
-
-     /* Inputs.  */
-     : "r" (buf), "r" (val)
-     : "memory");
-#endif /* not __arch_common_v10_v32 or __arch_v32 */
-}
diff --git a/newlib/libc/machine/cris/sys/errno.h b/newlib/libc/machine/cris/sys/errno.h
deleted file mode 100644
index d3529754d..000000000
--- a/newlib/libc/machine/cris/sys/errno.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* This file is to be kept in sync with newlib/libc/include/sys/errno.h
-   on which it is based, except values used or returned by syscalls must
-   be those of the Linux/CRIS kernel.  */
-
-/* errno is not a global variable, because that would make using it
-   non-reentrant.  Instead, its address is returned by the function
-   __errno.  */
-
-#ifndef _SYS_ERRNO_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define _SYS_ERRNO_H_
-
-#include <sys/reent.h>
-
-#ifndef _REENT_ONLY
-#define errno (*__errno())
-extern int *__errno _PARAMS ((void));
-#endif
-
-/* Please don't use these variables directly.
-   Use strerror instead. */
-extern _CONST char * _CONST _sys_errlist[];
-extern int _sys_nerr;
-
-#define __errno_r(ptr) ((ptr)->_errno)
-
-/* Adjusted to the linux asm/errno.h */
-#define	EPERM		 1	/* Operation not permitted */
-#define	ENOENT		 2	/* No such file or directory */
-#define	ESRCH		 3	/* No such process */
-#define	EINTR		 4	/* Interrupted system call */
-#define	EIO		 5	/* I/O error */
-#define	ENXIO		 6	/* No such device or address */
-#define	E2BIG		 7	/* Arg list too long */
-#define	ENOEXEC		 8	/* Exec format error */
-#define	EBADF		 9	/* Bad file number */
-#define	ECHILD		10	/* No child processes */
-#define	EAGAIN		11	/* Try again */
-#define	ENOMEM		12	/* Out of memory */
-#define	EACCES		13	/* Permission denied */
-#define	EFAULT		14	/* Bad address */
-#define	ENOTBLK		15	/* Block device required */
-#define	EBUSY		16	/* Device or resource busy */
-#define	EEXIST		17	/* File exists */
-#define	EXDEV		18	/* Cross-device link */
-#define	ENODEV		19	/* No such device */
-#define	ENOTDIR		20	/* Not a directory */
-#define	EISDIR		21	/* Is a directory */
-#define	EINVAL		22	/* Invalid argument */
-#define	ENFILE		23	/* File table overflow */
-#define	EMFILE		24	/* Too many open files */
-#define	ENOTTY		25	/* Not a typewriter */
-#define	ETXTBSY		26	/* Text file busy */
-#define	EFBIG		27	/* File too large */
-#define	ENOSPC		28	/* No space left on device */
-#define	ESPIPE		29	/* Illegal seek */
-#define	EROFS		30	/* Read-only file system */
-#define	EMLINK		31	/* Too many links */
-#define	EPIPE		32	/* Broken pipe */
-#define	EDOM		33	/* Math argument out of domain of func */
-#define	ERANGE		34	/* Math result not representable */
-#define	EDEADLK		35	/* Resource deadlock would occur */
-#define	ENAMETOOLONG	36	/* File name too long */
-#define	ENOLCK		37	/* No record locks available */
-#define	ENOSYS		38	/* Function not implemented */
-#define	ENOTEMPTY	39	/* Directory not empty */
-#define	ELOOP		40	/* Too many symbolic links encountered */
-#define	EWOULDBLOCK	EAGAIN	/* Operation would block */
-#define	ENOMSG		42	/* No message of desired type */
-#define	EIDRM		43	/* Identifier removed */
-#define	ECHRNG		44	/* Channel number out of range */
-#define	EL2NSYNC	45	/* Level 2 not synchronized */
-#define	EL3HLT		46	/* Level 3 halted */
-#define	EL3RST		47	/* Level 3 reset */
-#define	ELNRNG		48	/* Link number out of range */
-#define	EUNATCH		49	/* Protocol driver not attached */
-#define	ENOCSI		50	/* No CSI structure available */
-#define	EL2HLT		51	/* Level 2 halted */
-#define	EBADE		52	/* Invalid exchange */
-#define	EBADR		53	/* Invalid request descriptor */
-#define	EXFULL		54	/* Exchange full */
-#define	ENOANO		55	/* No anode */
-#define	EBADRQC		56	/* Invalid request code */
-#define	EBADSLT		57	/* Invalid slot */
-
-#define	EDEADLOCK	EDEADLK
-
-#define	EBFONT		59	/* Bad font file format */
-/* This is only used internally in newlib; not returned by the kernel.
-   EBFONT seems the closest match for a "bad file format" error.  */
-#define EFTYPE		EBFONT	/* Inappropriate file type or format */
-#define	ENOSTR		60	/* Device not a stream */
-#define	ENODATA		61	/* No data available */
-#define	ETIME		62	/* Timer expired */
-#define	ENOSR		63	/* Out of streams resources */
-#define	ENONET		64	/* Machine is not on the network */
-#define	ENOPKG		65	/* Package not installed */
-#define	EREMOTE		66	/* Object is remote */
-#define	ENOLINK		67	/* Link has been severed */
-#define	EADV		68	/* Advertise error */
-#define	ESRMNT		69	/* Srmount error */
-#define	ECOMM		70	/* Communication error on send */
-#define	EPROTO		71	/* Protocol error */
-#define	EMULTIHOP	72	/* Multihop attempted */
-#define	EDOTDOT		73	/* RFS specific error */
-#define	EBADMSG		74	/* Not a data message */
-#define	EOVERFLOW	75	/* Value too large for defined data type */
-#define	ENOTUNIQ	76	/* Name not unique on network */
-#define	EBADFD		77	/* File descriptor in bad state */
-#define	EREMCHG		78	/* Remote address changed */
-#define	ELIBACC		79	/* Can not access a needed shared library */
-#define	ELIBBAD		80	/* Accessing a corrupted shared library */
-#define	ELIBSCN		81	/* .lib section in a.out corrupted */
-#define	ELIBMAX		82	/* Attempting to link in too many shared libraries */
-#define	ELIBEXEC	83	/* Cannot exec a shared library directly */
-#define	EILSEQ		84	/* Illegal byte sequence */
-#define	ERESTART	85	/* Interrupted system call should be restarted */
-#define	ESTRPIPE	86	/* Streams pipe error */
-#define	EUSERS		87	/* Too many users */
-#define	ENOTSOCK	88	/* Socket operation on non-socket */
-#define	EDESTADDRREQ	89	/* Destination address required */
-#define	EMSGSIZE	90	/* Message too long */
-#define	EPROTOTYPE	91	/* Protocol wrong type for socket */
-#define	ENOPROTOOPT	92	/* Protocol not available */
-#define	EPROTONOSUPPORT	93	/* Protocol not supported */
-#define	ESOCKTNOSUPPORT	94	/* Socket type not supported */
-#define	EOPNOTSUPP	95	/* Operation not supported on transport endpoint */
-#define	EPFNOSUPPORT	96	/* Protocol family not supported */
-#define	EAFNOSUPPORT	97	/* Address family not supported by protocol */
-#define	EADDRINUSE	98	/* Address already in use */
-#define	EADDRNOTAVAIL	99	/* Cannot assign requested address */
-#define	ENETDOWN	100	/* Network is down */
-#define	ENETUNREACH	101	/* Network is unreachable */
-#define	ENETRESET	102	/* Network dropped connection because of reset */
-#define	ECONNABORTED	103	/* Software caused connection abort */
-#define	ECONNRESET	104	/* Connection reset by peer */
-#define	ENOBUFS		105	/* No buffer space available */
-#define	EISCONN		106	/* Transport endpoint is already connected */
-#define	ENOTCONN	107	/* Transport endpoint is not connected */
-#define	ESHUTDOWN	108	/* Cannot send after transport endpoint shutdown */
-#define	ETOOMANYREFS	109	/* Too many references: cannot splice */
-#define	ETIMEDOUT	110	/* Connection timed out */
-#define	ECONNREFUSED	111	/* Connection refused */
-#define	EHOSTDOWN	112	/* Host is down */
-#define	EHOSTUNREACH	113	/* No route to host */
-#define	EALREADY	114	/* Operation already in progress */
-#define	EINPROGRESS	115	/* Operation now in progress */
-#define	ESTALE		116	/* Stale NFS file handle */
-#define	EUCLEAN		117	/* Structure needs cleaning */
-#define	ENOTNAM		118	/* Not a XENIX named type file */
-#define	ENAVAIL		119	/* No XENIX semaphores available */
-#define	EISNAM		120	/* Is a named type file */
-#define	EREMOTEIO	121	/* Remote I/O error */
-#define	EDQUOT		122	/* Quota exceeded */
-
-#define	ENOMEDIUM	123	/* No medium found */
-#define	EMEDIUMTYPE	124	/* Wrong medium type */
-
-#define __ELASTERROR 2000	/* Users can add values starting here */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _SYS_ERRNO_H */
diff --git a/newlib/libc/machine/cris/sys/fcntl.h b/newlib/libc/machine/cris/sys/fcntl.h
deleted file mode 100644
index 6017a190f..000000000
--- a/newlib/libc/machine/cris/sys/fcntl.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* This file is to be kept in sync with newlib/libc/include/sys/fcntl.h,
-   on which it is based, except values used or returned by syscalls must
-   be those of the Linux/CRIS kernel.  */
-
-#ifndef	_FCNTL_
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define	_FCNTL_
-#include <_ansi.h>
-#define	_FOPEN		(-1)	/* from sys/file.h, kernel use only */
-#define	_FREAD		0x0001	/* read enabled */
-#define	_FWRITE		0x0002	/* write enabled */
-#define	_FNDELAY	0x0800	/* non blocking I/O (4.2 style) */
-#define	_FAPPEND	0x0400	/* append (writes guaranteed at the end) */
-#define	_FMARK		0x0010	/* internal; mark during gc() */
-#define	_FDEFER		0x0020	/* internal; defer for next gc pass */
-#define	_FASYNC		0x2000	/* signal pgrp when data ready */
-#define	_FCREAT		0x0040	/* open with file create */
-#define	_FTRUNC		0x0200	/* open with truncation */
-#define	_FEXCL		0x0080	/* error on open if file exists */
-#define	_FNBIO	    _FNONBLOCK	/* non blocking I/O (sys5 style) */
-#define	_FSYNC		0x1000	/* do all writes synchronously */
-#define	_FNONBLOCK	0x0800	/* non blocking I/O (POSIX style) */
-#define	_FNOCTTY	0x0100	/* don't assign a ctty on this open */
-
-#define	O_ACCMODE	(O_RDONLY|O_WRONLY|O_RDWR)
-
-/*
- * Flag values for open(2) and fcntl(2)
- * The kernel adds 1 to the open modes to turn it into some
- * combination of FREAD and FWRITE.
- */
-#define	O_RDONLY	0		/* +1 == FREAD */
-#define	O_WRONLY	1		/* +1 == FWRITE */
-#define	O_RDWR		2		/* +1 == FREAD|FWRITE */
-#define	O_APPEND	_FAPPEND
-#define	O_CREAT		_FCREAT
-#define	O_TRUNC		_FTRUNC
-#define	O_EXCL		_FEXCL
-/*	O_SYNC		_FSYNC		not posix, defined below */
-/*	O_NDELAY	_FNDELAY 	set in include/fcntl.h */
-/*	O_NDELAY	_FNBIO 		set in 5include/fcntl.h */
-#define	O_NONBLOCK	_FNONBLOCK
-#define	O_NOCTTY	_FNOCTTY
-
-#ifndef	_POSIX_SOURCE
-
-#define	O_SYNC		_FSYNC
-
-/*
- * Flags that work for fcntl(fd, F_SETFL, FXXXX)
- */
-#define	FAPPEND		_FAPPEND
-#define	FSYNC		_FSYNC
-#define	FASYNC		_FASYNC
-#define	FNBIO		_FNBIO
-#define	FNONBIO		_FNONBLOCK	/* XXX fix to be NONBLOCK everywhere */
-#define	FNDELAY		_FNDELAY
-
-/*
- * Flags that are disallowed for fcntl's (FCNTLCANT);
- * used for opens, internal state, or locking.
- */
-#define	FREAD		_FREAD
-#define	FWRITE		_FWRITE
-#define	FMARK		_FMARK
-#define	FDEFER		_FDEFER
-#define	FSHLOCK		_FSHLOCK
-#define	FEXLOCK		_FEXLOCK
-
-/*
- * The rest of the flags, used only for opens
- */
-#define	FOPEN		_FOPEN
-#define	FCREAT		_FCREAT
-#define	FTRUNC		_FTRUNC
-#define	FEXCL		_FEXCL
-#define	FNOCTTY		_FNOCTTY
-
-#endif	/* !_POSIX_SOURCE */
-
-/* XXX close on exec request; must match UF_EXCLOSE in user.h */
-#define	FD_CLOEXEC	1	/* posix */
-
-/* fcntl(2) requests */
-#define F_DUPFD		0	/* dup */
-#define F_GETFD		1	/* get f_flags */
-#define F_SETFD		2	/* set f_flags */
-#define F_GETFL		3	/* more flags (cloexec) */
-#define F_SETFL		4
-#define F_GETLK		5
-#define F_SETLK		6
-#define F_SETLKW	7
-
-#define F_SETOWN	8	/*  for sockets. */
-#define F_GETOWN	9	/*  for sockets. */
-
-/* for F_[GET|SET]FL */
-#define FD_CLOEXEC	1	/* actually anything with low bit set goes */
-
-/* for posix fcntl() and lockf() */
-#define F_RDLCK		0
-#define F_WRLCK		1
-#define F_UNLCK		2
-
-/* for old implementation of bsd flock () */
-#define F_EXLCK		4	/* or 3 */
-#define F_SHLCK		8	/* or 4 */
-
-/* operations for bsd flock(), also used by the kernel implementation */
-#define LOCK_SH		1	/* shared lock */
-#define LOCK_EX		2	/* exclusive lock */
-#define LOCK_NB		4	/* or'd with one of the above to prevent
-				   blocking */
-#define LOCK_UN		8	/* remove lock */
-
-/* file segment locking set data type - information passed to system by user */
-struct flock {
-	short	l_type;		/* F_RDLCK, F_WRLCK, or F_UNLCK */
-	short	l_whence;	/* flag to choose starting offset */
-	long	l_start;	/* relative offset, in bytes */
-	long	l_len;		/* length, in bytes; 0 means lock to EOF */
-	short	l_pid;		/* returned with F_GETLK */
-	short	l_xxx;		/* reserved for future use */
-};
-
-#ifndef	_POSIX_SOURCE
-/* extended file segment locking set data type */
-struct eflock {
-	short	l_type;		/* F_RDLCK, F_WRLCK, or F_UNLCK */
-	short	l_whence;	/* flag to choose starting offset */
-	long	l_start;	/* relative offset, in bytes */
-	long	l_len;		/* length, in bytes; 0 means lock to EOF */
-	short	l_pid;		/* returned with F_GETLK */
-	short	l_xxx;		/* reserved for future use */
-	long	l_rpid;		/* Remote process id wanting this lock */
-	long	l_rsys;		/* Remote system id wanting this lock */
-};
-#endif	/* !_POSIX_SOURCE */
-
-
-#include <sys/types.h>
-#include <sys/stat.h>		/* sigh. for the mode bits for open/creat */
-
-extern int open _PARAMS ((const char *, int, ...));
-extern int creat _PARAMS ((const char *, mode_t));
-extern int fcntl _PARAMS ((int, int, ...));
-
-/* Provide _<systemcall> prototypes for functions provided by some versions
-   of newlib.  */
-#ifdef _COMPILING_NEWLIB
-extern int _open _PARAMS ((const char *, int, ...));
-extern int _fcntl _PARAMS ((int, int, ...));
-#ifdef __LARGE64_FILES
-extern int _open64 _PARAMS ((const char *, int, ...));
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif	/* !_FCNTL_ */
diff --git a/newlib/libc/machine/cris/sys/signal.h b/newlib/libc/machine/cris/sys/signal.h
deleted file mode 100644
index 081a75fe9..000000000
--- a/newlib/libc/machine/cris/sys/signal.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* This file is to be kept in sync (well, reasonably so, it's quite
-   different) with newlib/libc/include/sys/signal.h on which it is
-   based, except values used or returned by syscalls must be those of
-   the Linux/CRIS kernel.  */
-
-/* sys/signal.h */
-
-#ifndef _SYS_SIGNAL_H
-#define _SYS_SIGNAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "_ansi.h"
-
-typedef unsigned long sigset_t;
-
-/* Adjusted to linux, has unused sa_restorer field and unsigned long
-   sa_flags; relatively unimportant though.  */
-/* Type of a signal handler.  */
-typedef void (*__sighandler_t)(int);
-
-/* The type used in newlib sources.  */
-typedef __sighandler_t _sig_func_ptr;
-
-struct sigaction {
-	__sighandler_t sa_handler;
-	sigset_t sa_mask;
-	unsigned long sa_flags;
-	void (*sa_restorer)(void);
-};
-
-/* Adjusted to glibc; other values.  */
-#define SA_NOCLDSTOP 1	/* only value supported now for sa_flags */
-#define SIG_SETMASK 2	/* set mask with sigprocmask() */
-#define SIG_BLOCK 0	/* set of signals to block */
-#define SIG_UNBLOCK 1	/* set of signals to, well, unblock */
-
-/* These depend upon the type of sigset_t, which right now
-   is always a long.. They're in the POSIX namespace, but
-   are not ANSI. */
-#define sigaddset(what,sig) (*(what) |= (1<<(sig)))
-#define sigemptyset(what)   (*(what) = 0)
-
-int sigprocmask (int __how, const sigset_t *__a, sigset_t *__b);
-
-#define SIGHUP		 1
-#define SIGINT		 2
-#define SIGQUIT		 3
-#define SIGILL		 4
-#define SIGTRAP		 5
-#define SIGABRT		 6
-#define SIGIOT		 6
-#define SIGBUS		 7
-#define SIGFPE		 8
-#define SIGKILL		 9
-#define SIGUSR1		10
-#define SIGSEGV		11
-#define SIGUSR2		12
-#define SIGPIPE		13
-#define SIGALRM		14
-#define SIGTERM		15
-#define SIGSTKFLT	16
-#define SIGCHLD		17
-#define SIGCONT		18
-#define SIGSTOP		19
-#define SIGTSTP		20
-#define SIGTTIN		21
-#define SIGTTOU		22
-#define SIGURG		23
-#define SIGXCPU		24
-#define SIGXFSZ		25
-#define SIGVTALRM	26
-#define SIGPROF		27
-#define SIGWINCH	28
-#define SIGIO		29
-#define SIGPOLL		SIGIO
-#define SIGPWR		30
-#define	NSIG 31
-
-#ifdef __cplusplus
-}
-#endif
-#ifndef _SIGNAL_H_
-/* Some applications take advantage of the fact that <sys/signal.h>
- * and <signal.h> are equivalent in glibc.  Allow for that here.  */
-#include <signal.h>
-#endif
-#endif /* _SYS_SIGNAL_H */
diff --git a/newlib/libc/machine/crx/Makefile.am b/newlib/libc/machine/crx/Makefile.am
deleted file mode 100644
index 789227192..000000000
--- a/newlib/libc/machine/crx/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S getenv.c
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/crx/Makefile.in b/newlib/libc/machine/crx/Makefile.in
deleted file mode 100644
index 1c319a43e..000000000
--- a/newlib/libc/machine/crx/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S getenv.c
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o getenv.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/crx/aclocal.m4 b/newlib/libc/machine/crx/aclocal.m4
deleted file mode 100644
index 55d5e67ce..000000000
--- a/newlib/libc/machine/crx/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/crx/configure b/newlib/libc/machine/crx/configure
deleted file mode 100755
index 028b7b4fa..000000000
--- a/newlib/libc/machine/crx/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.am
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/crx/configure.in b/newlib/libc/machine/crx/configure.in
deleted file mode 100644
index a5384f62a..000000000
--- a/newlib/libc/machine/crx/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/arm configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(Makefile.am)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/crx/getenv.c b/newlib/libc/machine/crx/getenv.c
deleted file mode 100644
index 75ef1ccd1..000000000
--- a/newlib/libc/machine/crx/getenv.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* getenv.c -- Implementation of the getenv() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-/* getenv() is implemented as a low-level function, 
-   thus we only invoke here the system call.  */
-char * getenv (const char *name)
-{
-  char *_getenv(const char *);
-
-  return (_getenv (name));
-}
-
diff --git a/newlib/libc/machine/crx/setjmp.S b/newlib/libc/machine/crx/setjmp.S
deleted file mode 100644
index 19b7d6c2a..000000000
--- a/newlib/libc/machine/crx/setjmp.S
+++ /dev/null
@@ -1,51 +0,0 @@
- ##############################################################################
- # setjmp.S -- CRX setjmp routine                                             #
- #                                                                            #
- # Copyright (c) 2004 National Semiconductor Corporation                      #
- #                                                                            #
- # The authors hereby grant permission to use, copy, modify, distribute,      #
- # and license this software and its documentation for any purpose, provided  #
- # that existing copyright notices are retained in all copies and that this   #
- # notice is included verbatim in any distributions. No written agreement,    #
- # license, or royalty fee is required for any of the authorized uses.        #
- # Modifications to this software may be copyrighted by their authors         #
- # and need not follow the licensing terms described here, provided that      #
- # the new terms are clearly indicated on the first page of each file where   #
- # they apply.                                                                #
- #                                                                            #
- # C library -- setjmp, longjmp                                               #
- # longjmp(a,v)                                                               #
- # will generate a "return(v)"                                                #
- # from the last call to                                                      #
- # setjmp(a)                                                                  #
- # by restoring r7-ra, sp,                                                    #
- # and pc from 'a'                                                            #
- # and doing a return. (Makes sure that longjmp never returns 0).             #
- ##############################################################################
-
-	.text
-	.file	"setjmp.s"
-        .align 4
-
-        .globl _setjmp
-        .align 4
-_setjmp:
-        #r2: .blkw
-        storm r2,{r7,r8,r9,r10,r11,r12,r13,r14}
-	stord sp,0(r2)
-        movd  $0,r0
-        jump  ra
-
-        .globl _longjmp
-_longjmp:
-        #r2: .blkw # pointer save area
-        #r3: .blkw # ret vlaue
-        loadm r2, {r7,r8,r9,r10,r11,r12,r13,ra}
-        loadd 0(r2), sp
-        movd r3, r0
-        cmpd $0, r3
-        bne end1
-        movd $1, r0
-end1:
-        jump ra
-        .align 4
diff --git a/newlib/libc/machine/crx/sys/asm.h b/newlib/libc/machine/crx/sys/asm.h
deleted file mode 100644
index a8226d1c1..000000000
--- a/newlib/libc/machine/crx/sys/asm.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/* asm.h -- CRX architecture intrinsic functions
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#ifndef	_ASM
-#define _ASM
-
-/* Note that immediate input values are not checked for validity. It is 
-   the user's responsibility to use the intrinsic functions with appropriate
-   immediate values. */
-
-/* Absolute Instructions */
-#define _absb_(src, dest)  	__asm__("absb %1, %0" : "=r" (dest) : \
-                                   "r" ((char)src) , "0" (dest))
-#define _absw_(src, dest)  	__asm__("absw %1,%0" : "=r" (dest) : \
-                                    "r" ((short)src) , "0" (dest))
-#define _absd_(src, dest)  	__asm__("absd %1, %0" : "=r" (dest)  : \
-                                    "r" ((int)src) , "0" (dest))
-
-/* Addition Instructions */
-#define _addb_(src, dest)	__asm__("addb %1, %0" : "=r" (dest) : \
-					"ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _addub_(src, dest)	__asm__("addub	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _addw_(src, dest)	__asm__("addw %1, %0" : "=r" (dest) : \
-					"ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _adduw_(src, dest)	__asm__("adduw	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _addd_(src, dest)	__asm__("addd %1, %0" : "=r" (dest) : \
-					"ri" ((unsigned int)src), "0" (dest) : "cc")
-#define _addud_(src, dest)	__asm__("addud	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned int)src), "0" (dest) : "cc")
-/* Add with Carry */
-#define _addcb_(src, dest)	__asm__("addcb	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _addcw_(src, dest)	__asm__("addcw	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _addcd_(src, dest)	__asm__("addcd	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned int)src), "0" (dest) : "cc")
-/* Q-format Add */
-#define _addqb_(src, dest)	__asm__("addqb %1, %0" : "=r" (dest) : \
-					"r" ((unsigned char)src), "0" (dest) : "cc")
-#define _addqw_(src, dest)	__asm__("addqw %1, %0" : "=r" (dest) : \
-					"r" ((unsigned short)src), "0" (dest) : "cc")
-#define _addqd_(src, dest)	__asm__("addqd %1, %0" : "=r" (dest) : \
-					"r" ((unsigned int)src), "0" (dest) : "cc")
-
-/* Bitwise Logical AND */
-
-#define _andb_(src, dest)  __asm__("andb %1,%0" : "=r" (dest) : \
-				   "ri" ((unsigned char)src) , "0" (dest))
-#define _andw_(src, dest)  __asm__("andw %1,%0" : "=r" (dest) : \
-				   "ri" ((unsigned short)src) , "0" (dest))
-#define _andd_(src, dest)  __asm__("andd %1,%0" : "=r" (dest) : \
-		 		  "ri" ((unsigned int)src) , "0" (dest))
-
-/* bswap Instruction */
-#define _bswap_(src, dest)  	__asm__("bswap %1,%0" : "=r" (dest) : \
-                                        "r" ((unsigned int)src) , "0" (dest))
-/* cbit (clear bit) Instructions */
-#define _cbitb_(pos, dest)  	__asm__("cbitb %1,%0" : "=mr" (dest) : \
-                                     	"i" ((unsigned char)pos) , "0" (dest) : "cc")
-#define _cbitw_(pos, dest)  	__asm__("cbitw %1,%0" : "=mr" (dest) : \
-                                     	"i" ((unsigned char)pos) , "0" (dest) : "cc")
-#define _cbitd_(pos, dest)  	__asm__("cbitd %1,%0" : "=r" (dest) : \
-				    	"i" ((unsigned char)pos) , "0" (dest) : "cc")
-
-/* Compare Instructions */
-#define _cmpb_(src1, src2)  __asm__("cmpb %0,%1" : /* no output */  : \
-				    "ri" ((unsigned char)src1) , "r" (src2) : "cc")
-#define _cmpw_(src1,src2)  __asm__("cmpw %0,%1" : /* no output */  \
-				   : "ri" ((unsigned short)src1) , "r" (src2) : "cc")
-#define _cmpd_(src1,src2)  __asm__("cmpd %0,%1" : /* no output */  \
-				   : "ri" ((unsigned int)src1) , "r" (src2) : "cc")
-
-/* cntl Count Leading Ones Instructions */
-#define _cntl1b_(src, dest)  	__asm__("cntl1b %1,%0" : "=r" (dest) : \
-                                        "r" ((char)src) , "0" (dest))
-#define _cntl1w_(src, dest)  	__asm__("cntl1w %1,%0" : "=r" (dest) : \
-                                        "r" ((short)src) , "0" (dest))
-#define _cntl1d_(src, dest)  	__asm__("cntl1d %1,%0" : "=r" (dest)  : \
-                                        "r" ((int)src) , "0" (dest))
-
-/* cntl Count Leading Zeros Instructions */
-#define _cntl0b_(src, dest)  	__asm__("cntl0b %1,%0" : "=r" (dest) : \
-                                        "r" ((char)src) , "0" (dest))
-#define _cntl0w_(src, dest)  	__asm__("cntl0w %1,%0" : "=r" (dest) : \
-                                        "r" ((short)src) , "0" (dest))
-#define _cntl0d_(src, dest)  	__asm__("cntl0d %1,%0" : "=r" (dest)  : \
-                                         "r" ((int)src) , "0" (dest))
-
-/* cntl Count Leading Signs Instructions */
-#define _cntlsb_(src, dest)  	__asm__("cntlsb %1,%0" : "=r" (dest) : \
-                                        "r" ((char)src) , "0" (dest))
-#define _cntlsw_(src, dest)  	__asm__("cntlsw %1,%0" : "=r" (dest) : \
-                                        "r" ((short)src) , "0" (dest))
-#define _cntlsd_(src, dest)  	__asm__("cntlsd %1,%0" : "=r" (dest)  : \
-                                         "r" ((int)src) , "0" (dest))
-
-/* Disable Inerrupts instructions */
-#define _di_()       __asm__ volatile ("di\n" :  :  : "cc")
-#define _disable_()  __asm__ volatile ("di\n" :  :  : "cc")
-
-/* Enable Inerrupts instructions */
-#define _ei_()			__asm__ volatile ("ei\n" :  :  : "cc")
-#define _enable_()		__asm__ volatile ("ei\n" :  :  : "cc")
-
-/* Enable Inerrupts instructions and Wait */
-#define _eiwait_()  		__asm__ volatile ("eiwait" :  :  : "cc")
-
-/* excp Instructions */
-#define _excp_(vector)  	__asm__ volatile ("excp " # vector)
-
-/* getpid Instruction */
-#define _getrfid_(dest) 	__asm__("getrfid %0" : "=r" (dest)  : \
-                                     	/* No input */ : "cc")
-
-/* Load Instructions */
-#define _loadb_(base,dest)	__asm__("loadb %1,%0" : "=r" (dest) : \
-					"m" (base) , "0" (dest))
-#define _loadw_(base,dest)	__asm__("loadw %1,%0" : "=r" (dest) : \
-				        "m" (base) , "0" (dest))
-#define _loadd_(base,dest)	__asm__("loadd %1,%0" : "=r" (dest) : \
-					"m" (base) , "0" (dest))
-
-/* Load Multiple Instructions */
-#define _loadm_(src, mask)  	__asm__("loadm %0,%1" : /* No output */ : \
-					"r" ((unsigned int)src) , "i" (mask))
-#define _loadmp_(src, mask)  	__asm__("loadmp %0,%1" : /* No output */ : \
-					"r" ((unsigned int)src) , "i" (mask))
-
-/* Multiply Accumulate Instrutions */
-#define _macsb_(hi, lo, src1, src2)  	__asm__("macsb %1,%0" \
-					: =l (lo), =h (hi) \
-					: "r" ((char)src1) , "r" (src2))
-#define _macsw_(hi, lo, src1, src2)  	__asm__("macsw %1,%0" \
-					: =l (lo), =h (hi) \
-					: "r" ((short)src1) , "r" (src2))
-#define _macsd_(hi, lo, src1, src2)  	__asm__("macsd %1,%0" \
-					: =l (lo), =h (hi) \
-					: "r" ((int)src1) , "r" (src2))
-#define _macub_(hi, lo, src1, src2)  	__asm__("macub %1,%0" \
-  					: =l (lo), =h (hi) \
-					:"r" ((unsigned char)src1) , "r" (src2))
-#define _macuw_(hi, lo, src1, src2)  	__asm__("macuw %1,%0" \
-  					: =l (lo), =h (hi) \
-					: "r" ((unsigned short)src1) , "r" (src2))
-#define _macud_(hi, lo, src1, src2)  	__asm__("macud %1,%0" \
-  					: =l (lo), =h (hi) \
-					: "r" ((unsigned int)src1) , "r" (src2))
-
-/* Q-Format Multiply Accumulate Instrutions */
-#define _macqb_(src1, src2)  	__asm__("macqb %1,%0" \
-  					: =l (lo), =h (hi) \
-					:"r" ((char)src1) , "r" (src2))
-#define _macqw_(src1, src2)  	__asm__("macqw %1,%0" \
-  					: =l (lo), =h (hi) \
-					:"r" ((short)src1) , "r" (src2))
-#define _macqd_(src1, src2)  	__asm__("macqd %1,%0" \
-  					: =l (lo), =h (hi) \
-					:"r" ((int)src1) , "r" (src2))
-
-/* Maximum Instructions */
-#define _maxsb_(src, dest)  	__asm__("maxsb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _maxsw_(src, dest)  	__asm__("maxsw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-#define _maxsd_(src, dest)  	__asm__("maxsd %1,%0" : "=r" (dest)  : \
-					"r" ((int)src) , "0" (dest))
-#define _maxub_(src, dest)  	__asm__("maxub %1,%0" : "=r" (dest) : \
-					"r" ((unsigned char)src) , "0" (dest))
-#define _maxuw_(src, dest)  	__asm__("maxuw %1,%0" : "=r" (dest) : \
-					"r" ((unsigned short)src) , "0" (dest))
-#define _maxud_(src, dest)  	__asm__("maxud %1,%0" : "=r" (dest)  : \
-					"r" ((unsigned int)src) , "0" (dest))
-
-/* Minimum Instructions */
-#define _minsb_(src, dest)  	__asm__("minsb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _minsw_(src, dest)  	__asm__("minsw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-#define _minsd_(src, dest)  	__asm__("minsd %1,%0" : "=r" (dest)  : \
-					"r" ((int)src) , "0" (dest))
-#define _minub_(src, dest)  	__asm__("minub %1,%0" : "=r" (dest) : \
-					"r" ((unsigned char)src) , "0" (dest))
-#define _minuw_(src, dest)  	__asm__("minuw %1,%0" : "=r" (dest) : \
-					"r" ((unsigned short)src) , "0" (dest))
-#define _minud_(src, dest)  	__asm__("minud %1,%0" : "=r" (dest)  : \
-					"r" ((unsigned int)src) , "0" (dest))
-
-/* Move Instructions */
-#define _movb_(src, dest)  	__asm__("movb %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _movw_(src, dest)  	__asm__("movw %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned short)src) , "0" (dest))
-#define _movd_(src, dest)  	__asm__("movd %1,%0" : "=r" (dest)  : \
-					"ri" ((unsigned int)src) , "0" (dest))
-
-/* mtpr and mfpr Insturctions */
-#define _mtpr_(procregd, src)  __asm__("mtpr\t%0," procregd : /* no output */ : \
-				       "r" (src) : "cc")
-#define _mfpr_(procregd, dest) __asm__("mfpr\t" procregd ",%0" : "=r" (dest) : \
-				       /* no input */ "0" (dest) : "cc")
-
-/* Multiplication Instructions */
-#define _mulsbw_(src, dest)  	__asm__("mulsbw %1,%0" : "=r" (dest) : \
-                                   	"r" ((char)src) , "0" (dest))
-#define _mulubw_(src, dest)  	__asm__("mulubw %1,%0" : "=r" (dest) : \
-                                   	"r" ((unsigned char)src) , "0" (dest))
-#define _mulswd_(src, dest)  	__asm__("mulswd %1,%0" : "=r" (dest) : \
-                                   	"r" ((short)src) , "0" (dest))
-#define _muluwd_(src, dest)  	__asm__("muluwd %1,%0" : "=r" (dest) : \
-                                   	"r" ((unsigned short)src) , "0" (dest))
-#define _mulb_(src, dest)  	__asm__("mulb %1,%0" : "=r" (dest) : \
-					"ri" ((char)src) , "0" (dest))
-#define _mulw_(src, dest)  	__asm__("mulw %1,%0" : "=r" (dest) : \
-					"ri" ((short)src) , "0" (dest))
-#define _muld_(src, dest)  	__asm__("muld %1,%0" : "=r" (dest)  : \
-					"ri" ((int)src) , "0" (dest))
-#define _mullsd_(hi, lo, src1, src2)  	__asm__("mullsd %2,%3" \
-  					: =l (lo), =h (hi) \
-					: "r" ((unsigned int)src1) , "r" ((unsigned int)src2))
-#define _mullud_(hi, lo, src1, src2)  	__asm__("mullud %2,%3" \
-  					: =l (lo), =h (hi) \
-					: "r" ((int)src1) , "r" ((int)src2))
-
-/* Q-Format Multiplication Instructions */
-#define _mulqb_(src, dest)  	__asm__("mulqb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _mulqw_(src, dest)  	__asm__("mulqw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-
-/* nop Instruction */
-#define _nop_()  __asm__("nop")
-
-/* Negate Instructions */
-#define _negb_(src, dest)  	__asm__("negb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _negw_(src, dest)  	__asm__("negw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-#define _negd_(src, dest)  	__asm__("negd %1,%0" : "=r" (dest) : \
-					"r" ((int)src) , "0" (dest))
-
-/* or Instructions */
-#define _orb_(src, dest)  	__asm__("orb %1,%0" : "=r" (dest) : \
-                                   "ri" ((unsigned char)src) , "0" (dest))
-#define _orw_(src, dest)  	__asm__("orw %1,%0" : "=r" (dest) : \
-                                    "ri" ((unsigned short)src) , "0" (dest))
-#define _ord_(src, dest)  	__asm__("ord %1,%0" : "=r" (dest)  : \
-                                    "ri" ((unsigned int)src) , "0" (dest))
-
-/* Pop 1's Count Instructions */
-#define _popcntb_(src, dest)  	__asm__("popcntb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _popcntw_(src, dest)  	__asm__("popcntw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-#define _popcntd_(src, dest)  	__asm__("popcntd %1,%0" : "=r" (dest)  : \
-                                    "r" ((int)src) , "0" (dest))
-
-/* Rotate and Mask Instructions */ 
-#define _ram_(shift, end, begin, dest, src) __asm__("ram %1, %2, %3, %0, %4" : \
-						    "=r" (dest) : \
-						    "i" ((unsigned char) shift), \
-						    "i" (end), "i" (begin), \
-						    "r" (src), "0" (dest))
-#define _rim_(shift, end, begin, dest, src) __asm__("rim %1, %2, %3, %0, %4" : \
-						    "=r" (dest) : \
-						    "i" ((unsigned char) shift), \
-						    "i" (end), "i" (begin), \
-						    "r" (src), "0" (dest))
-
-/* retx Instruction */
-#define _retx_()  __asm__("retx")
-
-/* Rotate Instructions */
-#define _rotb_(shift, dest)  __asm__("rotb %1,%0" : "=r" (dest) : \
-				     "i" ((unsigned char)shift) , "0" (dest))
-#define _rotw_(shift, dest)  __asm__("rotw %1,%0" : "=r" (dest) : \
-				     "i" ((unsigned char)shift) , "0" (dest))
-#define _rotd_(shift, dest)  __asm__("rotd %1,%0" : "=r" (dest)  : \
-				     "i" ((unsigned char)shift) , "0" (dest))
-#define _rotlb_(shift, dest) __asm__("rotlb %1,%0" : "=r" (dest) : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotlw_(shift, dest) __asm__("rotlw %1,%0" : "=r" (dest) : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotld_(shift, dest) __asm__("rotld %1,%0" : "=r" (dest)  : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotrb_(shift, dest) __asm__("rotrb %1,%0" : "=r" (dest) : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotrw_(shift, dest) __asm__("rotrw %1,%0" : "=r" (dest) : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotrd_(shift, dest) __asm__("rotrd %1,%0" : "=r" (dest)  : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-
-/* Set Bit Instructions */
-#define _sbitb_(pos,dest)  __asm__("sbitb %1,%0" : "=mr" (dest) : \
-				   "i" ((unsigned char)pos) , "0" (dest) : "cc")
-#define _sbitw_(pos,dest)  __asm__("sbitw %1,%0" : "=mr" (dest) : \
-                                   "i" ((unsigned char)pos) , "0" (dest) : "cc")
-#define _sbitd_(pos,dest)  __asm__("sbitd %1,%0" : "=mr" (dest) : \
-                                   "i" ((unsigned char)pos) , "0" (dest) : "cc")
-
-/* setrfid Instruction */
-#define _setrfid_(src)		__asm__("setrfid %0" : /* No output */  : \
-					"r" (src) : "cc")
-
-/* Sign Extend Instructions */
-#define _sextbw_(src, dest)  	__asm__("sextbw %1,%0" : "=r" (dest) : \
-                                   "r" ((char)src) , "0" (dest) )
-#define _sextbd_(src, dest)  	__asm__("sextbd %1,%0" : "=r" (dest) : \
-                                    "r" ((char)src) , "0" (dest) )
-#define _sextwd_(src, dest)  	__asm__("sextwd %1,%0" : "=r" (dest) : \
-                                    "r" ((short)src) , "0" (dest) )
-
-/* Shift Left Logical Instructions */
-#define _sllb_(src, dest)  	__asm__("sllb %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _sllw_(src, dest)  	__asm__("sllw %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _slld_(src, dest)  	__asm__("slld %1,%0" : "=r" (dest)  : \
-					"ri" ((unsigned char)src) , "0" (dest))
-/* Shift Right Arithmetic Instructions */
-#define _srab_(src, dest)  	__asm__("srab %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _sraw_(src, dest)  	__asm__("sraw %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _srad_(src, dest)  	__asm__("srad %1,%0" : "=r" (dest)  : \
-					"ri" ((unsigned char)src) , "0" (dest))
-
-/* Shift Right Logical Instructions */
-#define _srlb_(src, dest)  	__asm__("srlb %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _srlw_(src, dest)  	__asm__("srlw %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _srld_(src, dest)  	__asm__("srld %1,%0" : "=r" (dest)  : \
-					"ri" ((unsigned char)src) , "0" (dest))
-				
-/* Store Instructions */
-#define _storb_(src,address)  	__asm__("storb %1,%0" : "=m" (address) : \
-					"ri" ((unsigned int)src))
-#define _storw_(src,address)  	__asm__("storw %1,%0" : "=m" (address) : \
-					"ri" ((unsigned int)src))
-#define _stord_(src,address)  	__asm__("stord %1,%0" : "=m" (address) : \
-					"ri" ((unsigned int)src))
-
-/* Store Multiple Instructions */
-#define _storm_(mask, src)  	__asm__("storm %1,%0" : /* No output here */ : \
-					"i" (mask) , "r" ((unsigned int)src))
-#define _stormp_(mask, src)  	__asm__("stormp %1,%0" : /* No output here */ : \
-					"i" (mask) , "r" ((unsigned int)src))
-
-/* Substruct Instructions */
-#define _subb_(src, dest)  __asm__("subb	%1, %0" : "=r" (dest) : \
-			           "ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _subw_(src, dest)  __asm__("subw	%1, %0" : "=r" (dest) : \
-			           "ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _subd_(src, dest)  __asm__("subd	%1, %0" : "=r" (dest) : \
-				   "ri" ((unsigned int)src), "0" (dest) : "cc")
-
-/* Substruct with Carry Instructions */
-#define _subcb_(src, dest) __asm__("subcb	%1, %0" : "=r" (dest) : \
-			           "ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _subcw_(src, dest) __asm__("subcw	%1, %0" : "=r" (dest) : \
-				   "ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _subcd_(src, dest) __asm__("subcd	%1, %0" : "=r" (dest) : \
-			           "ri" ((unsigned int)src), "0" (dest) : "cc")
-
-/* Q-Format Substruct Instructions */
-#define _subqb_(src, dest)  	__asm__("subqw %1,%0" : "=r" (dest)  : \
-                                        "r" ((char)src) , "0" (dest))
-#define _subqw_(src, dest)  	__asm__("subqw %1,%0" : "=r" (dest)  : \
-                                        "r" ((short)src) , "0" (dest))
-#define _subqd_(src, dest)  	__asm__("subqd %1,%0" : "=r" (dest)  : \
-                                        "r" ((short)src) , "0" (dest))
-
-/* Test Bit Instructions */
-#define _tbitb_(pos,dest)  __asm__("tbitb %0,%1" : /* No output */ : \
-                                   "i" ((unsigned char)pos) , "rm" (dest) : "cc")
-#define _tbitw_(pos,dest)  __asm__("tbitw %0,%1" : /* No output */ : \
-                                   "i" ((unsigned char)pos) , "rm" (dest) : "cc")
-#define _tbitd_(pos,dest)  __asm__("tbitd %0,%1" : /* No output */ : \
-                                   "i" ((unsigned char)pos) , "rm" (dest) : "cc")
-
-/* wait Instruction*/
-#define _wait_()  		__asm__ volatile ("wait" :  :  : "cc")
-
-/* xor Instructions */
-#define _xorb_(src, dest)  	__asm__("xorb %1,%0" : "=r" (dest) : \
-                                   "ri" ((unsigned char)src) , "0" (dest))
-#define _xorw_(src, dest)  	__asm__("xorw %1,%0" : "=r" (dest) : \
-                                    "ri" ((unsigned short)src) , "0" (dest))
-#define _xord_(src, dest)  	__asm__("xord %1,%0" : "=r" (dest)  : \
-                                    "ri" ((unsigned int)src) , "0" (dest))
-
-/* Zero Extend Instructions */
-#define _zextbw_(src, dest)  	__asm__("zextbw %1,%0" : "=r" (dest) : \
-					"r" ((unsigned char)src) , "0" (dest))
-#define _zextbd_(src, dest)  	__asm__("zextbd %1,%0" : "=r" (dest) : \
-					"r" ((unsigned char)src) , "0" (dest))
-#define _zextwd_(src, dest)  	__asm__("zextwd %1,%0" : "=r" (dest) : \
-					"r" ((unsigned short)src) , "0" (dest))
-
-#define _save_asm_(x) \
-  __asm__ volatile (x ::: "memory","cc", \
-		    "r0","r1","r2","r3","r4","r5","r6","r7", \
-		    "r8","r9","r10","r11","r12","r13")
-
-#endif  /* _ASM */
-
-
diff --git a/newlib/libc/machine/crx/sys/libh.h b/newlib/libc/machine/crx/sys/libh.h
deleted file mode 100644
index a7ac54bce..000000000
--- a/newlib/libc/machine/crx/sys/libh.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* libh.h -- CRX default handlers
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#ifndef	_LIBH
-#define _LIBH
-
-/* These are the first 16 entries of the default dispatch table as defined
-   in the CompactRISC architecture:
-
-   Entry    Function
-   -----    --------
-    0	    NULL
-    1	    nmi
-    2	    NULL
-    3	    NULL
-    4	    NULL
-    5	    svc
-    6	    dvz
-    7	    flg
-    8	    bpt
-    9	    trc
-   10	    und
-   11	    NULL
-   12	    iad
-   13	    NULL
-   14	    dbg
-   15	    ise
-*/
-
-extern void (* const _dispatch_table[])(void);
-
-/* Function prototypes */
-void svc_handler(void);
-void dvz_handler(void);
-void flg_handler(void);
-void und_handler(void);
-void iad_handler(void);
-
-#endif  /* _LIBH */
diff --git a/newlib/libc/machine/crx/sys/syscall.h b/newlib/libc/machine/crx/sys/syscall.h
deleted file mode 100644
index f775fbb54..000000000
--- a/newlib/libc/machine/crx/sys/syscall.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* syscall.h -- CRX virtual I/O and trap service codes
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#ifndef _SYSCALL_H
-#define _SYSCALL_H
-
-#include <sys/asm.h>
-
-/* SVC codes to pass to the debugger */
-
-/* Virtual I/O services */
-#define SVC_OPEN	0x401
-#define SVC_CLOSE	0x402
-#define SVC_READ	0x403
-#define SVC_WRITE	0x404
-#define SVC_LSEEK	0x405
-#define SVC_RENAME	0x406
-#define SVC_UNLINK	0x407
-#define SVC_GETENV	0x408
-
-/* Time service */
-#define SVC_TIME        0x300
-
-/* Start/end of program services */
-#define SVC_EOP		0x410
-
-/* Trap services */
-#define SVC_SVC		0x505
-#define SVC_DVZ		0x506
-#define SVC_FLG		0x507
-#define SVC_UND		0x50a
-#define SVC_IAD		0x50c
-
-
-/* Places the code of the requested service in R0, then transfers control
-   to the debugger using the BPT exception.
-   It is called from the start routine, VIO functions and the trap
-   handlers.  */
-
-#define STRINGIFY(x)	#x
-#define HOST_SERVICE(service) \
-  do { \
-    __asm__("movd\t$" STRINGIFY(service) ",r0"); \
-    _excp_(bpt); \
-    __asm__(".short\t0xFFFF"); \
-  } while (0)
-
-#endif  /* _SYSCALL_H */
-
diff --git a/newlib/libc/machine/d10v/aclocal.m4 b/newlib/libc/machine/d10v/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/d10v/aclocal.m4
+++ b/newlib/libc/machine/d10v/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/d10v/configure b/newlib/libc/machine/d10v/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/d10v/configure
+++ b/newlib/libc/machine/d10v/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/d30v/aclocal.m4 b/newlib/libc/machine/d30v/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/d30v/aclocal.m4
+++ b/newlib/libc/machine/d30v/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/d30v/configure b/newlib/libc/machine/d30v/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/d30v/configure
+++ b/newlib/libc/machine/d30v/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/fr30/aclocal.m4 b/newlib/libc/machine/fr30/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/fr30/aclocal.m4
+++ b/newlib/libc/machine/fr30/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/fr30/configure b/newlib/libc/machine/fr30/configure
index 028b7b4fa..bba10b075 100755
--- a/newlib/libc/machine/fr30/configure
+++ b/newlib/libc/machine/fr30/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/frv/aclocal.m4 b/newlib/libc/machine/frv/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/frv/aclocal.m4
+++ b/newlib/libc/machine/frv/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/frv/configure b/newlib/libc/machine/frv/configure
index 028b7b4fa..bba10b075 100755
--- a/newlib/libc/machine/frv/configure
+++ b/newlib/libc/machine/frv/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/h8300/aclocal.m4 b/newlib/libc/machine/h8300/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/h8300/aclocal.m4
+++ b/newlib/libc/machine/h8300/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/h8300/configure b/newlib/libc/machine/h8300/configure
index 4a3c8cf46..5ce8d7e8a 100755
--- a/newlib/libc/machine/h8300/configure
+++ b/newlib/libc/machine/h8300/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/h8500/aclocal.m4 b/newlib/libc/machine/h8500/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/h8500/aclocal.m4
+++ b/newlib/libc/machine/h8500/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/h8500/configure b/newlib/libc/machine/h8500/configure
index ec4e3cf09..53e5ca5cd 100755
--- a/newlib/libc/machine/h8500/configure
+++ b/newlib/libc/machine/h8500/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/hppa/aclocal.m4 b/newlib/libc/machine/hppa/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/hppa/aclocal.m4
+++ b/newlib/libc/machine/hppa/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/hppa/configure b/newlib/libc/machine/hppa/configure
index ec6b96e33..c99fbda7f 100755
--- a/newlib/libc/machine/hppa/configure
+++ b/newlib/libc/machine/hppa/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/i386/aclocal.m4 b/newlib/libc/machine/i386/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/machine/i386/aclocal.m4
+++ b/newlib/libc/machine/i386/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/i386/configure b/newlib/libc/machine/i386/configure
index 60bb861a8..1448a25b1 100755
--- a/newlib/libc/machine/i386/configure
+++ b/newlib/libc/machine/i386/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1655,7 +1652,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1682,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1765,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1886,7 +1883,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
+echo "configure:1887: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1917: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1920: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1954,7 +1951,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
+echo "configure:1972: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:2022: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2042,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
+echo "configure:2043: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
+echo "configure:2216: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2245,7 +2242,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2246: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2304,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
+echo "configure:2308: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2378,7 +2375,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
+echo "configure:2379: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
+echo "configure:2411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,7 +2442,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
+echo "configure:2446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
+echo "configure:2478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2545 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2564,7 +2561,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2582,7 +2579,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:2583: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2596 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:2633: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2696,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2732: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2763,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2799: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2834,12 +2831,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
+echo "configure:2835: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
+echo "configure:2869: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
diff --git a/newlib/libc/machine/i960/aclocal.m4 b/newlib/libc/machine/i960/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/i960/aclocal.m4
+++ b/newlib/libc/machine/i960/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/i960/configure b/newlib/libc/machine/i960/configure
index 554de7e58..c1eb54b5e 100755
--- a/newlib/libc/machine/i960/configure
+++ b/newlib/libc/machine/i960/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/iq2000/aclocal.m4 b/newlib/libc/machine/iq2000/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/iq2000/aclocal.m4
+++ b/newlib/libc/machine/iq2000/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/iq2000/configure b/newlib/libc/machine/iq2000/configure
index 028b7b4fa..bba10b075 100755
--- a/newlib/libc/machine/iq2000/configure
+++ b/newlib/libc/machine/iq2000/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/m32c/Makefile.am b/newlib/libc/machine/m32c/Makefile.am
deleted file mode 100644
index 1c65b9ffe..000000000
--- a/newlib/libc/machine/m32c/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/m32c/Makefile.in b/newlib/libc/machine/m32c/Makefile.in
deleted file mode 100644
index 9736912dc..000000000
--- a/newlib/libc/machine/m32c/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/m32c/aclocal.m4 b/newlib/libc/machine/m32c/aclocal.m4
deleted file mode 100644
index 55d5e67ce..000000000
--- a/newlib/libc/machine/m32c/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/m32c/configure b/newlib/libc/machine/m32c/configure
deleted file mode 100755
index 98bab641e..000000000
--- a/newlib/libc/machine/m32c/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=setjmp.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/m32c/configure.in b/newlib/libc/machine/m32c/configure.in
deleted file mode 100644
index e53227db5..000000000
--- a/newlib/libc/machine/m32c/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/m32r configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(setjmp.S)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/m32c/setjmp.S b/newlib/libc/machine/m32c/setjmp.S
deleted file mode 100644
index 96cd0f20d..000000000
--- a/newlib/libc/machine/m32c/setjmp.S
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define A16 1
-#endif
-
-/* We implement setjmp/longjmp much like the way gcc implements
-   exceptions - we create new stack frames, then switch to them and
-   return.  Thus, the two setjmp's below each push all the relevent
-   registers, then copy the whole frame into the buffer (first $sp is
-   moved, then smovf copies the frame itself), and the two longjmps
-   restore $sp, copy the frame back into place, and issue the same
-   return as the setjmp would have used.
-
-   Since the sizes of registers differs between the 16 and 24 bit
-   models, we provide separate implementations for each rather than
-   trying to parameterize them.
-
-   Jump buffer sizes: 21 bytes for 16 bit, 34 bytes for 24 bit.
-*/
-
-	.text
-
-#ifdef A16	/* 16 bit versions */
-
-	.global	_setjmp
-_setjmp:
-	enter	#0
-	pushm	r1,r2,r3,a0,a1,sb,fb
-
-; At this point, the stack looks like this:
-; ... [pc:3] [oldfb:2] <fb> [r1:2] [r2:2] [r3:2] [a0:2] [a1:2] [sb:2] [fb:2] <sp> */
-
-	mov.w	r1,a1		;  a1 is the destination of smovf
-	mov.b	#0,r1h
-	stc	sp,a0		;  r1h:a0 is the source of smovf
-	mov.w	a0,[a1]
-	add.w	#2,a1
-	mov.w	#19,r3		;  plus two for sp later
-	smovf.b
-
-	; Return 0 to caller.
-	mov.w	#0,r0
-	popm	r1,r2,r3,a0,a1,sb,fb
-	exitd
-
-	.global	_longjmp
-_longjmp:
-	enter	#0
-	mov.w	r1,a0		;  pointer to jump buf
-	mov.w	r2,r0		;  setjmp's "new" return value
-
-	mov.b	#0,r1h		;  r1h:	a0 is the source, now jmpbuf
-	mov.w	[a0],a1		;  dest is new stack
-	ldc	a1,sp
-	add.w	#2,a0
-	mov.w	#19,r3
-	smovf.b
-
-	;; now return to our caller with this newly restored frame
-	popm	r1,r2,r3,a0,a1,sb,fb
-	exitd
-
-#else	/* 24 bit versions */
-
-	.global	_setjmp
-_setjmp:
-	enter	#0
-	pushm	r1,r2,r3,a0,a1,sb,fb
-
-; At this point, the stack looks like this:
-; ... [jbuf:4] [pc:4] [oldfb:4] <fb> [r1:2] [r2:2] [r3:2] [a0:4] [a1:4] [sb:4] [fb:4] <sp> */
-
-	mov.l	8[fb],a1	;  a1 is the destination of smovf
-	stc	sp,a0		;  r1h:a0 is the source of smovf
-	mov.l	a0,[a1]
-	add.l	#4,a1
-	mov.w	#30,r3		;  plus two for sp later
-	smovf.b
-
-	; Return 0 to caller.
-	mov.w	#0,r0
-	popm	r1,r2,r3,a0,a1,sb,fb
-	exitd
-
-	.global	_longjmp
-_longjmp:
-	enter	#0
-; ... [rv:2] [jbuf:4] [pc:4] [oldfb:4] <fb>
-	mov.l	8[fb],a0	;  pointer to jump buf
-	mov.w	12[fb],r0	;  setjmp's "new" return value
-
-	mov.l	[a0],a1		;  dest is new stack
-	ldc	a1,sp
-	add.l	#4,a0
-	mov.w	#30,r3
-	smovf.b
-
-	;; now return to our caller with this newly restored frame
-	popm	r1,r2,r3,a0,a1,sb,fb
-	exitd
-#endif
-
diff --git a/newlib/libc/machine/m32r/aclocal.m4 b/newlib/libc/machine/m32r/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/m32r/aclocal.m4
+++ b/newlib/libc/machine/m32r/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/m32r/configure b/newlib/libc/machine/m32r/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/m32r/configure
+++ b/newlib/libc/machine/m32r/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/m68hc11/aclocal.m4 b/newlib/libc/machine/m68hc11/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/m68hc11/aclocal.m4
+++ b/newlib/libc/machine/m68hc11/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/m68hc11/configure b/newlib/libc/machine/m68hc11/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/m68hc11/configure
+++ b/newlib/libc/machine/m68hc11/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/m68k/aclocal.m4 b/newlib/libc/machine/m68k/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/m68k/aclocal.m4
+++ b/newlib/libc/machine/m68k/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/m68k/configure b/newlib/libc/machine/m68k/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/m68k/configure
+++ b/newlib/libc/machine/m68k/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/m88k/aclocal.m4 b/newlib/libc/machine/m88k/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/m88k/aclocal.m4
+++ b/newlib/libc/machine/m88k/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/m88k/configure b/newlib/libc/machine/m88k/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/m88k/configure
+++ b/newlib/libc/machine/m88k/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/mips/aclocal.m4 b/newlib/libc/machine/mips/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/mips/aclocal.m4
+++ b/newlib/libc/machine/mips/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/mips/configure b/newlib/libc/machine/mips/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/mips/configure
+++ b/newlib/libc/machine/mips/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/mn10200/aclocal.m4 b/newlib/libc/machine/mn10200/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/mn10200/aclocal.m4
+++ b/newlib/libc/machine/mn10200/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/mn10200/configure b/newlib/libc/machine/mn10200/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/mn10200/configure
+++ b/newlib/libc/machine/mn10200/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/mn10300/aclocal.m4 b/newlib/libc/machine/mn10300/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/mn10300/aclocal.m4
+++ b/newlib/libc/machine/mn10300/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/mn10300/configure b/newlib/libc/machine/mn10300/configure
index ec6b96e33..c99fbda7f 100755
--- a/newlib/libc/machine/mn10300/configure
+++ b/newlib/libc/machine/mn10300/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/mt/Makefile.am b/newlib/libc/machine/mt/Makefile.am
deleted file mode 100644
index 1c65b9ffe..000000000
--- a/newlib/libc/machine/mt/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/mt/Makefile.in b/newlib/libc/machine/mt/Makefile.in
deleted file mode 100644
index 9736912dc..000000000
--- a/newlib/libc/machine/mt/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/mt/aclocal.m4 b/newlib/libc/machine/mt/aclocal.m4
deleted file mode 100644
index 55d5e67ce..000000000
--- a/newlib/libc/machine/mt/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/mt/configure b/newlib/libc/machine/mt/configure
deleted file mode 100755
index 028b7b4fa..000000000
--- a/newlib/libc/machine/mt/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.am
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/mt/configure.in b/newlib/libc/machine/mt/configure.in
deleted file mode 100644
index d6898f515..000000000
--- a/newlib/libc/machine/mt/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/mt configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(Makefile.am)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/mt/setjmp.S b/newlib/libc/machine/mt/setjmp.S
deleted file mode 100644
index e93bd3313..000000000
--- a/newlib/libc/machine/mt/setjmp.S
+++ /dev/null
@@ -1,99 +0,0 @@
-# setjmp/longjmp for mt.
-# 
-# The jmpbuf looks like this:
-#	
-# Register	jmpbuf offset
-# R0		---		--
-# R1		0x4		 4
-# R2		0x8		 8
-# R3		0xc		12
-# R4		0x10		16
-# R5		0x14		20
-# R6		0x18		24
-# R7		0x1c		28
-# R8		0x20		32
-# R9		----		--
-# R10		----		--
-# R11		0x2c		44
-# R12		0x30		48
-# R13		0x34		52
-# R14		0x38		56
-# R15		0x3c		60
-#
-# R1 contains the pointer to jmpbuf
-	.text
-	.global	setjmp
-	.type	setjmp ,@function
-setjmp:
-
-	stw	r1, r1, #4
-	or	r0, r0, r0
-	stw	r2, r1, #8
-	or	r0, r0, r0
-	stw	r3, r1, #12
-	or	r0, r0, r0
-	stw	r4, r1, #16
-	or	r0, r0, r0
-	stw	r5, r1, #20
-	or	r0, r0, r0
-	stw	r6, r1, #24
-	or	r0, r0, r0
-	stw	r7, r1, #28
-	or	r0, r0, r0
-	stw	r8, r1, #32
-	or	r0, r0, r0
-	stw	r11, r1, #44
-	or	r0, r0, r0
-	stw	r12, r1, #48
-	or	r0, r0, r0
-	stw	r13, r1, #52
-	or	r0, r0, r0
-	stw	r14, r1, #56
-	or	r0, r0, r0
-	stw	r15, r1, #60
-
-	jal	r0, r14
-	addi	r11, r0, #0
-.Lend1:
-	.size	setjmp,.Lend1-setjmp
-
-	.global	longjmp
-	.type	longjmp,@function
-longjmp:
-	or	r9, r1, r1
-	or	r11, r2, r2
-	ldw	r1, r1, #4
-	or	r0, r0, r0
-	ldw	r2, r1, #8
-	or	r0, r0, r0
-	ldw	r3, r1, #12
-	or	r0, r0, r0
-	ldw	r4, r1, #16
-	or	r0, r0, r0
-	ldw	r5, r1, #20
-	or	r0, r0, r0
-	ldw	r6, r1, #24
-	or	r0, r0, r0
-	ldw	r7, r1, #28
-	or	r0, r0, r0
-	ldw	r8, r1, #32
-	or	r0, r0, r0
-
-
-	ldw	r12, r1, #48
-	or	r0, r0, r0
-	ldw	r13, r1, #52
-	or	r0, r0, r0
-	ldw	r14, r1, #56
-	or	r0, r0, r0
-	ldw	r15, r1, #60
-
-	brne	r0, r11, .L01
-	or	r0, r0, r0
-
-	addi	r11, r0, #1
-.L01:
-	jal	r0, r14
-	or	r0, r0, r0
-.Lend2:
-	.size	longjmp,.Lend2-longjmp2
diff --git a/newlib/libc/machine/necv70/aclocal.m4 b/newlib/libc/machine/necv70/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/necv70/aclocal.m4
+++ b/newlib/libc/machine/necv70/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/necv70/configure b/newlib/libc/machine/necv70/configure
index 58653d8be..2ca2754da 100755
--- a/newlib/libc/machine/necv70/configure
+++ b/newlib/libc/machine/necv70/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/powerpc/aclocal.m4 b/newlib/libc/machine/powerpc/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/powerpc/aclocal.m4
+++ b/newlib/libc/machine/powerpc/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/powerpc/configure b/newlib/libc/machine/powerpc/configure
index e74aa97b6..eefd4225f 100755
--- a/newlib/libc/machine/powerpc/configure
+++ b/newlib/libc/machine/powerpc/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/sh/Makefile.in b/newlib/libc/machine/sh/Makefile.in
index 619a9059a..5e8a42b98 100644
--- a/newlib/libc/machine/sh/Makefile.in
+++ b/newlib/libc/machine/sh/Makefile.in
@@ -103,10 +103,10 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@SH64_FALSE@lib_a_OBJECTS =  memcpy.o memset.o setjmp.o strcpy.o \
-@SH64_FALSE@strlen.o strcmp.o
 @SH64_TRUE@lib_a_OBJECTS =  memcpy.o memset.o setjmp.o strcpy.o strlen.o \
 @SH64_TRUE@strcmp.o strncpy.o
+@SH64_FALSE@lib_a_OBJECTS =  memcpy.o memset.o setjmp.o strcpy.o \
+@SH64_FALSE@strlen.o strcmp.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
diff --git a/newlib/libc/machine/sh/aclocal.m4 b/newlib/libc/machine/sh/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/sh/aclocal.m4
+++ b/newlib/libc/machine/sh/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/sh/configure b/newlib/libc/machine/sh/configure
index 1eb7514bc..64454a738 100755
--- a/newlib/libc/machine/sh/configure
+++ b/newlib/libc/machine/sh/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1569,7 +1566,7 @@ OBJEXT=${oext}
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1573: checking how to run the C preprocessor" >&5
+echo "configure:1570: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1584,13 +1581,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1588 "configure"
+#line 1585 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1601,13 +1598,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1605 "configure"
+#line 1602 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1618,13 +1615,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1622 "configure"
+#line 1619 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1649,7 +1646,7 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 cat > conftest.$ac_ext <<EOF
-#line 1653 "configure"
+#line 1650 "configure"
 #include "confdefs.h"
 
 #if __SH5__
diff --git a/newlib/libc/machine/sparc/aclocal.m4 b/newlib/libc/machine/sparc/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/sparc/aclocal.m4
+++ b/newlib/libc/machine/sparc/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/sparc/configure b/newlib/libc/machine/sparc/configure
index 934fdab95..0db14c787 100755
--- a/newlib/libc/machine/sparc/configure
+++ b/newlib/libc/machine/sparc/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/tic4x/aclocal.m4 b/newlib/libc/machine/tic4x/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/tic4x/aclocal.m4
+++ b/newlib/libc/machine/tic4x/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/tic4x/configure b/newlib/libc/machine/tic4x/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/tic4x/configure
+++ b/newlib/libc/machine/tic4x/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/tic80/aclocal.m4 b/newlib/libc/machine/tic80/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/tic80/aclocal.m4
+++ b/newlib/libc/machine/tic80/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/tic80/configure b/newlib/libc/machine/tic80/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/tic80/configure
+++ b/newlib/libc/machine/tic80/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/v850/aclocal.m4 b/newlib/libc/machine/v850/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/v850/aclocal.m4
+++ b/newlib/libc/machine/v850/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/v850/configure b/newlib/libc/machine/v850/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/v850/configure
+++ b/newlib/libc/machine/v850/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/w65/aclocal.m4 b/newlib/libc/machine/w65/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/w65/aclocal.m4
+++ b/newlib/libc/machine/w65/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/w65/configure b/newlib/libc/machine/w65/configure
index ec4e3cf09..53e5ca5cd 100755
--- a/newlib/libc/machine/w65/configure
+++ b/newlib/libc/machine/w65/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/xscale/aclocal.m4 b/newlib/libc/machine/xscale/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/xscale/aclocal.m4
+++ b/newlib/libc/machine/xscale/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/xscale/configure b/newlib/libc/machine/xscale/configure
index 028b7b4fa..bba10b075 100755
--- a/newlib/libc/machine/xscale/configure
+++ b/newlib/libc/machine/xscale/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/xstormy16/aclocal.m4 b/newlib/libc/machine/xstormy16/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/xstormy16/aclocal.m4
+++ b/newlib/libc/machine/xstormy16/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/xstormy16/configure b/newlib/libc/machine/xstormy16/configure
index 98bab641e..8a3f017eb 100755
--- a/newlib/libc/machine/xstormy16/configure
+++ b/newlib/libc/machine/xstormy16/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/machine/z8k/aclocal.m4 b/newlib/libc/machine/z8k/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/machine/z8k/aclocal.m4
+++ b/newlib/libc/machine/z8k/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/machine/z8k/configure b/newlib/libc/machine/z8k/configure
index 8b9a4a1df..43885ff5a 100755
--- a/newlib/libc/machine/z8k/configure
+++ b/newlib/libc/machine/z8k/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/misc/unctrl.c b/newlib/libc/misc/unctrl.c
index fa0b90ff1..710bf16bd 100644
--- a/newlib/libc/misc/unctrl.c
+++ b/newlib/libc/misc/unctrl.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<unctrl>>---get printable representation of a character
+	<<unctrl>>---translate characters to upper case
 
 INDEX
 	unctrl
diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c
index 2cd586050..97094a676 100644
--- a/newlib/libc/posix/scandir.c
+++ b/newlib/libc/posix/scandir.c
@@ -74,8 +74,8 @@ int
 _DEFUN(scandir, (dirname, namelist, select, dcomp),
 	const char *dirname _AND
 	struct dirent ***namelist _AND
-	int (*select) __P((const struct dirent *)) _AND
-	int (*dcomp) __P((const struct dirent **, const struct dirent **)))
+	int (*select) __P((struct dirent *)) _AND
+	int (*dcomp) __P((const void *, const void *)))
 {
 	register struct dirent *d, *p, **names;
 	register size_t nitems;
@@ -155,7 +155,7 @@ _DEFUN(scandir, (dirname, namelist, select, dcomp),
 	}
 	closedir(dirp);
 	if (nitems && dcomp != NULL)
-		qsort(names, nitems, sizeof(struct dirent *), (void *)dcomp);
+		qsort(names, nitems, sizeof(struct dirent *), dcomp);
 	*namelist = names;
 #ifdef HAVE_DD_LOCK
 	__lock_release_recursive(dirp->dd_lock);
diff --git a/newlib/libc/reent/reent.tex b/newlib/libc/reent/reent.tex
index 881c572c6..e76330b32 100644
--- a/newlib/libc/reent/reent.tex
+++ b/newlib/libc/reent/reent.tex
@@ -4,8 +4,8 @@
 @cindex reentrancy
 Reentrancy is a characteristic of library functions which allows multiple
 processes to use the same address space with assurance that the values stored
-in those spaces will remain constant between calls. The Red Hat
-newlib implementation of the library functions ensures that 
+in those spaces will remain constant between calls. Cygnus's implementation
+of the library functions ensures that 
 whenever possible, these library functions are reentrant.  However,
 there are some functions that can not be trivially made reentrant.
 Hooks have been provided to allow you to use these functions in a fully
diff --git a/newlib/libc/signal/signal.c b/newlib/libc/signal/signal.c
index bfb85e66a..20e919e74 100644
--- a/newlib/libc/signal/signal.c
+++ b/newlib/libc/signal/signal.c
@@ -6,12 +6,21 @@ INDEX
 	signal
 INDEX
 	_signal_r
+INDEX
+	raise
+INDEX
+	_raise_r
 
 ANSI_SYNOPSIS
 	#include <signal.h>
-	void (*signal(int <[sig]>, void(*<[func]>)(int))) (int);
+	void ( * signal(int <[sig]>, void(*<[func]>)(int)) )(int);
+
+	void ( * _signal_r(void *<[reent]>, 
+                           int <[sig]>, void(*<[func]>)(int)) )(int);
 
-	void (*_signal_r(void *<[reent]>, int <[sig]>, void(*<[func]>)(int))) (int);
+	int raise (int <[sig]>);
+
+	int _raise_r (void *<[reent]>, int <[sig]>);
 
 TRAD_SYNOPSIS
 	#include <signal.h>
@@ -24,8 +33,15 @@ TRAD_SYNOPSIS
 	int <[sig]>;
 	char ( * <[func]> )();
 
+	int raise (<[sig]>)()
+	int <[sig]>;
+
+	int _raise_r (<[reent]>, <[sig]>)()
+	char *<[reent]>;
+	int <[sig]>;
+
 DESCRIPTION
-<<signal>> provides a simple signal-handling implementation for embedded
+<<signal, raise>> provide a simple signal/raise implementation for embedded
 targets.
 
 <<signal>> allows you to request changed treatment for a particular
@@ -36,7 +52,7 @@ that identifies a subroutine in your program as the handler for this signal.
 
 Some of the execution environment for signal handlers is
 unpredictable; notably, the only library function required to work
-correctly from within a signal handler is <<signal>> itself, and
+correctly from within a signal handler is @code{signal} itself, and
 only when used to redefine the handler for the current signal value.
 
 Static storage is likewise unreliable for signal handlers, with one
@@ -50,9 +66,13 @@ where it was when the signal was raised (whether by your program
 itself, or by an external event).  Signal handlers can also
 use functions such as <<exit>> and <<abort>> to avoid returning.
 
-The alternate function <<_signal_r>> is the reentrant version.
+<<raise>> sends the signal sig to the executing program.  It returns zero if
+successful, non-zero if unsuccessful.
+
+The alternate functions <<_signal_r, _raise_r>> are the reentrant versions.
 The extra argument <[reent]> is a pointer to a reentrancy structure.
 
+
 @c FIXME: do we have setjmp.h and assoc fns?
 
 RETURNS
@@ -63,7 +83,7 @@ Otherwise, the result is the previous handler (a function pointer or
 one of the predefined macros).
 
 PORTABILITY
-ANSI C requires <<signal>>.
+ANSI C requires <<raise>>, <<signal>>.
 
 No supporting OS subroutines are required to link with <<signal>>, but
 it will not have any useful effects, except for software generated signals,
diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am
index 1ae643f4d..df147caf8 100644
--- a/newlib/libc/stdio/Makefile.am
+++ b/newlib/libc/stdio/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 GENERAL_SOURCES = \
 	clearerr.c 			\
-	dprintf.c			\
 	fclose.c 			\
 	fdopen.c 			\
 	feof.c 				\
@@ -71,7 +70,6 @@ GENERAL_SOURCES = \
 	tmpfile.c 			\
 	tmpnam.c 			\
 	ungetc.c 			\
-	vdprintf.c			\
 	viprintf.c 			\
 	viscanf.c			\
 	vprintf.c 			\
@@ -141,7 +139,6 @@ vfiscanf.$(oext): vfscanf.c
 
 CHEWOUT_FILES = \
 	clearerr.def		\
-	dprintf.def		\
 	fclose.def		\
 	fcloseall.def		\
 	fdopen.def		\
diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
index 49827e332..952e3341b 100644
--- a/newlib/libc/stdio/Makefile.in
+++ b/newlib/libc/stdio/Makefile.in
@@ -110,7 +110,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES =  	clearerr.c 				dprintf.c				fclose.c 				fdopen.c 				feof.c 					ferror.c 				fflush.c 				fgetc.c 				fgetpos.c 				fgets.c 				fileno.c				findfp.c 				fiprintf.c 				flags.c 				fopen.c 				fprintf.c 				fputc.c 				fputs.c 				fread.c 				freopen.c 				fscanf.c 				fiscanf.c 				fseek.c 				fsetpos.c 				ftell.c 				fvwrite.c 				fwalk.c 				fwrite.c 				getc.c 					getchar.c 				getc_u.c				getchar_u.c				getdelim.c				getline.c				gets.c 					iprintf.c 				iscanf.c 				makebuf.c				perror.c 				printf.c 				putc.c 					putchar.c 				putc_u.c				putchar_u.c				puts.c 					refill.c 				remove.c 				rename.c 				rewind.c 				rget.c 					scanf.c 				sccl.c	 				setbuf.c 				setbuffer.c 				setlinebuf.c 				setvbuf.c 				siprintf.c 				siscanf.c 				sniprintf.c				snprintf.c				sprintf.c 				sscanf.c 				stdio.c 				tmpfile.c 				tmpnam.c 				ungetc.c 				vdprintf.c				viprintf.c 				viscanf.c				vprintf.c 				vscanf.c				vsiprintf.c 				vsiscanf.c				vsnprintf.c				vsniprintf.c				vsprintf.c 				vsscanf.c				wbuf.c 					wsetup.c 
+GENERAL_SOURCES =  	clearerr.c 				fclose.c 				fdopen.c 				feof.c 					ferror.c 				fflush.c 				fgetc.c 				fgetpos.c 				fgets.c 				fileno.c				findfp.c 				fiprintf.c 				flags.c 				fopen.c 				fprintf.c 				fputc.c 				fputs.c 				fread.c 				freopen.c 				fscanf.c 				fiscanf.c 				fseek.c 				fsetpos.c 				ftell.c 				fvwrite.c 				fwalk.c 				fwrite.c 				getc.c 					getchar.c 				getc_u.c				getchar_u.c				getdelim.c				getline.c				gets.c 					iprintf.c 				iscanf.c 				makebuf.c				perror.c 				printf.c 				putc.c 					putchar.c 				putc_u.c				putchar_u.c				puts.c 					refill.c 				remove.c 				rename.c 				rewind.c 				rget.c 					scanf.c 				sccl.c	 				setbuf.c 				setbuffer.c 				setlinebuf.c 				setvbuf.c 				siprintf.c 				siscanf.c 				sniprintf.c				snprintf.c				sprintf.c 				sscanf.c 				stdio.c 				tmpfile.c 				tmpnam.c 				ungetc.c 				viprintf.c 				viscanf.c				vprintf.c 				vscanf.c				vsiprintf.c 				vsiscanf.c				vsnprintf.c				vsniprintf.c				vsprintf.c 				vsscanf.c				wbuf.c 					wsetup.c 
 
 @ELIX_LEVEL_1_TRUE@LIB_OBJS = 
 @ELIX_LEVEL_1_FALSE@LIB_OBJS = 	asiprintf.$(oext)			asprintf.$(oext)			fcloseall.$(oext)			fseeko.$(oext) 				ftello.$(oext) 				getw.$(oext)				mktemp.$(oext) 				putw.$(oext) 				vasiprintf.$(oext)			vasprintf.$(oext)
@@ -132,7 +132,7 @@ libstdio_la_LDFLAGS = -Xcompiler -nostdlib
 @USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
 @USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
 
-CHEWOUT_FILES =  	clearerr.def			dprintf.def			fclose.def			fcloseall.def			fdopen.def			feof.def			ferror.def			fflush.def			fgetc.def			fgetpos.def			fgets.def			fileno.def			fiprintf.def			fopen.def			fputc.def			fputs.def			fread.def			freopen.def			fseek.def			fsetpos.def			ftell.def			fwrite.def			getc.def			getchar.def			getc_u.def			getchar_u.def			getdelim.def			getline.def			gets.def			getw.def			mktemp.def			perror.def			putc.def			putchar.def			putc_u.def			putchar_u.def			puts.def			putw.def			remove.def			rename.def			rewind.def			setbuf.def			setbuffer.def			setlinebuf.def			setvbuf.def			siprintf.def			siscanf.def			sprintf.def			sscanf.def			tmpfile.def			tmpnam.def			vfprintf.def			vfscanf.def			viprintf.def			viscanf.def
+CHEWOUT_FILES =  	clearerr.def			fclose.def			fcloseall.def			fdopen.def			feof.def			ferror.def			fflush.def			fgetc.def			fgetpos.def			fgets.def			fileno.def			fiprintf.def			fopen.def			fputc.def			fputs.def			fread.def			freopen.def			fseek.def			fsetpos.def			ftell.def			fwrite.def			getc.def			getchar.def			getc_u.def			getchar_u.def			getdelim.def			getline.def			gets.def			getw.def			mktemp.def			perror.def			putc.def			putchar.def			putc_u.def			putchar_u.def			puts.def			putw.def			remove.def			rename.def			rewind.def			setbuf.def			setbuffer.def			setlinebuf.def			setvbuf.def			siprintf.def			siscanf.def			sprintf.def			sscanf.def			tmpfile.def			tmpnam.def			vfprintf.def			vfscanf.def			viprintf.def			viscanf.def
 
 
 SUFFIXES = .def
@@ -150,56 +150,55 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  clearerr.$(OBJEXT) dprintf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fclose.$(OBJEXT) fdopen.$(OBJEXT) feof.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ferror.$(OBJEXT) fflush.$(OBJEXT) fgetc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fgetpos.$(OBJEXT) fgets.$(OBJEXT) fileno.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@findfp.$(OBJEXT) fiprintf.$(OBJEXT) flags.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fopen.$(OBJEXT) fprintf.$(OBJEXT) fputc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fputs.$(OBJEXT) fread.$(OBJEXT) freopen.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fscanf.$(OBJEXT) fiscanf.$(OBJEXT) fseek.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fsetpos.$(OBJEXT) ftell.$(OBJEXT) fvwrite.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fwalk.$(OBJEXT) fwrite.$(OBJEXT) getc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getchar.$(OBJEXT) getc_u.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getchar_u.$(OBJEXT) getdelim.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getline.$(OBJEXT) gets.$(OBJEXT) iprintf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@iscanf.$(OBJEXT) makebuf.$(OBJEXT) perror.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@printf.$(OBJEXT) putc.$(OBJEXT) putchar.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@putc_u.$(OBJEXT) putchar_u.$(OBJEXT) puts.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@refill.$(OBJEXT) remove.$(OBJEXT) rename.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@rewind.$(OBJEXT) rget.$(OBJEXT) scanf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sccl.$(OBJEXT) setbuf.$(OBJEXT) setbuffer.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  clearerr.$(OBJEXT) fclose.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@fdopen.$(OBJEXT) feof.$(OBJEXT) ferror.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@fflush.$(OBJEXT) fgetc.$(OBJEXT) fgetpos.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@fgets.$(OBJEXT) fileno.$(OBJEXT) findfp.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@fiprintf.$(OBJEXT) flags.$(OBJEXT) fopen.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@fprintf.$(OBJEXT) fputc.$(OBJEXT) fputs.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@fread.$(OBJEXT) freopen.$(OBJEXT) fscanf.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@fiscanf.$(OBJEXT) fseek.$(OBJEXT) fsetpos.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@ftell.$(OBJEXT) fvwrite.$(OBJEXT) fwalk.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@fwrite.$(OBJEXT) getc.$(OBJEXT) getchar.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@getc_u.$(OBJEXT) getchar_u.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@getdelim.$(OBJEXT) getline.$(OBJEXT) gets.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@iprintf.$(OBJEXT) iscanf.$(OBJEXT) makebuf.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@perror.$(OBJEXT) printf.$(OBJEXT) putc.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@putchar.$(OBJEXT) putc_u.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@putchar_u.$(OBJEXT) puts.$(OBJEXT) refill.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@remove.$(OBJEXT) rename.$(OBJEXT) rewind.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@rget.$(OBJEXT) scanf.$(OBJEXT) sccl.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@setbuf.$(OBJEXT) setbuffer.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@setlinebuf.$(OBJEXT) setvbuf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@siprintf.$(OBJEXT) siscanf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sniprintf.$(OBJEXT) snprintf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sprintf.$(OBJEXT) sscanf.$(OBJEXT) stdio.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@tmpfile.$(OBJEXT) tmpnam.$(OBJEXT) ungetc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@vdprintf.$(OBJEXT) viprintf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@viscanf.$(OBJEXT) vprintf.$(OBJEXT) vscanf.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@viprintf.$(OBJEXT) viscanf.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@vprintf.$(OBJEXT) vscanf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@vsiprintf.$(OBJEXT) vsiscanf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@vsnprintf.$(OBJEXT) vsniprintf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@vsprintf.$(OBJEXT) vsscanf.$(OBJEXT) wbuf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@wsetup.$(OBJEXT)
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
-@USE_LIBTOOL_TRUE@libstdio_la_OBJECTS =  clearerr.lo dprintf.lo \
-@USE_LIBTOOL_TRUE@fclose.lo fdopen.lo feof.lo ferror.lo fflush.lo \
-@USE_LIBTOOL_TRUE@fgetc.lo fgetpos.lo fgets.lo fileno.lo findfp.lo \
-@USE_LIBTOOL_TRUE@fiprintf.lo flags.lo fopen.lo fprintf.lo fputc.lo \
-@USE_LIBTOOL_TRUE@fputs.lo fread.lo freopen.lo fscanf.lo fiscanf.lo \
-@USE_LIBTOOL_TRUE@fseek.lo fsetpos.lo ftell.lo fvwrite.lo fwalk.lo \
-@USE_LIBTOOL_TRUE@fwrite.lo getc.lo getchar.lo getc_u.lo getchar_u.lo \
-@USE_LIBTOOL_TRUE@getdelim.lo getline.lo gets.lo iprintf.lo iscanf.lo \
-@USE_LIBTOOL_TRUE@makebuf.lo perror.lo printf.lo putc.lo putchar.lo \
-@USE_LIBTOOL_TRUE@putc_u.lo putchar_u.lo puts.lo refill.lo remove.lo \
-@USE_LIBTOOL_TRUE@rename.lo rewind.lo rget.lo scanf.lo sccl.lo \
-@USE_LIBTOOL_TRUE@setbuf.lo setbuffer.lo setlinebuf.lo setvbuf.lo \
-@USE_LIBTOOL_TRUE@siprintf.lo siscanf.lo sniprintf.lo snprintf.lo \
-@USE_LIBTOOL_TRUE@sprintf.lo sscanf.lo stdio.lo tmpfile.lo tmpnam.lo \
-@USE_LIBTOOL_TRUE@ungetc.lo vdprintf.lo viprintf.lo viscanf.lo \
-@USE_LIBTOOL_TRUE@vprintf.lo vscanf.lo vsiprintf.lo vsiscanf.lo \
-@USE_LIBTOOL_TRUE@vsnprintf.lo vsniprintf.lo vsprintf.lo vsscanf.lo \
-@USE_LIBTOOL_TRUE@wbuf.lo wsetup.lo
+@USE_LIBTOOL_TRUE@libstdio_la_OBJECTS =  clearerr.lo fclose.lo fdopen.lo \
+@USE_LIBTOOL_TRUE@feof.lo ferror.lo fflush.lo fgetc.lo fgetpos.lo \
+@USE_LIBTOOL_TRUE@fgets.lo fileno.lo findfp.lo fiprintf.lo flags.lo \
+@USE_LIBTOOL_TRUE@fopen.lo fprintf.lo fputc.lo fputs.lo fread.lo \
+@USE_LIBTOOL_TRUE@freopen.lo fscanf.lo fiscanf.lo fseek.lo fsetpos.lo \
+@USE_LIBTOOL_TRUE@ftell.lo fvwrite.lo fwalk.lo fwrite.lo getc.lo \
+@USE_LIBTOOL_TRUE@getchar.lo getc_u.lo getchar_u.lo getdelim.lo \
+@USE_LIBTOOL_TRUE@getline.lo gets.lo iprintf.lo iscanf.lo makebuf.lo \
+@USE_LIBTOOL_TRUE@perror.lo printf.lo putc.lo putchar.lo putc_u.lo \
+@USE_LIBTOOL_TRUE@putchar_u.lo puts.lo refill.lo remove.lo rename.lo \
+@USE_LIBTOOL_TRUE@rewind.lo rget.lo scanf.lo sccl.lo setbuf.lo \
+@USE_LIBTOOL_TRUE@setbuffer.lo setlinebuf.lo setvbuf.lo siprintf.lo \
+@USE_LIBTOOL_TRUE@siscanf.lo sniprintf.lo snprintf.lo sprintf.lo \
+@USE_LIBTOOL_TRUE@sscanf.lo stdio.lo tmpfile.lo tmpnam.lo ungetc.lo \
+@USE_LIBTOOL_TRUE@viprintf.lo viscanf.lo vprintf.lo vscanf.lo \
+@USE_LIBTOOL_TRUE@vsiprintf.lo vsiscanf.lo vsnprintf.lo vsniprintf.lo \
+@USE_LIBTOOL_TRUE@vsprintf.lo vsscanf.lo wbuf.lo wsetup.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
deleted file mode 100644
index 6ebf12e8d..000000000
--- a/newlib/libc/stdio/dprintf.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright 2005 Shaun Jackman
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-/*
-FUNCTION
-<<dprintf>>, <<vdprintf>>---print to a file descriptor
-
-INDEX
-	dprintf
-INDEX
-	vdprintf
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	#include <stdarg.h>
-	int dprintf(int <[fd]>, const char *<[format]>, ...);
-	int vdprintf(int <[fd]>, const char *<[format]>, va_list <[ap]>);
-	int _dprintf_r(struct _reent *<[ptr]>, int <[fd]>, 
-			const char *<[format]>, ...);
-	int _vdprintf_r(struct _reent *<[ptr]>, int <[fd]>, 
-			const char *<[format]>, va_list <[ap]>);
-
-TRAD_SYNOPSIS
-        #include <stdio.h>
-        #include <varargs.h>
-
-        int dprintf(<[fd]>, <[format]> [, <[arg]>, ...])
-	int <[fd]>;
-        char *<[format]>;
-
-        int vdprintf(<[fd]>, <[fmt]>, <[list]>)
-	int <[fd]>;
-        char *<[fmt]>;
-        va_list <[list]>;
-
-        int _dprintf_r(<[ptr]>, <[fd]>, <[format]> [, <[arg]>, ...])
-	struct _reent *<[ptr]>;
-	int <[fd]>;
-        char *<[format]>;
-
-        int _vdprintf_r(<[ptr]>, <[fd]>, <[fmt]>, <[list]>)
-	struct _reent *<[ptr]>;
-	int <[fd]>;
-        char *<[fmt]>;
-        va_list <[list]>;
-
-DESCRIPTION
-<<dprintf>> and <<vdprintf>> allow printing a format, similarly to
-<<printf>>, but write to a file descriptor instead of to a <<FILE>>
-stream.
-
-The functions <<_dprintf_r>> and <<_vdprintf_r>> are simply
-reentrant versions of the functions above.
-
-RETURNS
-The return value and errors are exactly as for <<write>>, except that
-<<errno>> may also be set to <<ENOMEM>> if the heap is exhausted.
-
-PORTABILITY
-This function is originally a GNU extension in glibc and is not portable.
-
-Supporting OS subroutines required: <<sbrk>>, <<write>>.
-*/
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <unistd.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#ifdef _HAVE_STDC
-int
-_dprintf_r(struct _reent *ptr, int fd, _CONST char *format, ...)
-#else
-int
-_dprintf_r(ptr, fd, format, va_alist)
-	struct _reent *ptr;
-	int fd;
-	char *format;
-	va_dcl
-#endif
-{
-	va_list ap;
-	int n;
-	_REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
-  	va_start (ap, format);
-#else
-  	va_start (ap);
-#endif
-	n = _vdprintf_r (ptr, fd, format, ap);
-	va_end (ap);
-	return n;
-}
-
-#ifndef _REENT_ONLY
-
-#ifdef _HAVE_STDC
-int
-dprintf(int fd, _CONST char *format, ...)
-#else
-int
-dprintf(fd, format, va_alist)
-	struct _reent *ptr;
-	int fd;
-	char *format;
-	va_dcl
-#endif
-{
-	va_list ap;
-	int n;
-	_REENT_SMALL_CHECK_INIT (_REENT);
-#ifdef _HAVE_STDC
-  	va_start (ap, format);
-#else
-  	va_start (ap);
-#endif
-	n = _vdprintf_r (_REENT, fd, format, ap);
-	va_end (ap);
-	return n;
-}
-
-#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c
index 05084dde0..b417e5424 100644
--- a/newlib/libc/stdio/fflush.c
+++ b/newlib/libc/stdio/fflush.c
@@ -72,18 +72,8 @@ _DEFUN(fflush, (fp),
   _flockfile (fp);
 
   t = fp->_flags;
-  if ((t & __SWR) == 0)
+  if ((t & __SWR) == 0 || (p = fp->_bf._base) == NULL)
     {
-      /* For a read stream, an fflush causes the next seek to be
-         unoptimized (i.e. forces a system-level seek).  This conforms
-         to the POSIX and SUSv3 standards.  */
-      fp->_flags |= __SNPT;
-      _funlockfile (fp);
-      return 0;
-    }
-  if ((p = fp->_bf._base) == NULL)
-    {
-      /* Nothing to flush.  */
       _funlockfile (fp);
       return 0;
     }
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index ae3444b1b..995100b27 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1990, 2006 The Regents of the University of California.
+ * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -55,12 +55,6 @@ it).
 
 <[file]> and <[mode]> are used just as in <<fopen>>.
 
-If <[file]> is <<NULL>>, the underlying stream is modified rather than
-closed.  The file cannot be given a more permissive access mode (for
-example, a <[mode]> of "w" will fail on a read-only file descriptor),
-but can change status such as append or binary mode.  If modification
-is not possible, failure occurs.
-
 RETURNS
 If successful, the result is the same as the argument <[fp]>.  If the
 file cannot be opened as specified, the result is <<NULL>>.
@@ -76,7 +70,6 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <reent.h>
 #include <time.h>
 #include <stdio.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/lock.h>
@@ -94,8 +87,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
        register FILE *fp)
 {
   register int f;
-  int flags, oflags;
-  int e = 0;
+  int flags, oflags, e;
 
   __sfp_lock_acquire ();
 
@@ -125,60 +117,17 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
     {
       if (fp->_flags & __SWR)
 	_CAST_VOID fflush (fp);
-      /*
-       * If close is NULL, closing is a no-op, hence pointless.
-       * If file is NULL, the file should not be closed.
-       */
-      if (fp->_close != NULL && file != NULL)
+      /* if close is NULL, closing is a no-op, hence pointless */
+      if (fp->_close != NULL)
 	_CAST_VOID (*fp->_close) (fp->_cookie);
     }
 
   /*
-   * Now get a new descriptor to refer to the new file, or reuse the
-   * existing file descriptor if file is NULL.
+   * Now get a new descriptor to refer to the new file.
    */
 
-  if (file != NULL)
-    {
-      f = _open_r (ptr, (char *) file, oflags, 0666);
-      e = ptr->_errno;
-    }
-  else
-    {
-#ifdef HAVE_FCNTL
-      int oldflags;
-      /*
-       * Reuse the file descriptor, but only if the new access mode is
-       * equal or less permissive than the old.  F_SETFL correctly
-       * ignores creation flags.
-       */
-      f = fp->_file;
-      if ((oldflags = _fcntl_r (ptr, f, F_GETFL, 0)) == -1
-          || ! ((oldflags & O_ACCMODE) == O_RDWR
-                || ((oldflags ^ oflags) & O_ACCMODE) == 0)
-          || _fcntl_r (ptr, f, F_SETFL, oflags) == -1)
-        f = -1;
-#else
-      /* We cannot modify without fcntl support.  */
-      f = -1;
-#endif
-
-#ifdef __SCLE
-      /*
-       * F_SETFL doesn't change textmode.  Don't mess with modes of ttys.
-       */
-      if (0 <= f && ! isatty (f)
-          && setmode (f, flags & (O_BINARY | O_TEXT)) == -1)
-        f = -1;
-#endif
-
-      if (f < 0)
-        {
-          e = EBADF;
-          if (fp->_close != NULL)
-            _CAST_VOID (*fp->_close) (fp->_cookie);
-        }
-    }
+  f = _open_r (ptr, (char *) file, oflags, 0666);
+  e = ptr->_errno;
 
   /*
    * Finish closing fp.  Even if the open succeeded above,
diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c
index 8b189ba17..2ad98551c 100644
--- a/newlib/libc/stdio/fseek.c
+++ b/newlib/libc/stdio/fseek.c
@@ -359,13 +359,6 @@ dumb:
   fp->_r = 0;
   /* fp->_w = 0; *//* unnecessary (I think...) */
   fp->_flags &= ~__SEOF;
-  /* Reset no-optimization flag after successful seek.  The
-     no-optimization flag may be set in the case of a read
-     stream that is flushed which by POSIX/SUSv3 standards,
-     means that a corresponding seek must not optimize.  The
-     optimization is then allowed if no subsequent flush
-     is performed.  */
-  fp->_flags &= ~__SNPT;
   _funlockfile (fp);
   return 0;
 }
diff --git a/newlib/libc/stdio/getdelim.c b/newlib/libc/stdio/getdelim.c
index 0fdfb3add..dad8feeb2 100644
--- a/newlib/libc/stdio/getdelim.c
+++ b/newlib/libc/stdio/getdelim.c
@@ -1,7 +1,7 @@
 /* Copyright 2002, Red Hat Inc. - all rights reserved */
 /*
 FUNCTION
-<<getdelim>>---read a line up to a specified line delimiter
+<<getdelim>>---read a line up to a specified line delimeter
 
 INDEX
 	getdelim
@@ -21,16 +21,16 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 <<getdelim>> reads a file <[fp]> up to and possibly including a specified
-delimiter <[delim]>.  The line is read into a buffer pointed to
+delimeter <[delim]>.  The line is read into a buffer pointed to
 by <[bufptr]> and designated with size *<[n]>.  If the buffer is
 not large enough, it will be dynamically grown by <<getdelim>>.
 As the buffer is grown, the pointer to the size <[n]> will be
 updated.
 
 RETURNS
-<<getdelim>> returns <<-1>> if no characters were successfully read;
+<<getdelim>> returns <<-1>> if no characters were successfully read,
 otherwise, it returns the number of bytes successfully read.
-At end of file, the result is nonzero.
+at end of file, the result is nonzero.
 
 PORTABILITY
 <<getdelim>> is a glibc extension.
diff --git a/newlib/libc/stdio/getw.c b/newlib/libc/stdio/getw.c
index 210c5939a..b5065bd53 100644
--- a/newlib/libc/stdio/getw.c
+++ b/newlib/libc/stdio/getw.c
@@ -37,15 +37,14 @@ to get the next word from the file or stream identified by <[fp]>.  As
 a side effect, <<getw>> advances the file's current position
 indicator.
 
-RETURNS
-The next word (read as an <<int>>), unless there is no more
-data or the host system reports a read error; in either of these
+RETURNS The next word (read as an <<int>>), unless there is no more
+data, or the host system reports a read error; in either of these
 situations, <<getw>> returns <<EOF>>.  Since <<EOF>> is a valid
 <<int>>, you must use <<ferror>> or <<feof>> to distinguish these
 situations.
 
 PORTABILITY
-<<getw>> is a remnant of K&R C; it is not part of any ISO C Standard.
+<<getw>> is a remnant of K&R C, it is not part of any ISO C Standard.
 <<fread>> should be used instead.  In fact, this implementation of
 <<getw>> is based upon <<fread>>.
 
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index 682015c0a..78406eeb4 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -37,11 +37,10 @@ DESCRIPTION
 to write a word to the file or stream identified by <[fp]>.  As a side
 effect, <<putw>> advances the file's current position indicator.
 
-RETURNS
-Zero on success, <<EOF>> on failure.
+RETURNS Zero on success, <<EOF>> on failure.
 
 PORTABILITY
-<<putw>> is a remnant of K&R C; it is not part of any ISO C Standard.
+<<putw>> is a remnant of K&R C, it is not part of any ISO C Standard.
 <<fwrite>> should be used instead.  In fact, this implementation of
 <<putw>> is based upon <<fwrite>>.
 
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index 4e8e95aaa..18ba489b7 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -37,8 +37,7 @@ ANSI_SYNOPSIS
         int fiprintf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
         int siprintf(char *<[str]>, const char *<[format]> [, <[arg]>, ...]);
         int asiprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]);
-        int sniprintf(char *<[str]>, size_t <[size]>, const char *<[format]>
-                      [, <[arg]>, ...]);
+        int sniprintf(char *<[str]>, size_t <[size]>, const char *<[format]> [, <[arg]>, ...]);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index 694750dae..b87a5ea49 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -34,12 +34,10 @@ ANSI_SYNOPSIS
         int siscanf(const char *<[str]>, const char *<[format]> 
                    [, <[arg]>, ...]);
 
-        int _iscanf_r(struct _reent *<[ptr]>, const char *<[format]>
+        int _iscanf_r(struct _reent *<[ptr]>, const char *<[format]> [, <[arg]>, ...]);
+        int _fiscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
+        int _siscanf_r(struct _reent *<[ptr]>, const char *<[str]>, const char *<[format]> 
                    [, <[arg]>, ...]);
-        int _fiscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, const char *<[format]>
-                   [, <[arg]>, ...]);
-        int _siscanf_r(struct _reent *<[ptr]>, const char *<[str]>,
-                   const char *<[format]> [, <[arg]>, ...]);
 
 
 TRAD_SYNOPSIS
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 346749a68..8ee530730 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -37,8 +37,7 @@ ANSI_SYNOPSIS
         int fprintf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
         int sprintf(char *<[str]>, const char *<[format]> [, <[arg]>, ...]);
         int asprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]);
-        int snprintf(char *<[str]>, size_t <[size]>, const char *<[format]>
-                     [, <[arg]>, ...]);
+        int snprintf(char *<[str]>, size_t <[size]>, const char *<[format]> [, <[arg]>, ...]);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index 5ad39d8b7..687f53edf 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -34,12 +34,10 @@ ANSI_SYNOPSIS
         int sscanf(const char *<[str]>, const char *<[format]> 
                    [, <[arg]>, ...]);
 
-        int _scanf_r(struct _reent *<[ptr]>, const char *<[format]>
-                     [, <[arg]>, ...]);
-        int _fscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, const char *<[format]>
-                      [, <[arg]>, ...]);
-        int _sscanf_r(struct _reent *<[ptr]>, const char *<[str]>,
-                      const char *<[format]> [, <[arg]>, ...]);
+        int _scanf_r(struct _reent *<[ptr]>, const char *<[format]> [, <[arg]>, ...]);
+        int _fscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
+        int _sscanf_r(struct _reent *<[ptr]>, const char *<[str]>, const char *<[format]> 
+                   [, <[arg]>, ...]);
 
 
 TRAD_SYNOPSIS
diff --git a/newlib/libc/stdio/stdio.tex b/newlib/libc/stdio/stdio.tex
index 9c2ca0f5d..67be50374 100644
--- a/newlib/libc/stdio/stdio.tex
+++ b/newlib/libc/stdio/stdio.tex
@@ -25,7 +25,6 @@ structure.
  
 @menu  
 * clearerr::    Clear file or stream error indicator
-* dprintf::     Print to a file descriptor
 * fclose::      Close a file
 * fcloseall::   Close all files
 * feof::        Test for end of file
@@ -84,9 +83,6 @@ structure.
 @include stdio/clearerr.def
 
 @page
-@include stdio/dprintf.def
-
-@page
 @include stdio/fclose.def
 
 @page
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
deleted file mode 100644
index acd193a13..000000000
--- a/newlib/libc/stdio/vdprintf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2005 Shaun Jackman
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-int
-_DEFUN (_vdprintf_r, (ptr, fd, format, ap),
-	struct _reent *ptr _AND
-	int fd _AND
-	_CONST char *format _AND
-	va_list ap)
-{
-	char *p;
-	int n;
-	_REENT_SMALL_CHECK_INIT (ptr);
-	n = _vasprintf_r (ptr, &p, format, ap);
-	if (n == -1) return -1;
-	n = _write_r (ptr, fd, p, n);
-	_free_r (ptr, p);
-	return n;
-}
-
-#ifndef _REENT_ONLY
-
-int 
-_DEFUN (vdprintf, (fd, format, ap),
-	int fd _AND
-	_CONST char *format _AND
-	va_list ap)
-{
-	_REENT_SMALL_CHECK_INIT (_REENT);
-	return _vdprintf_r (_REENT, fd, format, ap);
-}
-
-#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index a8c1f9bca..c10fed8e9 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -54,19 +54,18 @@ ANSI_SYNOPSIS
 	int vfprintf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
 	int vsprintf(char *<[str]>, const char *<[fmt]>, va_list <[list]>);
 	int vasprintf(char **<[strp]>, const char *<[fmt]>, va_list <[list]>);
-	int vsnprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>,
-                      va_list <[list]>);
+	int vsnprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>, va_list <[list]>);
 
 	int _vprintf_r(struct _reent *<[reent]>, const char *<[fmt]>,
                         va_list <[list]>);
 	int _vfprintf_r(struct _reent *<[reent]>, FILE *<[fp]>, const char *<[fmt]>,
                         va_list <[list]>);
-	int _vasprintf_r(struct _reent *<[reent]>, char **<[str]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vsprintf_r(struct _reent *<[reent]>, char *<[str]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vsnprintf_r(struct _reent *<[reent]>, char *<[str]>, size_t <[size]>,
-                         const char *<[fmt]>, va_list <[list]>);
+	int _vasprintf_r(struct _reent *<[reent]>, char **<[str]>, const char *<[fmt]>,
+                        va_list <[list]>);
+	int _vsprintf_r(struct _reent *<[reent]>, char *<[str]>, const char *<[fmt]>,
+                        va_list <[list]>);
+	int _vsnprintf_r(struct _reent *<[reent]>, char *<[str]>, size_t <[size]>, const char *<[fmt]>,
+                        va_list <[list]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -801,7 +800,6 @@ reswitch:	switch (ch) {
 		case 'e':
 		case 'E':
 		case 'f':
-		case 'F':
 		case 'g':
 		case 'G':
 			if (prec == -1) {
@@ -821,18 +819,12 @@ reswitch:	switch (ch) {
 			if (isinf (_fpvalue)) {
 				if (_fpvalue < 0)
 					sign = '-';
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					cp = "INF";
-				else
-					cp = "inf";
+				cp = "Inf";
 				size = 3;
 				break;
 			}
 			if (isnan (_fpvalue)) {
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					cp = "NAN";
-				else
-					cp = "nan";
+				cp = "NaN";
 				size = 3;
 				break;
 			}
@@ -850,18 +842,12 @@ reswitch:	switch (ch) {
 			if (tmp == 2) {
 				if (_fpvalue < 0)
 					sign = '-';
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					cp = "INF";
-				else
-					cp = "inf";
+				cp = "Inf";
 				size = 3;
 				break;
 			}
 			if (tmp == 1) {
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					cp = "NAN";
-				else
-					cp = "nan";
+				cp = "NaN";
 				size = 3;
 				break;
 			}
@@ -1274,11 +1260,7 @@ _DEFUN(cvt, (data, value, ndigits, flags, sign, decpt, ch, length),
 #ifdef _NO_LONGDBL
         union double_union tmp;
 #else
-	union
-	{
-	  struct ldieee ieee;
-	  _LONG_DOUBLE val;
-	} ld;
+        struct ldieee *ldptr;
 #endif
 
 	if (ch == 'f') {
@@ -1305,8 +1287,8 @@ _DEFUN(cvt, (data, value, ndigits, flags, sign, decpt, ch, length),
 
 	digits = _dtoa_r (data, value, mode, ndigits, decpt, &dsgn, &rve);
 #else /* !_NO_LONGDBL */
-	ld.val = value;
-	if (ld.ieee.sign) { /* this will check for < 0 and -0.0 */
+	ldptr = (struct ldieee *)&value;
+	if (ldptr->sign) { /* this will check for < 0 and -0.0 */
 		value = -value;
 		*sign = '-';
         } else
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 4788938c9..621ea23aa 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -37,8 +37,8 @@ ANSI_SYNOPSIS
                        va_list <[list]>);
 	int _vfscanf_r(struct _reent *<[reent]>, FILE *<[fp]>, const char *<[fmt]>, 
                        va_list <[list]>);
-	int _vsscanf_r(struct _reent *<[reent]>, const char *<[str]>,
-                       const char *<[fmt]>, va_list <[list]>);
+	int _vsscanf_r(struct _reent *<[reent]>, const char *<[str]>, const char *<[fmt]>, 
+                       va_list <[list]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -1050,8 +1050,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		case 'n':
 		case 'N':
 	          if (nancount == 0
-		      && (flags & (SIGNOK | NDIGITS | DPTOK | EXPOK)) ==
-		      	          (SIGNOK | NDIGITS | DPTOK | EXPOK))
+		      && (flags & (SIGNOK | NDIGITS | DPTOK | EXPOK)))
 		    {
 		      flags &= ~(SIGNOK | DPTOK | EXPOK | NDIGITS);
 		      nancount = 1;
@@ -1112,24 +1111,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	    }
 	  if (zeroes)
 	    flags &= ~NDIGITS;
-          /* We may have a 'N' or possibly even a 'Na' as the start of 'NaN', 
-	     only to run out of chars before it was complete (or having 
-	     encountered a non- matching char).  So check here if we have an 
-	     outstanding nancount, and if so put back the chars we did 
-	     swallow and treat as a failed match. */
-          if (nancount && nancount != 3)
-            {
-              /* Ok... what are we supposed to do in the event that the
-              __srefill call above was triggered in the middle of the partial
-              'NaN' and so we can't put it all back? */
-              while (nancount-- && (p > buf))
-                {
-                  ungetc (*(u_char *)--p, fp);
-                  --nread;
-                }
-              goto match_failure;
-            }
-          /*
+	  /*
 	   * If no digits, might be missing exponent digits
 	   * (just give back the exponent) or might be missing
 	   * regular digits, but had sign and/or decimal point.
@@ -1141,7 +1123,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		  /* no digits at all */
 		  while (p > buf)
                     {
-		      ungetc (*(u_char *)--p, fp);
+		      ungetc (*(u_char *)-- p, fp);
                       --nread;
                     }
 		  goto match_failure;
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index cea96d3db..e70fa13f1 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -35,19 +35,18 @@ ANSI_SYNOPSIS
 	int vfiprintf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
 	int vsiprintf(char *<[str]>, const char *<[fmt]>, va_list <[list]>);
 	int vasiprintf(char **<[strp]>, const char *<[fmt]>, va_list <[list]>);
-	int vsniprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>,
-                       va_list <[list]>);
+	int vsniprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>, va_list <[list]>);
 
 	int _viprintf_r(struct _reent *<[reent]>, const char *<[fmt]>,
                         va_list <[list]>);
-	int _vfiprintf_r(struct _reent *<[reent]>, FILE *<[fp]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vasiprintf_r(struct _reent *<[reent]>, char **<[str]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vsiprintf_r(struct _reent *<[reent]>, char *<[str]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vsniprintf_r(struct _reent *<[reent]>, char *<[str]>, size_t <[size]>,
-                        const char *<[fmt]>, va_list <[list]>);
+	int _vfiprintf_r(struct _reent *<[reent]>, FILE *<[fp]>, const char *<[fmt]>,
+                        va_list <[list]>);
+	int _vasiprintf_r(struct _reent *<[reent]>, char **<[str]>, const char *<[fmt]>,
+                        va_list <[list]>);
+	int _vsiprintf_r(struct _reent *<[reent]>, char *<[str]>, const char *<[fmt]>,
+                        va_list <[list]>);
+	int _vsniprintf_r(struct _reent *<[reent]>, char *<[str]>, size_t <[size]>, const char *<[fmt]>,
+                        va_list <[list]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index f335f69ff..e5287acac 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -39,8 +39,8 @@ ANSI_SYNOPSIS
                        va_list <[list]>);
 	int _vfiscanf_r(struct _reent *<[reent]>, FILE *<[fp]>, const char *<[fmt]>, 
                        va_list <[list]>);
-	int _vsiscanf_r(struct _reent *<[reent]>, const char *<[str]>,
-                       const char *<[fmt]>, va_list <[list]>);
+	int _vsiscanf_r(struct _reent *<[reent]>, const char *<[str]>, const char *<[fmt]>, 
+                       va_list <[list]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
diff --git a/newlib/libc/stdio/wsetup.c b/newlib/libc/stdio/wsetup.c
index cf56c2abc..bc7299678 100644
--- a/newlib/libc/stdio/wsetup.c
+++ b/newlib/libc/stdio/wsetup.c
@@ -58,11 +58,9 @@ _DEFUN(__swsetup, (fp),
 
   /*
    * Make a buffer if necessary, then set _w.
-   * A string I/O file should not explicitly allocate a buffer
-   * unless asprintf is being used.
    */
-  if (fp->_bf._base == NULL 
-        && (!(fp->_flags & __SSTR) || (fp->_flags & __SMBF)))
+  /* NOT NEEDED FOR CYGNUS SPRINTF ONLY jpg */
+  if (fp->_bf._base == NULL)
     __smakebuf (fp);
 
   if (fp->_flags & __SLBF)
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
index 6081e03dc..b8b7974e5 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1990, 2006 The Regents of the University of California.
+ * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -55,12 +55,6 @@ it).
 
 <[file]> and <[mode]> are used just as in <<fopen>>.
 
-If <[file]> is <<NULL>>, the underlying stream is modified rather than
-closed.  The file cannot be given a more permissive access mode (for
-example, a <[mode]> of "w" will fail on a read-only file descriptor),
-but can change status such as append or binary mode.  If modification
-is not possible, failure occurs.
-
 RETURNS
 If successful, the result is the same as the argument <[fp]>.  If the
 file cannot be opened as specified, the result is <<NULL>>.
@@ -74,7 +68,6 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 #include <time.h>
 #include <stdio.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/lock.h>
@@ -94,8 +87,7 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
 	register FILE *fp)
 {
   register int f;
-  int flags, oflags;
-  int e = 0;
+  int flags, oflags, e;
 
   __sfp_lock_acquire ();
 
@@ -125,60 +117,17 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
     {
       if (fp->_flags & __SWR)
 	(void) fflush (fp);
-      /*
-       * If close is NULL, closing is a no-op, hence pointless.
-       * If file is NULL, the file should not be closed.
-       */
-      if (fp->_close != NULL && file != NULL)
+      /* if close is NULL, closing is a no-op, hence pointless */
+      if (fp->_close != NULL)
 	(void) (*fp->_close) (fp->_cookie);
     }
 
   /*
-   * Now get a new descriptor to refer to the new file, or reuse the
-   * existing file descriptor if file is NULL.
+   * Now get a new descriptor to refer to the new file.
    */
 
-  if (file != NULL)
-    {
-      f = _open64_r (ptr, (char *) file, oflags, 0666);
-      e = ptr->_errno;
-    }
-  else
-    {
-#ifdef HAVE_FCNTL
-      int oldflags;
-      /*
-       * Reuse the file descriptor, but only if the new access mode is
-       * equal or less permissive than the old.  F_SETFL correctly
-       * ignores creation flags.
-       */
-      f = fp->_file;
-      if ((oldflags = _fcntl_r (ptr, f, F_GETFL, 0)) == -1
-          || ! ((oldflags & O_ACCMODE) == O_RDWR
-                || ((oldflags ^ oflags) & O_ACCMODE) == 0)
-          || _fcntl_r (ptr, f, F_SETFL, oflags) == -1)
-        f = -1;
-#else
-      /* We cannot modify without fcntl support.  */
-      f = -1;
-#endif
-
-#ifdef __SCLE
-      /*
-       * F_SETFL doesn't change textmode.  Don't mess with modes of ttys.
-       */
-      if (0 <= f && ! isatty (f)
-          && setmode (f, flags & (O_BINARY | O_TEXT)) == -1)
-        f = -1;
-#endif
-
-      if (f < 0)
-        {
-          e = EBADF;
-          if (fp->_close != NULL)
-            (void) (*fp->_close) (fp->_cookie);
-        }
-    }
+  f = _open64_r (ptr, (char *) file, oflags, 0666);
+  e = ptr->_errno;
 
   /*
    * Finish closing fp.  Even if the open succeeded above,
diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c
index 49eebb37e..04f494738 100644
--- a/newlib/libc/stdlib/__atexit.c
+++ b/newlib/libc/stdlib/__atexit.c
@@ -35,9 +35,6 @@ _DEFUN (__register_exitproc,
     _GLOBAL_REENT->_atexit = p = &_GLOBAL_REENT->_atexit0;
   if (p->_ind >= _ATEXIT_SIZE)
     {
-#ifndef _ATEXIT_DYNAMIC_ALLOC
-      return -1;
-#else
       p = (struct _atexit *) malloc (sizeof *p);
       if (p == NULL)
 	{
@@ -53,7 +50,6 @@ _DEFUN (__register_exitproc,
       p->_on_exit_args._fntypes = 0;
       p->_on_exit_args._is_cxa = 0;
 #endif
-#endif
     }
 
   if (type != __et_atexit)
diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c
index 6fa398ae2..cea569ff4 100644
--- a/newlib/libc/stdlib/__call_atexit.c
+++ b/newlib/libc/stdlib/__call_atexit.c
@@ -61,9 +61,6 @@ _DEFUN (__call_exitprocs, (code, d),
 	    (*((void (*)(_PTR)) fn))(args->_fnargs[n]);
 	}
 
-#ifndef _ATEXIT_DYNAMIC_ALLOC
-      break;
-#else
       /* Move to the next block.  Free empty blocks except the last one,
 	 which is part of _GLOBAL_REENT.  */
       if (p->_ind == 0 && p->_next)
@@ -82,6 +79,5 @@ _DEFUN (__call_exitprocs, (code, d),
 	  lastp = &p->_next;
 	  p = p->_next;
 	}
-#endif
     }
 }
diff --git a/newlib/libc/stdlib/a64l.c b/newlib/libc/stdlib/a64l.c
index 42fc2d2fa..93c8e834b 100644
--- a/newlib/libc/stdlib/a64l.c
+++ b/newlib/libc/stdlib/a64l.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-<<a64l>>, <<l64a>>---convert between radix-64 ASCII string and long
+<<a64l>>,<<l64a>>---convert between radix-64 ascii string and long
 
 INDEX
         a64l
@@ -21,36 +21,31 @@ TRAD_SYNOPSIS
         long <[input]>;
 
 DESCRIPTION
-Conversion is performed between long and radix-64 characters.  The
-<<l64a>> routine transforms up to 32 bits of input value starting from
-least significant bits to the most significant bits.  The input value
-is split up into a maximum of 5 groups of 6 bits and possibly one
-group of 2 bits (bits 31 and 30).
-
-Each group of 6 bits forms a value from 0--63 which is translated into
-a character as follows:
-
-O+
-o     0 = '.'
-o     1 = '/'
-o     2--11 = '0' to '9'
-o     12--37 = 'A' to 'Z'
-o     38--63 = 'a' to 'z'
-O-
-
-When the remaining bits are zero or all bits have been translated, a
-null terminator is appended to the string.  An input value of 0
-results in the empty string.
-
-The <<a64l>> function performs the reverse translation.  Each
-character is used to generate a 6-bit value for up to 30 bits and then
-a 2-bit value to complete a 32-bit result.  The null terminator means
-that the remaining digits are 0.  An empty input string or NULL string
-results in 0L.  An invalid string results in undefined behavior.  If
-the size of a long is greater than 32 bits, the result is sign-extended.
-
+Conversion is performed between long and radix-64 characters.  The <<l64a>> routine
+transforms up to 32-bits of input value starting from least significant bits to
+the most significant bits.  The input value is split up into a maximum of 5
+groups of 6-bits and possibly one group of 2 bits (bits 31 and 30).
+
+Each group of 6 bits forms a value from 0-63 which is translated into a character
+as follows:
+
+      0 = '.'
+      1 = '/'
+      2-11 = '0' to '9'
+      12-37 = 'A' to 'Z'
+      38-63 = 'a' to 'z'
+
+When remaining bits are zero or all bits have been translated, a nul terminator
+is appended to the string.  An input value of 0 results in the empty string.
+
+The <<a64l>> performs the reverse translation.  Each character is used to generate
+a 6-bit value for up to 30 bits and then a 2-bit value to complete a 32-bit result.
+The nul terminator means that the remaining digits are 0.  An empty input string or 
+NULL string results in 0L.  An invalid string results in undefined behavior.
+If the size of a long is > 32 bits, the result is sign-extended.
+ 
 RETURNS
-<<l64a>> returns a null-terminated string of 0 to 6 characters.
+<<l64a>> returns a nul-terminated string of 0 to 6 characters.
 <<a64l>> returns the 32-bit translated value from the input character string.
 
 PORTABILITY
diff --git a/newlib/libc/stdlib/assert.c b/newlib/libc/stdlib/assert.c
index c9887da5c..5b08bbaf4 100644
--- a/newlib/libc/stdlib/assert.c
+++ b/newlib/libc/stdlib/assert.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-<<assert>>---macro for debugging diagnostics
+<<assert>>---Macro for Debugging Diagnostics
 
 INDEX
 	assert
diff --git a/newlib/libc/stdlib/efgcvt.c b/newlib/libc/stdlib/efgcvt.c
index 9aa3b2fe7..556d22414 100644
--- a/newlib/libc/stdlib/efgcvt.c
+++ b/newlib/libc/stdlib/efgcvt.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-<<ecvt>>, <<ecvtf>>, <<fcvt>>, <<fcvtf>>---double or float to string
+<<ecvt>>,<<ecvtf>>,<<fcvt>>,<<fcvtf>>---double or float to string
 
 INDEX
 	ecvt
diff --git a/newlib/libc/stdlib/envlock.c b/newlib/libc/stdlib/envlock.c
index 74c85a8f5..24d0083be 100644
--- a/newlib/libc/stdlib/envlock.c
+++ b/newlib/libc/stdlib/envlock.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-<<__env_lock>>, <<__env_unlock>>---lock environ variable
+<<__env_lock>>, <<__env_unlock>>--lock environ variable
 
 INDEX
 	__env_lock
diff --git a/newlib/libc/stdlib/getopt.c b/newlib/libc/stdlib/getopt.c
index 10002ed6b..b38938d5f 100644
--- a/newlib/libc/stdlib/getopt.c
+++ b/newlib/libc/stdlib/getopt.c
@@ -1,406 +1,117 @@
-/****************************************************************************
+/*
+ * Copyright (c) 1987, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+/* static char sccsid[] = "from: @(#)getopt.c	8.2 (Berkeley) 4/2/94"; */
+static char *rcsid = "$Id$";
+#endif /* LIBC_SCCS and not lint */
 
-getopt.c - Read command line options
-
-AUTHOR: Gregory Pietsch
-CREATED Fri Jan 10 21:13:05 1997
-
-DESCRIPTION:
-
-The getopt() function parses the command line arguments.  Its arguments argc
-and argv are the argument count and array as passed to the main() function
-on program invocation.  The argument optstring is a list of available option
-characters.  If such a character is followed by a colon (`:'), the option
-takes an argument, which is placed in optarg.  If such a character is
-followed by two colons, the option takes an optional argument, which is
-placed in optarg.  If the option does not take an argument, optarg is NULL.
-
-The external variable optind is the index of the next array element of argv
-to be processed; it communicates from one call to the next which element to
-process.
-
-The getopt_long() function works like getopt() except that it also accepts
-long options started by two dashes `--'.  If these take values, it is either
-in the form
-
---arg=value
-
- or
-
---arg value
-
-It takes the additional arguments longopts which is a pointer to the first
-element of an array of type struct option.  The last element of the array
-has to be filled with NULL for the name field.
-
-The longind pointer points to the index of the current long option relative
-to longopts if it is non-NULL.
-
-The getopt() function returns the option character if the option was found
-successfully, `:' if there was a missing parameter for one of the options,
-`?' for an unknown option character, and EOF for the end of the option list.
-
-The getopt_long() function's return value is described in the header file.
-
-The function getopt_long_only() is identical to getopt_long(), except that a
-plus sign `+' can introduce long options as well as `--'.
-
-The following describes how to deal with options that follow non-option
-argv-elements.
-
-If the caller did not specify anything, the default is REQUIRE_ORDER if the
-environment variable POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-REQUIRE_ORDER means don't recognize them as options; stop option processing
-when the first non-option is seen.  This is what Unix does.  This mode of
-operation is selected by either setting the environment variable
-POSIXLY_CORRECT, or using `+' as the first character of the optstring
-parameter.
-
-PERMUTE is the default.  We permute the contents of ARGV as we scan, so that
-eventually all the non-options are at the end.  This allows options to be
-given in any order, even with programs that were not written to expect this.
-
-RETURN_IN_ORDER is an option available to programs that were written to
-expect options and other argv-elements in any order and that care about the
-ordering of the two.  We describe each non-option argv-element as if it were
-the argument of an option with character code 1.  Using `-' as the first
-character of the optstring parameter selects this mode of operation.
-
-The special argument `--' forces an end of option-scanning regardless of the
-value of ordering.  In the case of RETURN_IN_ORDER, only `--' can cause
-getopt() and friends to return EOF with optind != argc.
-
-COPYRIGHT NOTICE AND DISCLAIMER:
-
-Copyright (C) 1997 Gregory Pietsch
-
-This file and the accompanying getopt.h header file are hereby placed in the 
-public domain without restrictions.  Just give the author credit, don't
-claim you wrote it or prevent anyone else from using it.
-
-Gregory Pietsch's current e-mail address:
-gpietsch@comcast.net
-****************************************************************************/
-
-/* include files */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <getopt.h>
 
-/* macros */
+int	opterr = 1,		/* if error message should be printed */
+	optind = 1,		/* index into parent argv vector */
+	optopt,			/* character checked for validity */
+	optreset;		/* reset getopt */
+char	*optarg;		/* argument associated with option */
 
-/* types */
-typedef enum GETOPT_ORDERING_T
-{
-  PERMUTE,
-  RETURN_IN_ORDER,
-  REQUIRE_ORDER
-} GETOPT_ORDERING_T;
-
-/* globally-defined variables */
-char *optarg = NULL;
-int optind = 0;
-int opterr = 1;
-int optopt = '?';
-
-/* functions */
-
-/* reverse_argv_elements:  reverses num elements starting at argv */
-static void
-reverse_argv_elements (char ** argv, int num)
-{
-  int i;
-  char *tmp;
-
-  for (i = 0; i < (num >> 1); i++)
-    {
-      tmp = argv[i];
-      argv[i] = argv[num - i - 1];
-      argv[num - i - 1] = tmp;
-    }
-}
-
-/* permute: swap two blocks of argv-elements given their lengths */
-static void
-permute (char *const argv[], int len1, int len2)
-{
-  reverse_argv_elements ((char **)argv, len1);
-  reverse_argv_elements ((char **)argv, len1 + len2);
-  reverse_argv_elements ((char **)argv, len2);
-}
-
-/* is_option: is this argv-element an option or the end of the option list? */
-static int
-is_option (char *argv_element, int only)
-{
-  return ((argv_element == NULL)
-          || (argv_element[0] == '-') || (only && argv_element[0] == '+'));
-}
-
-/* getopt_internal:  the function that does all the dirty work */
-static int
-getopt_internal (int argc, char *const argv[], const char *shortopts,
-                 const struct option *longopts, int *longind, int only)
-{
-  GETOPT_ORDERING_T ordering = PERMUTE;
-  static size_t optwhere = 0;
-  size_t permute_from = 0;
-  int num_nonopts = 0;
-  int optindex = 0;
-  size_t match_chars = 0;
-  char *possible_arg = NULL;
-  int longopt_match = -1;
-  int has_arg = -1;
-  char *cp;
-  int arg_next = 0;
-
-  /* first, deal with silly parameters and easy stuff */
-  if (argc == 0 || argv == NULL || (shortopts == NULL && longopts == NULL))
-    return EOF;
-  if (optind >= argc || argv[optind] == NULL)
-    return EOF;
-  if (strcmp (argv[optind], "--") == 0)
-    {
-      optind++;
-      return EOF;
-    }
-  /* if this is our first time through */
-  if (optind == 0)
-    optind = optwhere = 1;
-
-  /* define ordering */
-  if (shortopts != NULL && (*shortopts == '-' || *shortopts == '+'))
-    {
-      ordering = (*shortopts == '-') ? RETURN_IN_ORDER : REQUIRE_ORDER;
-      shortopts++;
-    }
-  else
-    ordering = (getenv ("POSIXLY_CORRECT") != NULL) ? REQUIRE_ORDER : PERMUTE;
-
-  /*
-   * based on ordering, find our next option, if we're at the beginning of
-   * one
-   */
-  if (optwhere == 1)
-    {
-      switch (ordering)
-        {
-        case PERMUTE:
-          permute_from = optind;
-          num_nonopts = 0;
-          while (!is_option (argv[optind], only))
-            {
-              optind++;
-              num_nonopts++;
-            }
-          if (argv[optind] == NULL)
-            {
-              /* no more options */
-              optind = permute_from;
-              return EOF;
-            }
-          else if (strcmp (argv[optind], "--") == 0)
-            {
-              /* no more options, but have to get `--' out of the way */
-              permute (argv + permute_from, num_nonopts, 1);
-              optind = permute_from + 1;
-              return EOF;
-            }
-          break;
-        case RETURN_IN_ORDER:
-          if (!is_option (argv[optind], only))
-            {
-              optarg = argv[optind++];
-              return (optopt = 1);
-            }
-          break;
-        case REQUIRE_ORDER:
-          if (!is_option (argv[optind], only))
-            return EOF;
-          break;
-        }
-    }
-  /* we've got an option, so parse it */
-
-  /* first, is it a long option? */
-  if (longopts != NULL
-      && (memcmp (argv[optind], "--", 2) == 0
-          || (only && argv[optind][0] == '+')) && optwhere == 1)
-    {
-      /* handle long options */
-      if (memcmp (argv[optind], "--", 2) == 0)
-        optwhere = 2;
-      longopt_match = -1;
-      possible_arg = strchr (argv[optind] + optwhere, '=');
-      if (possible_arg == NULL)
-        {
-          /* no =, so next argv might be arg */
-          match_chars = strlen (argv[optind]);
-          possible_arg = argv[optind] + match_chars;
-          match_chars = match_chars - optwhere;
-        }
-      else
-        match_chars = (possible_arg - argv[optind]) - optwhere;
-      for (optindex = 0; longopts[optindex].name != NULL; optindex++)
-        {
-          if (memcmp (argv[optind] + optwhere,
-                      longopts[optindex].name, match_chars) == 0)
-            {
-              /* do we have an exact match? */
-              if (match_chars == (int) (strlen (longopts[optindex].name)))
-                {
-                  longopt_match = optindex;
-                  break;
-                }
-              /* do any characters match? */
-              else
-                {
-                  if (longopt_match < 0)
-                    longopt_match = optindex;
-                  else
-                    {
-                      /* we have ambiguous options */
-                      if (opterr)
-                        fprintf (stderr, "%s: option `%s' is ambiguous "
-                                 "(could be `--%s' or `--%s')\n",
-                                 argv[0],
-                                 argv[optind],
-                                 longopts[longopt_match].name,
-                                 longopts[optindex].name);
-                      return (optopt = '?');
-                    }
-                }
-            }
-        }
-      if (longopt_match >= 0)
-        has_arg = longopts[longopt_match].has_arg;
-    }
-  /* if we didn't find a long option, is it a short option? */
-  if (longopt_match < 0 && shortopts != NULL)
-    {
-      cp = strchr (shortopts, argv[optind][optwhere]);
-      if (cp == NULL)
-        {
-          /* couldn't find option in shortopts */
-          if (opterr)
-            fprintf (stderr,
-                     "%s: invalid option -- `-%c'\n",
-                     argv[0], argv[optind][optwhere]);
-          optwhere++;
-          if (argv[optind][optwhere] == '\0')
-            {
-              optind++;
-              optwhere = 1;
-            }
-          return (optopt = '?');
-        }
-      has_arg = ((cp[1] == ':')
-                 ? ((cp[2] == ':') ? OPTIONAL_ARG : REQUIRED_ARG) : NO_ARG);
-      possible_arg = argv[optind] + optwhere + 1;
-      optopt = *cp;
-    }
-  /* get argument and reset optwhere */
-  arg_next = 0;
-  switch (has_arg)
-    {
-    case OPTIONAL_ARG:
-      if (*possible_arg == '=')
-        possible_arg++;
-      if (*possible_arg != '\0')
-        {
-          optarg = possible_arg;
-          optwhere = 1;
-        }
-      else
-        optarg = NULL;
-      break;
-    case REQUIRED_ARG:
-      if (*possible_arg == '=')
-        possible_arg++;
-      if (*possible_arg != '\0')
-        {
-          optarg = possible_arg;
-          optwhere = 1;
-        }
-      else if (optind + 1 >= argc)
-        {
-          if (opterr)
-            {
-              fprintf (stderr, "%s: argument required for option `", argv[0]);
-              if (longopt_match >= 0)
-                fprintf (stderr, "--%s'\n", longopts[longopt_match].name);
-              else
-                fprintf (stderr, "-%c'\n", *cp);
-            }
-          optind++;
-          return (optopt = ':');
-        }
-      else
-        {
-          optarg = argv[optind + 1];
-          arg_next = 1;
-          optwhere = 1;
-        }
-      break;
-    case NO_ARG:
-      if (longopt_match < 0)
-        {
-          optwhere++;
-          if (argv[optind][optwhere] == '\0')
-            optwhere = 1;
-        }
-      else
-        optwhere = 1;
-      optarg = NULL;
-      break;
-    }
-
-  /* do we have to permute or otherwise modify optind? */
-  if (ordering == PERMUTE && optwhere == 1 && num_nonopts != 0)
-    {
-      permute (argv + permute_from, num_nonopts, 1 + arg_next);
-      optind = permute_from + 1 + arg_next;
-    }
-  else if (optwhere == 1)
-    optind = optind + 1 + arg_next;
-
-  /* finally return */
-  if (longopt_match >= 0)
-    {
-      if (longind != NULL)
-        *longind = longopt_match;
-      if (longopts[longopt_match].flag != NULL)
-        {
-          *(longopts[longopt_match].flag) = longopts[longopt_match].val;
-          return 0;
-        }
-      else
-        return longopts[longopt_match].val;
-    }
-  else
-    return optopt;
-}
+#define	BADCH	(int)'?'
+#define	BADARG	(int)':'
+#define	EMSG	""
 
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ */
 int
-getopt (int argc, char *const argv[], const char *optstring)
+getopt(nargc, nargv, ostr)
+	int nargc;
+	char * const *nargv;
+	const char *ostr;
 {
-  return getopt_internal (argc, argv, optstring, NULL, NULL, 0);
+	static char *place = EMSG;		/* option letter processing */
+	char *oli;				/* option letter list index */
+
+	if (optreset || !*place) {		/* update scanning pointer */
+		optreset = 0;
+		if (optind >= nargc || *(place = nargv[optind]) != '-') {
+			place = EMSG;
+			return (-1);
+		}
+		if (place[1] && *++place == '-') {	/* found "--" */
+			++optind;
+			place = EMSG;
+			return (-1);
+		}
+	}					/* option letter okay? */
+	if ((optopt = (int)*place++) == (int)':' ||
+	    !(oli = strchr(ostr, optopt))) {
+		/*
+		 * if the user didn't specify '-' as an option,
+		 * assume it means -1.
+		 */
+		if (optopt == (int)'-')
+			return (-1);
+		if (!*place)
+			++optind;
+		if (opterr && *ostr != ':')
+			(void)fprintf(stderr,
+			    "%s: illegal option -- %c\n", nargv[0], optopt);
+		return (BADCH);
+	}
+	if (*++oli != ':') {			/* don't need argument */
+		optarg = NULL;
+		if (!*place)
+			++optind;
+	}
+	else {					/* need an argument */
+		if (*place)			/* no white space */
+			optarg = place;
+		else if (nargc <= ++optind) {	/* no arg */
+			place = EMSG;
+			if (*ostr == ':')
+				return (BADARG);
+			if (opterr)
+				(void)fprintf(stderr,
+				    "%s: option requires an argument -- %c\n",
+				    nargv[0], optopt);
+			return (BADCH);
+		}
+	 	else				/* white space */
+			optarg = nargv[optind];
+		place = EMSG;
+		++optind;
+	}
+	return (optopt);			/* dump back option letter */
 }
-
-int
-getopt_long (int argc, char *const argv[], const char *shortopts,
-             const struct option *longopts, int *longind)
-{
-  return getopt_internal (argc, argv, shortopts, longopts, longind, 0);
-}
-
-int
-getopt_long_only (int argc, char *const argv[], const char *shortopts,
-                  const struct option *longopts, int *longind)
-{
-  return getopt_internal (argc, argv, shortopts, longopts, longind, 1);
-}
-
-/* end of file GETOPT.C */
diff --git a/newlib/libc/stdlib/ldtoa.c b/newlib/libc/stdlib/ldtoa.c
index 6a29dda9b..7af35d5e8 100644
--- a/newlib/libc/stdlib/ldtoa.c
+++ b/newlib/libc/stdlib/ldtoa.c
@@ -80,12 +80,6 @@ static void einfin(register short unsigned int *x, register LDPARMS *ldp);
 static void efloor(short unsigned int *x, short unsigned int *y, LDPARMS *ldp);
 static void etoasc(short unsigned int *x, char *string, int ndigs, int outformat, LDPARMS *ldp);
 
-union uconv
-{
-  unsigned short pe;
-  long double d;
-};
-
 #if LDBL_MANT_DIG == 24
 static void e24toe(short unsigned int *pe, short unsigned int *y, LDPARMS *ldp);
 #elif LDBL_MANT_DIG == 53
@@ -2718,8 +2712,6 @@ LDPARMS rnd;
 LDPARMS *ldp = &rnd;
 char *outstr;
 char outbuf[NDEC + MAX_EXP_DIGITS + 10];
-union uconv du;
-du.d = d;
 
 orig_ndigits = ndigits;
 rnd.rlast = -1;
@@ -2737,13 +2729,13 @@ if (_REENT_MP_RESULT(ptr))
   }
 
 #if LDBL_MANT_DIG == 24
-e24toe( &du.pe, e, ldp );
+e24toe( (unsigned short *)&d, e, ldp );
 #elif LDBL_MANT_DIG == 53
-e53toe( &du.pe, e, ldp );
+e53toe( (unsigned short *)&d, e, ldp );
 #elif LDBL_MANT_DIG == 64
-e64toe( &du.pe, e, ldp );
+e64toe( (unsigned short *)&d, e, ldp );
 #else
-e113toe( &du.pe, e, ldp );
+e113toe( (unsigned short *)&d, e, ldp );
 #endif
 
 if( eisneg(e) )
@@ -2872,16 +2864,14 @@ LDPARMS *ldp = &rnd;
 rnd.rlast = -1;
 rnd.rndprc = NBITS;
 
-union uconv du;
-du.d = *d;
 #if LDBL_MANT_DIG == 24
-e24toe( &du.pe, e, ldp );
+e24toe( (unsigned short *)d, e, ldp );
 #elif LDBL_MANT_DIG == 53
-e53toe( &du.pe, e, ldp );
+e53toe( (unsigned short *)d, e, ldp );
 #elif LDBL_MANT_DIG == 64
-e64toe( &du.pe, e, ldp );
+e64toe( (unsigned short *)d, e, ldp );
 #else
-e113toe( &du.pe, e, ldp );
+e113toe( (unsigned short *)d, e, ldp );
 #endif
 
 if( (e[NE-1] & 0x7fff) == 0x7fff )
@@ -3230,7 +3220,7 @@ ldp->outexpon =  expon;
 
 long double _strtold (char *s, char **se)
 {
-  union uconv x;
+  long double x;
   LDPARMS rnd;
   LDPARMS *ldp = &rnd;
   int lenldstr;
@@ -3238,10 +3228,10 @@ long double _strtold (char *s, char **se)
   rnd.rlast = -1;
   rnd.rndprc = NBITS;
 
-  lenldstr = asctoeg( s, &x.pe, LDBL_MANT_DIG, ldp );
+  lenldstr = asctoeg( s, (unsigned short *)&x, LDBL_MANT_DIG, ldp );
   if (se)
     *se = s + lenldstr;
-  return x.d;
+  return x;
 }
 
 #define REASONABLE_LEN 200
diff --git a/newlib/libc/stdlib/mallocr.c b/newlib/libc/stdlib/mallocr.c
index cfa25545f..71886c14f 100644
--- a/newlib/libc/stdlib/mallocr.c
+++ b/newlib/libc/stdlib/mallocr.c
@@ -268,7 +268,6 @@ extern "C" {
 
 #include <stdio.h>    /* needed for malloc_stats */
 #include <limits.h>   /* needed for overflow checks */
-#include <errno.h>    /* needed to set errno to ENOMEM */
 
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
@@ -336,7 +335,6 @@ extern void __malloc_unlock();
 #define RDECL struct _reent *reent_ptr;
 #endif
 
-#define RERRNO reent_ptr->_errno
 #define RCALL reent_ptr,
 #define RONECALL reent_ptr
 
@@ -346,7 +344,6 @@ extern void __malloc_unlock();
 #define RARG
 #define RONEARG
 #define RDECL
-#define RERRNO errno
 #define RCALL
 #define RONECALL
 
@@ -490,10 +487,6 @@ extern void __malloc_unlock();
 
 #define HAVE_MEMCPY 
 
-/* Although the original macro is called USE_MEMCPY, newlib actually
-   uses memmove to handle cases whereby a platform's memcpy implementation
-   copies backwards and thus destructive overlap may occur in realloc
-   whereby we are reclaiming free memory prior to the old allocation.  */
 #ifndef USE_MEMCPY
 #ifdef HAVE_MEMCPY
 #define USE_MEMCPY 1
@@ -507,11 +500,9 @@ extern void __malloc_unlock();
 #if __STD_C
 void* memset(void*, int, size_t);
 void* memcpy(void*, const void*, size_t);
-void* memmove(void*, const void*, size_t);
 #else
 Void_t* memset();
 Void_t* memcpy();
-Void_t* memmove();
 #endif
 #endif
 
@@ -553,7 +544,7 @@ do {                                                                          \
                                      *mcdst++ = *mcsrc++;                     \
                                      *mcdst++ = *mcsrc++;                     \
                                      *mcdst   = *mcsrc  ;                     \
-  } else memmove(dest, src, mcsz);                                             \
+  } else memcpy(dest, src, mcsz);                                             \
 } while(0)
 
 #else /* !USE_MEMCPY */
@@ -2344,10 +2335,7 @@ Void_t* mALLOc(RARG bytes) RDECL size_t bytes;
 
   /* Check for overflow and just fail, if so. */
   if (nb > INT_MAX || nb < bytes)
-  {
-    RERRNO = ENOMEM;
     return 0;
-  }
 
   MALLOC_LOCK;
 
@@ -2810,10 +2798,7 @@ Void_t* rEALLOc(RARG oldmem, bytes) RDECL Void_t* oldmem; size_t bytes;
 
   /* Check for overflow and just fail, if so. */
   if (nb > INT_MAX || nb < bytes)
-  {
-    RERRNO = ENOMEM;
     return 0;
-  }
 
 #if HAVE_MMAP
   if (chunk_is_mmapped(oldp)) 
@@ -3046,10 +3031,7 @@ Void_t* mEMALIGn(RARG alignment, bytes) RDECL size_t alignment; size_t bytes;
 
   /* Check for overflow. */
   if (nb > INT_MAX || nb < bytes)
-  {
-    RERRNO = ENOMEM;
     return 0;
-  }
 
   m  = (char*)(mALLOc(RCALL nb + alignment + MINSIZE));
 
diff --git a/newlib/libc/stdlib/mlock.c b/newlib/libc/stdlib/mlock.c
index 888c986a9..378b4e691 100644
--- a/newlib/libc/stdlib/mlock.c
+++ b/newlib/libc/stdlib/mlock.c
@@ -1,7 +1,7 @@
 #ifndef MALLOC_PROVIDED
 /*
 FUNCTION
-<<__malloc_lock>>, <<__malloc_unlock>>---lock malloc pool
+<<__malloc_lock>>, <<__malloc_unlock>>--lock malloc pool
 
 INDEX
 	__malloc_lock
diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c
index ba89f494d..42b5db2fe 100644
--- a/newlib/libc/stdlib/mstats.c
+++ b/newlib/libc/stdlib/mstats.c
@@ -10,7 +10,7 @@ int _dummy_mstats = 1;
 
 /*
 FUNCTION
-<<mallinfo>>, <<malloc_stats>>, <<mallopt>>---malloc support
+<<mallinfo>>, <<malloc_stats>>, <<mallopt>>--malloc support
 
 INDEX
 	mallinfo
diff --git a/newlib/libc/stdlib/rand.c b/newlib/libc/stdlib/rand.c
index 6a46aa807..4f5a60796 100644
--- a/newlib/libc/stdlib/rand.c
+++ b/newlib/libc/stdlib/rand.c
@@ -51,8 +51,8 @@ number between <<0>> and <<RAND_MAX>> (inclusive).
 <<srand>> does not return a result.
 
 NOTES
-<<rand>> and <<srand>> are unsafe for multi-threaded applications.
-<<rand_r>> is thread-safe and should be used instead.
+<<rand>> and <<srand>> are unsafe for multi-thread applications.
+<<rand_r>> is MT-Safe and should be used instead.
 
 
 PORTABILITY
diff --git a/newlib/libc/stdlib/rand48.c b/newlib/libc/stdlib/rand48.c
index af2be3c07..17fd04e92 100644
--- a/newlib/libc/stdlib/rand48.c
+++ b/newlib/libc/stdlib/rand48.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-   <<rand48>>, <<drand48>>, <<erand48>>, <<lrand48>>, <<nrand48>>, <<mrand48>>, <<jrand48>>, <<srand48>>, <<seed48>>, <<lcong48>>---pseudo-random number generators and initialization routines
+   <<rand48>>, <<drand48>>, <<erand48>>, <<lrand48>>, <<nrand48>>, <<mrand48>>, <<jrand48>>, <<srand48>>, <<seed48>>, <<lcong48>> ---pseudo random number generators and initialization routines
 
 INDEX
        rand48
diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index e8d057352..23e7c26a2 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -21,6 +21,8 @@ DESCRIPTION
 	object pointed to by <[s1]> with the object pointed to by <[s2]>.
 
 	This function is identical to <<memcmp>>.
+	
+
 
 RETURNS
 	The function returns an integer greater than, equal to or
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index 7c1a584b7..2fd3c861d 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -28,9 +28,9 @@ RETURNS
 	<[c]> is not found, then <<NULL>> is returned.
 
 PORTABILITY
-<<memchr>> is ANSI C.
+<<memchr>>> is ANSI C.
 
-<<memchr>> requires no supporting OS subroutines.
+<<memchr>>  requires no supporting OS subroutines.
 
 QUICKREF
 	memchr ansi pure
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index f96f7f5c9..4dcfc784a 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strcasecmp>>---case-insensitive character string compare
+	<<strcasecmp>>---case insensitive character string compare
 	
 INDEX
 	strcasecmp
@@ -22,7 +22,7 @@ DESCRIPTION
 RETURNS 
 
 	If <<*<[a]>>> sorts lexicographically after <<*<[b]>>> (after
-	both are converted to uppercase), <<strcasecmp>> returns a
+	both are converted to upper case), <<strcasecmp>> returns a
 	number greater than zero.  If the two strings match,
 	<<strcasecmp>> returns zero.  If <<*<[a]>>> sorts
 	lexicographically before <<*<[b]>>>, <<strcasecmp>> returns a
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index 65dc38037..8760b2217 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strcoll>>---locale-specific character string compare
+	<<strcoll>>---locale specific character string compare
 	
 INDEX
 	strcoll
diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c
index 403330c94..fe68b8f51 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strcspn>>---count characters not in string
+	<<strcspn>>---count chars not in string
 
 INDEX
 	strcspn
diff --git a/newlib/libc/string/strerror_r.c b/newlib/libc/string/strerror_r.c
index be5358f3e..956a1f485 100644
--- a/newlib/libc/string/strerror_r.c
+++ b/newlib/libc/string/strerror_r.c
@@ -30,7 +30,7 @@ This function returns a pointer to a string.  Your application must
 not modify that string.
 
 PORTABILITY
-<<strerror_r>> is a GNU extension.
+<<strerror_r>> is a gnu extension.
 
 <<strerror_r>> requires no supporting OS subroutines.
 
diff --git a/newlib/libc/string/strings.tex b/newlib/libc/string/strings.tex
index 3ca732f79..4e1a2cd16 100644
--- a/newlib/libc/string/strings.tex
+++ b/newlib/libc/string/strings.tex
@@ -22,13 +22,13 @@ managing areas of memory.  The corresponding declarations are in
 * strcat::      Concatenate strings
 * strchr::      Search for character in string
 * strcmp::      Character string compare
-* strcoll::     Locale-specific character string compare
+* strcoll::     Locale specific character string compare
 * strcpy::      Copy string
 * strcspn::     Count chars not in string
 * strerror::    Convert error number to string
 * strerror_r::  Convert error number to string
 * strlen::      Character string length
-* strlwr::	Convert string to lowercase
+* strlwr::	Convert string to lower case
 * strncasecmp::	Compare strings ignoring case
 * strncat::     Concatenate strings
 * strncmp::     Character string compare
diff --git a/newlib/libc/string/strlwr.c b/newlib/libc/string/strlwr.c
index 47096d430..cf0d45f71 100644
--- a/newlib/libc/string/strlwr.c
+++ b/newlib/libc/string/strlwr.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strlwr>>---force string to lowercase
+	<<strlwr>>---force string to lower case
 	
 INDEX
 	strlwr
@@ -15,8 +15,8 @@ TRAD_SYNOPSIS
 	char *<[a]>;
 
 DESCRIPTION
-	<<strlwr>> converts each character in the string at <[a]> to
-	lowercase.
+	<<strlwr>> converts each characters in the string at <[a]> to
+	lower case.
 
 RETURNS
 	<<strlwr>> returns its argument, <[a]>.
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index c877ba53c..28c6cc44f 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strncasecmp>>---case-insensitive character string compare
+	<<strncasecmp>>---case insensitive character string compare
 	
 INDEX
 	strncasecmp
@@ -24,7 +24,7 @@ DESCRIPTION
 RETURNS
 
 	If <<*<[a]>>> sorts lexicographically after <<*<[b]>>> (after
-	both are converted to uppercase), <<strncasecmp>> returns a
+	both are converted to upper case), <<strncasecmp>> returns a
 	number greater than zero.  If the two strings are equivalent,
 	<<strncasecmp>> returns zero.  If <<*<[a]>>> sorts
 	lexicographically before <<*<[b]>>>, <<strncasecmp>> returns a
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index 0f29247a8..57ca068eb 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -28,6 +28,7 @@ WARNINGS
 	Note that a null is always appended, so that if the copy is
 	limited by the <[length]> argument, the number of characters
 	appended to <[dst]> is <<n + 1>>.
+	
 
 RETURNS
 	This function returns the initial value of <[dst]>
diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c
index 2acf63dec..86d9eec44 100644
--- a/newlib/libc/string/strndup_r.c
+++ b/newlib/libc/string/strndup_r.c
@@ -2,22 +2,16 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+
 char *
 _DEFUN (_strndup_r, (reent_ptr, str, n), 
         struct _reent *reent_ptr  _AND
         _CONST char   *str _AND
         size_t n)
 {
-  _CONST char *ptr = str;
-  size_t len;
-  char *copy;
-
-  while (n-- > 0 && *ptr)
-    ptr++;
-
-  len = ptr - str;
-
-  copy = _malloc_r (reent_ptr, len + 1);
+  size_t len = MIN(strlen (str), n);
+  char *copy = _malloc_r (reent_ptr, len + 1);
   if (copy)
     {
       memcpy (copy, str, len);
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index ed60e9371..b9a3b5e77 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -25,7 +25,7 @@ RETURNS
 	<<strnlen>> returns the character count or <[n]>.
 
 PORTABILITY
-<<strnlen>> is a GNU extension.
+<<strnlen>> is a Gnu extension.
 
 <<strnlen>> requires no supporting OS subroutines.
 
@@ -42,7 +42,7 @@ _DEFUN (strnlen, (str, n),
 {
   _CONST char *start = str;
 
-  while (n-- > 0 && *str)
+  while (*str && n-- > 0)
     str++;
 
   return str - start;
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index 5668db395..e7f2dd2b6 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strpbrk>>---find characters in string
+	<<strpbrk>>---find chars in string
 
 INDEX
 	strpbrk
diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c
index 7640fb73d..8d53290c7 100644
--- a/newlib/libc/string/strtok.c
+++ b/newlib/libc/string/strtok.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strtok>>, <<strtok_r>>, <<strsep>>---get next token from a string
+	<<strtok>>,<<strtok_r>>,<<strsep>>---get next token from a string
 
 INDEX
 	strtok
@@ -40,25 +40,25 @@ DESCRIPTION
 	The first time that <<strtok>> is called, <<*<[source]>>> should be
 	specified; subsequent calls, wishing to obtain further tokens from
 	the same string, should pass a null pointer instead.  The separator
-	string, <<*<[delimiters]>>>, must be supplied each time and may 
+	string, <<*<[delimiters]>>>, must be supplied each time, and may 
 	change between calls.
 
 	The <<strtok>> function returns a pointer to the beginning of each 
 	subsequent token in the string, after replacing the separator 
-	character itself with a null character.  When no more tokens remain, 
+	character itself with a NUL character.  When no more tokens remain, 
 	a null pointer is returned.
 
 	The <<strtok_r>> function has the same behavior as <<strtok>>, except
-	a pointer to placeholder <<*<[lasts]>>> must be supplied by the caller.
+	a pointer to placeholder <<*[lasts]>> must be supplied by the caller.
 
 	The <<strsep>> function is similar in behavior to <<strtok>>, except
-	a pointer to the string pointer must be supplied <<<[source_ptr]>>> and
-	the function does not skip leading delimiters.  When the string starts
-	with a delimiter, the delimiter is changed to the null character and
+	a pointer to the string pointer must be supplied <<[source_ptr]>> and
+	the function does not skip leading delimeters.  When the string starts
+	with a delimeter, the delimeter is changed to the NUL character and
 	the empty string is returned.  Like <<strtok_r>> and <<strtok>>, the
-	<<*<[source_ptr]>>> is updated to the next character following the
-	last delimiter found or NULL if the end of string is reached with
-	no more delimiters.
+	<<*[source_ptr]>> is updated to the next character following the
+	last delimeter found or NULL if the end of string is reached with
+	no more delimeters.
 
 RETURNS
 	<<strtok>>, <<strtok_r>>, and <<strsep>> all return a pointer to the 
@@ -66,13 +66,13 @@ RETURNS
 	<<strsep>>, a token may be the empty string.
 
 NOTES
-	<<strtok>> is unsafe for multi-threaded applications.  <<strtok_r>>
-	and <<strsep>> are thread-safe and should be used instead.
+	<<strtok>> is unsafe for multi-thread applications.  <<strtok_r>>
+	and <<strsep>> are MT-Safe and should be used instead.
 
 PORTABILITY
 <<strtok>> is ANSI C.
 <<strtok_r>> is POSIX.
-<<strsep>> is a BSD extension.
+<<strsep>> is a BSD-extension.
 
 <<strtok>>, <<strtok_r>>, and <<strsep>> require no supporting OS subroutines.
 
diff --git a/newlib/libc/string/strupr.c b/newlib/libc/string/strupr.c
index 3f346b840..d7f7c129d 100644
--- a/newlib/libc/string/strupr.c
+++ b/newlib/libc/string/strupr.c
@@ -15,8 +15,8 @@ TRAD_SYNOPSIS
 	char *<[a]>;
 
 DESCRIPTION
-	<<strupr>> converts each character in the string at <[a]> to
-	uppercase.
+	<<strupr>> converts each characters in the string at <[a]> to
+	upper case.
 
 RETURNS
 	<<strupr>> returns its argument, <[a]>.
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
index 54c0b503b..b3a3bd987 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -27,7 +27,6 @@ RETURNS
 
 PORTABILITY
 <<wcscat>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
index fb35d1f42..acc07a521 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -24,7 +24,6 @@ RETURNS
 
 PORTABILITY
 <<wcschr>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
index 03089620d..279f3a90c 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -26,7 +26,6 @@ RETURNS
 
 PORTABILITY
 <<wcscmp>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 0f0513a58..9287af38c 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<wcscoll>>---locale-specific wide-character string compare
+	<<wcscoll>>---locale specific wide-character string compare
 	
 INDEX
 	wcscoll
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index ede693d9c..5a72338ce 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -23,7 +23,6 @@ RETURNS
 
 PORTABILITY
 <<wcscpy>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
index 5ab965690..7e53cc15d 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -23,7 +23,6 @@ RETURNS
 
 PORTABILITY
 <<wcscspn>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
index 75c085b5b..adf683ad5 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -14,12 +14,12 @@ TRAD_SYNOPSIS
 	size_t <[siz]>;
 
 DESCRIPTION
-	The <<wcslcat>> function appends wide characters from <[src]> to
+	The <<wcslcat>> function appends wide-characters from <[src]> to
 	end of the <[dst]> wide-character string so that the resultant
-	wide-character string is not more than <[siz]> wide characters
-	including the terminating null wide-character code.  A terminating
-	null wide character is always added unless <[siz]> is 0.  Thus,
-	the maximum number of wide characters that can be appended from
+	wide-character string is not more than <[siz]> wide-characters
+	including terminating null wide-character code.  A terminating
+	null wide-character is always added unless <[siz]> is 0.  Thus,
+	the maximum number of wide-characters that can be appended from
 	<[src]> is <[siz]> - 1. If copying takes place between objects 
 	that overlap, the behaviour is undefined.
 
@@ -28,7 +28,7 @@ RETURNS
 	wide-character string length of <[src]> (does not include
 	terminating null wide-characters).  If the return value is
 	greater than or equal to <[siz]>, then truncation occurred and
-	not all wide characters from <[src]> were appended.
+	not all wide-characters from <[src]> were appended.
 
 PORTABILITY
 No supporting OS subroutines are required.
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index 21c030b38..ac7d01863 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -14,16 +14,16 @@ TRAD_SYNOPSIS
 	size_t <[siz]>;
 
 DESCRIPTION
-	<<wcslcpy>> copies wide characters from <[src]> to <[dst]>
+	<<wcslcpy>> copies wide-characters from <[src]> to <[dst]>
 	such that up to <[siz]> - 1 characters are copied.  A
 	terminating null is appended to the result, unless <[siz]>
 	is zero.
 
 RETURNS
-	<<wcslcpy>> returns the number of wide characters in <[src]>,
-	not including the terminating null wide character.  If the
+	<<wcslcpy>> returns the number of wide-characters in <[src]>,
+	not including the terminating null wide-character.  If the
 	return value is greater than or equal to <[siz]>, then
-	not all wide characters were copied from <[src]> and truncation
+	not all wide-characters were copied from <[src]> and truncation
 	occurred.
 
 PORTABILITY
diff --git a/newlib/libc/string/wcslen.c b/newlib/libc/string/wcslen.c
index d671551af..d68f00a72 100644
--- a/newlib/libc/string/wcslen.c
+++ b/newlib/libc/string/wcslen.c
@@ -21,7 +21,6 @@ RETURNS
 
 PORTABILITY
 <<wcslen>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
index fd77c0cc8..2ba293497 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -29,7 +29,6 @@ RETURNS
 
 PORTABILITY
 <<wcsncat>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 1897f5c4e..48cb96c25 100644
--- a/newlib/libc/string/wcsncmp.c
+++ b/newlib/libc/string/wcsncmp.c
@@ -30,7 +30,6 @@ RETURNS
 
 PORTABILITY
 <<wcsncmp>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c
index b53e9c332..afe75a238 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -30,7 +30,6 @@ RETURNS
 
 PORTABILITY
 <<wcsncpy>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
index 9d680d603..e84342d3d 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -1,6 +1,6 @@
 /* 
 FUNCTION
-        <<wcsnlen>>---get fixed-size wide-character string length
+        <<wcsnlen>>---get fixed-size wide character string length
     
 INDEX
         wcsnlen
@@ -16,8 +16,8 @@ TRAD_SYNOPSIS
         size_t <[maxlen]>;
 
 DESCRIPTION
-        The <<wcsnlen>> function computes the number of wide-character codes
-        in the wide-character string pointed to by <[s]> not including the
+        The <<wcsnlen>> function computes the number of wide character codes
+        in the wide character string pointed to by <[s]> not including the
         terminating L'\0' wide character but at most <[maxlen]> wide
         characters.
 
@@ -27,8 +27,7 @@ RETURNS
         characters.
 
 PORTABILITY
-<<wcsnlen>> is a GNU extension.
-
+<<wcsnlen>> is GNU extension..
 <<wcsnlen>> requires no supporting OS subroutines.
 */
 
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
index fbdf9e49c..bfe793b15 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -23,7 +23,6 @@ RETURNS
 
 PORTABILITY
 <<wcspbrk>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
index 495d95a15..d3dc7431e 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -27,7 +27,6 @@ RETURNS
 
 PORTABILITY
 <<wcsrchr>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index e83f42f4f..f0b2fb99f 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -23,7 +23,6 @@ RETURNS
 
 PORTABILITY
 <<wcsspn>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
@@ -76,7 +75,6 @@ _DEFUN (wcsspn, (s, set),
 	{
 	  if (*p == *q)
 	    break;
-	  q++;
 	}
       if (!*q)
 	goto done;
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
index 0b00396ea..30fc4631f 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -14,7 +14,7 @@ TRAD_SYNOPSIS
 DESCRIPTION
 	The <<wcsstr>> function locates the first occurrence in the
 	wide-character string pointed to by <[big]> of the sequence of
-	wide characters (excluding the terminating null wide character) in the
+	wide-characters (excluding the terminating null wide-character) in the
 	wide-character string pointed to by <[little]>.
 
 RETURNS
diff --git a/newlib/libc/string/wcstrings.tex b/newlib/libc/string/wcstrings.tex
index df6edc47c..ad0a60788 100644
--- a/newlib/libc/string/wcstrings.tex
+++ b/newlib/libc/string/wcstrings.tex
@@ -2,21 +2,21 @@
 @chapter Wide Character Strings (@file{wchar.h})
 
 This chapter describes wide-character string-handling functions and
-managing areas of memory containing wide characters.  The corresponding 
+managing areas of memory containing wide-characters.  The corresponding 
 declarations are in @file{wchar.h}.
 
 @menu
-* wmemchr::     Find wide character in memory
+* wmemchr::     Find wide-character in memory
 * wmemcmp::     Compare two wide-character memory areas
 * wmemcpy::     Copy wide-character memory regions
 * wmemmove::    Move possibly overlapping wide-character memory
-* wmemset::     Set an area of memory to a specified wide character
+* wmemset::     Set an area of memory to a specified wide-character
 * wcscat::      Concatenate wide-character strings
-* wcschr::      Search for wide character in string
+* wcschr::      Search for wide-character in string
 * wcscmp::      Wide-character string compare
-* wcscoll::     Locale-specific wide-character string compare
+* wcscoll::     Locale specific Wide-character string compare
 * wcscpy::      Copy wide-character string
-* wcscspn::     Count wide characters not in string
+* wcscspn::     Count wide-chars not in string
 * wcslcat::     Concatenate wide-character strings to specified length
 * wcslcpy::     Copy wide-character string to specified length
 * wcslen::      Wide-character string length
@@ -24,8 +24,8 @@ declarations are in @file{wchar.h}.
 * wcsncmp::     Wide-character string compare
 * wcsncpy::     Counted copy wide-character string
 * wcsnlen::     Wide-character string length with maximum limit
-* wcspbrk::     Find wide characters in string
-* wcsrchr::     Reverse search for wide character in string
+* wcspbrk::     Find wide-chars in string
+* wcsrchr::     Reverse search for wide-character in string
 * wcsspn::      Find initial match in wide-character string
 * wcsstr::      Find wide-character string segment
 * wcswidth::    Number of column positions of a wide-character string
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 8a9670eb1..bd3d9bbad 100644
--- a/newlib/libc/string/wcswidth.c
+++ b/newlib/libc/string/wcswidth.c
@@ -17,22 +17,22 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 	The <<wcswidth>> function shall determine the number of column
-	positions required for <[n]> wide-character codes (or fewer than <[n]>
+	positions required for n wide-character codes (or fewer than n
 	wide-character codes if a null wide-character code is encountered
-	before <[n]> wide-character codes are exhausted) in the string pointed
-	to by <[pwcs]>.
+	before n wide-character codes are exhausted) in the string pointed
+	to by pwcs.
 
 RETURNS
-	The <<wcswidth>> function either shall return 0 (if <[pwcs]> points to a
+	The <<wcswidth>> function either shall return 0 (if pwcs points to a
 	null wide-character code), or return the number of column positions
-	to be occupied by the wide-character string pointed to by <[pwcs]>, or
-	return -1 (if any of the first <[n]> wide-character codes in the
-	wide-character string pointed to by <[pwcs]> is not a printable
+	to be occupied by the wide-character string pointed to by pwcs, or
+	return -1 (if any of the first n wide-character codes in the
+	wide-character string pointed to by pwcs is not a printable
 	wide-character code).
 
 PORTABILITY
-<<wcswidth>> has been introduced in the Single UNIX Specification Volume 2.
-<<wcswidth>> has been marked as an extension in the Single UNIX Specification Volume 3.
+<<wcswidth>> has been introduced in the Single UNIX Specification Volume 2
+<<wcswidth>> has been marked as extension in Single UNIX Specification Volume 3
 */
 
 #include <_ansi.h>
diff --git a/newlib/libc/string/wcwidth.c b/newlib/libc/string/wcwidth.c
index d886b4aca..2cbd59e18 100644
--- a/newlib/libc/string/wcwidth.c
+++ b/newlib/libc/string/wcwidth.c
@@ -16,15 +16,15 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 	The <<wcwidth>> function shall determine the number of column
-	positions required for the wide character <[wc]>. The application
-	shall ensure that the value of <[wc]> is a character representable
+	positions required for the wide character wc. The application
+	shall ensure that the value of wc is a character representable
 	as a wchar_t, and is a wide-character code corresponding to a
 	valid character in the current locale.
 
 RETURNS
-	The <<wcwidth>> function shall either return 0 (if <[wc]> is a null
+	The <<wcwidth>> function shall either return 0 (if wc is a null
 	wide-character code), or return the number of column positions to
-	be occupied by the wide-character code <[wc]>, or return -1 (if <[wc]>
+	be occupied by the wide-character code wc, or return -1 (if wc
 	does not correspond to a printable wide-character code).
 
 	The current implementation of <<wcwidth>> simply sets the width
@@ -32,8 +32,8 @@ RETURNS
 	tables around.
 
 PORTABILITY
-<<wcwidth>> has been introduced in the Single UNIX Specification Volume 2.
-<<wcwidth>> has been marked as an extension in the Single UNIX Specification Volume 3.
+<<wcwidth>> has been introduced in the Single UNIX Specification Volume 2
+<<wcwidth>> has been marked as extension in Single UNIX Specification Volume 3
 */
 
 #include <_ansi.h>
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index b582b8948..e99991324 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<wmemchr>>---find a wide character in memory
+	<<wmemchr>>---find a wide-character in memory
  
 
 ANSI_SYNOPSIS
@@ -15,9 +15,9 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 	The <<wmemchr>> function locates the first occurrence of <[c]> in the
-	initial <[n]> wide characters of the object pointed to be <[s]>. This
+	initial <[n]> wide-characters of the object pointed to be <[s]>. This
 	function is not affected by locale and all wchar_t values are treated
-	identically.  The null wide character and wchar_t values not
+	identically.  The null wide-character and wchar_t values not
 	corresponding to valid characters are not treated specially.
 
 	If <[n]> is zero, <[s]> must be a valid pointer and the function
@@ -25,12 +25,11 @@ DESCRIPTION
 
 RETURNS
 	The <<wmemchr>> function returns a pointer to the located
-	wide character, or a null pointer if the wide character does not occur
+	wide-character, or a null pointer if the wide-character does not occur
 	in the object. 
 
 PORTABILITY
 <<wmemchr>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index af9ee3207..51072942c 100644
--- a/newlib/libc/string/wmemcmp.c
+++ b/newlib/libc/string/wmemcmp.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<wmemcmp>>---compare wide characters in memory 
+	<<wmemcmp>>---compare wide-characters in memory 
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
@@ -13,10 +13,10 @@ TRAD_SYNOPSIS
 	size_t <[n]>;
 
 DESCRIPTION
-	The <<wmemcmp>> function compares the first <[n]> wide characters of the
-	object pointed to by <[s1]> to the first <[n]> wide characters of the
+	The <<wmemcmp>> function compares the first <[n]> wide-characters of the
+	object pointed to by <[s1]> to the first <[n]> wide-characters of the
 	object pointed to by <[s2]>. This function is not affected by locale
-	and all wchar_t values are treated identically. The null wide character
+	and all wchar_t values are treated identically. The null wide-character
 	and wchar_t values not corresponding to valid characters are not treated
 	specially.
 
@@ -30,7 +30,6 @@ RETURNS
 
 PORTABILITY
 <<wmemcmp>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
index 748e8e196..c3a96a32d 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<wmemcpy>>---copy wide characters in memory 
+	<<wmemcpy>>---copy wide-characters in memory 
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
@@ -13,21 +13,20 @@ TRAD_SYNOPSIS
 	size_t <[n]>;
 
 DESCRIPTION
-	The <<wmemcpy>> function copies <[n]> wide characters from the object
+	The <<wmemcpy>> function copies <[n]> wide-characters from the object
 	pointed to by <[s]> to the object pointed to be <[d]>. This function
 	is not affected by locale and all wchar_t values are treated
-	identically.  The null wide character and wchar_t values not
+	identically.  The null wide-character and wchar_t values not
 	corresponding to valid characters are not treated specially.
 
 	If <[n]> is zero, <[d]> and <[s]> must be a valid pointers, and the
-	function copies zero wide characters. 
+	function copies zero wide-characters. 
 
 RETURNS
 	The <<wmemcpy>> function returns the value of <[d]>.
 
 PORTABILITY
 <<wmemcpy>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
index e20a26ae9..f49e359f3 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<wmemmove>>---copy wide characters in memory with overlapping areas 
+	<<wmemmove>>---wmemmove - copy wide-characters in memory with overlapping areas 
 
 ANSI_SYNOPSIS
 	#include <wchar.h>
@@ -13,27 +13,26 @@ TRAD_SYNOPSIS
 	size_t <[n]>;
 
 DESCRIPTION
-	The <<wmemmove>> function copies <[n]> wide characters from the object
+	The <<wmemmove>> function copies <[n]> wide-characters from the object
 	pointed to by <[s]> to the object pointed to by <[d]>. Copying takes
-	place as if the <[n]> wide characters from the object pointed to by
-	<[s]> are first copied into a temporary array of <[n]> wide characters
+	place as if the <[n]> wide-characters from the object pointed to by
+	<[s]> are first copied into a temporary array of <[n]> wide-characters
 	that does not overlap the objects pointed to by <[d]> or <[s]>, and then
-	the <[n]> wide characters from the temporary array are copied into the
+	the <[n]> wide-characters from the temporary array are copied into the
 	object pointed to by <[d]>.
 
 	This function is not affected by locale and all wchar_t values are
-	treated identically. The null wide character and wchar_t values not
+	treated identically. The null wide-character and wchar_t values not
 	corresponding to valid characters are not treated specially.
 
 	If <[n]> is zero, <[d]> and <[s]> must be a valid pointers, and the
-	function copies zero wide characters. 
+	function copies zero wide-characters. 
 
 RETURNS
 	The <<wmemmove>> function returns the value of <[d]>.
 
 PORTABILITY
 <<wmemmove>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/string/wmemset.c b/newlib/libc/string/wmemset.c
index 0af6f91d5..4e05b93b6 100644
--- a/newlib/libc/string/wmemset.c
+++ b/newlib/libc/string/wmemset.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-       <<wmemset>>---set wide characters in memory 
+       <<wmemset>>---set wide-characters in memory 
 
 ANSI_SYNOPSIS
        #include <wchar.h>
@@ -14,20 +14,19 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
        The <<wmemset>> function copies the value of <[c]> into each of the
-       first <[n]> wide characters of the object pointed to by <[s]>.  This
+       first <[n]> wide-characters of the object pointed to by <[s]>.  This
        function is not affected by locale and all wchar_t values are treated
-       identically.  The null wide character and wchar_t values not
+       identically.  The null wide-character and wchar_t values not
        corresponding to valid characters are not treated specially.
 
        If <[n]> is zero, <[s]> must be a valid pointer and the function
-       copies zero wide characters.
+       copies zero wide-characters.
 
 RETURNS
-       The <<wmemset>> function returns the value of <[s]>.
+       The <<wmemset>> functions returns the value of <[s]>.
 
 PORTABILITY
 <<wmemset>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
 No supporting OS subroutines are required.
 */
 
diff --git a/newlib/libc/sys.tex b/newlib/libc/sys.tex
index 3b04c1500..362732ace 100644
--- a/newlib/libc/sys.tex
+++ b/newlib/libc/sys.tex
@@ -34,7 +34,7 @@ Graceful failure is permitted by returning an error code.  A minor
 complication arises here: the C library must be compatible with
 development environments that supply fully functional versions of these
 subroutines.  Such environments usually return error codes in a global
-@code{errno}.  However, the Red Hat newlib C library provides a @emph{macro}
+@code{errno}.  However, the Cygnus C library provides a @emph{macro}
 definition for @code{errno} in the header file @file{errno.h}, as part
 of its support for reentrant routines (@pxref{Reentrancy,,Reentrancy}).
 
@@ -68,8 +68,8 @@ it (@code{exit}, @code{system}).
 Close a file.  Minimal implementation:
 
 @example
-int close(int file) @{
-  return -1;
+int close(int file)@{
+    return -1;
 @}
 @end example
 
@@ -90,8 +90,8 @@ without processes):
 #include <errno.h>
 #undef errno
 extern int errno;
-int execve(char *name, char **argv, char **env) @{
-  errno = ENOMEM;
+int execve(char *name, char **argv, char **env)@{
+  errno=ENOMEM;
   return -1;
 @}
 @end example
@@ -103,8 +103,8 @@ Create a new process.  Minimal implementation (for a system without processes):
 #include <errno.h>
 #undef errno
 extern int errno;
-int fork(void) @{
-  errno = EAGAIN;
+int fork() @{
+  errno=EAGAIN;
   return -1;
 @}
 @end example
@@ -129,7 +129,7 @@ conflict with other processes.  Minimal implementation, for a system
 without processes:
 
 @example
-int getpid(void) @{
+int getpid() @{
   return 1;
 @}
 @end example
@@ -140,8 +140,8 @@ other minimal implementations, which only support output to
 @code{stdout}, this minimal implementation is suggested:
 
 @example
-int isatty(int file) @{
-  return 1;
+int isatty(int file)@{
+   return 1;
 @}
 @end example
 
@@ -152,9 +152,9 @@ Send a signal.  Minimal implementation:
 #include <errno.h>
 #undef errno
 extern int errno;
-int kill(int pid, int sig) @{
-  errno = EINVAL;
-  return -1;
+int kill(int pid, int sig)@{
+  errno=EINVAL;
+  return(-1);
 @}
 @end example
 
@@ -165,8 +165,8 @@ Establish a new name for an existing file.  Minimal implementation:
 #include <errno.h>
 #undef errno
 extern int errno;
-int link(char *old, char *new) @{
-  errno = EMLINK;
+int link(char *old, char *new)@{
+  errno=EMLINK;
   return -1;
 @}
 @end example
@@ -175,8 +175,8 @@ int link(char *old, char *new) @{
 Set position in a file.  Minimal implementation:
 
 @example
-int lseek(int file, int ptr, int dir) @{
-  return 0;
+int lseek(int file, int ptr, int dir)@{
+    return 0;
 @}
 @end example
 
@@ -184,8 +184,8 @@ int lseek(int file, int ptr, int dir) @{
 Open a file.  Minimal implementation:
 
 @example
-int open(const char *name, int flags, int mode) @{
-  return -1;
+int open(const char *name, int flags, int mode)@{
+    return -1;
 @}
 @end example
 
@@ -193,8 +193,8 @@ int open(const char *name, int flags, int mode) @{
 Read from a file.  Minimal implementation:
 
 @example
-int read(int file, char *ptr, int len) @{
-  return 0;
+int read(int file, char *ptr, int len)@{
+    return 0;
 @}
 @end example
 
@@ -202,23 +202,24 @@ int read(int file, char *ptr, int len) @{
 Increase program data space.  As @code{malloc} and related functions
 depend on this, it is useful to have a working implementation.  The
 following suffices for a standalone system; it exploits the symbol
-@code{_end} automatically defined by the GNU linker.
+@code{end} automatically defined by the GNU linker.
 
 @example
 @group
-caddr_t sbrk(int incr) @{
-  extern char _end;		/* @r{Defined by the linker} */
+caddr_t sbrk(int incr)@{
+  extern char end;		/* @r{Defined by the linker} */
   static char *heap_end;
   char *prev_heap_end;
  
   if (heap_end == 0) @{
-    heap_end = &_end;
+    heap_end = &end;
   @}
   prev_heap_end = heap_end;
-  if (heap_end + incr > stack_ptr) @{
-    write (1, "Heap and stack collision\n", 25);
-    abort ();
-  @}
+  if (heap_end + incr > stack_ptr)
+    @{
+      _write (1, "Heap and stack collision\n", 25);
+      abort ();
+    @}
 
   heap_end += incr;
   return (caddr_t) prev_heap_end;
@@ -240,7 +241,7 @@ int stat(char *file, struct stat *st) @{
 Timing information for current process.  Minimal implementation:
 
 @example
-int times(struct tms *buf) @{
+int times(struct tms *buf)@{
   return -1;
 @}
 @end example
@@ -252,8 +253,8 @@ Remove a file's directory entry.  Minimal implementation:
 #include <errno.h>
 #undef errno
 extern int errno;
-int unlink(char *name) @{
-  errno = ENOENT;
+int unlink(char *name)@{
+  errno=ENOENT;
   return -1; 
 @}
 @end example
@@ -265,30 +266,30 @@ Wait for a child process.  Minimal implementation:
 #undef errno
 extern int errno;
 int wait(int *status) @{
-  errno = ECHILD;
+  errno=ECHILD;
   return -1;
 @}
 @end example
 
 @item write
-Write to a file.  @file{libc} subroutines will use this
+Write a character to a file.  @file{libc} subroutines will use this
 system routine for output to all files, @emph{including}
 @code{stdout}---so if you need to generate any output, for example to a
 serial port for debugging, you should make your minimal @code{write}
 capable of doing this.  The following minimal implementation is an
-incomplete example; it relies on a @code{outbyte} subroutine (not
+incomplete example; it relies on a @code{writechar} subroutine (not
 shown; typically, you must write this in assembler from examples
 provided by your hardware manufacturer) to actually perform the output.
 
 @example
 @group
-int write(int file, char *ptr, int len) @{
-  int todo;
-
-  for (todo = 0; todo < len; todo++) @{
-    outbyte (*ptr++);
-  @}
-  return len;
+int write(int file, char *ptr, int len)@{
+    int todo;
+  
+    for (todo = 0; todo < len; todo++) @{
+        writechar(*ptr++);
+    @}
+    return len;
 @}
 @end group
 @end example
diff --git a/newlib/libc/sys/a29khif/aclocal.m4 b/newlib/libc/sys/a29khif/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/a29khif/aclocal.m4
+++ b/newlib/libc/sys/a29khif/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/a29khif/configure b/newlib/libc/sys/a29khif/configure
index cd8d26300..8315f6139 100755
--- a/newlib/libc/sys/a29khif/configure
+++ b/newlib/libc/sys/a29khif/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/aclocal.m4 b/newlib/libc/sys/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/sys/aclocal.m4
+++ b/newlib/libc/sys/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/arc/aclocal.m4 b/newlib/libc/sys/arc/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/arc/aclocal.m4
+++ b/newlib/libc/sys/arc/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/arc/configure b/newlib/libc/sys/arc/configure
index 39982f1bf..46148becd 100755
--- a/newlib/libc/sys/arc/configure
+++ b/newlib/libc/sys/arc/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am
index 7749d4aff..76504f9d9 100644
--- a/newlib/libc/sys/arm/Makefile.am
+++ b/newlib/libc/sys/arm/Makefile.am
@@ -7,18 +7,16 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 noinst_LIBRARIES = lib.a
 
 if MAY_SUPPLY_SYSCALLS
-extra_objs = libcfunc.o trap.o syscalls.o
+extra_objs = syscalls.o
 else
 extra_objs =
 endif
 
-lib_a_SOURCES = aeabi_atexit.c
+lib_a_SOURCES = libcfunc.c trap.S
 lib_a_LIBADD = $(extra_objs)
 lib_a_DEPENDENCIES = $(extra_objs)
 
-if MAY_SUPPLY_SYSCALLS
 all: crt0.o
-endif
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/arm/Makefile.in b/newlib/libc/sys/arm/Makefile.in
index 323db9c9b..942f909b2 100644
--- a/newlib/libc/sys/arm/Makefile.in
+++ b/newlib/libc/sys/arm/Makefile.in
@@ -88,10 +88,10 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
-@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = libcfunc.o trap.o syscalls.o
+@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = syscalls.o
 @MAY_SUPPLY_SYSCALLS_FALSE@extra_objs = 
 
-lib_a_SOURCES = aeabi_atexit.c
+lib_a_SOURCES = libcfunc.c trap.S
 lib_a_LIBADD = $(extra_objs)
 lib_a_DEPENDENCIES = $(extra_objs)
 
@@ -106,7 +106,7 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-lib_a_OBJECTS =  aeabi_atexit.o
+lib_a_OBJECTS =  libcfunc.o trap.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -325,7 +325,7 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-@MAY_SUPPLY_SYSCALLS_TRUE@all: crt0.o
+all: crt0.o
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/newlib/libc/sys/arm/aclocal.m4 b/newlib/libc/sys/arm/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/arm/aclocal.m4
+++ b/newlib/libc/sys/arm/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/arm/aeabi_atexit.c b/newlib/libc/sys/arm/aeabi_atexit.c
deleted file mode 100644
index 4b600e250..000000000
--- a/newlib/libc/sys/arm/aeabi_atexit.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdlib.h>
-
-/* Register a function to be called by exit or when a shared library
-   is unloaded.  This routine is like __cxa_atexit, but uses the
-   calling sequence required by the ARM EABI.  */
-int
-__aeabi_atexit (void *arg, void (*func) (void *), void *d)
-{
-  return __cxa_atexit (func, arg, d);
-}
diff --git a/newlib/libc/sys/arm/configure b/newlib/libc/sys/arm/configure
index 1f40c98f3..106d8eabf 100755
--- a/newlib/libc/sys/arm/configure
+++ b/newlib/libc/sys/arm/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/arm/crt0.S b/newlib/libc/sys/arm/crt0.S
index c750ca819..00a037a0d 100644
--- a/newlib/libc/sys/arm/crt0.S
+++ b/newlib/libc/sys/arm/crt0.S
@@ -18,26 +18,15 @@
 
 /* .text is used instead of .section .text so it works with arm-aout too.  */
 	.text
-#if defined(__thumb2__)
-	.syntax unified
-	.thumb
-.macro FUNC_START name
-	.global	\name
-	.thumb_func
-\name:
-.endm	
-#else
 	.code 32
-.macro FUNC_START name
-	.global	\name
-\name:
-.endm	
-#endif
 	.align 	0
 
-	FUNC_START	_mainCRTStartup
-	FUNC_START	_start
-	FUNC_START	start
+	.global	_mainCRTStartup
+	.global	_start
+	.global	start
+start:
+_start:
+_mainCRTStartup:
 #if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__)
 	/* Annotation for EABI unwinding tables.  */
 	.fnstart
@@ -56,12 +45,7 @@
 	/*  Issue Angel SWI to read stack info */
 	mov	r0, #AngelSWI_Reason_HeapInfo
 	adr	r1, .LC0	/*  point at ptr to 4 words to receive data */
-#if defined(__thumb2__)
-	bkpt	AngelSWI
-#else
-	/*  We are always in ARM mode for startup */
-	AngelSWIAsm	AngelSWI_ARM
-#endif
+	swi	AngelSWI_ARM	/*  We are always in ARM mode for startup */
 	ldr	r0, .LC0	/*  point at values read */
 	ldr	sp, [r0, #8]
 	ldr	sl, [r0, #12]
@@ -91,8 +75,8 @@
 	sub	a3, a3, a1		/* Third arg: length of block */
 	
 
-#if defined(__thumb__) && !defined(__thumb2__)
-	/* Enter Thumb mode.... */
+#ifdef __thumb__		/* Enter Thumb mode.... */
+
 	add	a4, pc, #1	/* Get the address of the Thumb block */
 	bx	a4		/* Go there and start Thumb decoding  */
 
@@ -116,7 +100,7 @@ __change_mode:
 #else
 	mov	r0, #AngelSWI_Reason_GetCmdLine
 	adr	r1, .LC30	/*  Space for command line */
-	AngelSWIAsm	AngelSWI
+	swi	AngelSWI
 	ldr	r1, .LC30
 #endif
 	/*  Parse string at r1 */
@@ -202,11 +186,6 @@ __change_mode:
 	add	r3, #4
 	b	.LC15
 .LC14:	
-	/* Ensure doubleword stack alignment.  */
-	mov	r4, sp
-	mov	r5, #7
-	bic	r4, r5
-	mov	sp, r4
 #else
 	add	r2, sp, r0, LSL #2	/* End of args */
 	mov	r3, sp			/* Start of args */
@@ -216,8 +195,6 @@ __change_mode:
 	strhi	r5, [r2, #-4]!
 	strhi	r4, [r3], #4
 	bhi	.LC13
-	/* Ensure doubleword stack alignment.  */
-	bic	sp, sp, #7
 #endif
 #endif
 
@@ -238,7 +215,7 @@ __change_mode:
 
 	bl	FUNCTION (exit)		/* Should not return.  */
 
-#if defined(__thumb__) && !defined(__thumb2__)
+#ifdef __thumb__
 	/* Come out of Thumb mode.  This code should be redundant.  */
 
 	mov	a4, pc
diff --git a/newlib/libc/sys/arm/libcfunc.c b/newlib/libc/sys/arm/libcfunc.c
index 3bf0a56f4..ddc611f34 100644
--- a/newlib/libc/sys/arm/libcfunc.c
+++ b/newlib/libc/sys/arm/libcfunc.c
@@ -13,7 +13,7 @@ static inline int
 do_AngelSWI (int reason, void * arg)
 {
   int value;
-  asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
+  asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0"
        : "=r" (value) /* Outputs */
        : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */
        : "r0", "r1", "lr"
diff --git a/newlib/libc/sys/arm/swi.h b/newlib/libc/sys/arm/swi.h
index f5c910313..15c3866a1 100644
--- a/newlib/libc/sys/arm/swi.h
+++ b/newlib/libc/sys/arm/swi.h
@@ -33,14 +33,6 @@
 #else
 #define AngelSWI 			AngelSWI_ARM
 #endif
-/* For Thumb-2 code use the BKPT instruction instead of SWI.  */
-#ifdef __thumb2__
-#define AngelSWIInsn			"bkpt"
-#define AngelSWIAsm			bkpt
-#else
-#define AngelSWIInsn			"swi"
-#define AngelSWIAsm			swi
-#endif
 
 /* The reason codes:  */
 #define AngelSWI_Reason_Open		0x01
diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c
index 529309930..e89022806 100644
--- a/newlib/libc/sys/arm/syscalls.c
+++ b/newlib/libc/sys/arm/syscalls.c
@@ -98,7 +98,7 @@ static inline int
 do_AngelSWI (int reason, void * arg)
 {
   int value;
-  asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
+  asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0"
        : "=r" (value) /* Outputs */
        : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */
        : "r0", "r1", "r2", "r3", "ip", "lr", "memory", "cc"
diff --git a/newlib/libc/sys/arm/trap.S b/newlib/libc/sys/arm/trap.S
index 21b6937f9..328fabca5 100644
--- a/newlib/libc/sys/arm/trap.S
+++ b/newlib/libc/sys/arm/trap.S
@@ -1,5 +1,4 @@
         /* Run-time exception support */
-#if !defined(__thumb2__)
 #include "swi.h"
 
 /* .text is used instead of .section .text so it works with arm-aout too.  */
@@ -92,4 +91,3 @@ __rt_stkovf_split_big:
         @ We now know how much extra stack the function requires.
         @ Terminate the program for the moment:
         swi     SWI_Exit
-#endif
diff --git a/newlib/libc/sys/configure b/newlib/libc/sys/configure
index 04436d960..9f389dbb2 100755
--- a/newlib/libc/sys/configure
+++ b/newlib/libc/sys/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1654,7 +1651,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1658: checking for $ac_word" >&5
+echo "configure:1655: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1684,7 +1681,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1688: checking for $ac_word" >&5
+echo "configure:1685: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1735,7 +1732,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1739: checking for $ac_word" >&5
+echo "configure:1736: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1767,7 +1764,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1768: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1778,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1782 "configure"
+#line 1779 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1809,12 +1806,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1810: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1818: checking whether we are using GNU C" >&5
+echo "configure:1815: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1823,7 +1820,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1842,7 +1839,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1846: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1843: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1885,7 +1882,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1889: checking for ld used by GCC" >&5
+echo "configure:1886: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1915,10 +1912,10 @@ echo "configure:1889: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1919: checking for GNU ld" >&5
+echo "configure:1916: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1922: checking for non-GNU ld" >&5
+echo "configure:1919: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1953,7 +1950,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1957: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1954: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1970,7 +1967,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1974: checking for $LD option to reload object files" >&5
+echo "configure:1971: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1982,7 +1979,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1986: checking for BSD-compatible nm" >&5
+echo "configure:1983: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2020,7 +2017,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2024: checking whether ln -s works" >&5
+echo "configure:2021: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2041,7 +2038,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2045: checking how to recognise dependant libraries" >&5
+echo "configure:2042: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2214,13 +2211,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2218: checking for object suffix" >&5
+echo "configure:2215: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2244,7 +2241,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2248: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2245: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2306,7 +2303,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2310: checking for file" >&5
+echo "configure:2307: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2377,7 +2374,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2381: checking for $ac_word" >&5
+echo "configure:2378: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2409,7 +2406,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2413: checking for $ac_word" >&5
+echo "configure:2410: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2444,7 +2441,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2448: checking for $ac_word" >&5
+echo "configure:2445: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2476,7 +2473,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2480: checking for $ac_word" >&5
+echo "configure:2477: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2543,8 +2540,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2547 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2544 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2563,7 +2560,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2581,7 +2578,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2585: checking whether the C compiler needs -belf" >&5
+echo "configure:2582: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2594,14 +2591,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
+#line 2595 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2631,7 +2628,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2635: checking for $ac_word" >&5
+echo "configure:2632: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2663,7 +2660,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2667: checking for $ac_word" >&5
+echo "configure:2664: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2698,7 +2695,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2702: checking for $ac_word" >&5
+echo "configure:2699: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2730,7 +2727,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2734: checking for $ac_word" >&5
+echo "configure:2731: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2765,7 +2762,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2769: checking for $ac_word" >&5
+echo "configure:2766: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2797,7 +2794,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2801: checking for $ac_word" >&5
+echo "configure:2798: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2833,12 +2830,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2837: checking if libtool should supply DllMain function" >&5
+echo "configure:2834: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+#line 2839 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2846,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2867,19 +2864,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2871: checking how to link DLLs" >&5
+echo "configure:2868: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2876 "configure"
+#line 2873 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
@@ -2996,7 +2993,7 @@ if test -n "${sys_dir}"; then
 fi
 
 CRT0=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
 fi
 
diff --git a/newlib/libc/sys/configure.in b/newlib/libc/sys/configure.in
index 895bdb2a2..4a53612e0 100644
--- a/newlib/libc/sys/configure.in
+++ b/newlib/libc/sys/configure.in
@@ -22,7 +22,7 @@ if test -n "${sys_dir}"; then
 fi
 
 CRT0=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
 fi
 AC_SUBST(CRT0)
diff --git a/newlib/libc/sys/d10v/aclocal.m4 b/newlib/libc/sys/d10v/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/d10v/aclocal.m4
+++ b/newlib/libc/sys/d10v/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/d10v/configure b/newlib/libc/sys/d10v/configure
index 091e11fe7..cf9254bff 100755
--- a/newlib/libc/sys/d10v/configure
+++ b/newlib/libc/sys/d10v/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/decstation/aclocal.m4 b/newlib/libc/sys/decstation/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/decstation/aclocal.m4
+++ b/newlib/libc/sys/decstation/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/decstation/configure b/newlib/libc/sys/decstation/configure
index 58f3ec9b0..10e5797c8 100755
--- a/newlib/libc/sys/decstation/configure
+++ b/newlib/libc/sys/decstation/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/h8300hms/aclocal.m4 b/newlib/libc/sys/h8300hms/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/h8300hms/aclocal.m4
+++ b/newlib/libc/sys/h8300hms/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/h8300hms/configure b/newlib/libc/sys/h8300hms/configure
index 1efee2bcc..c3fe7f351 100755
--- a/newlib/libc/sys/h8300hms/configure
+++ b/newlib/libc/sys/h8300hms/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/h8500hms/aclocal.m4 b/newlib/libc/sys/h8500hms/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/h8500hms/aclocal.m4
+++ b/newlib/libc/sys/h8500hms/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/h8500hms/configure b/newlib/libc/sys/h8500hms/configure
index 639276001..d3f9dfcb6 100755
--- a/newlib/libc/sys/h8500hms/configure
+++ b/newlib/libc/sys/h8500hms/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index de11547a3..56842cebb 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -146,7 +146,8 @@ ELIX_3_OBJS = \
 
 ELIX_4_OBJS = \
 	getlogin.$(oext) \
-	getpwent.$(oext) \
+	getpwnam.$(oext) \
+	getpwuid.$(oext) \
 	stack.$(oext)
 
 if ELIX_LEVEL_1
diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in
index ead358265..3f110fab2 100644
--- a/newlib/libc/sys/linux/Makefile.in
+++ b/newlib/libc/sys/linux/Makefile.in
@@ -118,7 +118,7 @@ ELIX_2_OBJS =  	aio64.$(oext) 	confstr.$(oext) 	ctermid.$(oext) 	fclean.$(oext)
 ELIX_3_OBJS =  	system.$(oext) 	wait.$(oext)
 
 
-ELIX_4_OBJS =  	getlogin.$(oext) 	getpwent.$(oext) 	stack.$(oext)
+ELIX_4_OBJS =  	getlogin.$(oext) 	getpwnam.$(oext) 	getpwuid.$(oext) 	stack.$(oext)
 
 @ELIX_LEVEL_1_TRUE@LIB_OBJS = 
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
diff --git a/newlib/libc/sys/linux/aclocal.m4 b/newlib/libc/sys/linux/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/sys/linux/aclocal.m4
+++ b/newlib/libc/sys/linux/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/linux/aio.c b/newlib/libc/sys/linux/aio.c
index 9a2e4ce57..de988ebfc 100644
--- a/newlib/libc/sys/linux/aio.c
+++ b/newlib/libc/sys/linux/aio.c
@@ -4,8 +4,6 @@
 
 /* Currently asynchronous I/O is not implemented. */
 
-#define _GNU_SOURCE 1
-
 #include <sys/types.h>
 #include <aio.h>
 #include <errno.h>
diff --git a/newlib/libc/sys/linux/argp/argp-fs-xinl.c b/newlib/libc/sys/linux/argp/argp-fs-xinl.c
index 9b836d138..b61a303e8 100644
--- a/newlib/libc/sys/linux/argp/argp-fs-xinl.c
+++ b/newlib/libc/sys/linux/argp/argp-fs-xinl.c
@@ -24,7 +24,7 @@
 
 #define ARGP_FS_EI
 #undef __OPTIMIZE__
-#define __OPTIMIZE__ 1
+#define __OPTIMIZE__
 #include "argp-fmtstream.h"
 
 /* Add weak aliases.  */
diff --git a/newlib/libc/sys/linux/argp/argp-xinl.c b/newlib/libc/sys/linux/argp/argp-xinl.c
index 644836d30..0d64b1efb 100644
--- a/newlib/libc/sys/linux/argp/argp-xinl.c
+++ b/newlib/libc/sys/linux/argp/argp-xinl.c
@@ -29,7 +29,7 @@
 #endif
 #define ARGP_EI
 #undef __OPTIMIZE__
-#define __OPTIMIZE__ 1
+#define __OPTIMIZE__
 #include <argp.h>
 
 /* Add weak aliases.  */
diff --git a/newlib/libc/sys/linux/bits/initspin.h b/newlib/libc/sys/linux/bits/initspin.h
deleted file mode 100644
index a19ec077e..000000000
--- a/newlib/libc/sys/linux/bits/initspin.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Generic definitions for spinlock initializers.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Initial value of a spinlock.  Most platforms should use zero,
-   unless they only implement a "test and clear" operation instead of
-   the usual "test and set". */
-#define __LT_SPINLOCK_INIT 0
-
-/* Macros for lock initializers, using the above definition. */
-#define __LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
-#define __ALT_LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
-#define __ATOMIC_INITIALIZER { 0, __LT_SPINLOCK_INIT }
diff --git a/newlib/libc/sys/linux/bits/libc-lock.h b/newlib/libc/sys/linux/bits/libc-lock.h
deleted file mode 100644
index 2b170444b..000000000
--- a/newlib/libc/sys/linux/bits/libc-lock.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/* libc-internal interface for mutex locks.  LinuxThreads version.
-   Copyright (C) 1996,1997,1998,1999,2000,2001,2002,2003
-   	Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _BITS_LIBC_LOCK_H
-#define _BITS_LIBC_LOCK_H 1
-
-#include <pthread.h>
-
-#if defined _LIBC && !defined NOT_IN_libc
-#include <linuxthreads/internals.h>
-#endif
-
-/* Mutex type.  */
-#if defined(_LIBC) || defined(_IO_MTSAFE_IO)
-typedef pthread_mutex_t __libc_lock_t;
-typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t;
-# ifdef __USE_UNIX98
-typedef pthread_rwlock_t __libc_rwlock_t;
-# else
-typedef struct __libc_rwlock_opaque__ __libc_rwlock_t;
-# endif
-typedef __libc_lock_recursive_t __rtld_lock_recursive_t;
-#else
-typedef struct __libc_lock_opaque__ __libc_lock_t;
-typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
-typedef struct __libc_rwlock_opaque__ __libc_rwlock_t;
-#endif
-
-/* Type for key to thread-specific data.  */
-typedef pthread_key_t __libc_key_t;
-
-/* Define a lock variable NAME with storage class CLASS.  The lock must be
-   initialized with __libc_lock_init before it can be used (or define it
-   with __libc_lock_define_initialized, below).  Use `extern' for CLASS to
-   declare a lock defined in another module.  In public structure
-   definitions you must use a pointer to the lock structure (i.e., NAME
-   begins with a `*'), because its storage size will not be known outside
-   of libc.  */
-#define __libc_lock_define(CLASS,NAME) \
-  CLASS __libc_lock_t NAME;
-#define __libc_rwlock_define(CLASS,NAME) \
-  CLASS __libc_rwlock_t NAME;
-#define __libc_lock_define_recursive(CLASS,NAME) \
-  CLASS __libc_lock_recursive_t NAME;
-#define __rtld_lock_define_recursive(CLASS,NAME) \
-  CLASS __rtld_lock_recursive_t NAME;
-
-/* Define an initialized lock variable NAME with storage class CLASS.
-
-   For the C library we take a deeper look at the initializer.  For
-   this implementation all fields are initialized to zero.  Therefore
-   we don't initialize the variable which allows putting it into the
-   BSS section.  (Except on PA-RISC and other odd architectures, where
-   initialized locks must be set to one due to the lack of normal
-   atomic operations.) */
-
-#if __LT_SPINLOCK_INIT == 0
-#  define __libc_lock_define_initialized(CLASS,NAME) \
-  CLASS __libc_lock_t NAME;
-#else
-#  define __libc_lock_define_initialized(CLASS,NAME) \
-  CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
-#define __libc_rwlock_define_initialized(CLASS,NAME) \
-  CLASS __libc_rwlock_t NAME = PTHREAD_RWLOCK_INITIALIZER;
-
-/* Define an initialized recursive lock variable NAME with storage
-   class CLASS.  */
-#define __libc_lock_define_initialized_recursive(CLASS,NAME) \
-  CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
-#define _LIBC_LOCK_RECURSIVE_INITIALIZER \
-  {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP}
-
-#define __rtld_lock_define_initialized_recursive(CLASS,NAME) \
-  CLASS __rtld_lock_recursive_t NAME = _RTLD_LOCK_RECURSIVE_INITIALIZER;
-#define _RTLD_LOCK_RECURSIVE_INITIALIZER \
-  {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP}
-
-#if defined _LIBC && defined IS_IN_libpthread
-# define __libc_maybe_call(FUNC, ARGS, ELSE) FUNC ARGS
-#else
-# if defined __PIC__ || (defined _LIBC && defined SHARED)
-#  define __libc_maybe_call(FUNC, ARGS, ELSE) \
-  (__extension__ ({ __typeof (FUNC) *_fn = (FUNC); \
-                    _fn != NULL ? (*_fn) ARGS : ELSE; }))
-# else
-#  define __libc_maybe_call(FUNC, ARGS, ELSE) \
-  (FUNC != NULL ? FUNC ARGS : ELSE)
-# endif
-#endif
-#if defined _LIBC && !defined NOT_IN_libc && defined SHARED
-# define __libc_maybe_call2(FUNC, ARGS, ELSE) \
-  ({__builtin_expect (__libc_pthread_functions.ptr_##FUNC != NULL, 0) \
-    ? __libc_pthread_functions.ptr_##FUNC ARGS : ELSE; })
-#else
-# define __libc_maybe_call2(FUNC, ARGS, ELSE) __libc_maybe_call (__##FUNC, ARGS, ELSE)
-#endif
-
-/* Initialize the named lock variable, leaving it in a consistent, unlocked
-   state.  */
-#if defined _LIBC && !defined NOT_IN_libc && defined SHARED
-#define __libc_lock_init(NAME) \
-  ({									      \
-    (NAME).__m_count = 0;						      \
-    (NAME).__m_owner = NULL;						      \
-    (NAME).__m_kind = PTHREAD_MUTEX_TIMED_NP;				      \
-    (NAME).__m_lock.__status = 0;					      \
-    (NAME).__m_lock.__spinlock = __LT_SPINLOCK_INIT;			      \
-    0; })
-#else
-#define __libc_lock_init(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_init, (&(NAME), NULL), 0))
-#endif
-#define __libc_rwlock_init(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_init, (&(NAME), NULL), 0));
-
-/* Same as last but this time we initialize a recursive mutex.  */
-#if defined _LIBC && !defined NOT_IN_libc && defined SHARED
-#define __libc_lock_init_recursive(NAME) \
-  ({									      \
-    (NAME).mutex.__m_count = 0;						      \
-    (NAME).mutex.__m_owner = NULL;					      \
-    (NAME).mutex.__m_kind = PTHREAD_MUTEX_RECURSIVE_NP;			      \
-    (NAME).mutex.__m_lock.__status = 0;					      \
-    (NAME).mutex.__m_lock.__spinlock = __LT_SPINLOCK_INIT;		      \
-    0; })
-#else
-#define __libc_lock_init_recursive(NAME) \
-  do {									      \
-    if (__pthread_mutex_init != NULL)					      \
-      {									      \
-	pthread_mutexattr_t __attr;					      \
-	__pthread_mutexattr_init (&__attr);				      \
-	__pthread_mutexattr_settype (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \
-	__pthread_mutex_init (&(NAME).mutex, &__attr);			      \
-	__pthread_mutexattr_destroy (&__attr);				      \
-      }									      \
-  } while (0);
-#endif
-#define __rtld_lock_init_recursive(NAME) \
-  __libc_lock_init_recursive (NAME)
-
-/* Finalize the named lock variable, which must be locked.  It cannot be
-   used again until __libc_lock_init is called again on it.  This must be
-   called on a lock variable before the containing storage is reused.  */
-#define __libc_lock_fini(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_destroy, (&(NAME)), 0));
-#define __libc_rwlock_fini(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_destroy, (&(NAME)), 0));
-
-/* Finalize recursive named lock.  */
-#define __libc_lock_fini_recursive(NAME) __libc_lock_fini ((NAME).mutex)
-#define __rtld_lock_fini_recursive(NAME) __libc_lock_fini_recursive (NAME)
-
-/* Lock the named lock variable.  */
-#define __libc_lock_lock(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_lock, (&(NAME)), 0));
-#define __libc_rwlock_rdlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_rdlock, (&(NAME)), 0));
-#define __libc_rwlock_wrlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_wrlock, (&(NAME)), 0));
-
-/* Lock the recursive named lock variable.  */
-#define __libc_lock_lock_recursive(NAME) __libc_lock_lock ((NAME).mutex)
-
-/* Try to lock the named lock variable.  */
-#define __libc_lock_trylock(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_trylock, (&(NAME)), 0))
-#define __libc_rwlock_tryrdlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_tryrdlock, (&(NAME)), 0))
-#define __libc_rwlock_trywrlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_trywrlock, (&(NAME)), 0))
-
-/* Try to lock the recursive named lock variable.  */
-#define __libc_lock_trylock_recursive(NAME) __libc_lock_trylock ((NAME).mutex)
-#define __rtld_lock_trylock_recursive(NAME) \
-  __libc_lock_trylock_recursive (NAME)
-
-/* Unlock the named lock variable.  */
-#define __libc_lock_unlock(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_unlock, (&(NAME)), 0));
-#define __libc_rwlock_unlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_unlock, (&(NAME)), 0));
-
-/* Unlock the recursive named lock variable.  */
-#define __libc_lock_unlock_recursive(NAME) __libc_lock_unlock ((NAME).mutex)
-
-#if defined _LIBC && defined SHARED
-# define __rtld_lock_default_lock_recursive(lock) \
-  ++((pthread_mutex_t *)(lock))->__m_count;
-
-# define __rtld_lock_default_unlock_recursive(lock) \
-  --((pthread_mutex_t *)(lock))->__m_count;
-
-# define __rtld_lock_lock_recursive(NAME) \
-  GL(dl_rtld_lock_recursive) (&(NAME).mutex)
-
-# define __rtld_lock_unlock_recursive(NAME) \
-  GL(dl_rtld_unlock_recursive) (&(NAME).mutex)
-#else
-#define __rtld_lock_lock_recursive(NAME) __libc_lock_lock_recursive (NAME)
-#define __rtld_lock_unlock_recursive(NAME) __libc_lock_unlock_recursive (NAME)
-#endif
-
-/* Define once control variable.  */
-#if PTHREAD_ONCE_INIT == 0
-/* Special case for static variables where we can avoid the initialization
-   if it is zero.  */
-# define __libc_once_define(CLASS, NAME) \
-  CLASS pthread_once_t NAME
-#else
-# define __libc_once_define(CLASS, NAME) \
-  CLASS pthread_once_t NAME = PTHREAD_ONCE_INIT
-#endif
-
-/* Call handler iff the first call.  */
-#define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \
-  do {									      \
-    if (__pthread_once != NULL)						      \
-      __pthread_once (&(ONCE_CONTROL), (INIT_FUNCTION));		      \
-    else if ((ONCE_CONTROL) == PTHREAD_ONCE_INIT) {			      \
-      INIT_FUNCTION ();							      \
-      (ONCE_CONTROL) = 2;						      \
-    }									      \
-  } while (0)
-
-
-/* Start critical region with cleanup.  */
-#define __libc_cleanup_region_start(DOIT, FCT, ARG) \
-  { struct _pthread_cleanup_buffer _buffer;				      \
-    int _avail = (DOIT) && _pthread_cleanup_push_defer != NULL;		      \
-    if (_avail) {							      \
-      _pthread_cleanup_push_defer (&_buffer, (FCT), (ARG));		      \
-    }
-
-/* End critical region with cleanup.  */
-#define __libc_cleanup_region_end(DOIT) \
-    if (_avail) {							      \
-      _pthread_cleanup_pop_restore (&_buffer, (DOIT));			      \
-    }									      \
-  }
-
-/* Sometimes we have to exit the block in the middle.  */
-#define __libc_cleanup_end(DOIT) \
-    if (_avail) {							      \
-      _pthread_cleanup_pop_restore (&_buffer, (DOIT));			      \
-    }
-
-#define __libc_cleanup_push(fct, arg) \
-    { struct _pthread_cleanup_buffer _buffer; 				      \
-    __libc_maybe_call (_pthread_cleanup_push, (&_buffer, (fct), (arg)), 0)
-
-#define __libc_cleanup_pop(execute) \
-    __libc_maybe_call (_pthread_cleanup_pop, (&_buffer, execute), 0);	      \
-    }
-
-/* Create thread-specific key.  */
-#define __libc_key_create(KEY, DESTRUCTOR) \
-  (__libc_maybe_call (__pthread_key_create, (KEY, DESTRUCTOR), 1))
-
-/* Get thread-specific data.  */
-#define __libc_getspecific(KEY) \
-  (__libc_maybe_call (__pthread_getspecific, (KEY), NULL))
-
-/* Set thread-specific data.  */
-#define __libc_setspecific(KEY, VALUE) \
-  (__libc_maybe_call (__pthread_setspecific, (KEY, VALUE), 0))
-
-
-/* Register handlers to execute before and after `fork'.  */
-#define __libc_atfork(PREPARE, PARENT, CHILD) \
-  (__libc_maybe_call (__pthread_atfork, (PREPARE, PARENT, CHILD), 0))
-
-/* Functions that are used by this file and are internal to the GNU C
-   library.  */
-
-extern int __pthread_mutex_init (pthread_mutex_t *__mutex,
-				 __const pthread_mutexattr_t *__mutex_attr);
-
-extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr);
-
-extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr);
-
-extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr,
-					int __kind);
-
-#ifdef __USE_UNIX98
-extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock,
-				  __const pthread_rwlockattr_t *__attr);
-
-extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
-#endif
-
-extern int __pthread_key_create (pthread_key_t *__key,
-				 void (*__destr_function) (void *));
-
-extern int __pthread_setspecific (pthread_key_t __key,
-				  __const void *__pointer);
-
-extern void *__pthread_getspecific (pthread_key_t __key);
-
-extern int __pthread_once (pthread_once_t *__once_control,
-			   void (*__init_routine) (void));
-
-extern int __pthread_atfork (void (*__prepare) (void),
-			     void (*__parent) (void),
-			     void (*__child) (void));
-
-
-
-/* Make the pthread functions weak so that we can elide them from
-   single-threaded processes.  */
-#ifndef __NO_WEAK_PTHREAD_ALIASES
-#  pragma weak __pthread_mutex_init
-#  pragma weak __pthread_mutex_destroy
-#  pragma weak __pthread_mutex_lock
-#  pragma weak __pthread_mutex_trylock
-#  pragma weak __pthread_mutex_unlock
-#  pragma weak __pthread_mutexattr_init
-#  pragma weak __pthread_mutexattr_destroy
-#  pragma weak __pthread_mutexattr_settype
-#  pragma weak __pthread_rwlock_destroy
-#  pragma weak __pthread_rwlock_rdlock
-#  pragma weak __pthread_rwlock_tryrdlock
-#  pragma weak __pthread_rwlock_wrlock
-#  pragma weak __pthread_rwlock_trywrlock
-#  pragma weak __pthread_rwlock_unlock
-#  pragma weak __pthread_key_create
-#  pragma weak __pthread_setspecific
-#  pragma weak __pthread_getspecific
-#  pragma weak __pthread_once
-#  pragma weak __pthread_initialize
-#  pragma weak __pthread_atfork
-#  pragma weak _pthread_cleanup_push_defer
-#  pragma weak _pthread_cleanup_pop_restore
-#  pragma weak _pthread_cleanup_push
-#  pragma weak _pthread_cleanup_pop
-#endif
-
-/* We need portable names for some functions.  E.g., when they are
-   used as argument to __libc_cleanup_region_start.  */
-#define __libc_mutex_unlock __pthread_mutex_unlock
-
-#endif	/* bits/libc-lock.h */
diff --git a/newlib/libc/sys/linux/bits/pthreadtypes.h b/newlib/libc/sys/linux/bits/pthreadtypes.h
deleted file mode 100644
index d1daef07a..000000000
--- a/newlib/libc/sys/linux/bits/pthreadtypes.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program is distributed in the hope that it will be useful,      */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of       */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        */
-/* GNU Library General Public License for more details.                 */
-
-#if !defined _BITS_TYPES_H && !defined _PTHREAD_H
-# error "Never include <bits/pthreadtypes.h> directly; use <sys/types.h> instead."
-#endif
-
-#ifndef _BITS_PTHREADTYPES_H
-#define _BITS_PTHREADTYPES_H	1
-
-#define __need_schedparam
-#include <bits/sched.h>
-
-/* Fast locks (not abstract because mutexes and conditions aren't abstract). */
-struct _pthread_fastlock
-{
-  long int __status;   /* "Free" or "taken" or head of waiting list */
-  int __spinlock;      /* Used by compare_and_swap emulation. Also,
-			  adaptive SMP lock stores spin count here. */
-};
-
-#ifndef _PTHREAD_DESCR_DEFINED
-/* Thread descriptors */
-typedef struct _pthread_descr_struct *_pthread_descr;
-# define _PTHREAD_DESCR_DEFINED
-#endif
-
-
-/* Attributes for threads.  */
-typedef struct __pthread_attr_s
-{
-  int __detachstate;
-  int __schedpolicy;
-  struct __sched_param __schedparam;
-  int __inheritsched;
-  int __scope;
-  size_t __guardsize;
-  int __stackaddr_set;
-  void *__stackaddr;
-  size_t __stacksize;
-} pthread_attr_t;
-
-
-/* Conditions (not abstract because of PTHREAD_COND_INITIALIZER */
-
-#ifdef __GLIBC_HAVE_LONG_LONG
-__extension__ typedef long long __pthread_cond_align_t;
-#else
-typedef long __pthread_cond_align_t;
-#endif
-
-typedef struct
-{
-  struct _pthread_fastlock __c_lock; /* Protect against concurrent access */
-  _pthread_descr __c_waiting;        /* Threads waiting on this condition */
-  char __padding[48 - sizeof (struct _pthread_fastlock)
-		 - sizeof (_pthread_descr) - sizeof (__pthread_cond_align_t)];
-  __pthread_cond_align_t __align;
-} pthread_cond_t;
-
-
-/* Attribute for conditionally variables.  */
-typedef struct
-{
-  int __dummy;
-} pthread_condattr_t;
-
-/* Keys for thread-specific data */
-typedef unsigned int pthread_key_t;
-
-
-/* Mutexes (not abstract because of PTHREAD_MUTEX_INITIALIZER).  */
-/* (The layout is unnatural to maintain binary compatibility
-    with earlier releases of LinuxThreads.) */
-typedef struct
-{
-  int __m_reserved;               /* Reserved for future use */
-  int __m_count;                  /* Depth of recursive locking */
-  _pthread_descr __m_owner;       /* Owner thread (if recursive or errcheck) */
-  int __m_kind;                   /* Mutex kind: fast, recursive or errcheck */
-  struct _pthread_fastlock __m_lock; /* Underlying fast lock */
-} pthread_mutex_t;
-
-
-/* Attribute for mutex.  */
-typedef struct
-{
-  int __mutexkind;
-} pthread_mutexattr_t;
-
-
-/* Once-only execution */
-typedef int pthread_once_t;
-
-
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-/* Read-write locks.  */
-typedef struct _pthread_rwlock_t
-{
-  struct _pthread_fastlock __rw_lock; /* Lock to guarantee mutual exclusion */
-  int __rw_readers;                   /* Number of readers */
-  _pthread_descr __rw_writer;         /* Identity of writer, or NULL if none */
-  _pthread_descr __rw_read_waiting;   /* Threads waiting for reading */
-  _pthread_descr __rw_write_waiting;  /* Threads waiting for writing */
-  int __rw_kind;                      /* Reader/Writer preference selection */
-  int __rw_pshared;                   /* Shared between processes or not */
-} pthread_rwlock_t;
-
-
-/* Attribute for read-write locks.  */
-typedef struct
-{
-  int __lockkind;
-  int __pshared;
-} pthread_rwlockattr_t;
-#endif
-
-#ifdef __USE_XOPEN2K
-/* POSIX spinlock data type.  */
-typedef volatile int pthread_spinlock_t;
-
-/* POSIX barrier. */
-typedef struct {
-  struct _pthread_fastlock __ba_lock; /* Lock to guarantee mutual exclusion */
-  int __ba_required;                  /* Threads needed for completion */
-  int __ba_present;                   /* Threads waiting */
-  _pthread_descr __ba_waiting;        /* Queue of waiting threads */
-} pthread_barrier_t;
-
-/* barrier attribute */
-typedef struct {
-  int __pshared;
-} pthread_barrierattr_t;
-
-#endif
-
-
-/* Thread identifiers */
-typedef unsigned long int pthread_t;
-
-#endif	/* bits/pthreadtypes.h */
diff --git a/newlib/libc/sys/linux/bits/typesizes.h b/newlib/libc/sys/linux/bits/typesizes.h
deleted file mode 100644
index 45264ac9c..000000000
--- a/newlib/libc/sys/linux/bits/typesizes.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* bits/typesizes.h -- underlying types for *_t.  Generic version.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _BITS_TYPES_H
-# error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead."
-#endif
-
-#ifndef	_BITS_TYPESIZES_H
-#define	_BITS_TYPESIZES_H	1
-
-/* See <bits/types.h> for the meaning of these macros.  This file exists so
-   that <bits/types.h> need not vary across different GNU platforms.  */
-
-#define __DEV_T_TYPE		__UQUAD_TYPE
-#define __UID_T_TYPE		__U32_TYPE
-#define __GID_T_TYPE		__U32_TYPE
-#define __INO_T_TYPE		__ULONGWORD_TYPE
-#define __INO64_T_TYPE		__UQUAD_TYPE
-#define __MODE_T_TYPE		__U32_TYPE
-#define __NLINK_T_TYPE		__UWORD_TYPE
-#define __OFF_T_TYPE		__SLONGWORD_TYPE
-#define __OFF64_T_TYPE		__SQUAD_TYPE
-#define __PID_T_TYPE		__S32_TYPE
-#define __RLIM_T_TYPE		__ULONGWORD_TYPE
-#define __RLIM64_T_TYPE		__UQUAD_TYPE
-#define	__BLKCNT_T_TYPE		__SLONGWORD_TYPE
-#define	__BLKCNT64_T_TYPE	__SQUAD_TYPE
-#define	__FSBLKCNT_T_TYPE	__ULONGWORD_TYPE
-#define	__FSBLKCNT64_T_TYPE	__UQUAD_TYPE
-#define	__FSFILCNT_T_TYPE	__ULONGWORD_TYPE
-#define	__FSFILCNT64_T_TYPE	__UQUAD_TYPE
-#define	__ID_T_TYPE		__U32_TYPE
-#define __CLOCK_T_TYPE		__SLONGWORD_TYPE
-#define __TIME_T_TYPE		__SLONGWORD_TYPE
-#define __USECONDS_T_TYPE	__U32_TYPE
-#define __SUSECONDS_T_TYPE	__SLONGWORD_TYPE
-#define __DADDR_T_TYPE		__S32_TYPE
-#define __SWBLK_T_TYPE		__SLONGWORD_TYPE
-#define __KEY_T_TYPE		__S32_TYPE
-#define __CLOCKID_T_TYPE	__S32_TYPE
-#define __TIMER_T_TYPE		__S32_TYPE
-#define __BLKSIZE_T_TYPE	__SLONGWORD_TYPE
-#define __FSID_T_TYPE		struct { int __val[2]; }
-#define __SSIZE_T_TYPE		__SWORD_TYPE
-
-/* Number of descriptors that can fit in an `fd_set'.  */
-#define	__FD_SETSIZE		1024
-
-
-#endif /* bits/typesizes.h */
diff --git a/newlib/libc/sys/linux/configure b/newlib/libc/sys/linux/configure
index 202a986e1..88451ffb1 100755
--- a/newlib/libc/sys/linux/configure
+++ b/newlib/libc/sys/linux/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1655,7 +1652,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1682,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1765,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1886,7 +1883,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
+echo "configure:1887: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1917: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1920: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1954,7 +1951,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
+echo "configure:1972: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:2022: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2042,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
+echo "configure:2043: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
+echo "configure:2216: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2245,7 +2242,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2246: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2304,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
+echo "configure:2308: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2378,7 +2375,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
+echo "configure:2379: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
+echo "configure:2411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,7 +2442,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
+echo "configure:2446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
+echo "configure:2478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2545 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2564,7 +2561,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2582,7 +2579,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:2583: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2596 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:2633: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2696,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2732: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2763,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2799: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2834,12 +2831,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
+echo "configure:2835: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
+echo "configure:2869: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
@@ -2994,7 +2991,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2998: checking for $ac_word" >&5
+echo "configure:2995: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/newlib/libc/sys/linux/dl/dl-cache.c b/newlib/libc/sys/linux/dl/dl-cache.c
index 9511da13f..a71e5e876 100644
--- a/newlib/libc/sys/linux/dl/dl-cache.c
+++ b/newlib/libc/sys/linux/dl/dl-cache.c
@@ -208,7 +208,7 @@ _dl_load_cache_lookup (const char *name)
       /* This file ends in static libraries where we don't have a hwcap.  */
       unsigned long int *hwcap;
       uint64_t platform;
-      #pragma weak _dl_hwcap
+      weak_extern (_dl_hwcap);
 
       /* This is where the strings start.  */
       cache_data = (const char *) cache_new;
diff --git a/newlib/libc/sys/linux/dl/dl-load.c b/newlib/libc/sys/linux/dl/dl-load.c
index 4e32d604b..65b72c729 100644
--- a/newlib/libc/sys/linux/dl/dl-load.c
+++ b/newlib/libc/sys/linux/dl/dl-load.c
@@ -1095,7 +1095,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
       }
     else
       /* Adjust the PT_PHDR value by the runtime load address.  */
-      l->l_phdr = (ElfW(Addr)) l->l_phdr + l->l_addr;
+      (ElfW(Addr)) l->l_phdr += l->l_addr;
   }
 
   /* We are done mapping in the file.  We no longer need the descriptor.  */
@@ -1115,7 +1115,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
 	}
     }
   else
-    l->l_ld = (ElfW(Addr)) l->l_ld + l->l_addr;
+    (ElfW(Addr)) l->l_ld += l->l_addr;
 
   l->l_entry += l->l_addr;
 
diff --git a/newlib/libc/sys/linux/dl/dl-local.h b/newlib/libc/sys/linux/dl/dl-local.h
deleted file mode 100644
index 3629ab94c..000000000
--- a/newlib/libc/sys/linux/dl/dl-local.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef _LOCAL_H
-#include <dlfcn.h>
-
-#define internal_function
-
-/* Internally used flag.  */
-#define __RTLD_DLOPEN	0x80000000
-#define __RTLD_SPROF	0x40000000
-
-/* Now define the internal interfaces.  */
-extern void *__dlvsym (void *__handle, __const char *__name,
-		       __const char *__version);
-
-extern void *__libc_dlopen  (__const char *__name);
-extern void *__libc_dlsym   (void *__map, __const char *__name);
-extern int   __libc_dlclose (void *__map);
-
-/* Locate shared object containing the given address.  */
-extern int _dl_addr (const void *address, Dl_info *info)
-     internal_function;
-
-/* Open the shared object NAME, relocate it, and run its initializer if it
-   hasn't already been run.  MODE is as for `dlopen' (see <dlfcn.h>).  If
-   the object is already opened, returns its existing map.  */
-extern void *_dl_open (const char *name, int mode, const void *caller)
-     internal_function;
-
-/* Close an object previously opened by _dl_open.  */
-extern void _dl_close (void *map)
-     internal_function;
-
-/* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or
-   RTLD_NEXT).  WHO is the calling function, for RTLD_NEXT.  Returns
-   the symbol value, which may be NULL.  */
-extern void *_dl_sym (void *handle, const char *name, void *who)
-    internal_function;
-
-/* Look up version VERSION of symbol NAME in shared object HANDLE
-   (which may be RTLD_DEFAULT or RTLD_NEXT).  WHO is the calling
-   function, for RTLD_NEXT.  Returns the symbol value, which may be
-   NULL.  */
-extern void *_dl_vsym (void *handle, const char *name, const char *version,
-		       void *who)
-    internal_function;
-
-/* Call OPERATE, catching errors from `dl_signal_error'.  If there is no
-   error, *ERRSTRING is set to null.  If there is an error, *ERRSTRING is
-   set to a string constructed from the strings passed to _dl_signal_error,
-   and the error code passed is the return value and *OBJNAME is set to
-   the object name which experienced the problems.  ERRSTRING if nonzero
-   points to a malloc'ed string which the caller has to free after use.
-   ARGS is passed as argument to OPERATE.  */
-extern int _dl_catch_error (const char **objname, const char **errstring,
-			    void (*operate) (void *),
-			    void *args)
-     internal_function;
-
-/* Helper function for <dlfcn.h> functions.  Runs the OPERATE function via
-   _dl_catch_error.  Returns zero for success, nonzero for failure; and
-   arranges for `dlerror' to return the error details.
-   ARGS is passed as argument to OPERATE.  */
-extern int _dlerror_run (void (*operate) (void *), void *args)
-     internal_function;
-
-#endif
diff --git a/newlib/libc/sys/linux/dl/dl-open.c b/newlib/libc/sys/linux/dl/dl-open.c
index 4e068d435..195361427 100644
--- a/newlib/libc/sys/linux/dl/dl-open.c
+++ b/newlib/libc/sys/linux/dl/dl-open.c
@@ -36,8 +36,8 @@
 extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,
 				    void (*dl_main) (const ElfW(Phdr) *phdr,
 						     ElfW(Word) phnum,
-						     ElfW(Addr) *user_entry))
-				   weak_function;
+						     ElfW(Addr) *user_entry));
+weak_extern (BP_SYM (_dl_sysdep_start))
 
 /* This function is used to unload the cache file if necessary.  */
 extern void _dl_unload_cache (void);
diff --git a/newlib/libc/sys/linux/dl/dl-reloc.c b/newlib/libc/sys/linux/dl/dl-reloc.c
index 0bffa4e76..94163143e 100644
--- a/newlib/libc/sys/linux/dl/dl-reloc.c
+++ b/newlib/libc/sys/linux/dl/dl-reloc.c
@@ -105,47 +105,50 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
   {
     /* Do the actual relocation of the object's GOT and other data.  */
 
+    /* String table object symbols.  */
+    const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]);
+
     /* This macro is used as a callback from the ELF_DYNAMIC_RELOCATE code.  */
-#define RESOLVE_MAP(ref, version, r_type, scope) \
+#define RESOLVE_MAP(ref, version, r_type) \
     (ELFW(ST_BIND) ((*ref)->st_info) != STB_LOCAL			      \
-     ? ((__builtin_expect ((*ref) == map->l_lookup_cache.sym, 0)	      \
-	 && elf_machine_type_class (r_type) == map->l_lookup_cache.type_class)\
+     ? ((__builtin_expect ((*ref) == l->l_lookup_cache.sym, 0)		      \
+	 && elf_machine_type_class (r_type) == l->l_lookup_cache.type_class)  \
 	? (++_dl_num_cache_relocations,					      \
-	   (*ref) = map->l_lookup_cache.ret,				      \
-	   map->l_lookup_cache.value)					      \
+	   (*ref) = l->l_lookup_cache.ret,				      \
+	   l->l_lookup_cache.value)					      \
 	: ({ lookup_t _lr;						      \
 	     int _tc = elf_machine_type_class (r_type);			      \
-	     map->l_lookup_cache.type_class = _tc;			      \
-	     map->l_lookup_cache.sym = (*ref);				      \
+	     l->l_lookup_cache.type_class = _tc;			      \
+	     l->l_lookup_cache.sym = (*ref);				      \
 	     _lr = ((version) != NULL && (version)->hash != 0		      \
 		    ? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name,  \
-						   map, (ref), scope,	      \
+						   l, (ref), scope,	      \
 						   (version), _tc, 0)	      \
-		    : _dl_lookup_symbol (strtab + (*ref)->st_name, map, (ref),\
+		    : _dl_lookup_symbol (strtab + (*ref)->st_name, l, (ref),  \
 					 scope, _tc, 0));		      \
-	     map->l_lookup_cache.ret = (*ref);				      \
-	     map->l_lookup_cache.value = _lr; }))				      \
-     : map)
-#define RESOLVE(ref, version, r_type, scope) \
+	     l->l_lookup_cache.ret = (*ref);				      \
+	     l->l_lookup_cache.value = _lr; }))				      \
+     : l)
+#define RESOLVE(ref, version, r_type) \
     (ELFW(ST_BIND) ((*ref)->st_info) != STB_LOCAL			      \
-     ? ((__builtin_expect ((*ref) == map->l_lookup_cache.sym, 0)	      \
-	 && elf_machine_type_class (r_type) == map->l_lookup_cache.type_class)\
+     ? ((__builtin_expect ((*ref) == l->l_lookup_cache.sym, 0)		      \
+	 && elf_machine_type_class (r_type) == l->l_lookup_cache.type_class)  \
 	? (++_dl_num_cache_relocations,					      \
-	   (*ref) = map->l_lookup_cache.ret,				      \
-	   map->l_lookup_cache.value)					      \
+	   (*ref) = l->l_lookup_cache.ret,				      \
+	   l->l_lookup_cache.value)					      \
 	: ({ lookup_t _lr;						      \
 	     int _tc = elf_machine_type_class (r_type);			      \
-	     map->l_lookup_cache.type_class = _tc;			      \
-	     map->l_lookup_cache.sym = (*ref);				      \
+	     l->l_lookup_cache.type_class = _tc;			      \
+	     l->l_lookup_cache.sym = (*ref);				      \
 	     _lr = ((version) != NULL && (version)->hash != 0		      \
 		    ? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name,  \
-						   map, (ref), scope,	      \
+						   l, (ref), scope,	      \
 						   (version), _tc, 0)	      \
-		    : _dl_lookup_symbol (strtab + (*ref)->st_name, map, (ref),\
+		    : _dl_lookup_symbol (strtab + (*ref)->st_name, l, (ref),  \
 					 scope, _tc, 0));		      \
-	     map->l_lookup_cache.ret = (*ref);				      \
-	     map->l_lookup_cache.value = _lr; }))			      \
-     : map->l_addr)
+	     l->l_lookup_cache.ret = (*ref);				      \
+	     l->l_lookup_cache.value = _lr; }))				      \
+     : l->l_addr)
 
 #include "dynamic-link.h"
 
@@ -194,7 +197,6 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
     }
 }
 
-#include <machine/dl-machine.h>
 
 void
 internal_function
diff --git a/newlib/libc/sys/linux/dl/dl-runtime.c b/newlib/libc/sys/linux/dl/dl-runtime.c
index 4fb81cfaf..403091d2e 100644
--- a/newlib/libc/sys/linux/dl/dl-runtime.c
+++ b/newlib/libc/sys/linux/dl/dl-runtime.c
@@ -46,7 +46,7 @@
    function.  */
 
 #ifndef ELF_MACHINE_NO_PLT
-static ElfW(Addr) __attribute__ ((regparm (2), used))
+static ElfW(Addr) __attribute__ ((regparm (2), unused))
 fixup (
 # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
         ELF_MACHINE_RUNTIME_FIXUP_ARGS,
@@ -130,7 +130,7 @@ fixup (
 
 #if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__
 
-static ElfW(Addr) __attribute__ ((regparm (3), used))
+static ElfW(Addr) __attribute__ ((regparm (3), unused))
 profile_fixup (
 #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
        ELF_MACHINE_RUNTIME_FIXUP_ARGS,
diff --git a/newlib/libc/sys/linux/dl/dlfcn.h b/newlib/libc/sys/linux/dl/dlfcn.h
new file mode 100644
index 000000000..67ba73d5d
--- /dev/null
+++ b/newlib/libc/sys/linux/dl/dlfcn.h
@@ -0,0 +1,84 @@
+/* User functions for run-time dynamic loading.
+   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef	_DLFCN_H
+#define	_DLFCN_H 1
+
+#include <features.h>
+
+/* Collect various system dependent definitions and declarations.  */
+#include <sys/dlfcn.h>
+
+
+/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT
+   the run-time address of the symbol called NAME in the next shared
+   object is returned.  The "next" relation is defined by the order
+   the shared objects were loaded.  */
+# define RTLD_NEXT	((void *) -1l)
+
+/* If the first argument to `dlsym' or `dlvsym' is set to RTLD_DEFAULT
+   the run-time address of the symbol called NAME in the global scope
+   is returned.  */
+# define RTLD_DEFAULT	((void *) 0)
+
+
+__BEGIN_DECLS
+
+/* Open the shared object FILE and map it in; return a handle that can be
+   passed to `dlsym' to get symbol values from it.  */
+extern void *dlopen (__const char *__file, int __mode) __THROW;
+
+/* Unmap and close a shared object opened by `dlopen'.
+   The handle cannot be used again after calling `dlclose'.  */
+extern int dlclose (void *__handle) __THROW;
+
+/* Find the run-time address in the shared object HANDLE refers to
+   of the symbol called NAME.  */
+extern void *dlsym (void *__restrict __handle,
+		    __const char *__restrict __name) __THROW;
+
+/* Find the run-time address in the shared object HANDLE refers to
+   of the symbol called NAME with VERSION.  */
+extern void *dlvsym (void *__restrict __handle,
+		     __const char *__restrict __name,
+		     __const char *__restrict __version) __THROW;
+
+/* When any of the above functions fails, call this function
+   to return a string describing the error.  Each call resets
+   the error string so that a following call returns null.  */
+extern char *dlerror (void) __THROW;
+
+
+/* Structure containing information about object searched using
+   `dladdr'.  */
+typedef struct
+{
+  __const char *dli_fname;	/* File name of defining object.  */
+  void *dli_fbase;		/* Load address of that object.  */
+  __const char *dli_sname;	/* Name of nearest symbol.  */
+  void *dli_saddr;		/* Exact value of nearest symbol.  */
+} Dl_info;
+
+/* Fill in *INFO with the following information about ADDRESS.
+   Returns 0 iff no shared object's segments contain that address.  */
+extern int dladdr (__const void *__address, Dl_info *__info) __THROW;
+
+__END_DECLS
+
+#endif	/* dlfcn.h */
diff --git a/newlib/libc/sys/linux/dl/do-rel.h b/newlib/libc/sys/linux/dl/do-rel.h
index 03b9e807b..46202d704 100644
--- a/newlib/libc/sys/linux/dl/do-rel.h
+++ b/newlib/libc/sys/linux/dl/do-rel.h
@@ -44,8 +44,7 @@
 static inline void
 elf_dynamic_do_rel (struct link_map *map,
 		    ElfW(Addr) reladdr, ElfW(Addr) relsize,
-		    int lazy,
-		    struct r_scope_elem *scope[])
+		    int lazy)
 {
   const ElfW(Rel) *r = (const void *) reladdr;
   const ElfW(Rel) *end = (const void *) (reladdr + relsize);
@@ -78,7 +77,7 @@ elf_dynamic_do_rel (struct link_map *map,
 	 RTLD_BOOTSTRAP) because rtld.c contains the common defn for
 	 _dl_rtld_map, which is incompatible with a weak decl in the same
 	 file.  */
-      #pragma weak _dl_rtld_map
+      weak_extern (_dl_rtld_map);
       if (map != &_dl_rtld_map) /* Already done in rtld itself.  */
 # ifndef DO_RELA
 	/* Rela platforms get the offset from r_addend and this must
@@ -102,14 +101,13 @@ elf_dynamic_do_rel (struct link_map *map,
 	      ElfW(Half) ndx = version[ELFW(R_SYM) (r->r_info)];
 	      elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)],
 			       &map->l_versions[ndx],
-			       (void *) (l_addr + r->r_offset),
-			       scope);
+			       (void *) (l_addr + r->r_offset));
 	    }
 	}
       else
 	for (; r < end; ++r)
 	  elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)], NULL,
-			   (void *) (l_addr + r->r_offset), scope);
+			   (void *) (l_addr + r->r_offset));
     }
 }
 
diff --git a/newlib/libc/sys/linux/dl/dynamic-link.h b/newlib/libc/sys/linux/dl/dynamic-link.h
index c1709f7c6..a63fded89 100644
--- a/newlib/libc/sys/linux/dl/dynamic-link.h
+++ b/newlib/libc/sys/linux/dl/dynamic-link.h
@@ -17,9 +17,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifndef __DYNAMIC_LINK_H__
-#define __DYNAMIC_LINK_H__
-
 #include <elf.h>
 #include <machine/dl-machine.h>
 #include <assert.h>
@@ -36,7 +33,7 @@ extern int _dl_verbose __attribute__ ((unused));
 
 /* Read the dynamic section at DYN and fill in INFO with indices DT_*.  */
 
-static void __attribute__ ((unused))
+static inline void __attribute__ ((unused))
 elf_get_dynamic_info (struct link_map *l)
 {
   ElfW(Dyn) *dyn = l->l_ld;
@@ -124,17 +121,6 @@ elf_get_dynamic_info (struct link_map *l)
     info[DT_RPATH] = NULL;
 }
 
-# if ! ELF_MACHINE_NO_REL
-#  include "do-rel.h"
-# endif
-
-# if ! ELF_MACHINE_NO_RELA
-#  define DO_RELA
-#  include "do-rel.h"
-# endif
-
-#endif  /* __DYNAMIC_LINK_H__ */
-
 #ifdef RESOLVE
 
 /* Get the definitions of `elf_dynamic_do_rel' and `elf_dynamic_do_rela'.
@@ -178,8 +164,7 @@ elf_get_dynamic_info (struct link_map *l)
       elf_dynamic_do_##reloc ((map),					      \
 			      ranges[ranges_index].start,		      \
 			      ranges[ranges_index].size,		      \
-			      ranges[ranges_index].lazy,		      \
-			      scope);					      \
+			      ranges[ranges_index].lazy);		      \
   } while (0)
 # else
 #  define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, test_rel) \
@@ -219,8 +204,7 @@ elf_get_dynamic_info (struct link_map *l)
       elf_dynamic_do_##reloc ((map),					      \
 			      ranges[ranges_index].start,		      \
 			      ranges[ranges_index].size,		      \
-			      ranges[ranges_index].lazy,		      \
-			      scope);					      \
+			      ranges[ranges_index].lazy);		      \
   } while (0)
 # endif
 
@@ -231,6 +215,7 @@ elf_get_dynamic_info (struct link_map *l)
 # endif
 
 # if ! ELF_MACHINE_NO_REL
+#  include "do-rel.h"
 #  define ELF_DYNAMIC_DO_REL(map, lazy) \
   _ELF_DYNAMIC_DO_RELOC (REL, rel, map, lazy, _ELF_CHECK_REL)
 # else
@@ -238,6 +223,8 @@ elf_get_dynamic_info (struct link_map *l)
 # endif
 
 # if ! ELF_MACHINE_NO_RELA
+#  define DO_RELA
+#  include "do-rel.h"
 #  define ELF_DYNAMIC_DO_RELA(map, lazy) \
   _ELF_DYNAMIC_DO_RELOC (RELA, rela, map, lazy, _ELF_CHECK_REL)
 # else
diff --git a/newlib/libc/sys/linux/dl/ldsodefs.h b/newlib/libc/sys/linux/dl/ldsodefs.h
index e6f57ddcf..f24e1136b 100644
--- a/newlib/libc/sys/linux/dl/ldsodefs.h
+++ b/newlib/libc/sys/linux/dl/ldsodefs.h
@@ -28,12 +28,11 @@
 #include <string.h>
 
 #include <elf.h>
+#include <dlfcn.h>
 #include <link.h>
 #include <dl-lookupcfg.h>
 #include <bits/libc-lock.h>
 
-#include "dl-local.h"
-
 __BEGIN_DECLS
 
 /* We use this macro to refer to ELF types independent of the native wordsize.
diff --git a/newlib/libc/sys/linux/getpwent.c b/newlib/libc/sys/linux/getpwent.c
deleted file mode 100644
index 9479021e3..000000000
--- a/newlib/libc/sys/linux/getpwent.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* FIXME: dummy stub for now.  */
-#include <errno.h>
-#include <pwd.h>
-
-struct passwd *
-_DEFUN (getpwnam, (name),
-	_CONST char *name)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-
-/* FIXME: dummy stub for now.  */
-struct passwd *
-_DEFUN (getpwuid, (uid),
-	uid_t uid)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-
-/* FIXME: dummy stub for now.  */
-struct passwd *
-_DEFUN (getpwent, (uid),
-	uid_t uid)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-
diff --git a/newlib/libc/sys/linux/getpwnam.c b/newlib/libc/sys/linux/getpwnam.c
new file mode 100644
index 000000000..c90562c5a
--- /dev/null
+++ b/newlib/libc/sys/linux/getpwnam.c
@@ -0,0 +1,12 @@
+/* FIXME: dummy stub for now.  */
+#include <errno.h>
+#include <pwd.h>
+
+struct passwd *
+_DEFUN (getpwnam, (name),
+	_CONST char *name)
+{
+  errno = ENOSYS;
+  return NULL;
+}
+
diff --git a/newlib/libc/sys/linux/getpwuid.c b/newlib/libc/sys/linux/getpwuid.c
new file mode 100644
index 000000000..4e9fcb220
--- /dev/null
+++ b/newlib/libc/sys/linux/getpwuid.c
@@ -0,0 +1,12 @@
+/* FIXME: dummy stub for now.  */
+#include <errno.h>
+#include <pwd.h>
+
+struct passwd *
+_DEFUN (getpwuid, (uid),
+	uid_t uid)
+{
+  errno = ENOSYS;
+  return NULL;
+}
+
diff --git a/newlib/libc/sys/linux/iconv/gconv_open.c b/newlib/libc/sys/linux/iconv/gconv_open.c
index 1b2fbb51a..5c10d601e 100644
--- a/newlib/libc/sys/linux/iconv/gconv_open.c
+++ b/newlib/libc/sys/linux/iconv/gconv_open.c
@@ -172,10 +172,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 	    lastp = runp;
 	  else
 	    /* This means we haven't found the module.  Remove it.  */
-	    if (lastp == NULL)
-	      trans = runp->next;
-	    else
-	      lastp->next = runp->next;
+	    (lastp == NULL ? trans : lastp->next) = runp->next;
 	}
 
       /* Allocate room for handle.  */
diff --git a/newlib/libc/sys/linux/iconv/gconv_simple.c b/newlib/libc/sys/linux/iconv/gconv_simple.c
index edc091f7c..a4a99ea81 100644
--- a/newlib/libc/sys/linux/iconv/gconv_simple.c
+++ b/newlib/libc/sys/linux/iconv/gconv_simple.c
@@ -75,10 +75,7 @@ internal_ucs4_loop (struct __gconv_step *step,
   size_t cnt;
 
   for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
-    {
-      *((uint32_t *) outptr) = bswap_32 (*(const uint32_t *) inptr);
-      outptr = (unsigned char *)((uint32_t *) outptr + 1);
-    }
+    *((uint32_t *) outptr)++ = bswap_32 (*(const uint32_t *) inptr);
 
   *inptrp = inptr;
   *outptrp = outptr;
@@ -183,13 +180,8 @@ internal_ucs4_loop_single (struct __gconv_step *step,
 
   *outptrp += 4;
 #elif __BYTE_ORDER == __BIG_ENDIAN
-  {
-    uint32_t **p = (uint32_t **)outptrp;
-    uint32_t *q = *p;
-    /* XXX unaligned */
-    *q = state->__value.__wch;
-    outptrp = (unsigned char *)(p + 1);
-  }
+  /* XXX unaligned */
+  *(*((uint32_t **) outptrp)++) = state->__value.__wch;
 #else
 # error "This endianess is not supported."
 #endif
@@ -252,7 +244,7 @@ ucs4_internal_loop (struct __gconv_step *step,
 	  if (flags & __GCONV_IGNORE_ERRORS)
 	    {
 	      /* Just ignore this character.  */
-	      *irreversible = *irreversible + 1;
+	      ++*irreversible;
 	      continue;
 	    }
 
@@ -261,8 +253,7 @@ ucs4_internal_loop (struct __gconv_step *step,
 	  return __GCONV_ILLEGAL_INPUT;
 	}
 
-      *((uint32_t *) outptr) = inval;
-      outptr = (unsigned char *) ((uint32_t *) outptr + 1);
+      *((uint32_t *) outptr)++ = inval;
     }
 
   *inptrp = inptr;
@@ -310,7 +301,7 @@ ucs4_internal_loop_unaligned (struct __gconv_step *step,
 	  if (flags & __GCONV_IGNORE_ERRORS)
 	    {
 	      /* Just ignore this character.  */
-	      *irreversible = *irreversible + 1;
+	      ++*irreversible;
 	      continue;
 	    }
 
@@ -545,13 +536,8 @@ internal_ucs4le_loop_single (struct __gconv_step *step,
 
   *outptrp += 4;
 #else
-  {
   /* XXX unaligned */
-  uint32_t **p = (uint32_t **)outptrp;
-  uint32_t *q = *p;
-  *q = state->__value.__wch;
-  outptrp = (unsigned char **)(p + 1);
-  }
+  *(*((uint32_t **) outptrp)++) = state->__value.__wch;
 #endif
 
   /* Clear the state buffer.  */
@@ -618,8 +604,7 @@ ucs4le_internal_loop (struct __gconv_step *step,
 	  return __GCONV_ILLEGAL_INPUT;
 	}
 
-      *((uint32_t *) outptr) = inval;
-      outptr = (unsigned char *)((uint32_t *) outptr + 1);
+      *((uint32_t *) outptr)++ = inval;
     }
 
   *inptrp = inptr;
@@ -796,16 +781,12 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
 	    break;							      \
 	  }								      \
 									      \
-	*irreversible = *irreversible + 1;				      \
+	++*irreversible;						      \
 	++inptr;							      \
       }									      \
     else								      \
-      { 								      \
-        /* It's an one byte sequence.  */				      \
-        *((uint32_t *) outptr) = *inptr;				      \
-        ++inptr;							      \
-        outptr = (unsigned char *)((uint32_t *) outptr + 1);		      \
-      }									      \
+      /* It's an one byte sequence.  */					      \
+      *((uint32_t *) outptr)++ = *inptr++;				      \
   }
 #define LOOP_NEED_FLAGS
 #include <iconv/loop.c>
@@ -834,11 +815,8 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
 	STANDARD_ERR_HANDLER (4);					      \
       }									      \
     else								      \
-      { 								      \
-        /* It's an one byte sequence.  */				      \
-        *outptr++ = *((const uint32_t *) inptr);			      \
-        inptr = ((const uint32_t *) inptr + 1);				      \
-      }									      \
+      /* It's an one byte sequence.  */					      \
+      *outptr++ = *((const uint32_t *) inptr)++;			      \
   }
 #define LOOP_NEED_FLAGS
 #include <iconv/loop.c>
@@ -1015,7 +993,7 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
 	      {								      \
 		/* Ignore it.  */					      \
 		inptr += i;						      \
-		*irreversible = *irreversible + 1;			      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
@@ -1045,7 +1023,7 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
 	    if (ignore_errors_p ())					      \
 	      {								      \
 		inptr += i;						      \
-		*irreversible = *irreversible + 1;			      \
+		++*irreversible;					      \
 		continue;						      \
 	      }								      \
 									      \
@@ -1057,8 +1035,7 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
       }									      \
 									      \
     /* Now adjust the pointers and store the result.  */		      \
-    *((uint32_t *) outptr) = ch;					      \
-    outptr = (unsigned char *)((uint32_t *) outptr + 1);		      \
+    *((uint32_t *) outptr)++ = ch;					      \
   }
 #define LOOP_NEED_FLAGS
 
@@ -1197,12 +1174,11 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
 	    break;							      \
 	  }								      \
 	inptr += 2;							      \
-	*irreversible = *irreversible + 1;				      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
 									      \
-    *((uint32_t *) outptr) = u1;					      \
-    outptr = (unsigned char *)((uint32_t *) outptr + 1);		      \
+    *((uint32_t *) outptr)++ = u1;					      \
     inptr += 2;								      \
   }
 #define LOOP_NEED_FLAGS
@@ -1247,13 +1223,12 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
 	    break;							      \
 	  }								      \
 	inptr += 4;							      \
-	*irreversible = *irreversible + 1;				      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
     else 								      \
       {									      \
-	*((uint16_t *) outptr) = val;					      \
-	outptr = (unsigned char *)((uint16_t *) outptr + 1);		      \
+	*((uint16_t *) outptr)++ = val;					      \
 	inptr += 4;							      \
       }									      \
   }
@@ -1290,12 +1265,11 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
 	    break;							      \
 	  }								      \
 	inptr += 2;							      \
-	*irreversible = *irreversible + 1;				      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
 									      \
-    *((uint32_t *) outptr) = u1;					      \
-    outptr = (unsigned char *)((uint32_t *) outptr + 1);		      \
+    *((uint32_t *) outptr)++ = u1;					      \
     inptr += 2;								      \
   }
 #define LOOP_NEED_FLAGS
@@ -1339,13 +1313,12 @@ ucs4le_internal_loop_single (struct __gconv_step *step,
 	    break;							      \
 	  }								      \
 	inptr += 4;							      \
-	*irreversible = *irreversible + 1;				      \
+	++*irreversible;						      \
 	continue;							      \
       }									      \
     else 								      \
       {									      \
-	*((uint16_t *) outptr) = bswap_16 (val);			      \
-	outptr = (unsigned char *)((uint16_t *) outptr + 1);		      \
+	*((uint16_t *) outptr)++ = bswap_16 (val);			      \
 	inptr += 4;							      \
       }									      \
   }
diff --git a/newlib/libc/sys/linux/include/dlfcn.h b/newlib/libc/sys/linux/include/dlfcn.h
index 67ba73d5d..75d7526b0 100644
--- a/newlib/libc/sys/linux/include/dlfcn.h
+++ b/newlib/libc/sys/linux/include/dlfcn.h
@@ -1,84 +1,65 @@
-/* User functions for run-time dynamic loading.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef	_DLFCN_H
-#define	_DLFCN_H 1
-
-#include <features.h>
-
-/* Collect various system dependent definitions and declarations.  */
-#include <sys/dlfcn.h>
-
-
-/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT
-   the run-time address of the symbol called NAME in the next shared
-   object is returned.  The "next" relation is defined by the order
-   the shared objects were loaded.  */
-# define RTLD_NEXT	((void *) -1l)
-
-/* If the first argument to `dlsym' or `dlvsym' is set to RTLD_DEFAULT
-   the run-time address of the symbol called NAME in the global scope
-   is returned.  */
-# define RTLD_DEFAULT	((void *) 0)
-
-
-__BEGIN_DECLS
-
-/* Open the shared object FILE and map it in; return a handle that can be
-   passed to `dlsym' to get symbol values from it.  */
-extern void *dlopen (__const char *__file, int __mode) __THROW;
-
-/* Unmap and close a shared object opened by `dlopen'.
-   The handle cannot be used again after calling `dlclose'.  */
-extern int dlclose (void *__handle) __THROW;
-
-/* Find the run-time address in the shared object HANDLE refers to
-   of the symbol called NAME.  */
-extern void *dlsym (void *__restrict __handle,
-		    __const char *__restrict __name) __THROW;
-
-/* Find the run-time address in the shared object HANDLE refers to
-   of the symbol called NAME with VERSION.  */
-extern void *dlvsym (void *__restrict __handle,
-		     __const char *__restrict __name,
-		     __const char *__restrict __version) __THROW;
-
-/* When any of the above functions fails, call this function
-   to return a string describing the error.  Each call resets
-   the error string so that a following call returns null.  */
-extern char *dlerror (void) __THROW;
-
-
-/* Structure containing information about object searched using
-   `dladdr'.  */
-typedef struct
-{
-  __const char *dli_fname;	/* File name of defining object.  */
-  void *dli_fbase;		/* Load address of that object.  */
-  __const char *dli_sname;	/* Name of nearest symbol.  */
-  void *dli_saddr;		/* Exact value of nearest symbol.  */
-} Dl_info;
-
-/* Fill in *INFO with the following information about ADDRESS.
-   Returns 0 iff no shared object's segments contain that address.  */
-extern int dladdr (__const void *__address, Dl_info *__info) __THROW;
-
-__END_DECLS
-
-#endif	/* dlfcn.h */
+#ifndef _DLFCN_H
+#include <dl/dlfcn.h>
+
+#define internal_function
+
+/* Internally used flag.  */
+#define __RTLD_DLOPEN	0x80000000
+#define __RTLD_SPROF	0x40000000
+
+/* Now define the internal interfaces.  */
+extern void *__dlvsym (void *__handle, __const char *__name,
+		       __const char *__version);
+
+extern void *__libc_dlopen  (__const char *__name);
+extern void *__libc_dlsym   (void *__map, __const char *__name);
+extern int   __libc_dlclose (void *__map);
+
+/* Locate shared object containing the given address.  */
+extern int _dl_addr (const void *address, Dl_info *info)
+     internal_function;
+
+/* Open the shared object NAME, relocate it, and run its initializer if it
+   hasn't already been run.  MODE is as for `dlopen' (see <dlfcn.h>).  If
+   the object is already opened, returns its existing map.  */
+extern void *_dl_open (const char *name, int mode, const void *caller)
+     internal_function;
+
+/* Close an object previously opened by _dl_open.  */
+extern void _dl_close (void *map)
+     internal_function;
+
+/* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or
+   RTLD_NEXT).  WHO is the calling function, for RTLD_NEXT.  Returns
+   the symbol value, which may be NULL.  */
+extern void *_dl_sym (void *handle, const char *name, void *who)
+    internal_function;
+
+/* Look up version VERSION of symbol NAME in shared object HANDLE
+   (which may be RTLD_DEFAULT or RTLD_NEXT).  WHO is the calling
+   function, for RTLD_NEXT.  Returns the symbol value, which may be
+   NULL.  */
+extern void *_dl_vsym (void *handle, const char *name, const char *version,
+		       void *who)
+    internal_function;
+
+/* Call OPERATE, catching errors from `dl_signal_error'.  If there is no
+   error, *ERRSTRING is set to null.  If there is an error, *ERRSTRING is
+   set to a string constructed from the strings passed to _dl_signal_error,
+   and the error code passed is the return value and *OBJNAME is set to
+   the object name which experienced the problems.  ERRSTRING if nonzero
+   points to a malloc'ed string which the caller has to free after use.
+   ARGS is passed as argument to OPERATE.  */
+extern int _dl_catch_error (const char **objname, const char **errstring,
+			    void (*operate) (void *),
+			    void *args)
+     internal_function;
+
+/* Helper function for <dlfcn.h> functions.  Runs the OPERATE function via
+   _dl_catch_error.  Returns zero for success, nonzero for failure; and
+   arranges for `dlerror' to return the error details.
+   ARGS is passed as argument to OPERATE.  */
+extern int _dlerror_run (void (*operate) (void *), void *args)
+     internal_function;
+
+#endif
diff --git a/newlib/libc/sys/linux/include/getopt.h b/newlib/libc/sys/linux/include/getopt.h
index 3fdf4645c..994f86001 100644
--- a/newlib/libc/sys/linux/include/getopt.h
+++ b/newlib/libc/sys/linux/include/getopt.h
@@ -8,11 +8,8 @@
 
 #include <unistd.h>
 
-enum { NO_ARG, REQUIRED_ARG, OPTIONAL_ARG };
-/* Define glibc names as well for compatibility.  */
-#define no_argument NO_ARG
-#define required_argument REQUIRED_ARG
-#define optional_argument OPTIONAL_ARG
+
+enum { no_argument, required_argument, optional_argument };
 
 struct option {
     const char *name;
diff --git a/newlib/libc/sys/linux/include/ltdl.h b/newlib/libc/sys/linux/include/ltdl.h
deleted file mode 100644
index 2bbfa302c..000000000
--- a/newlib/libc/sys/linux/include/ltdl.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/* ltdl.h -- generic dlopen functions
-   Copyright (C) 1998-2000 Free Software Foundation, Inc.
-   Originally by Thomas Tanner <tanner@ffii.org>
-   This file is part of GNU Libtool.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307  USA
-*/
-
-/* Only include this header file once. */
-#ifndef LTDL_H
-#define LTDL_H 1
-
-#include <sys/types.h>		/* for size_t declaration */
-
-
-/* --- MACROS FOR PORTABILITY --- */
-
-
-/* Saves on those hard to debug '\0' typos....  */
-#define LT_EOS_CHAR	'\0'
-
-/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations,
-   so that C++ compilers don't mangle their names.  Use LTDL_END_C_DECLS at
-   the end of C declarations. */
-#ifdef __cplusplus
-# define LT_BEGIN_C_DECLS	extern "C" {
-# define LT_END_C_DECLS		}
-#else
-# define LT_BEGIN_C_DECLS	/* empty */
-# define LT_END_C_DECLS		/* empty */
-#endif
-
-LT_BEGIN_C_DECLS
-
-
-/* LT_PARAMS is a macro used to wrap function prototypes, so that compilers
-   that don't understand ANSI C prototypes still work, and ANSI C
-   compilers can issue warnings about type mismatches.  */
-#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus)
-# define LT_PARAMS(protos)	protos
-# define lt_ptr		void*
-#else
-# define LT_PARAMS(protos)	()
-# define lt_ptr		char*
-#endif
-
-/* LT_STMT_START/END are used to create macros which expand to a
-   a single compound statement in a portable way.  */
-#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
-#  define LT_STMT_START        (void)(
-#  define LT_STMT_END          )
-#else
-#  if (defined (sun) || defined (__sun__))
-#    define LT_STMT_START      if (1)
-#    define LT_STMT_END        else (void)0
-#  else
-#    define LT_STMT_START      do
-#    define LT_STMT_END        while (0)
-#  endif
-#endif
-
-/* LT_CONC creates a new concatenated symbol for the compiler
-   in a portable way.  */
-#if defined(__STDC__) || defined(__cplusplus)
-#  define LT_CONC(s,t)	s##t
-#else
-#  define LT_CONC(s,t)	s/**/t
-#endif
-
-/* LT_STRLEN can be used safely on NULL pointers.  */
-#define LT_STRLEN(s)	(((s) && (s)[0]) ? strlen (s) : 0)
-
-
-
-/* --- WINDOWS SUPPORT --- */
-
-
-/* Canonicalise Windows and Cygwin recognition macros.  */
-#ifdef __CYGWIN32__
-#  ifndef __CYGWIN__
-#    define __CYGWIN__ __CYGWIN32__
-#  endif
-#endif
-#if defined(_WIN32) || defined(WIN32)
-#  ifndef __WINDOWS__
-#    ifdef _WIN32
-#      define __WINDOWS__ _WIN32
-#    else
-#      ifdef WIN32
-#        define __WINDOWS__ WIN32
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __WINDOWS__
-#  ifndef __CYGWIN__
-/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory
-   separator when it is set. */
-#    define LT_DIRSEP_CHAR	'\\'
-#    define LT_PATHSEP_CHAR	';'
-#  endif
-#endif
-#ifndef LT_PATHSEP_CHAR
-#  define LT_PATHSEP_CHAR	':'
-#endif
-
-/* DLL building support on win32 hosts;  mostly to workaround their
-   ridiculous implementation of data symbol exporting. */
-#ifndef LT_SCOPE
-#  ifdef __WINDOWS__
-#    ifdef DLL_EXPORT		/* defined by libtool (if required) */
-#      define LT_SCOPE	__declspec(dllexport)
-#    endif
-#    ifdef LIBLTDL_DLL_IMPORT	/* define if linking with this dll */
-#      define LT_SCOPE	extern __declspec(dllimport)
-#    endif
-#  endif
-#  ifndef LT_SCOPE		/* static linking or !__WINDOWS__ */
-#    define LT_SCOPE	extern
-#  endif
-#endif
-
-
-
-
-/* --- DYNAMIC MODULE LOADING API --- */
-
-
-typedef	struct lt_dlhandle_struct *lt_dlhandle;	/* A loaded module.  */
-
-/* Initialisation and finalisation functions for libltdl. */
-extern	int	    lt_dlinit		LT_PARAMS((void));
-extern	int	    lt_dlexit		LT_PARAMS((void));
-
-/* Module search path manipulation.  */
-extern	int	    lt_dladdsearchdir	 LT_PARAMS((const char *search_dir));
-extern	int	    lt_dlinsertsearchdir LT_PARAMS((const char *before,
-						    const char *search_dir));
-extern	int 	    lt_dlsetsearchpath	 LT_PARAMS((const char *search_path));
-extern	const char *lt_dlgetsearchpath	 LT_PARAMS((void));
-extern	int	    lt_dlforeachfile	 LT_PARAMS((
-			const char *search_path,
-			int (*func) (const char *filename, lt_ptr data),
-			lt_ptr data));
-
-/* Portable libltdl versions of the system dlopen() API. */
-extern	lt_dlhandle lt_dlopen		LT_PARAMS((const char *filename));
-extern	lt_dlhandle lt_dlopenext	LT_PARAMS((const char *filename));
-extern	lt_ptr	    lt_dlsym		LT_PARAMS((lt_dlhandle handle,
-						     const char *name));
-extern	const char *lt_dlerror		LT_PARAMS((void));
-extern	int	    lt_dlclose		LT_PARAMS((lt_dlhandle handle));
-
-/* Module residency management. */
-extern	int	    lt_dlmakeresident	LT_PARAMS((lt_dlhandle handle));
-extern	int	    lt_dlisresident	LT_PARAMS((lt_dlhandle handle));
-
-
-
-
-/* --- MUTEX LOCKING --- */
-
-
-typedef void	lt_dlmutex_lock		LT_PARAMS((void));
-typedef void	lt_dlmutex_unlock	LT_PARAMS((void));
-typedef void	lt_dlmutex_seterror	LT_PARAMS((const char *errmsg));
-typedef const char *lt_dlmutex_geterror	LT_PARAMS((void));
-
-extern	int	lt_dlmutex_register	LT_PARAMS((lt_dlmutex_lock *lock,
-					    lt_dlmutex_unlock *unlock,
-					    lt_dlmutex_seterror *seterror,
-					    lt_dlmutex_geterror *geterror));
-
-
-
-
-/* --- MEMORY HANDLING --- */
-
-
-/* By default, the realloc function pointer is set to our internal
-   realloc implementation which iself uses lt_dlmalloc and lt_dlfree.
-   libltdl relies on a featureful realloc, but if you are sure yours
-   has the right semantics then you can assign it directly.  Generally,
-   it is safe to assign just a malloc() and a free() function.  */
-LT_SCOPE  lt_ptr   (*lt_dlmalloc)	LT_PARAMS((size_t size));
-LT_SCOPE  lt_ptr   (*lt_dlrealloc)	LT_PARAMS((lt_ptr ptr, size_t size));
-LT_SCOPE  void	   (*lt_dlfree)		LT_PARAMS((lt_ptr ptr));
-
-
-
-
-/* --- PRELOADED MODULE SUPPORT --- */
-
-
-/* A preopened symbol. Arrays of this type comprise the exported
-   symbols for a dlpreopened module. */
-typedef struct {
-  const char *name;
-  lt_ptr      address;
-} lt_dlsymlist;
-
-extern	int	lt_dlpreload	LT_PARAMS((const lt_dlsymlist *preloaded));
-extern	int	lt_dlpreload_default
-				LT_PARAMS((const lt_dlsymlist *preloaded));
-
-#define LTDL_SET_PRELOADED_SYMBOLS() 		LT_STMT_START{	\
-	extern const lt_dlsymlist lt_preloaded_symbols[];		\
-	lt_dlpreload_default(lt_preloaded_symbols);			\
-						}LT_STMT_END
-
-
-
-
-/* --- MODULE INFORMATION --- */
-
-
-/* Read only information pertaining to a loaded module. */
-typedef	struct {
-  char	*filename;		/* file name */
-  char	*name;			/* module name */
-  int	ref_count;		/* number of times lt_dlopened minus
-				   number of times lt_dlclosed. */
-} lt_dlinfo;
-
-extern	const lt_dlinfo	*lt_dlgetinfo	    LT_PARAMS((lt_dlhandle handle));
-extern	lt_dlhandle	lt_dlhandle_next    LT_PARAMS((lt_dlhandle place));
-extern	int		lt_dlforeach	    LT_PARAMS((
-				int (*func) (lt_dlhandle handle, lt_ptr data),
-				lt_ptr data));
-
-/* Associating user data with loaded modules. */
-typedef unsigned lt_dlcaller_id;
-
-extern	lt_dlcaller_id	lt_dlcaller_register  LT_PARAMS((void));
-extern	lt_ptr		lt_dlcaller_set_data  LT_PARAMS((lt_dlcaller_id key,
-						lt_dlhandle handle,
-						lt_ptr data));
-extern	lt_ptr		lt_dlcaller_get_data  LT_PARAMS((lt_dlcaller_id key,
-						lt_dlhandle handle));
-
-
-
-/* --- USER MODULE LOADER API --- */
-
-
-typedef	struct lt_dlloader	lt_dlloader;
-typedef lt_ptr			lt_user_data;
-typedef lt_ptr			lt_module;
-
-/* Function pointer types for creating user defined module loaders. */
-typedef lt_module   lt_module_open	LT_PARAMS((lt_user_data loader_data,
-					    const char *filename));
-typedef int	    lt_module_close	LT_PARAMS((lt_user_data loader_data,
-					    lt_module handle));
-typedef lt_ptr	    lt_find_sym		LT_PARAMS((lt_user_data loader_data,
-					    lt_module handle,
-					    const char *symbol));
-typedef int	    lt_dlloader_exit	LT_PARAMS((lt_user_data loader_data));
-
-struct lt_user_dlloader {
-  const char	       *sym_prefix;
-  lt_module_open       *module_open;
-  lt_module_close      *module_close;
-  lt_find_sym	       *find_sym;
-  lt_dlloader_exit     *dlloader_exit;
-  lt_user_data		dlloader_data;
-};
-
-extern	lt_dlloader    *lt_dlloader_next    LT_PARAMS((lt_dlloader *place));
-extern	lt_dlloader    *lt_dlloader_find    LT_PARAMS((
-						const char *loader_name));
-extern	const char     *lt_dlloader_name    LT_PARAMS((lt_dlloader *place));
-extern	lt_user_data   *lt_dlloader_data    LT_PARAMS((lt_dlloader *place));
-extern	int		lt_dlloader_add     LT_PARAMS((lt_dlloader *place,
-				const struct lt_user_dlloader *dlloader,
-				const char *loader_name));
-extern	int		lt_dlloader_remove  LT_PARAMS((
-						const char *loader_name));
-
-
-
-/* --- ERROR MESSAGE HANDLING --- */
-
-
-/* Defining error strings alongside their symbolic names in a macro in
-   this way allows us to expand the macro in different contexts with
-   confidence that the enumeration of symbolic names will map correctly
-   onto the table of error strings.  */
-#define lt_dlerror_table						\
-    LT_ERROR(UNKNOWN,		    "unknown error")			\
-    LT_ERROR(DLOPEN_NOT_SUPPORTED,  "dlopen support not available")	\
-    LT_ERROR(INVALID_LOADER,	    "invalid loader")			\
-    LT_ERROR(INIT_LOADER,	    "loader initialization failed")	\
-    LT_ERROR(REMOVE_LOADER,	    "loader removal failed")		\
-    LT_ERROR(FILE_NOT_FOUND,	    "file not found")			\
-    LT_ERROR(DEPLIB_NOT_FOUND,      "dependency library not found")	\
-    LT_ERROR(NO_SYMBOLS,	    "no symbols defined")		\
-    LT_ERROR(CANNOT_OPEN,	    "can't open the module")		\
-    LT_ERROR(CANNOT_CLOSE,	    "can't close the module")		\
-    LT_ERROR(SYMBOL_NOT_FOUND,      "symbol not found")			\
-    LT_ERROR(NO_MEMORY,		    "not enough memory")		\
-    LT_ERROR(INVALID_HANDLE,	    "invalid module handle")		\
-    LT_ERROR(BUFFER_OVERFLOW,	    "internal buffer overflow")		\
-    LT_ERROR(INVALID_ERRORCODE,     "invalid errorcode")		\
-    LT_ERROR(SHUTDOWN,		    "library already shutdown")		\
-    LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module")	\
-    LT_ERROR(INVALID_MUTEX_ARGS,    "invalid mutex handler registration") \
-    LT_ERROR(INVALID_POSITION,	    "invalid search path insert position")
-
-/* Enumerate the symbolic error names. */
-enum {
-#define LT_ERROR(name, diagnostic)	LT_CONC(LT_ERROR_, name),
-	lt_dlerror_table
-#undef LT_ERROR
-
-	LT_ERROR_MAX
-};
-
-/* These functions are only useful from inside custom module loaders. */
-extern	int	lt_dladderror	LT_PARAMS((const char *diagnostic));
-extern	int	lt_dlseterror	LT_PARAMS((int errorcode));
-
-
-
-
-/* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */
-
-
-#ifdef LT_NON_POSIX_NAMESPACE
-#  define lt_ptr_t		lt_ptr
-#  define lt_module_t		lt_module
-#  define lt_module_open_t	lt_module_open
-#  define lt_module_close_t	lt_module_close
-#  define lt_find_sym_t		lt_find_sym
-#  define lt_dlloader_exit_t	lt_dlloader_exit
-#  define lt_dlloader_t		lt_dlloader
-#  define lt_dlloader_data_t	lt_user_data
-#endif
-
-LT_END_C_DECLS
-
-#endif /* !LTDL_H */
diff --git a/newlib/libc/sys/linux/include/stdint.h b/newlib/libc/sys/linux/include/stdint.h
index d1197f66c..5c89acd22 100644
--- a/newlib/libc/sys/linux/include/stdint.h
+++ b/newlib/libc/sys/linux/include/stdint.h
@@ -1,265 +1,18 @@
-/*
- * Copyright (c) 2004, 2005 by
- * Ralf Corsepius, Ulm/Germany. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-/*
- * @todo - Add fast<N>_t types.
- * @todo - Add support for wint_t types.
- */
-
-#ifndef _STDINT_H
-#define _STDINT_H
-
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__GNUC__) && (__GNUC__ >= 3 ) \
-  && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ > 2 ) 
-#define __STDINT_EXP(x) __##x##__
-#else
-#define __STDINT_EXP(x) x
-#include <limits.h>
-#endif
-
-#if __STDINT_EXP(SCHAR_MAX) == 0x7f
-#define __int8_t_defined 1
-#endif
-
-#if __int8_t_defined
-typedef signed char int_least8_t;
-typedef unsigned char uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#if __STDINT_EXP(SHRT_MAX) == 0x7fff
-#define __int16_t_defined 1
-#elif __STDINT_EXP(INT_MAX) == 0x7fff
-#define __int16_t_defined 1
-#elif __STDINT_EXP(SCHAR_MAX) == 0x7fff
-#define __int16_t_defined 1
-#endif
-
-#if __int16_t_defined
-typedef int16_t   	int_least16_t;
-typedef uint16_t 	uint_least16_t;
-#define __int_least16_t_defined 1
-
-#ifndef __int_least8_t_defined
-typedef int16_t	   	int_least8_t;
-typedef uint16_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-#endif
-
-#if __STDINT_EXP(INT_MAX) == 0x7fffffffL
-#define __int32_t_defined 1
-#elif __STDINT_EXP(LONG_MAX) == 0x7fffffffL
-#define __int32_t_defined 1
-#define __have_long32 1
-#elif __STDINT_EXP(SHRT_MAX) == 0x7fffffffL
-#define __int32_t_defined 1
-#elif __STDINT_EXP(SCHAR_MAX) == 0x7fffffffL
-#define __int32_t_defined 1
-#endif
-
-#if __int32_t_defined
-typedef int32_t   	int_least32_t;
-typedef uint32_t 	uint_least32_t;
-#define __int_least32_t_defined 1
-
-#ifndef __int_least8_t_defined
-typedef int32_t	   	int_least8_t;
-typedef uint32_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#ifndef __int_least16_t_defined
-typedef int32_t	   	int_least16_t;
-typedef uint32_t  	uint_least16_t;
-#define __int_least16_t_defined 1
-#endif
-#endif
-
-#if __STDINT_EXP(LONG_MAX) > 0x7fffffff
-#define __int64_t_defined 1
-#define __have_long64 1
-#elif  defined(__LONG_LONG_MAX__) && (__LONG_LONG_MAX__ > 0x7fffffff)
-#define __int64_t_defined 1
-#define __have_longlong64 1
-#elif  defined(LLONG_MAX) && (LLONG_MAX > 0x7fffffff)
-#define __int64_t_defined 1
-#define __have_longlong64 1
-#elif  __STDINT_EXP(INT_MAX) > 0x7fffffff
-#define __int64_t_defined 1
-#endif
-
-#if __int64_t_defined
-typedef int64_t   	int_least64_t;
-typedef uint64_t 	uint_least64_t;
-#define __int_least64_t_defined 1
-
-#ifndef __int_least8_t_defined
-typedef int64_t	   	int_least8_t;
-typedef uint64_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#ifndef __int_least16_t_defined
-typedef int64_t	   	int_least16_t;
-typedef uint64_t  	uint_least16_t;
-#define __int_least16_t_defined 1
-#endif
+/* libc/sys/linux/include/stdint.h - Standard integer types */
 
-#ifndef __int_least32_t_defined
-typedef int64_t	   	int_least32_t;
-typedef uint64_t  	uint_least32_t;
-#define __int_least32_t_defined 1
-#endif
-#endif
-
-/* Greatest-width integer types */
-/* Modern GCCs provide __INTMAX_TYPE__ */
-#if defined(__INTMAX_TYPE__)
-  typedef __INTMAX_TYPE__ intmax_t;
-#elif __have_longlong64
-  typedef signed long long intmax_t;
-#else
-  typedef signed long intmax_t;
-#endif
-
-/* Modern GCCs provide __UINTMAX_TYPE__ */
-#if defined(__UINTMAX_TYPE__)
-  typedef __UINTMAX_TYPE__ uintmax_t;
-#elif __have_longlong64
-  typedef unsigned long long uintmax_t;
-#else
-  typedef unsigned long uintmax_t;
-#endif
-  
-/* Limits of Specified-Width Integer Types */
+/* Written 2000 by Werner Almesberger */
 
-#if __int8_t_defined
-#define INT8_MIN 	-128
-#define INT8_MAX 	 127
-#define UINT8_MAX 	 255
-#endif
 
-#if __int_least8_t_defined
-#define INT_LEAST8_MIN 	-128
-#define INT_LEAST8_MAX 	 127
-#define UINT_LEAST8_MAX	 255
-#else
-#error required type int_least8_t missing
-#endif
-
-#if __int16_t_defined
-#define INT16_MIN 	-32768
-#define INT16_MAX 	 32767
-#define UINT16_MAX 	 65535
-#endif
-
-#if __int_least16_t_defined
-#define INT_LEAST16_MIN	-32768
-#define INT_LEAST16_MAX	 32767
-#define UINT_LEAST16_MAX 65535
-#else
-#error required type int_least16_t missing
-#endif
-
-#if __int32_t_defined
-#define INT32_MIN 	 (-2147483647-1)
-#define INT32_MAX 	 2147483647
-#define UINT32_MAX       4294967295U
-#endif
-
-#if __int_least32_t_defined
-#define INT_LEAST32_MIN  (-2147483647-1)
-#define INT_LEAST32_MAX  2147483647
-#define UINT_LEAST32_MAX 4294967295U
-#else
-#error required type int_least32_t missing
-#endif
-
-#if __int64_t_defined
-#ifdef __have_long64
-#define INT64_MIN 	(-9223372036854775807L-1L)
-#define INT64_MAX 	 9223372036854775807L
-#define UINT64_MAX 	18446744073709551615U
-#elif defined(__have_longlong64)
-#define INT64_MIN 	(-9223372036854775807LL-1LL)
-#define INT64_MAX 	 9223372036854775807LL
-#define UINT64_MAX 	18446744073709551615ULL
-#endif
-#endif
+#ifndef _NEWLIB_STDINT_H
+#define _NEWLIB_STDINT_H
 
-#if __int_least64_t_defined
-#ifdef __have_long64
-#define INT_LEAST64_MIN  (-9223372036854775807L-1L)
-#define INT_LEAST64_MAX  9223372036854775807L
-#define UINT_LEAST64_MAX 18446744073709551615U
-#elif defined(__have_longlong64)
-#define INT_LEAST64_MIN  (-9223372036854775807LL-1LL)
-#define INT_LEAST64_MAX  9223372036854775807LL
-#define UINT_LEAST64_MAX 18446744073709551615ULL
-#endif
-#endif
-
-/* This must match size_t in stddef.h, currently long unsigned int */
-#define SIZE_MIN (-__STDINT_EXP(LONG_MAX) - 1L)
-#define SIZE_MAX __STDINT_EXP(LONG_MAX)
-
-/* This must match sig_atomic_t in <signal.h> (currently int) */
-#define SIG_ATOMIC_MIN (-__STDINT_EXP(INT_MAX) - 1)
-#define SIG_ATOMIC_MAX __STDINT_EXP(INT_MAX)
-
-/* This must match ptrdiff_t  in <stddef.h> (currently long int) */
-#define PTRDIFF_MIN (-__STDINT_EXP(LONG_MAX) - 1L)
-#define PTRDIFF_MAX __STDINT_EXP(LONG_MAX)
-
-/** Macros for minimum-width integer constant expressions */
-#define INT8_C(x)	x
-#define UINT8_C(x)	x##U
-
-#define INT16_C(x)	x
-#define UINT16_C(x)	x##U
-
-#if __have_long32
-#define INT32_C(x)	x##L
-#define UINT32_C(x)	x##UL
-#else
-#define INT32_C(x)	x
-#define UINT32_C(x)	x##U
-#endif
-
-#if __int64_t_defined
-#if __have_longlong64
-#define INT64_C(x)	x##LL
-#define UINT64_C(x)	x##ULL
-#else
-#define INT64_C(x)	x##L
-#define UINT64_C(x)	x##UL
-#endif
-#endif
-
-/** Macros for greatest-width integer constant expression */
-#if __have_longlong64
-#define INTMAX_C(x)	x##LL
-#define UINTMAX_C(x)	x##ULL
-#else
-#define INTMAX_C(x)	x##L
-#define UINTMAX_C(x)	x##UL
-#endif
+/*
+ * FIXME: linux/types.h defines various types that rightfully belong into
+ * stdint.h. So we have no choice but to include linux/types.h directly, even
+ * if this causes name space pollution. Note: we have to go via sys/types.h
+ * in order to resolve some other compatibility issues.
+ */
 
+#include <sys/types.h>
 
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* _STDINT_H */
diff --git a/newlib/libc/sys/linux/include/unistd.h b/newlib/libc/sys/linux/include/unistd.h
index 55ecc3a4e..e2f562a3a 100644
--- a/newlib/libc/sys/linux/include/unistd.h
+++ b/newlib/libc/sys/linux/include/unistd.h
@@ -15,4 +15,6 @@ extern char *optarg;
 extern int optind, opterr, optopt;
 
 
+int readlink(const char *path, char *buf, size_t bufsiz);
+
 #endif
diff --git a/newlib/libc/sys/linux/inode.c b/newlib/libc/sys/linux/inode.c
index 837dae396..ed468c19b 100644
--- a/newlib/libc/sys/linux/inode.c
+++ b/newlib/libc/sys/linux/inode.c
@@ -35,7 +35,6 @@ _syscall3(int,getdents,int,fd,struct dirent *,dirp,unsigned int,count)
 _syscall2(int,chmod,const char *,path,mode_t,mode)
 _syscall3(int,chown,const char *,path,uid_t,owner,gid_t,group)
 _syscall2(int,fchmod,int,filedes,mode_t,mode)
-_syscall3(int,lchown,const char *,path,uid_t,owner,gid_t,group)
 _syscall2(int,lstat,const char *,file_name,struct stat *,buf)
 _syscall3(int,readlink,const char *,path,char *,buf,size_t,bufsiz)
 _syscall2(int,symlink,const char *,oldpath,const char *,newpath)
diff --git a/newlib/libc/sys/linux/linuxthreads/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/sys/linux/linuxthreads/aclocal.m4
+++ b/newlib/libc/sys/linux/linuxthreads/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h b/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h
index 84f91d569..2c1d16277 100644
--- a/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h
+++ b/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h
@@ -265,6 +265,36 @@ extern int __pthread_atfork (void (*__prepare) (void),
 /* Make the pthread functions weak so that we can elide them from
    single-threaded processes.  */
 #ifndef __NO_WEAK_PTHREAD_ALIASES
+# ifdef weak_extern
+#  if _LIBC
+#   include <bp-sym.h>
+#  else
+#   define BP_SYM (sym) sym
+#  endif
+weak_extern (BP_SYM (__pthread_mutex_init))
+weak_extern (BP_SYM (__pthread_mutex_destroy))
+weak_extern (BP_SYM (__pthread_mutex_lock))
+weak_extern (BP_SYM (__pthread_mutex_trylock))
+weak_extern (BP_SYM (__pthread_mutex_unlock))
+weak_extern (BP_SYM (__pthread_mutexattr_init))
+weak_extern (BP_SYM (__pthread_mutexattr_destroy))
+weak_extern (BP_SYM (__pthread_mutexattr_settype))
+weak_extern (BP_SYM (__pthread_rwlock_init))
+weak_extern (BP_SYM (__pthread_rwlock_destroy))
+weak_extern (BP_SYM (__pthread_rwlock_rdlock))
+weak_extern (BP_SYM (__pthread_rwlock_tryrdlock))
+weak_extern (BP_SYM (__pthread_rwlock_wrlock))
+weak_extern (BP_SYM (__pthread_rwlock_trywrlock))
+weak_extern (BP_SYM (__pthread_rwlock_unlock))
+weak_extern (BP_SYM (__pthread_key_create))
+weak_extern (BP_SYM (__pthread_setspecific))
+weak_extern (BP_SYM (__pthread_getspecific))
+weak_extern (BP_SYM (__pthread_once))
+weak_extern (__pthread_initialize)
+weak_extern (__pthread_atfork)
+weak_extern (BP_SYM (_pthread_cleanup_push_defer))
+weak_extern (BP_SYM (_pthread_cleanup_pop_restore))
+# else
 #  pragma weak __pthread_mutex_init
 #  pragma weak __pthread_mutex_destroy
 #  pragma weak __pthread_mutex_lock
@@ -287,6 +317,7 @@ extern int __pthread_atfork (void (*__prepare) (void),
 #  pragma weak __pthread_atfork
 #  pragma weak _pthread_cleanup_push_defer
 #  pragma weak _pthread_cleanup_pop_restore
+# endif
 #endif
 
 /* We need portable names for some functions.  E.g., when they are
diff --git a/newlib/libc/sys/linux/linuxthreads/config.h b/newlib/libc/sys/linux/linuxthreads/config.h
index 05fb5ec96..99b0528a6 100644
--- a/newlib/libc/sys/linux/linuxthreads/config.h
+++ b/newlib/libc/sys/linux/linuxthreads/config.h
@@ -11,3 +11,4 @@
        while (__result == -1L && errno == EINTR);                             \
        __result; }))
 
+#define UINT32_C(c)    c ## U
diff --git a/newlib/libc/sys/linux/linuxthreads/configure b/newlib/libc/sys/linux/linuxthreads/configure
index 65714818c..ded146b65 100755
--- a/newlib/libc/sys/linux/linuxthreads/configure
+++ b/newlib/libc/sys/linux/linuxthreads/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1655,7 +1652,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1682,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1765,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1886,7 +1883,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
+echo "configure:1887: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1917: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1920: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1954,7 +1951,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
+echo "configure:1972: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:2022: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2042,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
+echo "configure:2043: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
+echo "configure:2216: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2245,7 +2242,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2246: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2304,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
+echo "configure:2308: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2378,7 +2375,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
+echo "configure:2379: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
+echo "configure:2411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,7 +2442,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
+echo "configure:2446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
+echo "configure:2478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2545 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2564,7 +2561,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2582,7 +2579,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:2583: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2596 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:2633: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2696,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2732: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2763,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2799: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2834,12 +2831,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
+echo "configure:2835: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
+echo "configure:2869: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
@@ -2994,7 +2991,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2998: checking for $ac_word" >&5
+echo "configure:2995: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4
+++ b/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/configure b/newlib/libc/sys/linux/linuxthreads/machine/configure
index 32cb952b1..0076e3cf3 100755
--- a/newlib/libc/sys/linux/linuxthreads/machine/configure
+++ b/newlib/libc/sys/linux/linuxthreads/machine/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1654,7 +1651,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1658: checking for $ac_word" >&5
+echo "configure:1655: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1684,7 +1681,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1688: checking for $ac_word" >&5
+echo "configure:1685: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1735,7 +1732,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1739: checking for $ac_word" >&5
+echo "configure:1736: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1767,7 +1764,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1768: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1778,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1782 "configure"
+#line 1779 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1809,12 +1806,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1810: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1818: checking whether we are using GNU C" >&5
+echo "configure:1815: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1823,7 +1820,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1842,7 +1839,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1846: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1843: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1885,7 +1882,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1889: checking for ld used by GCC" >&5
+echo "configure:1886: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1915,10 +1912,10 @@ echo "configure:1889: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1919: checking for GNU ld" >&5
+echo "configure:1916: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1922: checking for non-GNU ld" >&5
+echo "configure:1919: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1953,7 +1950,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1957: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1954: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1970,7 +1967,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1974: checking for $LD option to reload object files" >&5
+echo "configure:1971: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1982,7 +1979,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1986: checking for BSD-compatible nm" >&5
+echo "configure:1983: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2020,7 +2017,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2024: checking whether ln -s works" >&5
+echo "configure:2021: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2041,7 +2038,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2045: checking how to recognise dependant libraries" >&5
+echo "configure:2042: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2214,13 +2211,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2218: checking for object suffix" >&5
+echo "configure:2215: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2244,7 +2241,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2248: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2245: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2306,7 +2303,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2310: checking for file" >&5
+echo "configure:2307: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2377,7 +2374,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2381: checking for $ac_word" >&5
+echo "configure:2378: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2409,7 +2406,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2413: checking for $ac_word" >&5
+echo "configure:2410: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2444,7 +2441,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2448: checking for $ac_word" >&5
+echo "configure:2445: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2476,7 +2473,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2480: checking for $ac_word" >&5
+echo "configure:2477: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2543,8 +2540,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2547 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2544 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2563,7 +2560,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2581,7 +2578,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2585: checking whether the C compiler needs -belf" >&5
+echo "configure:2582: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2594,14 +2591,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
+#line 2595 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2631,7 +2628,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2635: checking for $ac_word" >&5
+echo "configure:2632: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2663,7 +2660,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2667: checking for $ac_word" >&5
+echo "configure:2664: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2698,7 +2695,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2702: checking for $ac_word" >&5
+echo "configure:2699: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2730,7 +2727,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2734: checking for $ac_word" >&5
+echo "configure:2731: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2765,7 +2762,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2769: checking for $ac_word" >&5
+echo "configure:2766: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2797,7 +2794,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2801: checking for $ac_word" >&5
+echo "configure:2798: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2833,12 +2830,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2837: checking if libtool should supply DllMain function" >&5
+echo "configure:2834: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+#line 2839 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2846,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2867,19 +2864,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2871: checking how to link DLLs" >&5
+echo "configure:2868: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2876 "configure"
+#line 2873 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4
+++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure
index dfd1c9e65..4a9c4be10 100755
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure
+++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1655,7 +1652,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1682,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1765,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1886,7 +1883,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
+echo "configure:1887: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1917: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1920: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1954,7 +1951,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
+echo "configure:1972: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:2022: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2042,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
+echo "configure:2043: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
+echo "configure:2216: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2245,7 +2242,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2246: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2304,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
+echo "configure:2308: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2378,7 +2375,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
+echo "configure:2379: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
+echo "configure:2411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,7 +2442,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
+echo "configure:2446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
+echo "configure:2478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2545 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2564,7 +2561,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2582,7 +2579,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:2583: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2596 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:2633: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2696,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2732: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2763,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2799: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2834,12 +2831,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
+echo "configure:2835: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
+echo "configure:2869: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
@@ -2994,7 +2991,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2998: checking for $ac_word" >&5
+echo "configure:2995: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/newlib/libc/sys/linux/machine/aclocal.m4 b/newlib/libc/sys/linux/machine/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/sys/linux/machine/aclocal.m4
+++ b/newlib/libc/sys/linux/machine/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/linux/machine/configure b/newlib/libc/sys/linux/machine/configure
index 3c3167990..fe2d0bdb9 100755
--- a/newlib/libc/sys/linux/machine/configure
+++ b/newlib/libc/sys/linux/machine/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1654,7 +1651,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1658: checking for $ac_word" >&5
+echo "configure:1655: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1684,7 +1681,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1688: checking for $ac_word" >&5
+echo "configure:1685: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1735,7 +1732,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1739: checking for $ac_word" >&5
+echo "configure:1736: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1767,7 +1764,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1768: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1778,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1782 "configure"
+#line 1779 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1809,12 +1806,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1810: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1818: checking whether we are using GNU C" >&5
+echo "configure:1815: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1823,7 +1820,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1842,7 +1839,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1846: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1843: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1885,7 +1882,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1889: checking for ld used by GCC" >&5
+echo "configure:1886: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1915,10 +1912,10 @@ echo "configure:1889: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1919: checking for GNU ld" >&5
+echo "configure:1916: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1922: checking for non-GNU ld" >&5
+echo "configure:1919: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1953,7 +1950,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1957: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1954: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1970,7 +1967,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1974: checking for $LD option to reload object files" >&5
+echo "configure:1971: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1982,7 +1979,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1986: checking for BSD-compatible nm" >&5
+echo "configure:1983: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2020,7 +2017,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2024: checking whether ln -s works" >&5
+echo "configure:2021: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2041,7 +2038,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2045: checking how to recognise dependant libraries" >&5
+echo "configure:2042: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2214,13 +2211,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2218: checking for object suffix" >&5
+echo "configure:2215: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2244,7 +2241,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2248: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2245: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2306,7 +2303,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2310: checking for file" >&5
+echo "configure:2307: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2377,7 +2374,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2381: checking for $ac_word" >&5
+echo "configure:2378: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2409,7 +2406,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2413: checking for $ac_word" >&5
+echo "configure:2410: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2444,7 +2441,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2448: checking for $ac_word" >&5
+echo "configure:2445: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2476,7 +2473,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2480: checking for $ac_word" >&5
+echo "configure:2477: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2543,8 +2540,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2547 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2544 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2563,7 +2560,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2581,7 +2578,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2585: checking whether the C compiler needs -belf" >&5
+echo "configure:2582: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2594,14 +2591,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
+#line 2595 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2631,7 +2628,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2635: checking for $ac_word" >&5
+echo "configure:2632: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2663,7 +2660,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2667: checking for $ac_word" >&5
+echo "configure:2664: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2698,7 +2695,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2702: checking for $ac_word" >&5
+echo "configure:2699: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2730,7 +2727,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2734: checking for $ac_word" >&5
+echo "configure:2731: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2765,7 +2762,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2769: checking for $ac_word" >&5
+echo "configure:2766: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2797,7 +2794,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2801: checking for $ac_word" >&5
+echo "configure:2798: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2833,12 +2830,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2837: checking if libtool should supply DllMain function" >&5
+echo "configure:2834: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+#line 2839 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2846,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2867,19 +2864,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2871: checking how to link DLLs" >&5
+echo "configure:2868: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2876 "configure"
+#line 2873 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
diff --git a/newlib/libc/sys/linux/machine/i386/aclocal.m4 b/newlib/libc/sys/linux/machine/i386/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libc/sys/linux/machine/i386/aclocal.m4
+++ b/newlib/libc/sys/linux/machine/i386/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/linux/machine/i386/configure b/newlib/libc/sys/linux/machine/i386/configure
index f957f6692..bad36c30f 100755
--- a/newlib/libc/sys/linux/machine/i386/configure
+++ b/newlib/libc/sys/linux/machine/i386/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1655,7 +1652,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1682,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1765,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1886,7 +1883,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
+echo "configure:1887: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1917: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1920: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1954,7 +1951,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
+echo "configure:1972: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:2022: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2042,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
+echo "configure:2043: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
+echo "configure:2216: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2245,7 +2242,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2246: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2304,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
+echo "configure:2308: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2378,7 +2375,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
+echo "configure:2379: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
+echo "configure:2411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,7 +2442,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
+echo "configure:2446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
+echo "configure:2478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2545 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2564,7 +2561,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2582,7 +2579,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:2583: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2596 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:2633: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2696,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2732: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2763,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2799: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2834,12 +2831,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
+echo "configure:2835: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
+echo "configure:2869: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
@@ -2994,7 +2991,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2998: checking for $ac_word" >&5
+echo "configure:2995: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/newlib/libc/sys/linux/machine/i386/dl-machine.h b/newlib/libc/sys/linux/machine/i386/dl-machine.h
index 80757e89a..032713e5b 100644
--- a/newlib/libc/sys/linux/machine/i386/dl-machine.h
+++ b/newlib/libc/sys/linux/machine/i386/dl-machine.h
@@ -292,20 +292,6 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
   return value;
 }
 
-static inline void __attribute__ ((unused))
-elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
-		 const Elf32_Sym *sym, const struct r_found_version *version,
-		 Elf32_Addr *const reloc_addr,
-		 struct r_scope_elem *scope[]);
-
-static inline void __attribute__ ((unused))
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
-			  Elf32_Addr *const reloc_addr);
-
-static inline void
-elf_machine_lazy_rel (struct link_map *map,
-		      Elf32_Addr l_addr, const Elf32_Rel *reloc);
-
 #endif /* !dl_machine_h */
 
 #ifdef RESOLVE
@@ -313,11 +299,10 @@ elf_machine_lazy_rel (struct link_map *map,
 /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
    MAP is the object containing the reloc.  */
 
-static inline void __attribute__ ((unused))
+static inline void
 elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
 		 const Elf32_Sym *sym, const struct r_found_version *version,
-		 Elf32_Addr *const reloc_addr,
-		 struct r_scope_elem *scope[])
+		 Elf32_Addr *const reloc_addr)
 {
   const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
 
@@ -331,7 +316,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
 	 (i.e. #ifdef RTLD_BOOTSTRAP) because rtld.c contains the
 	 common defn for _dl_rtld_map, which is incompatible with a
 	 weak decl in the same file.  */
-      #pragma weak _dl_rtld_map
+      weak_extern (_dl_rtld_map);
       if (map != &_dl_rtld_map) /* Already done in rtld itself.  */
 # endif
 	*reloc_addr += map->l_addr;
@@ -346,9 +331,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
 #ifndef RTLD_BOOTSTRAP
       const Elf32_Sym *const refsym = sym;
 #endif
-      /* String table object symbols.  */
-      const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-      Elf32_Addr value = RESOLVE (&sym, version, r_type, scope);
+      Elf32_Addr value = RESOLVE (&sym, version, r_type);
       if (sym)
 	value += sym->st_value;
 
@@ -396,7 +379,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
     }
 }
 
-static inline void __attribute__ ((unused))
+static inline void
 elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
 			  Elf32_Addr *const reloc_addr)
 {
diff --git a/newlib/libc/sys/linux/machine/i386/weakalias.h b/newlib/libc/sys/linux/machine/i386/weakalias.h
index 2813bfe26..7b0b18a48 100644
--- a/newlib/libc/sys/linux/machine/i386/weakalias.h
+++ b/newlib/libc/sys/linux/machine/i386/weakalias.h
@@ -1,10 +1,8 @@
 #define weak_alias(name, aliasname) \
   extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
 
-#if 0
 #define weak_extern(symbol) _weak_extern (symbol)
 #define _weak_extern(symbol) asm (".weak " #symbol);
-#endif
 
 #define weak_function __attribute__ ((weak))
 
diff --git a/newlib/libc/sys/linux/net/gethostbydns.c b/newlib/libc/sys/linux/net/gethostbydns.c
index 9c80539f2..9db8bf4ad 100644
--- a/newlib/libc/sys/linux/net/gethostbydns.c
+++ b/newlib/libc/sys/linux/net/gethostbydns.c
@@ -94,7 +94,7 @@ u_int32_t _getlong(const u_char *src);
 u_int16_t _getshort(const u_char *src);
 
 #ifdef DEBUG
-static void dbgprintf(char *, int);
+static void dprintf(char *, int);
 #endif
 
 #if PACKETSZ > 1024
@@ -118,7 +118,7 @@ int _dns_ttl_;
 
 #ifdef DEBUG
 static void
-dbgprintf(msg, num)
+dprintf(msg, num)
 	char *msg;
 	int num;
 {
@@ -130,7 +130,7 @@ dbgprintf(msg, num)
 	}
 }
 #else
-# define dbgprintf(msg, num) /*nada*/
+# define dprintf(msg, num) /*nada*/
 #endif
 
 #define BOUNDED_INCR(x) \
@@ -397,13 +397,13 @@ gethostanswer(answer, anslen, qname, qtype, host, hostbuf, hostbuflen, herr)
 			bp += sizeof(align) - ((u_long)bp % sizeof(align));
 
 			if (bp + n >= &hostbuf[hostbuflen]) {
-				dbgprintf("size (%d) too big\n", n);
+				dprintf("size (%d) too big\n", n);
 				had_error++;
 				continue;
 			}
 			if (hap >= &host->__host_addrs[MAXADDRS-1]) {
 				if (!toobig++)
-					dbgprintf("Too many addresses (%d)\n",
+					dprintf("Too many addresses (%d)\n",
 						MAXADDRS);
 				cp += n;
 				continue;
@@ -418,7 +418,7 @@ gethostanswer(answer, anslen, qname, qtype, host, hostbuf, hostbuflen, herr)
 			}
 			break;
 		default:
-			dbgprintf("Impossible condition (type=%d)\n", type);
+			dprintf("Impossible condition (type=%d)\n", type);
 			*herr = NO_RECOVERY;
 			return (NULL);
 			/* BIND has abort() here, too risky on bad data */
@@ -606,7 +606,7 @@ _dns_gethostbyname(void *rval, void *cb_data, va_list ap)
 		}
 
 	if ((n = res_search(name, C_IN, type, buf.buf, sizeof(buf))) < 0) {
-		dbgprintf("res_search failed (%d)\n", n);
+		dprintf("res_search failed (%d)\n", n);
 		return NS_UNAVAIL;
 	}
 	*(struct hostent **)rval = gethostanswer(&buf, n, name, type, resultbuf, hostbuf, buflen, herr);
@@ -697,11 +697,11 @@ _dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
 	}
 	n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf);
 	if (n < 0) {
-		dbgprintf("res_query failed (%d)\n", n);
+		dprintf("res_query failed (%d)\n", n);
 		return NS_UNAVAIL;
 	}
 	if (n > sizeof buf.buf) {
-		dbgprintf("static buffer is too small (%d)\n", n);
+		dprintf("static buffer is too small (%d)\n", n);
 		return NS_UNAVAIL;
 	}
 	if (!(hp = gethostanswer(&buf, n, qbuf, T_PTR, resultbuf, hostbuf, buflen, herr)))
diff --git a/newlib/libc/sys/linux/net/ns_ntoa.c b/newlib/libc/sys/linux/net/ns_ntoa.c
index b6a6c4c22..018076064 100644
--- a/newlib/libc/sys/linux/net/ns_ntoa.c
+++ b/newlib/libc/sys/linux/net/ns_ntoa.c
@@ -43,8 +43,6 @@ static char sccsid[] = "@(#)ns_ntoa.c	8.1 (Berkeley) 6/4/93";
 #include <netns/ns.h>
 #include <stdio.h>
 
-static char *spectHex(char *p0);
-
 char *
 ns_ntoa(addr)
 	struct ns_addr addr;
@@ -56,6 +54,7 @@ ns_ntoa(addr)
 	char *cp2;
 	u_char *up = addr.x_host.c_host;
 	u_char *uplim = up + 6;
+	static char *spectHex();
 
 	net.net_e = addr.x_net;
 	sprintf(obuf, "%lx", (u_long)ntohl(net.long_e));
diff --git a/newlib/libc/sys/linux/shared.ld b/newlib/libc/sys/linux/shared.ld
index 33bf4f8fe..0e696572b 100644
--- a/newlib/libc/sys/linux/shared.ld
+++ b/newlib/libc/sys/linux/shared.ld
@@ -13,7 +13,3 @@ VERS_1.12 {
 VERS_1.13 {
 	global: *;
 };
-
-VERS_1.14 {
-	global: *;
-};
diff --git a/newlib/libc/sys/linux/sys/cdefs.h b/newlib/libc/sys/linux/sys/cdefs.h
index f6ea0c73e..459785bcb 100644
--- a/newlib/libc/sys/linux/sys/cdefs.h
+++ b/newlib/libc/sys/linux/sys/cdefs.h
@@ -227,12 +227,4 @@
 # endif
 #endif
 
-/* The nonull function attribute allows to mark pointer parameters which
-   must not be NULL.  */
-#if __GNUC_PREREQ (3,3)
-# define __nonnull(params) __attribute__ ((__nonnull__ params))
-#else
-# define __nonnull(params)
-#endif
-
 #endif	 /* sys/cdefs.h */
diff --git a/newlib/libc/sys/linux/sys/dirent.h b/newlib/libc/sys/linux/sys/dirent.h
index 4bbae4229..083158eb3 100644
--- a/newlib/libc/sys/linux/sys/dirent.h
+++ b/newlib/libc/sys/linux/sys/dirent.h
@@ -41,7 +41,6 @@ int closedir(DIR *);
 
 /* internal prototype */
 void _seekdir(DIR *dir,off_t offset);
-DIR *_opendir(const char *);
 
 #ifndef _POSIX_SOURCE
 long telldir (DIR *);
diff --git a/newlib/libc/sys/linux/sys/lock.h b/newlib/libc/sys/linux/sys/lock.h
index d934031e2..167392e10 100644
--- a/newlib/libc/sys/linux/sys/lock.h
+++ b/newlib/libc/sys/linux/sys/lock.h
@@ -1,6 +1,7 @@
 #ifndef __SYS_LOCK_H__
 #define __SYS_LOCK_H__
 
+#include <machine/weakalias.h>
 #include <features.h>
 
 #define  _LIBC  1
diff --git a/newlib/libc/sys/linux/sys/stat.h b/newlib/libc/sys/linux/sys/stat.h
index 99da598ba..b7a7f53e6 100644
--- a/newlib/libc/sys/linux/sys/stat.h
+++ b/newlib/libc/sys/linux/sys/stat.h
@@ -24,10 +24,10 @@ int     _EXFUN(stat,( const char *__path, struct stat *__sbuf ));
 mode_t  _EXFUN(umask,( mode_t __mask ));
 
 #ifndef _POSIX_SOURCE
-int     _EXFUN(fstat64,( int __fd, struct stat64 *__sbuf ));
-int	_EXFUN(lstat,( const char *file_name, struct stat64 *buf));
-int	_EXFUN(lstat64,( const char *file_name, struct stat64 *buf));
-int     _EXFUN(stat64,( const char *__path, struct stat64 *__sbuf ));
+int     _EXFUN(fstat64,( int __fd, struct stat *__sbuf ));
+int	_EXFUN(lstat,( const char *file_name, struct stat *buf));
+int	_EXFUN(lstat64,( const char *file_name, struct stat *buf));
+int     _EXFUN(stat64,( const char *__path, struct stat *__sbuf ));
 #endif /* _POSIX_SOURCE */
 
 #endif /* _SYS_STAT_H */
diff --git a/newlib/libc/sys/linux/sys/types.h b/newlib/libc/sys/linux/sys/types.h
index ba191f072..47f49087a 100644
--- a/newlib/libc/sys/linux/sys/types.h
+++ b/newlib/libc/sys/linux/sys/types.h
@@ -50,8 +50,8 @@
  * libc/include/sys/types.h.  Repeat those here and
  * skip the kernel's definitions. */
 
-#include <sys/config.h>
 #include <features.h>
+#include <sys/config.h>
 #include <machine/types.h>
 #include <sys/_types.h>
 
@@ -166,7 +166,6 @@ typedef __uint8_t u_int8_t;
 typedef __uint16_t u_int16_t;
 typedef __uint32_t u_int32_t;
 typedef __uint64_t u_int64_t;
-typedef __int8_t int8_t;
 typedef __int16_t int16_t;
 typedef __int32_t int32_t;
 typedef __int64_t int64_t;
diff --git a/newlib/libc/sys/linux/sys/unistd.h b/newlib/libc/sys/linux/sys/unistd.h
index 502fb473a..e720d6b72 100644
--- a/newlib/libc/sys/linux/sys/unistd.h
+++ b/newlib/libc/sys/linux/sys/unistd.h
@@ -72,7 +72,6 @@ int     _EXFUN(pipe, (int __fildes[2] ));
 ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
 ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
 _READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
-int     _EXFUN(readlink, (const char *path, char *buf, size_t bufsiz));
 int     _EXFUN(rmdir, (const char *__path ));
 void *  _EXFUN(sbrk,  (ptrdiff_t __incr));
 int     _EXFUN(setegid, (gid_t __gid ));
@@ -84,7 +83,6 @@ pid_t   _EXFUN(setsid, (void ));
 int     _EXFUN(setuid, (uid_t __uid ));
 unsigned _EXFUN(sleep, (unsigned int __seconds ));
 void    _EXFUN(swab, (const void *, void *, ssize_t));
-int     _EXFUN(symlink, (const char *oldpath, const char *newpath));
 long    _EXFUN(sysconf, (int __name ));
 pid_t   _EXFUN(tcgetpgrp, (int __fildes ));
 int     _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));
diff --git a/newlib/libc/sys/m88kbug/aclocal.m4 b/newlib/libc/sys/m88kbug/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/m88kbug/aclocal.m4
+++ b/newlib/libc/sys/m88kbug/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/m88kbug/configure b/newlib/libc/sys/m88kbug/configure
index abdfc90ff..89a8b1c97 100755
--- a/newlib/libc/sys/m88kbug/configure
+++ b/newlib/libc/sys/m88kbug/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/mmixware/aclocal.m4 b/newlib/libc/sys/mmixware/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/mmixware/aclocal.m4
+++ b/newlib/libc/sys/mmixware/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/mmixware/configure b/newlib/libc/sys/mmixware/configure
index c97c3f425..d5e1fc3ee 100755
--- a/newlib/libc/sys/mmixware/configure
+++ b/newlib/libc/sys/mmixware/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/netware/aclocal.m4 b/newlib/libc/sys/netware/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/netware/aclocal.m4
+++ b/newlib/libc/sys/netware/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/netware/configure b/newlib/libc/sys/netware/configure
index 8f0ed4de7..e3668a287 100755
--- a/newlib/libc/sys/netware/configure
+++ b/newlib/libc/sys/netware/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am
deleted file mode 100644
index 825ef56c0..000000000
--- a/newlib/libc/sys/rdos/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c \
-	getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c \
-	rdos.S read.c readlink.c sbrk.c stat.c symlink.c times.c unlink.c \
-	wait.c write.c
-
-all: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/rdos/Makefile.in b/newlib/libc/sys/rdos/Makefile.in
deleted file mode 100644
index 5fb59e5e2..000000000
--- a/newlib/libc/sys/rdos/Makefile.in
+++ /dev/null
@@ -1,376 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c 	getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c 	rdos.S read.c readlink.c sbrk.c stat.c symlink.c times.c unlink.c 	wait.c write.c
-
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  chown.$(OBJEXT) close.$(OBJEXT) execve.$(OBJEXT) \
-fork.$(OBJEXT) fstat.$(OBJEXT) getenv.$(OBJEXT) getpid.$(OBJEXT) \
-gettod.$(OBJEXT) isatty.$(OBJEXT) kill.$(OBJEXT) link.$(OBJEXT) \
-lseek.$(OBJEXT) open.$(OBJEXT) rdoshelp.$(OBJEXT) rdos.$(OBJEXT) \
-read.$(OBJEXT) readlink.$(OBJEXT) sbrk.$(OBJEXT) stat.$(OBJEXT) \
-symlink.$(OBJEXT) times.$(OBJEXT) unlink.$(OBJEXT) wait.$(OBJEXT) \
-write.$(OBJEXT)
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-all: crt0.o
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/rdos/aclocal.m4 b/newlib/libc/sys/rdos/aclocal.m4
deleted file mode 100644
index e6cbb29c0..000000000
--- a/newlib/libc/sys/rdos/aclocal.m4
+++ /dev/null
@@ -1,1226 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/sys/rdos/chown.c b/newlib/libc/sys/rdos/chown.c
deleted file mode 100755
index 48f33f563..000000000
--- a/newlib/libc/sys/rdos/chown.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include <sys/types.h>

-

-int chown(const char *path, uid_t owner, gid_t group)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/close.c b/newlib/libc/sys/rdos/close.c
deleted file mode 100644
index 7f95e24f3..000000000
--- a/newlib/libc/sys/rdos/close.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, or

-# (at your option) any later version.

-#

-# This library is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-# GNU Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# close.c                                                                

-# close function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include "rdos.h"

-

-int close(int fildes)

-{

-  RdosCloseFile(fildes);

-  return 0;

-}

diff --git a/newlib/libc/sys/rdos/config.h b/newlib/libc/sys/rdos/config.h
deleted file mode 100644
index 431e26805..000000000
--- a/newlib/libc/sys/rdos/config.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Place holder for future configuration information.  */
diff --git a/newlib/libc/sys/rdos/configure b/newlib/libc/sys/rdos/configure
deleted file mode 100755
index e937dd685..000000000
--- a/newlib/libc/sys/rdos/configure
+++ /dev/null
@@ -1,1876 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=close.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1011: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1024: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1037: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1050: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1063: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1088: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1118: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1167: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1191: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1222: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1254: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1286: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1318: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1363: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1420: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1454: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.$ac_ext | *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/sys/rdos/configure.in b/newlib/libc/sys/rdos/configure.in
deleted file mode 100644
index 6a78d9997..000000000
--- a/newlib/libc/sys/rdos/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/sys/rdos configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(close.c)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/rdos/crt0.S b/newlib/libc/sys/rdos/crt0.S
deleted file mode 100644
index efc3b1633..000000000
--- a/newlib/libc/sys/rdos/crt0.S
+++ /dev/null
@@ -1,406 +0,0 @@
-/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# crt0.S                                                               
-# GCC startupcode for RDOS
-#
-##########################################################################*/
-  
-#include "user.def"
-
-    KEY_ENTRIES = 256
-  
-    .macro UserGate nr 
-    .byte 0x9A
-    .long \nr
-    .word 2
-    .endm 
-
-    .data
-    .align  8
-
-_key_section:
-    .word 0
-
-_key_ref_arr:
-    .long 0
-
-_key_dtor_arr:
-    .long 0
-
-	.text
-	.align 4
-					  					    
-/*##########################################################################
-#
-#   Name       : _start
-#
-#   Purpose....: GCC startup-code
-#
-##########################################################################*/
-
-	.global _start
-
-_start:
-	call get_impure_data_size
-	movl %eax,%ecx
-	UserGate allocate_app_mem_nr
-
-	xorl %eax,%eax
-	.byte 0x64
-	movl %edx,(%eax)
-	movl %edx,%edi
-	rep
-	stosb
-	pushl %edx
-
-    movl $(4 * KEY_ENTRIES),%eax
-	movl %eax,%ecx
-    UserGate allocate_app_mem_nr
-    movl $4,%eax
-    .byte 0x64
-    movl %edx,(%eax)
-    movl %edx,%edi
-	xorl %eax,%eax
-    rep
-    stosb
-
-    movl $(4 * KEY_ENTRIES),%eax
-	movl %eax,%ecx
-    UserGate allocate_app_mem_nr
-    movl %edx,_key_ref_arr
-    movl %edx,%edi
-	xorl %eax,%eax
-    rep
-    stosb
-
-    movl $(4 * KEY_ENTRIES),%eax
-	movl %eax,%ecx
-    UserGate allocate_app_mem_nr
-    movl %edx,_key_dtor_arr
-    movl %edx,%edi
-	xorl %eax,%eax
-    rep
-    stosb
-
-	UserGate create_user_section_nr
-	movw %bx,_key_section
-
-	call __init_rdos
-	add $4, %esp
-
-	movl $0x1000,%eax
-	UserGate allocate_app_mem_nr
-
-	pushl %edx
-	UserGate get_cmd_line_nr
-
-	xorl %ecx,%ecx
-	xorb %ah,%ah
-
-arg_loop:
-	movl %edi,(%edx)
-	addl $4,%edx
-	movb (%edi),%al
-	orb %al,%al
-	je arg_done
-
-arg_scan:	
-	movb (%edi),%al
-	orb %al,%al
-	je next_arg
-
-	cmpb $0x22,%al
-	jne arg_no_quote
-
-	xorb $1,%ah
-	jmp arg_scan_next
-
-arg_no_quote:
-	orb %ah,%ah
-	jnz arg_scan_next
-
-	cmpb $0x20,%al
-	je next_arg
-
-	cmpb $0x8,%al
-	je next_arg
-
-arg_scan_next:
-	incl %edi
-	jmp arg_scan
-
-next_arg:
-	incl %ecx
-
-to_next_arg:
-	orb %al,%al
-	je arg_done
-
-	xorb %al,%al
-	movb %al,(%edi)
-	incl %edi
-	movb (%edi),%al
-	cmpb $0x20,%al
-	je to_next_arg
-
-	cmpb $0x8,%al
-	je to_next_arg
-	
-	jmp arg_loop	
-
-arg_done:
-	int $3
-	pushl %ecx
-	call main
-	add $8, %esp
-
-	pushl %eax
-	call	exit
-					    
-/*##########################################################################
-#
-#   Name       : _exit
-#
-#   Purpose....: GCC exit-code
-#
-##########################################################################*/
-
-	.global _exit
-
-_exit:
-	pushl %ebp
-	movl %esp,%ebp
-	movl 8(%ebp),%eax
-	UserGate unload_exe_nr
-					    					    
-/*##########################################################################
-#
-#   Name       : __getreent
-#
-#   Purpose....: ?
-#
-##########################################################################*/
-
-	.global __getreent
-
-__getreent:
-    xorl %eax,%eax
-	.byte 0x64
-	movl (%eax),%eax
-	ret
-					    					    					    
-/*##########################################################################
-#
-#   Name       : __rdos_thread_key_create
-#
-#   Purpose....: Emulate GCC pthread_key_create
-#
-#   Parameters.: dtor
-#
-#   Returns....: Key index
-#
-##########################################################################*/
-
-	.global __rdos_thread_key_create
-	
-__rdos_thread_key_create:
-    int $3
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-    mov _key_section,%bx
-    UserGate enter_user_section_nr	
-
-	movl _key_ref_arr,%ebx
-    movl KEY_ENTRIES,%ecx
-
-rtkc_scan_loop:
-    movl (%ebx), %eax
-    orl %eax, %eax
-    jz rtkc_entry_found
-
-    add $4, %ebx
-    loop rtkc_scan_loop
-
-    movl $-1, %eax
-    jmp rtkc_leave
-
-rtkc_entry_found:
-    movb $255,3(%ebx)
-    subl _key_ref_arr,%ebx
-    addl _key_dtor_arr,%ebx
-	movl 8(%ebp),%eax
-	movl %eax,(%ebx)
-	subl _key_dtor_arr,%ebx
-	movl %ebx,%eax
-
-rtkc_leave:
-    mov _key_section, %bx
-    UserGate leave_user_section_nr	
-
-    popl %ecx
-    popl %ebx	
-	leave
-	ret
-					    					    					    
-/*##########################################################################
-#
-#   Name       : __rdos_thread_key_delete
-#
-#   Purpose....: Emulate GCC pthread_key_delete
-#
-#   Parameters.: index
-#
-#   Returns....: result
-#
-##########################################################################*/
-
-	.global __rdos_thread_key_delete
-	
-__rdos_thread_key_delete:
-    int $3
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-    mov _key_section,%bx
-    UserGate enter_user_section_nr	
-
-	movl 8(%ebp),%ebx
-	testb $3,%bl
-	jnz rtkd_fail
-
-    cmpl $(4 * KEY_ENTRIES),%ebx
-    jae rtkd_fail
-    	
-    addl _key_ref_arr,%ebx
-    movb $0,3(%ebx)
-    mov (%ebx),%eax
-    orl %eax,%eax
-    jz rtkd_ok
-
-    subl _key_ref_arr,%ebx    
-    movl $0,(%ebx)
-    jmp rtkd_ok
-
-rtkd_fail:
-    movl $1,%eax 
-    jmp rtkd_leave   
-
-rtkd_ok:
-    xorl %eax,%eax 
-
-rtkd_leave:
-    mov _key_section, %bx
-    UserGate leave_user_section_nr	
-
-    popl %ebx	
-	leave
-	ret
-					    					    					    
-/*##########################################################################
-#
-#   Name       : __rdos_thread_getspecific
-#
-#   Purpose....: Emulate GCC pthread_getspecific
-#
-#   Parameters.: index
-#
-#   Returns....: value
-#
-##########################################################################*/
-
-	.global __rdos_thread_getspecific
-	
-__rdos_thread_getspecific:
-    int $3
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	testb $3,%bl
-	jnz rtg_fail
-
-    cmpl $(4 * KEY_ENTRIES),%ebx
-    jae rtg_fail
-
-    movl $4,%eax
-    .byte 0x64
-    movl (%eax),%eax
-    addl %eax,%ebx
-    movl (%ebx),%eax
-    jmp rtg_done
-
-rtg_fail:
-    xorl %eax,%eax
-
-rtg_done:
-    popl %ebx	
-	leave
-	ret
-					    					    					    
-/*##########################################################################
-#
-#   Name       : __rdos_thread_setspecific
-#
-#   Purpose....: Emulate GCC pthread_setspecific
-#
-#   Parameters.: index
-#                value
-#
-##########################################################################*/
-
-	.global __rdos_thread_setspecific
-	
-__rdos_thread_setspecific:
-    int $3
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movl 8(%ebp),%ebx
-	testb $3,%bl
-	jnz rts_fail
-
-    cmpl $(4 * KEY_ENTRIES),%ebx
-    jae rts_fail
-
-    movl $4,%eax
-    .byte 0x64
-    movl (%eax),%eax
-    addl %eax,%ebx
-
-	movl 12(%ebp),%eax
-    movl %eax,(%ebx)
-    xorl %eax,%eax
-    jmp rts_done
-
-rts_fail:
-    movl $1,%eax
-
-rts_done:
-    popl %ebx	
-	leave
-	ret
diff --git a/newlib/libc/sys/rdos/execve.c b/newlib/libc/sys/rdos/execve.c
deleted file mode 100644
index ac7eeb25c..000000000
--- a/newlib/libc/sys/rdos/execve.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int execve( char *name, char **argv, char **env)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/fork.c b/newlib/libc/sys/rdos/fork.c
deleted file mode 100755
index fc335bb41..000000000
--- a/newlib/libc/sys/rdos/fork.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int fork()

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/fstat.c b/newlib/libc/sys/rdos/fstat.c
deleted file mode 100755
index c18dd78ed..000000000
--- a/newlib/libc/sys/rdos/fstat.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, or

-# (at your option) any later version.

-#

-# This library is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-# GNU Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# fstat.c                                                                

-# fstat function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <errno.h>

-

-int fstat(int fd, struct stat *st)

-{

-  if (fd < 3)

-  {

-      st->st_mode = S_IFCHR;

-      st->st_blksize = 0;

-      return 0;

-  }

-  else

-  {

-      return -1;

-  }  

-}

diff --git a/newlib/libc/sys/rdos/getenv.c b/newlib/libc/sys/rdos/getenv.c
deleted file mode 100644
index 933ea4d76..000000000
--- a/newlib/libc/sys/rdos/getenv.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# getenv.c                                                                
-# getenv function implementation
-#
-##########################################################################*/
-
-/*
-FUNCTION
-<<getenv>>---look up environment variable
-
-INDEX
-	getenv
-INDEX
-	environ
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-	char *getenv(const char *<[name]>);
-
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	char *getenv(<[name]>)
-	char *<[name]>;
-
-DESCRIPTION
-<<getenv>> searches the list of environment variable names and values
-(using the global pointer ``<<char **environ>>'') for a variable whose
-name matches the string at <[name]>.  If a variable name matches,
-<<getenv>> returns a pointer to the associated value.
-
-RETURNS
-A pointer to the (string) value of the environment variable, or
-<<NULL>> if there is no such environment variable.
-
-PORTABILITY
-<<getenv>> is ANSI, but the rules for properly forming names of environment
-variables vary from one system to another.
-
-This function is not thread-safe, but does it need to be??
-There is an reentrant class that should be used if reentrance is required
-
-*/
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <rdos.h>
-
-static char envbuf[256];
-
-char *getenv(const char *name)
-{
-    int handle;
-    char *ptr = 0;
-
-    handle = RdosOpenSysEnv();
-    if (handle)
-    {
-        if (RdosFindEnvVar(handle, name, envbuf))
-            ptr = envbuf;
-    }
-    RdosCloseEnv(handle);
-    return ptr;
-}
diff --git a/newlib/libc/sys/rdos/getpid.c b/newlib/libc/sys/rdos/getpid.c
deleted file mode 100644
index d84d673e6..000000000
--- a/newlib/libc/sys/rdos/getpid.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int getpid()

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/gettod.c b/newlib/libc/sys/rdos/gettod.c
deleted file mode 100644
index b1801502d..000000000
--- a/newlib/libc/sys/rdos/gettod.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <sys/time.h>

-#include <sys/times.h>

-#include <errno.h>

-

-struct timeval;

-struct timezone;

-

-int gettimeofday(struct timeval *ptimeval, struct timezone *ptimezone)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/isatty.c b/newlib/libc/sys/rdos/isatty.c
deleted file mode 100644
index 9862a87f8..000000000
--- a/newlib/libc/sys/rdos/isatty.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int isatty(int file)

-{

-  return 0;

-}

diff --git a/newlib/libc/sys/rdos/kill.c b/newlib/libc/sys/rdos/kill.c
deleted file mode 100644
index 4f77906de..000000000
--- a/newlib/libc/sys/rdos/kill.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int kill(int pid, int sig)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/link.c b/newlib/libc/sys/rdos/link.c
deleted file mode 100644
index 23c0b2bee..000000000
--- a/newlib/libc/sys/rdos/link.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int link(char *existing, char *new)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/lseek.c b/newlib/libc/sys/rdos/lseek.c
deleted file mode 100755
index b1cdb2178..000000000
--- a/newlib/libc/sys/rdos/lseek.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, or

-# (at your option) any later version.

-#

-# This library is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-# GNU Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# lseek.c                                                                

-# lseek function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <unistd.h>

-#include <errno.h>

-#include <rdos.h>

-

-off_t lseek(int file, off_t pos, int whence)

-{

-	off_t temp;

-

-	switch (whence)

-	{

-		case SEEK_CUR:

-			temp = RdosGetFilePos(file);

-			temp += pos;

-			RdosSetFilePos(file, temp);

-			return temp;

-

-		case SEEK_SET:

-			RdosSetFilePos(file, pos);

-			return pos;

-

-		case SEEK_END:

-			temp = RdosGetFilePos(file);

-			temp += pos;

-			RdosSetFilePos(file, temp);

-			return temp;

-

-		default:

-			errno = EINVAL;

-			return - 1;

-	}

-}

diff --git a/newlib/libc/sys/rdos/open.c b/newlib/libc/sys/rdos/open.c
deleted file mode 100755
index e98910648..000000000
--- a/newlib/libc/sys/rdos/open.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, or

-# (at your option) any later version.

-#

-# This library is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-# GNU Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# open.c                                                                

-# open function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <fcntl.h>

-#include <errno.h>

-#include "rdos.h"

-#include <stdarg.h>

-

-int open(const char *file, int flags, ...)

-{

-	int handle;

-	int pos;

-

-	if (flags & O_CREAT)

-		handle = RdosCreateFile(file, flags);

-	else

-		handle = RdosOpenFile(file, flags);

-

-	if (handle >= 0)

-	{

-		if (flags & O_APPEND)

-		{

-			pos = RdosGetFileSize(handle);

-			RdosSetFilePos(handle, pos);

-		}

-

-		if (flags & O_TRUNC)

-			RdosSetFileSize(handle, 0);

-	

-		return handle;

-	}

-	else

-		return -1;

-}

diff --git a/newlib/libc/sys/rdos/rdos.S b/newlib/libc/sys/rdos/rdos.S
deleted file mode 100644
index d99be7345..000000000
--- a/newlib/libc/sys/rdos/rdos.S
+++ /dev/null
@@ -1,7528 +0,0 @@
-/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# rdos.S                                                                
-# GCC based interface to RDOS kernel                                    
-#
-##########################################################################*/
-
-#include "user.def"
-
-    .macro UserGate nr 
-    .byte 0x9A
-    .long \nr
-    .word 2
-    .endm 
-
-/*##########################################################################
-#
-#   Name       : RdosSwapShort
-#
-#   Purpose....: Byte reverse a short int
-#
-#   Returns....: Result
-#
-##########################################################################*/
-
-    .global RdosSwapShort
-    
-RdosSwapShort:
-	pushl %ebp
-	movl %esp,%ebp
-	movw 8(%ebp),%ax
-	xchgb %ah,%al
-	leave
-	ret
-
-
-/*##########################################################################
-#
-#   Name       : RdosSwapLong
-#
-#   Purpose....: Byte reverse a long int
-#
-#   Returns....: Result
-#
-##########################################################################*/
-
-    .global RdosSwapLong
-    
-RdosSwapLong:
-	pushl %ebp
-	movl %esp,%ebp
-	movl 8(%ebp),%eax
-	xchgb %ah,%al
-	roll $16,%eax
-	xchgb %ah,%al
-	leave
-	ret
-
-
-/*##########################################################################
-#
-#   Name       : LocalToNetworkLong
-#
-#   Purpose....: Convert a local long to network format
-#
-#   Returns....: Network format
-#
-##########################################################################*/
-
-    .global LocalToNetworkLong
-    
-LocalToNetworkLong:
-	pushl %ebp
-	movl %esp,%ebp
-	movl 8(%ebp),%eax
-	xchgb %ah,%al
-	roll $16,%eax
-	xchgb %ah,%al
-	leave
-	ret
-
-/*##########################################################################
-#
-#   Name       : NetworkToLocalLong
-#
-#   Purpose....: Convert a network long to local format
-#
-#   Returns....: Local format
-#
-##########################################################################*/
-
-    .global NetworkToLocalLong
-    
-NetworkToLocalLong:
-	pushl %ebp
-	movl %esp,%ebp
-	movl 8(%ebp),%eax
-	xchgb %ah,%al
-	roll $16,%eax
-	xchgb %ah,%al
-	leave
-	ret
-
-/*##########################################################################
-#
-#   Name       : RdosGetThreadHandle
-#
-#   Purpose....: Get current thread handle
-#
-#   Returns....: Thread ID
-#
-##########################################################################*/
-
-    .global RdosGetThreadHandle
-    
-RdosGetThreadHandle:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate get_thread_nr
-	movzx %ax,%eax
-	leave
-	ret
-
-/*##########################################################################
-#
-#   Name       : RdosGetThreadState
-#
-#   Purpose....: Get thread state
-#
-#   Parameters.: Thread #
-#                State buffer
-#
-##########################################################################*/
-
-    .global RdosGetThreadState
-    
-RdosGetThreadState:
-	pushl %ebp
-	movl %esp,%ebp
-	push %edi
-
-	movl 8(%ebp),%eax
-	movl 12(%ebp),%edx
-	UserGate get_thread_state_nr
-	jc rgtsFail
-	
-    movl $1,%eax
-    jmp rgtsDone
-    
-rgtsFail:
-    xorl %eax,%eax
-
-rgtsDone:
-	popl %edi
-	leave
-	ret
-
-/*##########################################################################
-#
-#   Name       : RdosSuspendThread
-#
-#   Purpose....: Suspend thread
-#
-#   Parameters.: Thread #
-#
-##########################################################################*/
-
-    .global RdosSuspendThread
-    
-RdosSuspendThread:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movl 8(%ebp),%eax
-	UserGate suspend_thread_nr
-	jc rsfFail
-
-    movl $1,%eax
-    jmp rsfDone
-    
-rsfFail:
-    xorl %eax,%eax
-
-rsfDone:
-    leave
-    ret
-    
-
-/*##########################################################################
-#
-#   Name       : RdosExec
-#
-#   Purpose....: Execute a program
-#
-#   Parameters.: Program
-#                Commandline
-#
-##########################################################################*/
-
-    .global RdosExec
-    
-RdosExec:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%esi
-	movl 12(%ebp),%edi
-
-	UserGate load_exe_nr
-	UserGate get_exit_code_nr
-
-	popl %edi
-	popl %esi
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosSpawn
-#
-#   Purpose....: Create new process and run a program
-#
-#   Parameters.: Program
-#                Commandline
-#                StartDir
-#
-##########################################################################*/
-
-    .global RdosSpawn
-    
-RdosSpawn:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %fs
-	pushl %ebx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-    movw %ds,%dx
-    movw %dx,%fs
-    xorl %edx,%edx
-	movl 8(%ebp),%esi
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ebx
-	UserGate spawn_exe_nr
-	jc rsFail
-	
-    movzx %dx,%eax
-    jmp rsDone
-    
-rsFail:
-    xorl %eax,%eax
-
-rsDone:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ebx
-	popw %fs
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosCpuReset
-#
-#   Purpose....: Cpu reset
-#
-##########################################################################*/
-
-    .global RdosCpuReset
-    
-RdosCpuReset:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate cpu_reset_nr
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosGetVersion
-#
-#   Purpose....: Get RDOS version
-#
-#   Parameters.: &major
-#                &minor
-#                &release
-#
-##########################################################################*/
-
-    .global RdosGetVersion
-    
-RdosGetVersion:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	UserGate get_version_nr
-
-    movzx %dx,%edx
-	movl 8(%ebp),%edi
-	movl %edx,(%edi)
-
-    movzx %ax,%eax
-	movl 12(%ebp),%edi
-	movl %eax,(%edi)
-
-    movzx %cx,%eax
-	movl 16(%ebp),%edi
-	movl %eax,(%edi)
-
-	popl %edi
-	popl %edx
-	popl %ecx
-	popl %eax
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosAllocateMem
-#
-#   Purpose....: Allocate memory
-#
-#   Parameters.: Bytes to allocate
-#
-#   Returns....: Memory pointer
-#
-##########################################################################*/
-
-    .global RdosAllocateMem
-    
-RdosAllocateMem:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movl 8(%ebp),%eax
-	UserGate allocate_app_mem_nr
-	movl %edx,%eax
-
-	popl %edx
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosFreeMem
-#
-#   Purpose....: Free memory
-#
-#   Parameters.: Memory pointer
-#
-##########################################################################*/
-
-    .global RdosFreeMem
-
-RdosFreeMem:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movl 8(%ebp),%edx
-	UserGate free_app_mem_nr
-
-	popl %edx
-	leave
-	ret
-	    
-/*##########################################################################
-#
-#   Name       : RdosAppDebug
-#
-#   Purpose....: App debug
-#
-##########################################################################*/
-
-    .global RdosAppDebug
-    
-RdosAppDebug:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate app_debug_nr
-	leave
-	ret
-		    
-/*##########################################################################
-#
-#   Name       : RdosWaitMilli
-#
-#   Purpose....: Wait a number of milliseconds
-#
-#   Parameters.: Milliseconds to wait
-#
-##########################################################################*/
-
-    .global RdosWaitMilli
-    
-RdosWaitMilli:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-
-	movl 8(%ebp),%eax
-	UserGate wait_milli_nr
-
-	popl %eax
-	leave
-	ret
-			    
-/*##########################################################################
-#
-#   Name       : RdosCreateSection
-#
-#   Purpose....: Create section
-#
-#   Returns....: Section handle
-#
-##########################################################################*/
-
-    .global RdosCreateSection
-    
-RdosCreateSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	
-	UserGate create_user_section_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-			    
-/*##########################################################################
-#
-#   Name       : RdosDeleteSection
-#
-#   Purpose....: Delete section
-#
-#   Parameters.: Section handle
-#
-##########################################################################*/
-
-    .global RdosDeleteSection
-    
-RdosDeleteSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate delete_user_section_nr
-
-	popl %ebx
-	leave
-	ret
-				    
-/*##########################################################################
-#
-#   Name       : RdosEnterSection
-#
-#   Purpose....: Enter section
-#
-#   Parameters.: Section handle
-#
-##########################################################################*/
-
-    .global RdosEnterSection
-    
-RdosEnterSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate enter_user_section_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosLeaveSection
-#
-#   Purpose....: Leave section
-#
-#   Parameters.: Section handle
-#
-##########################################################################*/
-
-    .global RdosLeaveSection
-    
-RdosLeaveSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate leave_user_section_nr
-
-	popl %ebx
-	leave
-	ret
-				    
-/*##########################################################################
-#
-#   Name       : RdosCreateWait
-#
-#   Purpose....: Create wait object
-#
-#   Returns....: Wait handle
-#
-##########################################################################*/
-
-    .global RdosCreateWait
-    
-RdosCreateWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate create_wait_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCloseWait
-#
-#   Purpose....: Close wait
-#
-#   Parameters.: Wait handle
-#
-##########################################################################*/
-
-    .global RdosCloseWait
-    
-RdosCloseWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_wait_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCheckWait
-#
-#   Purpose....: Check wait state
-#
-#   Parameters.: Wait handle
-#
-#   Returns....: Signalled ID or 0
-#
-##########################################################################*/
-
-    .global RdosCheckWait
-    
-RdosCheckWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	UserGate is_wait_idle_nr
-    movl %ecx,%eax
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosWaitForever
-#
-#   Purpose....: Wait forever
-#
-#   Parameters.: Wait handle
-#
-#   Returns....: Signalled ID or 0
-#
-##########################################################################*/
-
-    .global RdosWaitForever
-    
-RdosWaitForever:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	UserGate wait_no_timeout_nr
-	jc rwfFail
-
-    movl %ecx,%eax
-    jmp rwfDone
-
-rwfFail:
-    xorl %eax,%eax
-
-rwfDone:
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosWaitTimeout
-#
-#   Purpose....: Wait with timeout
-#
-#   Parameters.: Wait handle
-#                Timeout in ms
-#
-#   Returns....: Signalled ID or 0
-#
-##########################################################################*/
-
-    .global RdosWaitTimeout
-    
-RdosWaitTimeout:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movl 12(%ebp),%eax
-	movl $1193,%edx
-	mull %edx
-	pushl %edx
-	pushl %eax
-    UserGate get_system_time_nr
-    popl %ebx
-    addl %ebx,%eax
-    popl %ebx
-    adcl %ebx,%edx
-	movw 8(%ebp),%bx
-	UserGate wait_timeout_nr
-	jc rwtFail
-
-    movl %ecx,%eax
-    jmp rwtDone
-
-rwtFail:
-    xorl %eax,%eax
-
-rwtDone:
-    popl %edx
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosStopWait
-#
-#   Purpose....: Stop wait
-#
-#   Parameters.: Wait handle
-#
-##########################################################################*/
-
-    .global RdosStopWait
-    
-RdosStopWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate stop_wait_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosRemoveWait
-#
-#   Purpose....: Remove wait object from wait handle
-#
-#   Parameters.: Wait handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosRemoveWait
-    
-RdosRemoveWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%ecx
-	UserGate remove_wait_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-				    
-/*##########################################################################
-#
-#   Name       : RdosCreateSignal
-#
-#   Purpose....: Create signal object
-#
-#   Returns....: Signal handle
-#
-##########################################################################*/
-
-    .global RdosCreateSignal
-    
-RdosCreateSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate create_signal_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosResetSignal
-#
-#   Purpose....: Reset signal
-#
-#   Parameters.: Signal handle
-#
-##########################################################################*/
-
-    .global RdosResetSignal
-    
-RdosResetSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate reset_signal_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosIsSignalled
-#
-#   Purpose....: Check if signalled
-#
-#   Parameters.: Signal handle
-#
-#   Returns....: TRUE if signalled
-#
-##########################################################################*/
-
-    .global RdosIsSignalled
-    
-RdosIsSignalled:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate is_signalled_nr
-	jc risdFree
-
-    movl $1,%eax
-    jmp risdDone	
-
-risdFree:
-    xorl %eax,%eax
-
-risdDone:
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetSignal
-#
-#   Purpose....: Set signal
-#
-#   Parameters.: Signal handle
-#
-##########################################################################*/
-
-    .global RdosSetSignal
-    
-RdosSetSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_signal_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosFreeSignal
-#
-#   Purpose....: Free signal handle
-#
-#   Parameters.: Signal handle
-#
-##########################################################################*/
-
-    .global RdosFreeSignal
-    
-RdosFreeSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate free_signal_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForSignal
-#
-#   Purpose....: Add signal object to wait handle
-#
-#   Parameters.: Wait handle
-#                Signal handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForSignal
-    
-RdosAddWaitForSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_signal_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForKeyboard
-#
-#   Purpose....: Add keyboard to wait handle
-#
-#   Parameters.: Wait handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForKeyboard
-    
-RdosAddWaitForKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%ecx
-	UserGate add_wait_for_keyboard_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForMouse
-#
-#   Purpose....: Add mouse to wait handle
-#
-#   Parameters.: Wait handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForMouse
-    
-RdosAddWaitForMouse:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%ecx
-	UserGate add_wait_for_mouse_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForCom
-#
-#   Purpose....: Add com object to wait handle
-#
-#   Parameters.: Wait handle
-#                Com handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForCom
-    
-RdosAddWaitForCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_com_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForAdc
-#
-#   Purpose....: Add ADC object to wait handle
-#
-#   Parameters.: Wait handle
-#                Adc handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForAdc
-    
-RdosAddWaitForAdc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_adc_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetTextMode
-#
-#   Purpose....: Set text mode
-#
-##########################################################################*/
-
-    .global RdosSetTextMode
-    
-RdosSetTextMode:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movw $3,%ax
-    UserGate set_video_mode_nr
-
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetVideoMode
-#
-#   Purpose....: Set video mode
-#
-#   Parameters.: &xres
-#                &yres
-#                &linesize
-#                &LFB
-#
-#   Returns....: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosSetVideoMode
-    
-RdosSetVideoMode:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movw (%edi),%ax
-
-	movl 12(%ebp),%edi
-	movw (%edi),%cx
-
-	movl 16(%ebp),%edi
-	movw (%edi),%dx
-
-	UserGate get_video_mode_nr
-	jc set_video_fail
-
-    UserGate set_video_mode_nr
-    jc set_video_fail
-
-	pushl %edi
-	movl 8(%ebp),%edi
-	movzx %ax,%eax
-	movl %eax,(%edi)
-
-	movl 12(%ebp),%edi
-	movzx %cx,%ecx
-	movl %ecx,(%edi)
-
-	movl 16(%ebp),%edi
-	movzx %dx,%edx
-	movl %edx,(%edi)
-
-	movl 20(%ebp),%edi
-	movzx %si,%esi
-	movl %esi,(%edi)
-	popl %edi
-
-	movl 24(%ebp),%eax
-	movl %edi,(%eax)
-
-	movzx %bx,%eax
-	jmp set_video_done
-
-set_video_fail:
-	xorl %eax,%eax
-	movl 8(%ebp),%edi
-	movl %eax,(%edi)
-	movl 12(%ebp),%edi
-	movl %eax,(%edi)
-	movl 16(%ebp),%edi
-	movl %eax,(%edi)
-	movl 20(%ebp),%edi
-	movl %eax,(%edi)
-	movl 24(%ebp),%edi
-	movl %eax,(%edi)
-
-set_video_done:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetClipRect
-#
-#   Purpose....: Set clip rectangle
-#
-#   Parameters.: Bitmap handle
-#                xmin, xmax, ymin, ymax
-#
-##########################################################################*/
-
-    .global RdosSetClipRect
-    
-RdosSetClipRect:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%si
-	movw 24(%ebp),%di
-	UserGate set_clip_rect_nr
-
-    popl %edi
-    popl %esi
-    popl %edx
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosClearClipRect
-#
-#   Purpose....: Clear clip rectangle
-#
-#   Parameters.: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosClearClipRect
-    
-RdosClearClipRect:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate clear_clip_rect_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetDrawColor
-#
-#   Purpose....: Set draw color
-#
-#   Parameters.: Bitmap handle
-#                Color
-#
-##########################################################################*/
-
-    .global RdosSetDrawColor
-    
-RdosSetDrawColor:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	UserGate set_drawcolor_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetLGOP
-#
-#   Purpose....: Set draw color
-#
-#   Parameters.: Bitmap handle
-#                LGOP
-#
-##########################################################################*/
-
-    .global RdosSetLGOP
-    
-RdosSetLGOP:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	UserGate set_lgop_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetHollowStyle
-#
-#   Purpose....: Set hollow fill style
-#
-#   Parameters.: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosSetHollowStyle
-    
-RdosSetHollowStyle:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_hollow_style_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetFilledStyle
-#
-#   Purpose....: Set filled fill style
-#
-#   Parameters.: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosSetFilledStyle
-    
-RdosSetFilledStyle:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_filled_style_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosOpenFont
-#
-#   Purpose....: Open a font
-#
-#   Parameters.: height
-#
-#   Returns....: Font handle
-#
-##########################################################################*/
-
-    .global RdosOpenFont
-    
-RdosOpenFont:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%ax
-	UserGate open_font_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCloseFont
-#
-#   Purpose....: Close font handle
-#
-#   Parameters.: Font handle
-#
-##########################################################################*/
-
-    .global RdosCloseFont
-    
-RdosCloseFont:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_font_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosGetStringMetrics
-#
-#   Purpose....: Get string metrics for text using font
-#
-#   Parameters.: Font handle
-#                String
-#                &width
-#                &height
-#
-##########################################################################*/
-
-    .global RdosGetStringMetrics
-    
-RdosGetStringMetrics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	UserGate get_string_metrics_nr
-
-	movl 16(%ebp),%edi
-	movzx %cx,%ecx
-	movl %ecx,(%edi)
-	
-	movl 20(%ebp),%edi
-	movzx %dx,%edx
-	movl %edx,(%edi)
-
-	popl %edi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFont
-#
-#   Purpose....: Set font
-#
-#   Parameters.: Bitmap handle
-#                Font handle
-#
-##########################################################################*/
-
-    .global RdosSetFont
-    
-RdosSetFont:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	UserGate set_font_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetPixel
-#
-#   Purpose....: Get pixel
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#
-##########################################################################*/
-
-    .global RdosGetPixel
-    
-RdosGetPixel:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	UserGate get_pixel_nr
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetPixel
-#
-#   Purpose....: Set pixel
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#
-##########################################################################*/
-
-    .global RdosSetPixel
-    
-RdosSetPixel:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	UserGate set_pixel_nr
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosBlit
-#
-#   Purpose....: Blit
-#
-#   Parameters.: SrcHandle
-#                DestHandle
-#                width, height
-#                SrcX, SrcY
-#                DestX, DestY
-#
-##########################################################################*/
-
-    .global RdosBlit
-    
-RdosBlit:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-;
-	movw 8(%ebp),%ax
-	movw 12(%ebp),%bx
-	movw 16(%ebp),%cx
-	movw 20(%ebp),%dx
-	movw 28(%ebp),%si
-	shll $16,%esi
-	movw 24(%ebp),%si
-	movw 36(%ebp),%di
-	shll $16,%edi
-	movw 32(%ebp),%di
-	UserGate blit_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawMask
-#
-#   Purpose....: Draw mask
-#
-#   Parameters.: Bitmap handle
-#                mask
-#                RowSize
-#                width, height
-#                SrcX, SrcY
-#                DestX, DestY
-#
-##########################################################################*/
-
-    .global RdosDrawMask
-    
-RdosDrawMask:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-;
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movw 16(%ebp),%ax
-	movw 24(%ebp),%si
-	shll $16,%esi
-	movw 20(%ebp),%si
-	movw 32(%ebp),%cx
-	shll $16,%ecx
-	movw 28(%ebp),%cx
-	movw 40(%ebp),%dx
-	shll $16,%edx
-	movw 36(%ebp),%dx
-	UserGate draw_mask_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawLine
-#
-#   Purpose....: Draw a line
-#
-#   Parameters.: Bitmap handle
-#                x1, y1
-#                x2, y2
-#
-##########################################################################*/
-
-    .global RdosDrawLine
-    
-RdosDrawLine:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-;
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%si
-	movw 24(%ebp),%di
-	UserGate draw_line_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawString
-#
-#   Purpose....: Draw a string
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#                string
-#
-##########################################################################*/
-
-    .global RdosDrawString
-    
-RdosDrawString:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-;
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movl 20(%ebp),%edi
-	UserGate draw_string_nr
-
-	popl %edi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawRect
-#
-#   Purpose....: Draw a rect
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#                width, height
-#
-##########################################################################*/
-
-    .global RdosDrawRect
-    
-RdosDrawRect:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%si
-	movw 24(%ebp),%di
-	UserGate draw_rect_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawEllipse
-#
-#   Purpose....: Draw an ellipse
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#                width, height
-#
-##########################################################################*/
-
-    .global RdosDrawEllipse
-    
-RdosDrawEllipse:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%si
-	movw 24(%ebp),%di
-	UserGate draw_ellipse_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCreateBitmap
-#
-#   Purpose....: Create a bitmap
-#
-#   Parameters.: BitsPerPixel
-#                width, height
-#
-#   Returns....: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosCreateBitmap
-    
-RdosCreateBitmap:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%ax
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	UserGate create_bitmap_nr
-	movzx %bx,%eax
-;
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDuplicateBitmapHandle
-#
-#   Purpose....: Duplicate bitmap handle for use in another thread / object
-#
-#   Parameters.: Bitmap handle
-#
-#   Returns....: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosDuplicateBitmapHandle
-    
-RdosDuplicateBitmapHandle:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate dup_bitmap_handle_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseBitmap
-#
-#   Purpose....: Close bitmap handle
-#
-#   Parameters.: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosCloseBitmap
-    
-RdosCloseBitmap:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_bitmap_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateStringBitmap
-#
-#   Purpose....: Create bitmap from string & font
-#
-#   Parameters.: Font
-#                string
-#
-#   Returns....: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosCreateStringBitmap
-    
-RdosCreateStringBitmap:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	UserGate create_string_bitmap_nr
-	movzx %bx,%eax
-;
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetBitmapInfo
-#
-#   Purpose....: Get info about bitmap
-#
-#   Parameters.: Bitmap handle
-#                &BitsPerPixel
-#                &width, &height
-#                &linesize
-#                &LFB
-#
-##########################################################################*/
-
-    .global RdosGetBitmapInfo
-    
-RdosGetBitmapInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	UserGate get_bitmap_info_nr
-	jc gbiFail
-
-	pushl %edi
-	movl 12(%ebp),%edi
-	movzx %al,%eax
-	movl %eax,(%edi)
-
-	movl 16(%ebp),%edi
-	movzx %cx,%ecx
-	movl %ecx,(%edi)
-	
-	movl 20(%ebp),%edi
-	movzx %dx,%edx
-	movl %edx,(%edi)
-
-	movl 24(%ebp),%edi
-	movzx %si,%esi
-	movl %esi,(%edi)
-	popl %edi
-	
-	movl 28(%ebp),%eax
-	movl %edi,(%eax)
-	jmp gbiDone
-
-gbiFail:
-	xorl %eax,%eax
-	movl 12(%ebp),%edi
-	movl %eax,(%edi)
-
-	movl 16(%ebp),%edi
-	movl %eax,(%edi)
-
-	movl 20(%ebp),%edi
-	movl %eax,(%edi)
-
-	movl 24(%ebp),%edi
-	movl %eax,(%edi)
-
-	movl 28(%ebp),%edi
-	movl %eax,(%edi)
-
-gbiDone:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCreateSprite
-#
-#   Purpose....: Create a sprite
-#
-#   Parameters.: dest
-#                bitmap
-#                mask
-#                LGOP
-#
-#   Returns....: Sprite handle
-#
-##########################################################################*/
-
-    .global RdosCreateSprite
-    
-RdosCreateSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%ax
-	UserGate create_sprite_nr
-	movzx %bx,%eax
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseSprite
-#
-#   Purpose....: Close sprite handle
-#
-#   Parameters.: Sprite handle
-#
-##########################################################################*/
-
-    .global RdosCloseSprite
-    
-RdosCloseSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_sprite_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosShowSprite
-#
-#   Purpose....: Show sprite
-#
-#   Parameters.: Sprite handle
-#
-##########################################################################*/
-
-    .global RdosShowSprite
-    
-RdosShowSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate show_sprite_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosHideSprite
-#
-#   Purpose....: Hide sprite
-#
-#   Parameters.: Sprite handle
-#
-##########################################################################*/
-
-    .global RdosHideSprite
-    
-RdosHideSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate hide_sprite_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosMoveSprite
-#
-#   Purpose....: Move sprite
-#
-#   Parameters.: Sprite handle
-#                x, y
-#
-##########################################################################*/
-
-    .global RdosMoveSprite
-    
-RdosMoveSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	UserGate move_sprite_nr
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetForeColor
-#
-#   Purpose....: Set text-mode fore color
-#
-#   Parameters.: palette index
-#
-##########################################################################*/
-
-    .global RdosSetForeColor
-    
-RdosSetForeColor:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-
-	movb 8(%ebp),%al
-	UserGate set_forecolor_nr
-
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetBackColor
-#
-#   Purpose....: Set text-mode back color
-#
-#   Parameters.: palette index
-#
-##########################################################################*/
-
-    .global RdosSetBackColor
-    
-RdosSetBackColor:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-
-	movb 8(%ebp),%al
-	UserGate set_backcolor_nr
-
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetSysTime
-#
-#   Purpose....: Get system time
-#
-#   Parameters.: &year, &month, &day
-#                &hour, &min, &sec, &ms
-#
-##########################################################################*/
-
-    .global RdosGetSysTime
-    
-RdosGetSysTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	UserGate get_system_time_nr
-	pushl %eax
-	UserGate binary_to_time_nr
-	pushl %edx
-
-	movl 8(%ebp),%esi
-	movzx %dx,%edx
-	movl %edx,(%esi)
-
-	movl 12(%ebp),%esi
-	movzx %ch,%edx
-	movl %edx,(%esi)
-
-	movl 16(%ebp),%esi
-	movzx %cl,%edx
-	movl %edx,(%esi)
-
-	movl 20(%ebp),%esi
-	movzx %bh,%edx
-	movl %edx,(%esi)
-
-	movl 24(%ebp),%esi
-	movzx %bl,%edx
-	movl %edx,(%esi)
-
-	movl 28(%ebp),%esi
-	movzx %ah,%edx
-	movl %edx,(%esi)
-
-	popl %edx
-	UserGate time_to_binary_nr
-	movl %eax,%ebx
-	popl %eax
-	subl %ebx,%eax
-	xorl %edx,%edx
-	movl $1192,%ebx
-	divl %ebx
-
-	movl 32(%ebp),%esi
-	movzx %ax,%eax
-	movl %eax,(%esi)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetTime
-#
-#   Purpose....: Get time
-#
-#   Parameters.: &year, &month, &day
-#                &hour, &min, &sec, &ms
-#
-##########################################################################*/
-
-    .global RdosGetTime
-    
-RdosGetTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	UserGate get_time_nr
-	pushl %eax
-	UserGate binary_to_time_nr
-	pushl %edx
-
-	movl 8(%ebp),%esi
-	movzx %dx,%edx
-	movl %edx,(%esi)
-
-	movl 12(%ebp),%esi
-	movzx %ch,%edx
-	movl %edx,(%esi)
-
-	movl 16(%ebp),%esi
-	movzx %cl,%edx
-	movl %edx,(%esi)
-
-	movl 20(%ebp),%esi
-	movzx %bh,%edx
-	movl %edx,(%esi)
-
-	movl 24(%ebp),%esi
-	movzx %bl,%edx
-	movl %edx,(%esi)
-
-	movl 28(%ebp),%esi
-	movzx %ah,%edx
-	movl %edx,(%esi)
-
-	popl %edx
-	UserGate time_to_binary_nr
-	movl %eax,%ebx
-	popl %eax
-	subl %ebx,%eax
-	xorl %edx,%edx
-	movl $1192,%ebx
-	divl %ebx
-
-	movl 32(%ebp),%esi
-	movzx %ax,%eax
-	movl %eax,(%esi)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetTime
-#
-#   Purpose....: Set time
-#
-#   Parameters.: year, month, day
-#                hour, min, sec, ms
-#
-##########################################################################*/
-
-    .global RdosSetTime
-    
-RdosSetTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movw 8(%ebp),%dx
-	movb 12(%ebp),%ch
-	movb 16(%ebp),%cl
-	movb 20(%ebp),%bh
-	movb 24(%ebp),%bl
-	movb 28(%ebp),%ah
-	UserGate time_to_binary_nr
-
-    movl %edx,%edi
-    movl %eax,%esi
-
-	movl 32(%ebp),%eax
-    movl $1192,%edx
-    mull %edx
-    addl %eax,%esi
-    adcl $0,%edi    
-
-	UserGate get_system_time_nr
-    subl %eax,%esi
-    sbbl %edx,%edi
-    movl %esi,%eax
-    movl %edi,%edx
-    UserGate update_time_nr
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosTicsToRecord
-#
-#   Purpose....: Convert tics to record format
-#
-#   Parameters.: MSB, LSB
-#                &year, &month, &day
-#                &hour, &min, &sec, &ms
-#
-##########################################################################*/
-
-    .global RdosTicsToRecord
-    
-RdosTicsToRecord:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%eax
-	addl $596,%eax
-	adcl $0,%edx
-	UserGate binary_to_time_nr
-	pushl %edx
-
-	movl 16(%ebp),%esi
-	movzx %dx,%edx
-	movl %edx,(%esi)
-
-	movl 20(%ebp),%esi
-	movzx %ch,%edx
-	movl %edx,(%esi)
-
-	movl 24(%ebp),%esi
-	movzx %cl,%edx
-	movl %edx,(%esi)
-
-	movl 28(%ebp),%esi
-	movzx %bh,%edx
-	movl %edx,(%esi)
-
-	movl 32(%ebp),%esi
-	movzx %bl,%edx
-	movl %edx,(%esi)
-
-	movl 36(%ebp),%esi
-	movzx %ah,%edx
-	movl %edx,(%esi)
-
-	popl %edx
-	UserGate time_to_binary_nr
-	movl %eax,%ebx
-	movl 12(%ebp),%eax
-	subl %edx,%eax
-	xorl %edx,%edx
-	movl $1192,%ebx
-	divl %ebx
-
-	movl 40(%ebp),%esi
-	cmpw %ax,1000
-	jne rttrSaveMs
-
-	decw %ax
-
-rttrSaveMs:	
-	movzx %ax,%eax
-	movl %eax,(%esi)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosRecordToTics
-#
-#   Purpose....: Convert from record format to tics
-#
-#   Parameters.: &MSB, &LSB
-#                year, month, day
-#                hour, min, sec, ms
-#
-##########################################################################*/
-
-    .global RdosRecordToTics
-    
-RdosRecordToTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 40(%ebp),%eax
-	movl $1192,%edx
-	mull %edx
-	pushl %eax
-	movw 16(%ebp),%dx
-	movb 20(%ebp),%ch
-	movb 24(%ebp),%cl
-	movb 28(%ebp),%bh
-	movb 32(%ebp),%bl
-	movb 36(%ebp),%ah
-	UserGate time_to_binary_nr
-	popl %ebx
-	addl %ebx,%eax
-	adcl $0,%edx
-
-	movl 8(%ebp),%esi
-	movl %edx,(%esi)
-
-	movl 12(%ebp),%esi
-	movl %eax,(%esi)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDecodeMsbTics
-#
-#   Purpose....: Decode MSB tics
-#
-#   Parameters.: MSB
-#                &day, &hour
-#
-##########################################################################*/
-
-    .global RdosDecodeMsbTics
-    
-RdosDecodeMsbTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 8(%ebp),%eax
-	xorl %edx,%edx
-	movl $24,%ecx
-	divl %ecx
-
-	movl 12(%ebp),%ebx
-	movl %eax,(%ebx)
-
-	movl 16(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDecodeLsbTics
-#
-#   Purpose....: Decode LSB tics
-#
-#   Parameters.: LSB
-#                &min, &sec, &ms, &us
-#
-##########################################################################*/
-
-    .global RdosDecodeLsbTics
-    
-RdosDecodeLsbTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 8(%ebp),%eax
-	movl $60,%edx
-	mull %edx
-	movl 12(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl $60,%edx
-	mull %edx
-	movl 16(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl $1000,%edx
-	mull %edx
-	movl 20(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl $1000,%edx
-	mull %edx
-	movl 24(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDayOfWeek
-#
-#   Purpose....: Get day of week
-#
-#   Parameters.: year, month, day
-#
-#   Returns....: day of week
-#
-##########################################################################*/
-
-    .global RdosDayOfWeek
-    
-RdosDayOfWeek:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movl 8(%ebp),%edx
-	movb 12(%ebp),%ch
-	movb 16(%ebp),%cl
-    xorw %bx,%bx
-    xorb %ah,%ah
-	UserGate adjust_time_nr
-	pushw %dx
-	movl $365,%eax
-	imulw %dx
-	pushw %dx
-	pushw %ax
-	popl %ebx
-	popw %dx
-	UserGate passed_days_nr
-	decw %dx
-	shrw $2,%dx
-	incw %dx
-	addw %dx,%ax
-	addl %ebx,%eax
-    xorl %edx,%edx
-    addl $5,%eax
-    movl $7,%ebx
-    divl %ebx
-    movzx %dl,%eax
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetTics
-#
-#   Purpose....: Get system tics
-#
-#   Parameters.: &MSB, &LSB
-#
-##########################################################################*/
-
-    .global RdosGetTics
-    
-RdosGetTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-	pushl %esi
-
-	UserGate get_time_nr
-	movl 8(%ebp),%esi
-	movl %edx,(%esi)
-	movl 12(%ebp),%esi
-	movl %eax,(%esi)
-
-	popl %esi
-	popl %edx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddTics
-#
-#   Purpose....: Add tics to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                tics
-#
-##########################################################################*/
-
-    .global RdosAddTics
-    
-RdosAddTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl 12(%ebp),%ebx
-	addl %eax,(%ebx)
-	movl 8(%ebp),%ebx
-	adcl $0,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddMilli
-#
-#   Purpose....: Add milliseconds to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                milli
-#
-##########################################################################*/
-
-    .global RdosAddMilli
-    
-RdosAddMilli:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl $1193,%edx
-	mull %edx
-	movl 12(%ebp),%ebx
-	addl %eax,(%ebx)
-	movl 8(%ebp),%ebx
-	adcl %edx,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddSec
-#
-#   Purpose....: Add milliseconds to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                sec
-#
-##########################################################################*/
-
-    .global RdosAddSec
-    
-RdosAddSec:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl $1193000,%edx
-	mull %edx
-	movl 12(%ebp),%ebx
-	addl %eax,(%ebx)
-	movl 8(%ebp),%ebx
-	adcl %edx,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddMin
-#
-#   Purpose....: Add minutes to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                min
-#
-##########################################################################*/
-
-    .global RdosAddMin
-    
-RdosAddMin:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl $71582760,%edx
-	mull %edx
-	movl 12(%ebp),%ebx
-	addl %eax,(%ebx)
-	movl 8(%ebp),%ebx
-	adcl %edx,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddHour
-#
-#   Purpose....: Add hour to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                hour
-#
-##########################################################################*/
-
-    .global RdosAddHour
-    
-RdosAddHour:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl 8(%ebp),%ebx
-	adc %eax,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddDay
-#
-#   Purpose....: Add days to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                days
-#
-##########################################################################*/
-
-    .global RdosAddDay
-    
-RdosAddDay:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl $24,%edx
-	mull %edx
-	movl 8(%ebp),%ebx
-	adc %eax,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSyncTime
-#
-#   Purpose....: Synchronize time with NTP
-#
-#   Parameters.: IP
-#
-##########################################################################*/
-
-    .global RdosSyncTime
-    
-RdosSyncTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 8(%ebp),%edx
-	UserGate sync_time_nr
-	jc RdosSyncTimeFail
-
-	movl $1,%eax
-	jmp RdosSyncTimeDone
-
-RdosSyncTimeFail:
-	xorl %eax,%eax
-
-RdosSyncTimeDone:
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenCom
-#
-#   Purpose....: Open com-port
-#
-#   Parameters.: ID
-#                baudrate
-#                parity
-#                data bits
-#                stop bits
-#                SendBufferSize
-#                RecBufferSize
-#
-#    Returns...: Com handle
-#
-##########################################################################*/
-
-    .global RdosOpenCom
-    
-RdosOpenCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movb 20(%ebp),%ah
-	movb 24(%ebp),%bl
-	movb 16(%ebp),%bh
-	movl 12(%ebp),%ecx
-	movw 28(%ebp),%si
-	movw 32(%ebp),%di
-	UserGate open_com_nr
-	movzx %bx,%eax
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseCom
-#
-#   Purpose....: Close com-port
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosCloseCom
-    
-RdosCloseCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_com_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosFlushCom
-#
-#   Purpose....: Flush com-port
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosFlushCom
-    
-RdosFlushCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate flush_com_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadCom
-#
-#   Purpose....: Read com-port
-#
-#   Parameters.: Com handle
-#
-#   Returns....: Character
-#
-##########################################################################*/
-
-    .global RdosReadCom
-    
-RdosReadCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate read_com_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteCom
-#
-#   Purpose....: Write com-port
-#
-#   Parameters.: Com handle
-#                char
-#
-#   Returns....: 0 for success
-#
-##########################################################################*/
-
-    .global RdosWriteCom
-    
-RdosWriteCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movb 12(%ebp),%al
-	UserGate write_com_nr
-	movzx %al,%eax
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWaitForSendCompletedCom
-#
-#   Purpose....: Wait until send buffer is empty
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosWaitForSendCompletedCom
-    
-RdosWaitForSendCompletedCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate wait_for_send_completed_com_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosEnableCts
-#
-#   Purpose....: Enable CTS signal
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosEnableCts
-    
-RdosEnableCts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate enable_cts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDisableCts
-#
-#   Purpose....: Disable CTS signal
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosDisableCts
-    
-RdosDisableCts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate disable_cts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosEnableAutoRts
-#
-#   Purpose....: Enable auto RTS signal generation for RS485
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosEnableAutoRts
-    
-RdosEnableAutoRts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate enable_auto_rts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDisableAutoRts
-#
-#   Purpose....: Disable auto RTS signal generation for RS485
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosDisableAutoRts
-    
-RdosDisableAutoRts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate disable_auto_rts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetDtr
-#
-#   Purpose....: Set DTR active
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosSetDtr
-    
-RdosSetDtr:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_dtr_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosResetDtr
-#
-#   Purpose....: Set DTR inactive
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosResetDtr
-    
-RdosResetDtr:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate reset_dtr_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetRts
-#
-#   Purpose....: Set RTS active
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosSetRts
-    
-RdosSetRts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_rts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosResetRts
-#
-#   Purpose....: Set RTS inactive
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosResetRts
-    
-RdosResetRts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate reset_rts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetReceiveBufferSpace
-#
-#   Purpose....: Get receive buffer free space
-#
-#   Parameters.: Com handle
-#
-#   Returns....: Free bytes
-#
-##########################################################################*/
-
-    .global RdosGetReceiveBufferSpace
-    
-RdosGetReceiveBufferSpace:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_com_receive_space_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetSendBufferSpace
-#
-#   Purpose....: Get send buffer free space
-#
-#   Parameters.: Com handle
-#
-#   Returns....: Free bytes
-#
-##########################################################################*/
-
-    .global RdosGetSendBufferSpace
-    
-RdosGetSendBufferSpace:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_com_send_space_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenFile
-#
-#   Purpose....: Open file
-#
-#   Parameters.: Filename
-#                Access
-#
-#    Returns...: File handle
-#
-##########################################################################*/
-
-    .global RdosOpenFile
-    
-RdosOpenFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movb 12(%ebp),%cl
-	UserGate open_file_nr
-	jc OpenFileFailed
-
-	movzx %bx,%eax
-	jmp OpenFileDone
-
-OpenFileFailed:
-	xorl %eax,%eax
-
-OpenFileDone:
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateFile
-#
-#   Purpose....: Create file
-#
-#   Parameters.: Filename
-#                Attribute
-#
-#    Returns...: File handle
-#
-##########################################################################*/
-
-    .global RdosCreateFile
-    
-RdosCreateFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movw 12(%ebp),%cx
-	UserGate create_file_nr
-	jc CreateFileFailed
-
-	movzx %bx,%eax
-	jmp CreateFileDone
-
-CreateFileFailed:
-	xorl %eax,%eax
-
-CreateFileDone:
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseFile
-#
-#   Purpose....: Close file
-#
-#   Parameters.: File handle
-#
-##########################################################################*/
-
-    .global RdosCloseFile
-    
-RdosCloseFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_file_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosIsDevice
-#
-#   Purpose....: Check if file is device
-#
-#   Parameters.: TRUE if device
-#
-##########################################################################*/
-
-    .global RdosIsDevice
-    
-RdosIsDevice:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_ioctl_data_nr
-	testw $0x8000,%dx
-	jz ridFail
-
-	movl $1,%eax
-	jmp ridDone
-
-ridFail:
-	xorl %eax,%eax
-
-ridDone:
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDuplFile
-#
-#   Purpose....: Duplicate file handle
-#
-#   Parameters.: File handle
-#
-#   Returns....: File handle
-#
-##########################################################################*/
-
-    .global RdosDuplFile
-    
-RdosDuplFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate dupl_file_nr
-	jc DuplFileFailed
-	
-	movzx %bx,%eax
-	jmp DuplFileDone
-
-DuplFileFailed:
-	xorl %eax,%eax
-
-DuplFileDone:
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFileSize
-#
-#   Purpose....: Get file size
-#
-#   Parameters.: File handle
-#
-#   Returns....: Size
-#
-##########################################################################*/
-
-    .global RdosGetFileSize
-    
-RdosGetFileSize:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_file_size_nr
-	jnc GetFileSizeDone
-
-GetFileSizeFail:
-	xorl %eax,%eax
-
-GetFileSizeDone:
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFileSize
-#
-#   Purpose....: Set file size
-#
-#   Parameters.: File handle
-#                Size
-#
-##########################################################################*/
-
-    .global RdosSetFileSize
-    
-RdosSetFileSize:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	UserGate set_file_size_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFilePos
-#
-#   Purpose....: Get file position
-#
-#   Parameters.: File handle
-#
-#   Returns....: Position
-#
-##########################################################################*/
-
-    .global RdosGetFilePos
-    
-RdosGetFilePos:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_file_pos_nr
-	jnc GetFilePosDone
-
-GetFilePosFail:
-	xorl %eax,%eax
-
-GetFilePosDone:
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFilePos
-#
-#   Purpose....: Set file position
-#
-#   Parameters.: File handle
-#                Position
-#
-##########################################################################*/
-
-    .global RdosSetFilePos
-    
-RdosSetFilePos:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	UserGate set_file_pos_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFileTime
-#
-#   Purpose....: Get file time & date
-#
-#   Parameters.: File handle
-#                &MSB, &LSB
-#
-##########################################################################*/
-
-    .global RdosGetFileTime
-    
-RdosGetFileTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	UserGate get_file_time_nr
-	jc GetFileTimeDone
-
-	movl 12(%ebp),%edi
-	movl %edx,(%edi)
-
-	movl 16(%ebp),%edi
-	movl %eax,(%edi)
-
-GetFileTimeDone:
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFileTime
-#
-#   Purpose....: Set file time & date
-#
-#   Parameters.: File handle
-#                MSB, LSB
-#
-##########################################################################*/
-
-    .global RdosSetFileTime
-    
-RdosSetFileTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%eax
-	UserGate set_file_time_nr
-
-	popl %edx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadFile
-#
-#   Purpose....: Read from file
-#
-#   Parameters.: File handle
-#                buffer
-#                count
-#
-#   Returns....: Read count
-#
-##########################################################################*/
-
-    .global RdosReadFile
-    
-RdosReadFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate read_file_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteFile
-#
-#   Purpose....: Write to file
-#
-#   Parameters.: File handle
-#                buffer
-#                count
-#
-#   Returns....: Written count
-#
-##########################################################################*/
-
-    .global RdosWriteFile
-    
-RdosWriteFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate write_file_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateMapping
-#
-#   Purpose....: Create file mapping
-#
-#   Parameters.: Size
-#
-#    Returns...: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosCreateMapping
-    
-RdosCreateMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%eax
-	UserGate create_mapping_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateNamedMapping
-#
-#   Purpose....: Create named file mapping
-#
-#   Parameters.: Name
-#                Size
-#
-#    Returns...: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosCreateNamedMapping
-    
-RdosCreateNamedMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%eax
-	UserGate create_named_mapping_nr
-	movzx %bx,%eax
-
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateNamedFileMapping
-#
-#   Purpose....: Create file named file mapping
-#
-#   Parameters.: Name
-#                Size
-#                File handle
-#
-#    Returns...: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosCreateNamedFileMapping
-    
-RdosCreateNamedFileMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%eax
-	movw 16(%ebp),%bx
-	UserGate create_named_file_mapping_nr
-	movzx %bx,%eax
-
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenNamedMapping
-#
-#   Purpose....: Open named file mapping
-#
-#   Parameters.: Name
-#
-#    Returns...: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosOpenNamedMapping
-    
-RdosOpenNamedMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate open_named_mapping_nr
-	movzx %bx,%eax
-
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSyncMapping
-#
-#   Purpose....: Sync file mapping
-#
-#   Parameters.: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosSyncMapping
-    
-RdosSyncMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate sync_mapping_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseMapping
-#
-#   Purpose....: Close file mapping
-#
-#   Parameters.: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosCloseMapping
-    
-RdosCloseMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_mapping_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosMapView
-#
-#   Purpose....: Map view of file into memory
-#
-#   Parameters.: Filemap handle
-#                Offset
-#                Address
-#                Size
-#
-##########################################################################*/
-
-    .global RdosMapView
-    
-RdosMapView:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	movl 16(%ebp),%edi
-	movl 20(%ebp),%ecx
-	UserGate map_view_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosUnmapView
-#
-#   Purpose....: Unmap view of file
-#
-#   Parameters.: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosUnmapView
-    
-RdosUnmapView:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate unmap_view_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetCurDrive
-#
-#   Purpose....: Set current drive
-#
-#   Parameters.: Drive
-#
-##########################################################################*/
-
-    .global RdosSetCurDrive
-    
-RdosSetCurDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movb 8(%ebp),%al
-	UserGate set_cur_drive_nr
-	jc rscdrFail
-
-    movl $1,%eax
-    jmp rscdrDone
-
-rscdrFail:
-    xorl %eax,%eax
-
-rscdrDone:
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetCurDrive
-#
-#   Purpose....: Get current drive
-#
-#   Returns....: Drive
-#
-##########################################################################*/
-
-    .global RdosGetCurDrive
-    
-RdosGetCurDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-    xorl %eax,%eax
-	UserGate get_cur_drive_nr
-	movzx %al,%eax
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetCurDir
-#
-#   Purpose....: Set current directory
-#
-#   Parameters.: Pathname
-#
-##########################################################################*/
-
-    .global RdosSetCurDir
-    
-RdosSetCurDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate set_cur_dir_nr
-	jc rscdFail
-
-    movl $1,%eax
-    jmp rscdDone
-
-rscdFail:
-    xorl %eax,%eax
-
-rscdDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetCurDir
-#
-#   Purpose....: Get current directory
-#
-#   Parameters.: Drive
-#                Pathname
-#
-##########################################################################*/
-
-    .global RdosGetCurDir
-    
-RdosGetCurDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edi
-	UserGate get_cur_dir_nr
-	jc rgcdFail
-
-    movl $1,%eax
-    jmp rgcdDone
-
-rgcdFail:
-    xorl %eax,%eax
-
-rgcdDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosMakeDir
-#
-#   Purpose....: Create directory
-#
-#   Parameters.: Pathname
-#
-##########################################################################*/
-
-    .global RdosMakeDir
-    
-RdosMakeDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate make_dir_nr
-	jc mdFail
-
-    movl $1,%eax
-    jmp mdDone
-
-mdFail:
-    xorl %eax,%eax
-
-mdDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosRemoveDir
-#
-#   Purpose....: Remove directory
-#
-#   Parameters.: Pathname
-#
-##########################################################################*/
-
-    .global RdosRemoveDir
-    
-RdosRemoveDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate remove_dir_nr
-	jc rdFail
-
-    movl $1,%eax
-    jmp rdDone
-
-rdFail:
-    xorl %eax,%eax
-
-rdDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosRenameFile
-#
-#   Purpose....: Rename file
-#
-#   Parameters.: ToName
-#                FromName
-#
-##########################################################################*/
-
-    .global RdosRenameFile
-    
-RdosRenameFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%esi
-	UserGate rename_file_nr
-	jc rfFail
-
-    mov $1,%eax
-    jmp rfDone
-
-rfFail:
-    xorl %eax,%eax
-
-rfDone:
-	popl %edi
-	popl %esi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDeleteFile
-#
-#   Purpose....: Delete file
-#
-#   Parameters.: Pathname
-#
-##########################################################################*/
-
-    .global RdosDeleteFile
-    
-RdosDeleteFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate delete_file_nr
-	jc dfFail
-
-    mov $1,%eax
-    jmp dfDone
-
-dfFail:
-    xorl %eax,%eax
-
-dfDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFileAttribute
-#
-#   Purpose....: Get file attribute
-#
-#   Parameters.: Pathname
-#                &Attrib
-#
-##########################################################################*/
-
-    .global RdosGetFileAttribute
-    
-RdosGetFileAttribute:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate get_file_attribute_nr
-	jc gfaFail
-
-	movl 12(%ebp),%edi
-    movzx %cx,%ecx
-	movl %ecx,(%edi)
-    movl $1,%eax
-    jmp gfaDone
-
-gfaFail:
-    xorl %eax,%eax
-
-gfaDone:
-	popl %edi
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFileAttribute
-#
-#   Purpose....: Set file attribute
-#
-#   Parameters.: Pathname
-#                Attrib
-#
-##########################################################################*/
-
-    .global RdosSetFileAttribute
-    
-RdosSetFileAttribute:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movw 12(%ebp),%cx
-	UserGate set_file_attribute_nr
-	jc sfaFail
-
-    movl $1,%eax
-    jmp sfaDone
-
-sfaFail:
-    xorl %eax,%eax
-
-sfaDone:
-	popl %edi
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenDir
-#
-#   Purpose....: Open directory
-#
-#   Parameters.: Pathname
-#
-#   Returns....: Dir handle
-#
-##########################################################################*/
-
-    .global RdosOpenDir
-    
-RdosOpenDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate open_dir_nr
-	jc odFail
-
-    movzx %bx,%eax
-    jmp odDone
-
-odFail:
-    xorl %eax,%eax
-
-odDone:
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseDir
-#
-#   Purpose....: Close directory
-#
-#   Parameters.: Dir handle
-#
-##########################################################################*/
-
-    .global RdosCloseDir
-    
-RdosCloseDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_dir_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadDir
-#
-#   Purpose....: Read directory entry
-#
-#   Parameters.: Dir handle
-#                Entry #
-#                MaxNameSize
-#                Name buffer
-#                &FileSize
-#                &Attribute
-#                &Msb time
-#                &Lsb time
-#
-##########################################################################*/
-
-    .global RdosReadDir
-    
-RdosReadDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%dx
-	movw 16(%ebp),%cx
-	movl 20(%ebp),%edi
-	UserGate read_dir_nr
-	jc rdiFail
-
-	movl 24(%ebp),%edi
-	movl %ecx,(%edi)
-
-	movl 28(%ebp),%edi
-    movzx %bx,%ebx
-	movl %ebx,(%edi)
-
-	movl 32(%ebp),%edi
-	movl %edx,(%edi)
-
-	movl 36(%ebp),%edi
-	movl %eax,(%edi)
-
-    movl $1,%eax
-    jmp rdiDone
-
-rdiFail:
-    xorl %eax,%eax
-    
-rdiDone:
-    popl %edi
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFocus
-#
-#   Purpose....: Set input focus
-#
-#   Parameters.: Focus handle
-#
-##########################################################################*/
-
-    .global RdosSetFocus
-    
-RdosSetFocus:
-	pushl %ebp
-	movl %esp,%ebp
-	
-	movl 8(%ebp),%eax
-	UserGate set_focus_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFocus
-#
-#   Purpose....: Get input focus
-#
-#   Returns....: Focus handle
-#
-##########################################################################*/
-
-    .global RdosGetFocus
-    
-RdosGetFocus:
-	pushl %ebp
-	movl %esp,%ebp
-	
-	UserGate get_focus_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosClearKeyboard
-#
-#   Purpose....: Clear keyboard buffer
-#
-##########################################################################*/
-
-    .global RdosClearKeyboard
-    
-RdosClearKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate flush_keyboard_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPollKeyboard
-#
-#   Purpose....: Poll keyboard buffer
-#
-#   Returns....: TRUE if non-empty
-#
-##########################################################################*/
-
-    .global RdosPollKeyboard
-    
-RdosPollKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate poll_keyboard_nr
-	jc rpkEmpty
-
-	mov $1,%eax
-	jmp rpkDone
-
-rpkEmpty:
-	xorl %eax,%eax
-
-rpkDone:
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadKeyboard
-#
-#   Purpose....: Read keyboard buffer
-#
-#   Returns....: Scan code
-#
-##########################################################################*/
-
-    .global RdosReadKeyboard
-    
-RdosReadKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate read_keyboard_nr
-	movzx %ax,%eax
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetKeyboardState
-#
-#   Purpose....: Get keyboard buffer
-#
-#   Returns....: Keyboard state
-#
-##########################################################################*/
-
-    .global RdosGetKeyboardState
-    
-RdosGetKeyboardState:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate get_keyboard_state_nr
-	movzx %ax,%eax
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPutKeyboard
-#
-#   Purpose....: Put scancode in keyboard buffer
-#
-##########################################################################*/
-
-    .global RdosPutKeyboard
-    
-RdosPutKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-    pushl %edx
-
-	movw 8(%ebp),%ax
-	movb 12(%ebp),%dl
-	movb 16(%ebp),%dh
-	UserGate put_keyboard_code_nr
-
-    popl %edx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPeekKeyEvent
-#
-#   Purpose....: Peek keyboard event
-#
-##########################################################################*/
-
-    .global RdosPeekKeyEvent
-    
-RdosPeekKeyEvent:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	UserGate peek_key_event_nr
-	jc rpeFail
-
-	movl 8(%ebp),%edi
-	movzx %ax,%eax
-	movl %eax,(%edi)
-
-	movl 12(%ebp),%edi
-	movzx %cx,%eax
-	movl %eax,(%edi)
-
-	movl 16(%ebp),%edi
-	movzx %dl,%eax
-	movl %eax,(%edi)
-
-	movl 20(%ebp),%edi
-	movzx %dh,%eax
-	movl %eax,(%edi)
-
-	movl $1,%eax
-	jmp rpeDone
-
-rpeFail:
-	xorl %eax,%eax
-
-rpeDone:
-	popl %edi
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadKeyEvent
-#
-#   Purpose....: Read keyboard event
-#
-##########################################################################*/
-
-    .global RdosReadKeyEvent
-    
-RdosReadKeyEvent:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	UserGate read_key_event_nr
-	jc rkeFail
-
-	movl 8(%ebp),%edi
-	movzx %ax,%eax
-	movl %eax,(%edi)
-
-	movl 12(%ebp),%edi
-	movzx %cx,%eax
-	movl %eax,(%edi)
-
-	movl 16(%ebp),%edi
-	movzx %dl,%eax
-	movl %eax,(%edi)
-
-	movl 20(%ebp),%edi
-	movzx %dh,%eax
-	movl %eax,(%edi)
-
-	movl $1,%eax
-	jmp rkeDone
-
-rkeFail:
-	xorl %eax,%eax
-
-rkeDone:
-	popl %edi
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosHideMouse
-#
-#   Purpose....: Hide mouse cursor
-#
-##########################################################################*/
-
-    .global RdosHideMouse
-    
-RdosHideMouse:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate hide_mouse_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosShowMouse
-#
-#   Purpose....: Show mouse cursor
-#
-##########################################################################*/
-
-    .global RdosShowMouse
-    
-RdosShowMouse:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate show_mouse_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetMousePosition
-#
-#   Purpose....: Get mouse position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetMousePosition
-    
-RdosGetMousePosition:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_mouse_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetMousePosition
-#
-#   Purpose....: Set mouse position
-#
-#   Parameters.: x, y
-#
-##########################################################################*/
-
-    .global RdosSetMousePosition
-    
-RdosSetMousePosition:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%cx
-	movw 12(%ebp),%dx
-	UserGate set_mouse_position_nr
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetMouseWindow
-#
-#   Purpose....: Set mouse window
-#
-#   Parameters.: start x, start y
-#                end x, end y
-#
-##########################################################################*/
-
-    .global RdosSetMouseWindow
-    
-RdosSetMouseWindow:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%ax
-	movw 12(%ebp),%bx
-	movw 16(%ebp),%cx
-	movw 20(%ebp),%dx
-	UserGate set_mouse_window_nr
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetMouseMickey
-#
-#   Purpose....: Set mouse mickey
-#
-#   Parameters.: x, y
-#
-##########################################################################*/
-
-    .global RdosSetMouseMickey
-    
-RdosSetMouseMickey:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%cx
-	movw 12(%ebp),%dx
-	UserGate set_mouse_mickey_nr
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetCursorPosition
-#
-#   Purpose....: Get cursor position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetCursorPosition
-    
-RdosGetCursorPosition:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_cursor_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetCursorPosition
-#
-#   Purpose....: Set cursor position
-#
-#   Parameters.: x, y
-#
-##########################################################################*/
-
-    .global RdosSetCursorPosition
-    
-RdosSetCursorPosition:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%cx
-	movw 12(%ebp),%dx
-	UserGate set_cursor_position_nr
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLeftButton
-#
-#   Purpose....: Check if left button is pressed
-#
-#   Returns....: TRUE if pressed
-#
-##########################################################################*/
-
-    .global RdosGetLeftButton
-    
-RdosGetLeftButton:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate get_left_button_nr
-	jc get_left_rel
-
-	mov $1,%eax
-	jmp get_left_done
-
-get_left_rel:
-	xorl %eax,%eax
-
-get_left_done:
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRightButton
-#
-#   Purpose....: Check if right button is pressed
-#
-#   Returns....: TRUE if pressed
-#
-##########################################################################*/
-
-    .global RdosGetRightButton
-    
-RdosGetRightButton:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate get_right_button_nr
-	jc get_right_rel
-
-	mov $1,%eax
-	jmp get_right_done
-
-get_right_rel:
-	xorl %eax,%eax
-
-get_right_done:
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLeftButtonPressPosition
-#
-#   Purpose....: Get left button press position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetLeftButtonPressPosition
-    
-RdosGetLeftButtonPressPosition:
-	pushl %ebp
-	movl %esp,%ebp
-
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_left_button_press_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRightButtonPressPosition
-#
-#   Purpose....: Get right button press position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetRightButtonPressPosition
-    
-RdosGetRightButtonPressPosition:
-	pushl %ebp
-	movl %esp,%ebp
-
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_right_button_press_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLeftButtonReleasePosition
-#
-#   Purpose....: Get left button release position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetLeftButtonReleasePosition
-    
-RdosGetLeftButtonReleasePosition:
-	pushl %ebp
-	movl %esp,%ebp
-
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_left_button_release_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRightButtonReleasePosition
-#
-#   Purpose....: Get right button release position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetRightButtonReleasePosition
-    
-RdosGetRightButtonReleasePosition:
-	pushl %ebp
-	movl %esp,%ebp
-
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_right_button_release_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadLine
-#
-#   Purpose....: Read a line from keyboard
-#
-#   Parameters.: Buffer
-#                Size
-#
-#   Returns....: Read count
-#
-##########################################################################*/
-
-    .global RdosReadLine
-    
-RdosReadLine:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%ecx
-	UserGate read_con_nr
-
-	popl %edi
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteChar
-#
-#   Purpose....: Write a character to screen
-#
-#   Parameters.: Char
-#
-##########################################################################*/
-
-    .global RdosWriteChar
-    
-RdosWriteChar:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movb 8(%ebp),%al
-	UserGate write_char_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteSizeString
-#
-#   Purpose....: Write a fixed number of characters to screen
-#
-#   Parameters.: String
-#                Count
-#
-##########################################################################*/
-
-    .global RdosWriteSizeString
-    
-RdosWriteSizeString:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%ecx
-	UserGate write_size_string_nr
-
-	popl %edi
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteString
-#
-#   Purpose....: Write a string to screen
-#
-#   Parameters.: String
-#
-##########################################################################*/
-
-    .global RdosWriteString
-    
-RdosWriteString:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate write_asciiz_nr
-
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosNameToIp
-#
-#   Purpose....: Convert host name to IP address
-#
-#   Parameters.: Name
-#                
-#   Returns....: IP
-#
-##########################################################################*/
-
-    .global RdosNameToIp
-    
-RdosNameToIp:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate name_to_ip_nr
-	jc rntiFail
-
-	movl %edx,%eax
-	jmp rntiDone
-
-rntiFail:
-	xorl %eax,%eax
-
-rntiDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetIp
-#
-#   Purpose....: Get my IP
-#                
-#   Returns....: IP
-#
-##########################################################################*/
-
-    .global RdosGetIp
-    
-RdosGetIp:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate get_ip_address_nr
-	movl %edx,%eax
-
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosIpToName
-#
-#   Purpose....: Convert IP address to host name
-#
-#   Parameters.: IP
-#                Name                
-#                Size
-#
-##########################################################################*/
-
-    .global RdosIpToName
-    
-RdosIpToName:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-;
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate ip_to_name_nr
-	jnc ritnDone
-
-ritnFail:
-	xorl %eax,%eax
-
-ritnDone:
-	popl %edi
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPing
-#
-#   Purpose....: Ping node
-#                
-#   Parameters.: IP
-#                Timeout
-#
-##########################################################################*/
-
-    .global RdosPing
-    
-RdosPing:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-;
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%eax
-	UserGate ping_nr
-	jc ping_failed
-
-	movl $1,%eax
-	jmp ping_done
-
-ping_failed:
-	xorl %eax,%eax
-
-ping_done:
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenTcpConnection
-#
-#   Purpose....: Open an active connection over TCP
-#                
-#   Parameters.: RemoteIp
-#                LocalPort
-#                RemotePort
-#                Timeout in ms
-#                BufferSize
-#
-#   Returns....: Conn handle
-#
-##########################################################################*/
-
-    .global RdosOpenTcpConnection
-    
-RdosOpenTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%edx
-	movw 12(%ebp),%si
-	movw 16(%ebp),%di
-	movl 20(%ebp),%eax
-	movl 24(%ebp),%ecx
-	UserGate open_tcp_connection_nr
-	mov $0,%eax
-	jc rotcDone
-
-	movl %ebx,%eax
-
-rotcDone:
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateTcpListen
-#
-#   Purpose....: Create listen handle
-#                
-#   Parameters.: Port
-#                MaxConnections
-#                BufferSize
-#
-#   Returns....: Listen handle
-#
-##########################################################################*/
-
-    .global RdosCreateTcpListen
-    
-RdosCreateTcpListen:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-
-	movw 8(%ebp),%si
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate create_tcp_listen_nr
-	movzx %bx,%eax
-	jnc ctlDone
-
-    xorl %eax,%eax
-
-ctlDone:
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetTcpListen
-#
-#   Purpose....: Get connection from listen
-#                
-#   Parameters.: Listen handle
-#
-#   Returns....: Conn handle
-#
-##########################################################################*/
-
-    .global RdosGetTcpListen
-    
-RdosGetTcpListen:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_tcp_listen_nr
-	movzx %ax,%eax
-	jnc gtlDone
-
-    xorl %eax,%eax
-
-gtlDone:
-    popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseTcpListen
-#
-#   Purpose....: Close TCP listen
-#                
-#   Parameters.: Listen handle
-#
-##########################################################################*/
-
-    .global RdosCloseTcpListen
-    
-RdosCloseTcpListen:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_tcp_listen_nr
-	
-    popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForTcpListen
-#
-#   Purpose....: Add wait object to tcp listen
-#                
-#   Parameters.: Wait handle
-#                Listen handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForTcpListen
-    
-RdosAddWaitForTcpListen:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_tcp_listen_nr
-	movl $1,%eax
-	jnc awftlDone
-
-	xorl %eax,%eax
-
-awftlDone:
-    popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWaitForTcpConnection
-#
-#   Purpose....: Wait for Tcp connection to be established
-#                
-#   Parameters.: Conn handle
-#                Timeout ms
-#
-##########################################################################*/
-
-    .global RdosWaitForTcpConnection
-    
-RdosWaitForTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	UserGate wait_for_tcp_connection_nr
-	movl $1,%eax
-	jnc wftcDone
-
-	xorl %eax,%eax
-
-wftcDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForTcpConnection
-#
-#   Purpose....: Add wait object to tcp connection
-#                
-#   Parameters.: Wait handle
-#                Conn handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForTcpConnection
-    
-RdosAddWaitForTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_tcp_connection_nr
-	movl $1,%eax
-	jnc awftcDone
-
-	xorl %eax,%eax
-
-awftcDone:
-    popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseTcpConnection
-#
-#   Purpose....: Close Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-##########################################################################*/
-
-    .global RdosCloseTcpConnection
-    
-RdosCloseTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDeleteTcpConnection
-#
-#   Purpose....: Delete Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-##########################################################################*/
-
-    .global RdosDeleteTcpConnection
-    
-RdosDeleteTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate delete_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAbortTcpConnection
-#
-#   Purpose....: Abort Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-##########################################################################*/
-
-    .global RdosAbortTcpConnection
-    
-RdosAbortTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate abort_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPushTcpConnection
-#
-#   Purpose....: Push Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-##########################################################################*/
-
-    .global RdosPushTcpConnection
-    
-RdosPushTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate push_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPollTcpConnection
-#
-#   Purpose....: Poll Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: Available bytes in receive buffer
-#
-##########################################################################*/
-
-    .global RdosPollTcpConnection
-    
-RdosPollTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate poll_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosIsTcpConnectionClosed
-#
-#   Purpose....: Check if connection is closed
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: TRUE if closed
-#
-##########################################################################*/
-
-    .global RdosIsTcpConnectionClosed
-    
-RdosIsTcpConnectionClosed:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate is_tcp_connection_closed_nr
-	jc rptcClosed
-
-	xorl %eax,%eax
-	jmp rptcDone
-
-rptcClosed:
-	movl $1,%eax
-	
-rptcDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRemoteTcpConnectionIp
-#
-#   Purpose....: Get remote IP
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: IP
-#
-##########################################################################*/
-
-    .global RdosGetRemoteTcpConnectionIp
-    
-RdosGetRemoteTcpConnectionIp:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_remote_tcp_connection_ip_nr
-	jnc grtciDone
-
-	movl $0xFFFFFFFF,%eax
-	
-grtciDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRemoteTcpConnectionPort
-#
-#   Purpose....: Get remote port
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: Port
-#
-##########################################################################*/
-
-    .global RdosGetRemoteTcpConnectionPort
-    
-RdosGetRemoteTcpConnectionPort:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_remote_tcp_connection_port_nr
-	jnc grtcpDone
-
-	movl $0,%eax
-	
-grtcpDone:
-    movzx %ax,%eax
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLocalTcpConnectionPort
-#
-#   Purpose....: Get local port
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: Port
-#
-##########################################################################*/
-
-    .global RdosGetLocalTcpConnectionPort
-    
-RdosGetLocalTcpConnectionPort:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_local_tcp_connection_port_nr
-	jnc gltcpDone
-
-	movl $0,%eax
-	
-gltcpDone:
-    movzx %ax,%eax
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadTcpConnection
-#
-#   Purpose....: Read data from connection
-#                
-#   Parameters.: Conn handle
-#                Buffer
-#                Size
-#
-#   Returns....: Read bytes
-#
-##########################################################################*/
-
-    .global RdosReadTcpConnection
-    
-RdosReadTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate read_tcp_connection_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteTcpConnection
-#
-#   Purpose....: Write data fto connection
-#                
-#   Parameters.: Conn handle
-#                Buffer
-#                Size
-#
-#   Returns....: Written bytes
-#
-##########################################################################*/
-
-    .global RdosWriteTcpConnection
-    
-RdosWriteTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate write_tcp_connection_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLocalMailslot
-#
-#   Purpose....: Get local mailslot from name
-#                
-#   Parameters.: Name
-#
-#   Returns....: Mailslot handle
-#
-##########################################################################*/
-
-    .global RdosGetLocalMailslot
-    
-RdosGetLocalMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate get_local_mailslot_nr
-	jc rglmFail
-
-	movzx %bx,%eax
-	jmp rglmDone
-
-rglmFail:
-	xorl %eax,%eax
-
-rglmDone:
-	popl %edi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRemoteMailslot
-#
-#   Purpose....: Get remote mailslot from name
-#                
-#   Parameters.: IP
-#                Name
-#
-#   Returns....: Mailslot handle
-#
-##########################################################################*/
-
-    .global RdosGetRemoteMailslot
-    
-RdosGetRemoteMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edx
-	pushl %edi
-
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%edi
-	UserGate get_remote_mailslot_nr
-	jc rgrmFail
-
-	movzx %bx,%eax
-	jmp rgrmDone
-
-rgrmFail:
-	xorl %eax,%eax
-
-rgrmDone:
-	popl %edi
-	popl %edx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosFreeMailslot
-#
-#   Purpose....: Free mailslot
-#                
-#   Parameters.: Mailslot handle
-#
-##########################################################################*/
-
-    .global RdosFreeMailslot
-    
-RdosFreeMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate free_mailslot_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSendMailslot
-#
-#   Purpose....: Send mailslot
-#                
-#   Parameters.: Mailslot handle
-#				 Msg
-#				 Size
-#				 ReplyBuf
-#				 MaxReplySize
-#
-#   Returns....: Size of reply
-#
-##########################################################################*/
-
-    .global RdosSendMailslot
-    
-RdosSendMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%ecx
-	movl 20(%ebp),%edi
-	movl 24(%ebp),%eax
-	UserGate send_mailslot_nr
-	jc smFail
-
-	movl %ecx,%eax
-	jmp smDone
-
-smFail:
-	movl $0xFFFFFFFF,%eax
-
-smDone:
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDefineMailslot
-#
-#   Purpose....: Define mailslot
-#                
-#   Parameters.: Name
-#                Max msg size
-#
-##########################################################################*/
-
-    .global RdosDefineMailslot
-    
-RdosDefineMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%ecx
-	UserGate define_mailslot_nr
-
-	popl %edi
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReceiveMailslot
-#
-#   Purpose....: Receive from mailslot
-#                
-#   Parameters.: Msg buffer
-#
-#   Returns....: Msg size
-#
-##########################################################################*/
-
-    .global RdosReceiveMailslot
-    
-RdosReceiveMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate receive_mailslot_nr
-	movl %ecx,%eax
-
-	popl %edi
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReplyMailslot
-#
-#   Purpose....: Reply to mailslot
-#                
-#   Parameters.: Msg buffer
-#                Msg size
-#
-##########################################################################*/
-
-    .global RdosReplyMailslot
-    
-RdosReplyMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%ecx
-	UserGate reply_mailslot_nr
-
-	popl %edi
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetIdeDisc
-#
-#   Purpose....: Get IDE disc
-#                
-#   Parameters.: Unit #
-#
-#   Returns....: Disc #
-#
-##########################################################################*/
-
-    .global RdosGetIdeDisc
-    
-RdosGetIdeDisc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movb 8(%ebp),%bl
-	UserGate get_ide_disc_nr
-	jc get_ide_disc_fail
-
-    movzx %al,%eax
-	jmp get_ide_disc_done
-
-get_ide_disc_fail:
-	movl $0xFFFFFFFF,%eax
-
-get_ide_disc_done:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFloppyDisc
-#
-#   Purpose....: Get floppy disc
-#                
-#   Parameters.: Unit #
-#
-#   Returns....: Disc #
-#
-##########################################################################*/
-
-    .global RdosGetFloppyDisc
-    
-RdosGetFloppyDisc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movb 8(%ebp),%bl
-	UserGate get_floppy_disc_nr
-	jc get_floppy_disc_fail
-
-    movzx %al,%eax
-	jmp get_floppy_disc_done
-
-get_floppy_disc_fail:
-	movl $0xFFFFFFFF,%eax
-
-get_floppy_disc_done:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetDiscInfo
-#
-#   Purpose....: Get disc info
-#                
-#   Parameters.: Disc #
-#				 Bytes / sector
-#				 Total sectors
-#				 BIOS sectors / cyl
-#				 BIOS heads
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosGetDiscInfo
-    
-RdosGetDiscInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movb 8(%ebp),%al
-	UserGate get_disc_info_nr
-	jc get_disc_info_fail
-
-	movl 12(%ebp),%ebx
-	movzx %cx,%ecx
-	movl %ecx,(%ebx)
-
-	movl 16(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl 20(%ebp),%ebx
-	movzx %si,%esi
-	movl %esi,(%ebx)
-
-	movl 24(%ebp),%ebx
-	movzx %di,%edi
-	movl %edi,(%ebx)
-
-	movl $1,%eax
-	jmp get_disc_info_done
-
-get_disc_info_fail:
-	xorl %eax,%eax
-
-get_disc_info_done:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetDiscInfo
-#
-#   Purpose....: Set disc info
-#                
-#   Parameters.: Disc #
-#				 Bytes / sector
-#				 Total sectors
-#				 BIOS sectors / cyl
-#				 BIOS heads
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosSetDiscInfo
-    
-RdosSetDiscInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%ecx
-	movl 16(%ebp),%edx
-	movl 20(%ebp),%esi
-	movl 24(%ebp),%edi
-	UserGate set_disc_info_nr
-	jc set_disc_info_fail
-
-	movl $1,%eax
-	jmp set_disc_info_done
-
-set_disc_info_fail:
-	xorl %eax,%eax
-
-set_disc_info_done:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadDisc
-#
-#   Purpose....: Read from disc
-#                
-#   Parameters.: Disc #
-#				 Sector #
-#				 Buffer
-#				 Size
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosReadDisc
-    
-RdosReadDisc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%edi
-	movl 20(%ebp),%ecx
-	UserGate read_disc_nr
-	jc read_disc_fail
-
-	movl $1,%eax
-	jmp read_disc_done
-
-read_disc_fail:
-	xorl %eax,%eax
-
-read_disc_done:
-	popl %edi
-	popl %edx
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteDisc
-#
-#   Purpose....: Write to disc
-#                
-#   Parameters.: Disc #
-#				 Sector #
-#				 Buffer
-#				 Size
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosWriteDisc
-    
-RdosWriteDisc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%edi
-	movl 20(%ebp),%ecx
-	UserGate write_disc_nr
-	jc write_disc_fail
-
-	movl $1,%eax
-	jmp write_disc_done
-
-write_disc_fail:
-	xorl %eax,%eax
-
-write_disc_done:
-	popl %edi
-	popl %edx
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAllocateFixedDrive
-#
-#   Purpose....: Allocate fixed drive
-#                
-#   Parameters.: Drive #
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosAllocateFixedDrive
-    
-RdosAllocateFixedDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movb 8(%ebp),%al
-	UserGate allocate_fixed_drive_nr
-	jc allocate_fixed_drive_fail
-
-	movl $1,%eax
-	jmp allocate_fixed_drive_done
-
-allocate_fixed_drive_fail:
-	xorl %eax,%eax
-
-allocate_fixed_drive_done:
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAllocateStaticDrive
-#
-#   Purpose....: Allocate static drive
-#                
-#   Returns....: Drive #
-#
-##########################################################################*/
-
-    .global RdosAllocateStaticDrive
-    
-RdosAllocateStaticDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate allocate_static_drive_nr
-	jc allocate_static_drive_fail
-
-    movzx %al,%eax
-	jmp allocate_static_drive_done
-
-allocate_static_drive_fail:
-	xorl %eax,%eax
-
-allocate_static_drive_done:
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAllocateDynamicDrive
-#
-#   Purpose....: Allocate dynamic drive
-#                
-#   Returns....: Drive #
-#
-##########################################################################*/
-
-    .global RdosAllocateDynamicDrive
-    
-RdosAllocateDynamicDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate allocate_dynamic_drive_nr
-	jc allocate_dynamic_drive_fail
-
-    movzx %al,%eax
-	jmp allocate_dynamic_drive_done
-
-allocate_dynamic_drive_fail:
-	xorl %eax,%eax
-
-allocate_dynamic_drive_done:
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRdfsInfo
-#
-#   Purpose....: Get rdfs info
-#                
-#   Parameters.: Crypt tab
-#                Key tab
-#                Extent size tab
-#
-##########################################################################*/
-
-    .global RdosGetRdfsInfo
-    
-RdosGetRdfsInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%esi
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ebx
-	UserGate get_rdfs_info_nr
-
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetDriveInfo
-#
-#   Purpose....: Get drive info
-#                
-#   Parameters.: Drive #
-#                Free units
-#                Bytes per unit
-#                Total units
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosGetDriveInfo
-    
-RdosGetDriveInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movb 8(%ebp),%al
-	UserGate get_drive_info_nr
-	jc get_drive_info_fail
-
-	movl 12(%ebp),%ebx
-	movl %eax,(%ebx)
-
-	movl 16(%ebp),%ebx
-	movzx %cx,%ecx
-	movl %ecx,(%ebx)
-
-	movl 20(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl $1,%eax
-	jmp get_drive_info_done
-
-get_drive_info_fail:
-	xorl %eax,%eax
-
-get_drive_info_done:
-	popl %edx
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDemandLoadDrive
-#
-#   Purpose....: Demand load drive
-#                
-#   Parameters.: Drive #
-#
-##########################################################################*/
-
-    .global RdosDemandLoadDrive
-    
-RdosDemandLoadDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movb 8(%ebp),%al
-	UserGate demand_load_drive_nr
-
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetDriveDiscParam
-#
-#   Purpose....: Get drive disc parameters
-#                
-#   Parameters.: Drive #
-#                Disc #
-#                Start sector
-#                Total sectors
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosGetDriveDiscParam
-    
-RdosGetDriveDiscParam:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movb 8(%ebp),%al
-	UserGate get_drive_disc_param_nr
-	jc get_drive_disc_param_fail
-
-	movl 12(%ebp),%ebx
-	movzx %al,%eax
-	movl %eax,(%ebx)
-
-	movl 16(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl 20(%ebp),%ebx
-	movl %ecx,(%ebx)
-
-	movl $1,%eax
-	jmp get_drive_disc_param_done
-
-get_drive_disc_param_fail:
-	xorl %eax,%eax
-
-get_drive_disc_param_done:
-	popl %edx
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosFormatDrive
-#
-#   Purpose....: Format drive
-#                
-#   Parameters.: Disc #
-#                Start sector
-#                Sectors
-#                FS name
-#
-#   Returns....: Drive #
-#
-##########################################################################*/
-
-    .global RdosFormatDrive
-    
-RdosFormatDrive:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%ecx
-	movl 20(%ebp),%edi
-	UserGate format_drive_nr
-	jc rfdFail
-
-    movzx %al,%eax
-    jmp rfdDone
-
-rfdFail:
-    xorl %eax,%eax
-
-rfdDone:
-	popl %edi
-	popl %edx
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetExeName
-#
-#   Purpose....: Get name of executable file
-#
-#   Returns....: Exe pathname
-#
-##########################################################################*/
-
-    .global RdosGetExeName
-    
-RdosGetExeName:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	UserGate get_exe_name_nr
-	jc rgenFail
-
-    movl %edi,%eax
-    jmp rgenDone
-
-rgenFail:
-    xorl %eax,%eax
-
-rgenDone:
-	popl %edi
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenAdc
-#
-#   Purpose....: Open handle to ADC channel
-#
-#   Parameters.: Channel #
-#
-#   Returns....: Adc handle
-#
-##########################################################################*/
-
-    .global RdosOpenAdc
-    
-RdosOpenAdc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%eax
-	UserGate open_adc_nr
-	movw %bx,%ax
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseAdc
-#
-#   Purpose....: Close ADC handle
-#
-#   Parameters.: Adc handle
-#
-##########################################################################*/
-
-    .global RdosCloseAdc
-    
-RdosCloseAdc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate close_adc_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDefineAdcTime
-#
-#   Purpose....: Define time of next conversion
-#
-#   Parameters.: Adc handle
-#                MSB time
-#                LSB time
-#
-##########################################################################*/
-
-    .global RdosDefineAdcTime
-    
-RdosDefineAdcTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edx
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%eax
-	UserGate define_adc_time_nr
-
-    popl %edx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadAdc
-#
-#   Purpose....: Read ADC
-#
-#   Parameters.: Adc handle
-#                
-#   Returns....: Value
-#
-##########################################################################*/
-
-    .global RdosReadAdc
-    
-RdosReadAdc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate read_adc_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadSerialLines
-#
-#   Purpose....: Read serial lines
-#
-#   Parameters.: Device
-#                &Value
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosReadSerialLines
-    
-RdosReadSerialLines:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-	pushl %esi
-
-	movb 8(%ebp),%dh
-	UserGate read_serial_lines_nr
-	jc rdsFail
-
-	movzx %al,%eax
-	movl 12(%ebp),%esi
-	movl %eax,(%esi)
-	movl $1,%eax
-	jmp rdsDone
-
-rdsFail:
-	xorl %eax,%eax
-
-rdsDone:
-	popl %esi
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosToggleSerialLine
-#
-#   Purpose....: Toggle serial line
-#
-#   Parameters.: Device
-#                Line
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosToggleSerialLine
-    
-RdosToggleSerialLine:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	UserGate toggle_serial_line_nr
-	jc rtsFail
-
-	movl $1,%eax
-	jmp rtsDone
-
-rtsFail:
-	xorl %eax,%eax
-
-rtsDone:
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadSerialVal
-#
-#   Purpose....: Read serial value
-#
-#   Parameters.: Device
-#                Line
-#                &Val
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosReadSerialVal
-    
-RdosReadSerialVal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-	pushl %esi
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	UserGate read_serial_val_nr
-
-    pushfw
-	shll $8,%eax
-	movl 16(%ebp),%esi
-	movl %eax,(%esi)
-    popfw
-	jc rdvFail
-
-	movl $1,%eax
-	jmp rdvDone
-
-rdvFail:
-	xorl %eax,%eax
-
-rdvDone:
-	popl %esi
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteSerialVal
-#
-#   Purpose....: Write serial value
-#
-#   Parameters.: Device
-#                Line
-#                Val
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosWriteSerialVal
-    
-RdosWriteSerialVal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	movl 16(%ebp),%eax
-	sarl $8,%eax
-	UserGate write_serial_val_nr
-	jc rwvFail
-
-	movl $1,%eax
-	jmp rwvDone
-
-rwvFail:
-	xorl %eax,%eax
-
-rwvDone:
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadSerialRaw
-#
-#   Purpose....: Read serial raw value
-#
-#   Parameters.: Device
-#                Line
-#                &Val
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosReadSerialRaw
-    
-RdosReadSerialRaw:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-	pushl %esi
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	UserGate read_serial_val_nr
-
-    pushfw
-	movl 16(%ebp),%esi
-	movl %eax,(%esi)
-    popfw
-	jc rdrFail
-
-	movl $1,%eax
-	jmp rdrDone
-
-rdrFail:
-	xorl %eax,%eax
-
-rdrDone:
-	popl %esi
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteSerialRaw
-#
-#   Purpose....: Write serial raw value
-#
-#   Parameters.: Device
-#                Line
-#                Val
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosWriteSerialRaw
-    
-RdosWriteSerialRaw:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	movl 16(%ebp),%eax
-	UserGate write_serial_val_nr
-	jc rwrFail
-
-	movl $1,%eax
-	jmp rwrDone
-
-rwrFail:
-	xorl %eax,%eax
-
-rwrDone:
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenSysEnv
-#
-#   Purpose....: Open system environment
-#                
-#   Returns....: Env handle
-#
-##########################################################################*/
-
-    .global RdosOpenSysEnv
-    
-RdosOpenSysEnv:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate open_sys_env_nr
-	jc oseFail
-
-	movzx %bx,%eax
-	jmp oseDone
-
-oseFail:
-	xorl %eax,%eax
-
-oseDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenProcessEnv
-#
-#   Purpose....: Open process environment
-#                
-#   Returns....: Env handle
-#
-##########################################################################*/
-
-    .global RdosOpenProcessEnv
-    
-RdosOpenProcessEnv:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate open_proc_env_nr
-	jc opeFail
-
-	movzx %bx,%eax
-	jmp opeDone
-
-opeFail:
-	xorl %eax,%eax
-
-opeDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseEnv
-#
-#   Purpose....: Close environment
-#
-#   Parameters.: Env handle
-#
-##########################################################################*/
-
-    .global RdosCloseEnv
-    
-RdosCloseEnv:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate close_env_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddEnvVar
-#
-#   Purpose....: Add environment variable
-#
-#   Parameters.: Env handle
-#                var
-#                data
-#
-##########################################################################*/
-
-    .global RdosAddEnvVar
-    
-RdosAddEnvVar:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%edi
-	UserGate add_env_var_nr
-
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDeleteEnvVar
-#
-#   Purpose....: Delete environment variable
-#
-#   Parameters.: Env handle
-#                var
-#
-##########################################################################*/
-
-    .global RdosDeleteEnvVar
-    
-RdosDeleteEnvVar:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	UserGate delete_env_var_nr
-
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosFindEnvVar
-#
-#   Purpose....: Find environment variable
-#
-#   Parameters.: Env handle
-#                var
-#                data
-#
-##########################################################################*/
-
-    .global RdosFindEnvVar
-    
-RdosFindEnvVar:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%edi
-	UserGate find_env_var_nr
-	jc fevFail
-
-	movl $1,%eax
-	jmp fevDone
-
-fevFail:
-	xorl %eax,%eax
-
-fevDone:
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetEnvData
-#
-#   Purpose....: Get raw environment data
-#
-#   Parameters.: Env handle
-#                data
-#
-##########################################################################*/
-
-    .global RdosGetEnvData
-    
-RdosGetEnvData:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%edi
-	UserGate get_env_data_nr
-	jnc gedDone
-
-	xorw %ax,%ax
-	stosw
-
-gedDone:
-	popl %edi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetEnvData
-#
-#   Purpose....: Set raw environment data
-#
-#   Parameters.: Env handle
-#                data
-#
-##########################################################################*/
-
-    .global RdosSetEnvData
-    
-RdosSetEnvData:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%edi
-	UserGate set_env_data_nr
-
-	popl %edi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenSysIni
-#
-#   Purpose....: Open system ini-file
-#
-#   Returns....: Ini handle
-#
-##########################################################################*/
-
-    .global RdosOpenSysIni
-    
-RdosOpenSysIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate open_sys_ini_nr
-	jc osiFail
-
-	movzx %bx,%eax
-	jmp osiDone
-
-osiFail:
-	xorl %eax,%eax
-
-osiDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseIni
-#
-#   Purpose....: Close ini-file
-#
-#   Parameters.: Ini handle
-#
-##########################################################################*/
-
-    .global RdosCloseIni
-    
-RdosCloseIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate close_ini_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGotoIniSection
-#
-#   Purpose....: Goto ini section
-#
-#   Parameters.: Ini handle
-#                SectionName
-#
-##########################################################################*/
-
-    .global RdosGotoIniSection
-    
-RdosGotoIniSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%edi
-	UserGate goto_ini_section_nr
-	jc gisFail
-
-	movl $1,%eax
-	jmp gisDone
-
-gisFail:
-	xorl %eax,%eax
-
-gisDone:
-	popl %edi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosRemoveIniSection
-#
-#   Purpose....: Remove current ini section
-#
-#   Parameters.: Ini handle
-#
-##########################################################################*/
-
-    .global RdosRemoveIniSection
-    
-RdosRemoveIniSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate remove_ini_section_nr
-	jc risFail
-
-	movl $1,%eax
-	jmp risDone
-
-risFail:
-	xorl %eax,%eax
-
-risDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadIni
-#
-#   Purpose....: Read ini var in current section
-#
-#   Parameters.: Ini handle
-#                VarName
-#                Data
-#                MaxSize
-#
-##########################################################################*/
-
-    .global RdosReadIni
-    
-RdosReadIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%edi
-	movl 20(%ebp),%ecx
-	UserGate read_ini_nr
-	jc riFail
-
-	movl $1,%eax
-	jmp riDone
-
-riFail:
-	xorl %eax,%eax
-
-riDone:
-	popl %edi
-	popl %esi
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteIni
-#
-#   Purpose....: Write ini var in current section
-#
-#   Parameters.: Ini handle
-#                VarName
-#                Data
-#
-##########################################################################*/
-
-    .global RdosWriteIni
-    
-RdosWriteIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%edi
-	UserGate write_ini_nr
-	jc wiFail
-
-	movl $1,%eax
-	jmp wiDone
-
-wiFail:
-	xorl %eax,%eax
-
-wiDone:
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDeleteIni
-#
-#   Purpose....: Delete ini var in current section
-#
-#   Parameters.: Ini handle
-#                VarName
-#
-##########################################################################*/
-
-    .global RdosDeleteIni
-    
-RdosDeleteIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	UserGate delete_ini_nr
-	jc diFail
-
-	movl $1,%eax
-	jmp diDone
-
-diFail:
-	xorl %eax,%eax
-
-diDone:
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateFileDrive
-#
-#   Purpose....: Create a new file-drive
-#
-#   Parameters.: Drive
-#                Size
-#                FS name
-#                Filename
-#
-##########################################################################*/
-
-    .global RdosCreateFileDrive
-    
-RdosCreateFileDrive:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %esi
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%ecx
-	movl 16(%ebp),%esi
-	movl 20(%ebp),%edi
-	UserGate create_file_drive_nr
-	jnc cfdOk
-
-    xorl %eax,%eax
-    jmp cfdDone
-
-cfdOk:
-	movl $1,%eax
-
-cfdDone:
-	popl %edi
-	popl %esi
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenFileDrive
-#
-#   Purpose....: Open a new file-drive
-#
-#   Parameters.: Drive
-#                Filename
-#
-##########################################################################*/
-
-    .global RdosOpenFileDrive
-    
-RdosOpenFileDrive:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edi
-	UserGate open_file_drive_nr
-	jnc ofdOk
-
-	xorl %eax,%eax
-	jmp ofdDone
-
-ofdOk:
-	movl $1,%eax
-
-ofdDone:
-	popl %edi
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosEnableStatusLed
-#
-#   Purpose....: Enable status LED
-#
-##########################################################################*/
-
-    .global RdosEnableStatusLed
-    
-RdosEnableStatusLed:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate enable_status_led_nr
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDisableStatusLed
-#
-#   Purpose....: Disable status LED
-#
-##########################################################################*/
-
-    .global RdosDisableStatusLed
-    
-RdosDisableStatusLed:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate disable_status_led_nr
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosStartWatchdog
-#
-#   Purpose....: Start watchdog
-#
-#   Parameters.: Timeout, ms
-#
-##########################################################################*/
-
-    .global RdosStartWatchdog
-    
-RdosStartWatchdog:
-	pushl %ebp
-	movl %esp,%ebp
-;
-	movl 8(%ebp),%eax
-	UserGate start_watchdog_nr
-;	
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosKickWatchdog
-#
-#   Purpose....: Kick watchdog
-#
-##########################################################################*/
-
-    .global RdosKickWatchdog
-    
-RdosKickWatchdog:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate kick_watchdog_nr
-    leave
-    ret
-					    
diff --git a/newlib/libc/sys/rdos/rdos.h b/newlib/libc/sys/rdos/rdos.h
deleted file mode 100755
index 690500071..000000000
--- a/newlib/libc/sys/rdos/rdos.h
+++ /dev/null
@@ -1,344 +0,0 @@
-

-#ifndef _RDOS_H

-#define _RDOS_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-//#undef WIN32

-

-#define FILE_ATTRIBUTE_READONLY         0x1

-#define FILE_ATTRIBUTE_HIDDEN           0x2

-#define FILE_ATTRIBUTE_SYSTEM           0x4

-#define FILE_ATTRIBUTE_DIRECTORY        0x10

-#define FILE_ATTRIBUTE_ARCHIVE          0x20

-#define FILE_ATTRIBUTE_NORMAL           0x80

-

-#define LGOP_NULL  0

-#define LGOP_NONE  1

-#define LGOP_OR  2

-#define LGOP_AND  3

-#define LGOP_XOR  4

-#define LGOP_INVERT  5

-#define LGOP_INVERT_OR  6

-#define LGOP_INVERT_AND  7

-#define LGOP_INVERT_XOR  8

-#define LGOP_ADD  9

-#define LGOP_SUBTRACT  10

-#define LGOP_MULTIPLY  11

-

-#define getred(pgc)       (((pgc)>>16)&0xFF)

-#define getgreen(pgc)     (((pgc)>>8)&0xFF)

-#define getblue(pgc)      ((pgc)&0xFF)

-#define mkcolor(r,g,b)    (((r)<<16)|((g)<<8)|(b))

-

-typedef struct ThreadState

-{

-	 short int ID;

-	 char Name[32];

-	 unsigned long MsbTime;

-	 unsigned long LsbTime;

-	 char List[32];

-	 long Offset;

-	 short int Sel;

-} ThreadState;

-

-#ifdef __GNUC__

-#define __stdcall

-#else

-#if (sizeof(int) == 2)

-#define __stdcall

-#endif

-#endif

-

-short int __stdcall RdosSwapShort(short int val);

-long __stdcall RdosSwapLong(long val);

-

-void __stdcall RdosSetTextMode();

-int __stdcall RdosSetVideoMode(int *BitsPerPixel, int *xres, int *yres, int *linesize, void **buffer);

-void __stdcall RdosSetClipRect(int handle, int xmin, int ymin, int xmax, int ymax);

-void __stdcall RdosClearClipRect(int handle);

-void __stdcall RdosSetDrawColor(int handle, int color);

-void __stdcall RdosSetLGOP(int handle, int lgop);

-void __stdcall RdosSetHollowStyle(int handle);

-void __stdcall RdosSetFilledStyle(int handle);

-int __stdcall RdosOpenFont(int height);

-void __stdcall RdosCloseFont(int font);

-void __stdcall RdosGetStringMetrics(int font, const char *str, int *width, int *height);

-void __stdcall RdosSetFont(int handle, int font);

-int __stdcall RdosGetPixel(int handle, int x, int y);

-void __stdcall RdosSetPixel(int handle, int x, int y);

-void __stdcall RdosBlit(int SrcHandle, int DestHandle, int width, int height,

-				int SrcX, int SrcY, int DestX, int DestY);

-void __stdcall RdosDrawMask(int handle, void *mask, int RowSize, int width, int height,

-				int SrcX, int SrcY, int DestX, int DestY); 

-void __stdcall RdosDrawLine(int handle, int x1, int y1, int x2, int y2);

-void __stdcall RdosDrawString(int handle, int x, int y, const char *str);

-void __stdcall RdosDrawRect(int handle, int x, int y, int width, int height);

-void __stdcall RdosDrawEllipse(int handle, int x, int y, int width, int height);

-int __stdcall RdosCreateBitmap(int BitsPerPixel, int width, int height);

-int __stdcall RdosDuplicateBitmapHandle(int handle);

-void __stdcall RdosCloseBitmap(int handle);

-int __stdcall RdosCreateStringBitmap(int font, const char *str);

-void __stdcall RdosGetBitmapInfo(int handle, int *BitPerPixel, int *width, int *height,

-					   int *linesize, void **buffer);

-

-int __stdcall RdosCreateSprite(int DestHandle, int BitmapHandle, int MaskHandle, int lgop); 

-void __stdcall RdosCloseSprite(int handle);

-void __stdcall RdosShowSprite(int handle);

-void __stdcall RdosHideSprite(int handle);

-void __stdcall RdosMoveSprite(int handle, int x, int y);

-

-void __stdcall RdosSetForeColor(int color);

-void __stdcall RdosSetBackColor(int color);

-int __stdcall RdosGetMemSize(void *ptr);

-void *__stdcall RdosAllocateMem(int Size);

-void __stdcall RdosFreeMem(void *ptr);

-int __stdcall RdosAppDebug();

-

-int __stdcall RdosOpenCom(int ID, long BaudRate, char Parity, char DataBits, char StopBits, int SendBufSize, int RecBufSize); 

-void __stdcall RdosCloseCom(int Handle);

-void __stdcall RdosFlushCom(int Handle);

-char __stdcall RdosReadCom(int Handle);

-int __stdcall RdosWriteCom(int Handle, char Val);

-void __stdcall RdosEnableCts(int Handle);

-void __stdcall RdosDisableCts(int Handle);

-void __stdcall RdosEnableAutoRts(int Handle);

-void __stdcall RdosDisableAutoRts(int Handle);

-void __stdcall RdosSetDtr(int Handle);

-void __stdcall RdosResetDtr(int Handle);

-void __stdcall RdosSetRts(int Handle);

-void __stdcall RdosResetRts(int Handle);

-int __stdcall RdosGetReceiveBufferSpace(int Handle);

-int __stdcall RdosGetSendBufferSpace(int Handle);

-void __stdcall RdosWaitForSendCompletedCom(int Handle);

-

-int __stdcall RdosOpenFile(const char *FileName, char Access);

-int __stdcall RdosCreateFile(const char *FileName, int Attrib);

-void __stdcall RdosCloseFile(int Handle);

-int __stdcall RdosIsDevice(int Handle);

-int __stdcall RdosDuplFile(int Handle);

-long __stdcall RdosGetFileSize(int Handle);

-void __stdcall RdosSetFileSize(int Handle, long Size);

-long __stdcall RdosGetFilePos(int Handle);

-void __stdcall RdosSetFilePos(int Handle, long Pos);

-int __stdcall RdosReadFile(int Handle, void *Buf, int Size);

-int __stdcall RdosWriteFile(int Handle, const void *Buf, int Size);

-void __stdcall RdosGetFileTime(int Handle, unsigned long *MsbTime, unsigned long *LsbTime);

-void __stdcall RdosSetFileTime(int Handle, unsigned long MsbTime, unsigned long LsbTime);

-

-int __stdcall RdosCreateMapping(int Size);

-int __stdcall RdosCreateNamedMapping(const char *Name, int Size); 

-int __stdcall RdosCreateNamedFileMapping(const char *Name, int Size, int FileHandle);

-int __stdcall RdosOpenNamedMapping(const char *Name);

-void __stdcall RdosSyncMapping(int Handle);

-void __stdcall RdosCloseMapping(int Handle);

-void __stdcall RdosMapView(int Handle, int Offset, void *Base, int Size);

-void __stdcall RdosUnmapView(int Handle);

-

-int __stdcall RdosSetCurDrive(int Drive);

-int __stdcall RdosGetCurDrive();

-int __stdcall RdosSetCurDir(const char *PathName);

-int __stdcall RdosGetCurDir(int Drive, char *PathName);

-int __stdcall RdosMakeDir(const char *PathName);

-int __stdcall RdosRemoveDir(const char *PathName);

-int __stdcall RdosRenameFile(const char *ToName, const char *FromName);

-int __stdcall RdosDeleteFile(const char *PathName);

-int __stdcall RdosGetFileAttribute(const char *PathName, int *Attribute);

-int __stdcall RdosSetFileAttribute(const char *PathName, int Attribute);

-int __stdcall RdosOpenDir(const char *PathName);

-void __stdcall RdosCloseDir(int Handle);

-int __stdcall RdosReadDir(int Handle, int EntryNr, int MaxNameSize, char *PathName, long *FileSize, int *Attribute, unsigned long *MsbTime, unsigned long *LsbTime);

-

-int __stdcall RdosGetThreadState(int ThreadNr, ThreadState *State);

-int __stdcall RdosSuspendThread(int ThreadNr);

-

-void __stdcall RdosCpuReset();

-void __stdcall RdosGetVersion(int *Major, int *Minor, int *Release);

-void __stdcall RdosCreateThread(void (*Start)(void *Param), const char *Name, void *Param, int StackSize);

-void __stdcall RdosTerminateThread();

-int __stdcall RdosGetThreadHandle();

-int __stdcall RdosExec(const char *prog, const char *param);

-int __stdcall RdosSpawn(const char *prog, const char *param, const char *startdir);

-void __stdcall RdosWaitMilli(int ms);

-void __stdcall RdosGetTics(unsigned long *msb, unsigned long *lsb);

-void __stdcall RdosTicsToRecord(unsigned long msb, unsigned long lsb, int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);

-void __stdcall RdosRecordToTics(unsigned long *msb, unsigned long *lsb, int year, int month, int day, int hour, int min, int sec, int milli);

-int __stdcall RdosDayOfWeek(int year, int month, int day);

-void __stdcall RdosGetSysTime(int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);

-void __stdcall RdosGetTime(int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);

-void __stdcall RdosSetTime(int year, int month, int day, int hour, int min, int sec, int milli);

-void __stdcall RdosAddTics(unsigned long *msb, unsigned long *lsb, long tics);

-void __stdcall RdosAddMilli(unsigned long *msb, unsigned long *lsb, long ms);

-void __stdcall RdosAddSec(unsigned long *msb, unsigned long *lsb, long sec);

-void __stdcall RdosAddMin(unsigned long *msb, unsigned long *lsb, long min);

-void __stdcall RdosAddHour(unsigned long *msb, unsigned long *lsb, long hour);

-void __stdcall RdosAddDay(unsigned long *msb, unsigned long *lsb, long day);

-int __stdcall RdosSyncTime(long IP);

-

-void __stdcall RdosDecodeMsbTics(unsigned long msb, int *days, int *hours);

-void __stdcall RdosDecodeLsbTics(unsigned long lsb, int *min, int *sec, int *milli, int *micro); 

-

-int __stdcall RdosCreateSection();

-void __stdcall RdosDeleteSection(int Handle);

-void __stdcall RdosEnterSection(int Handle);

-void __stdcall RdosLeaveSection(int Handle);

-

-int __stdcall RdosCreateWait();

-void __stdcall RdosCloseWait(int Handle);

-void * __stdcall RdosCheckWait(int Handle);

-void * __stdcall RdosWaitForever(int Handle);

-void * __stdcall RdosWaitTimeout(int Handle, int MillSec);

-void __stdcall RdosStopWait(int Handle);

-void __stdcall RdosRemoveWait(int Handle, void *ID);

-void __stdcall RdosAddWaitForKeyboard(int Handle, void *ID);

-void __stdcall RdosAddWaitForMouse(int Handle, void *ID);

-void __stdcall RdosAddWaitForCom(int Handle, int ComHandle, void *ID);

-void __stdcall RdosAddWaitForAdc(int Handle, int AdcHandle, void *ID);

-

-int __stdcall RdosCreateSignal();

-void __stdcall RdosResetSignal(int Handle);

-int __stdcall RdosIsSignalled(int Handle);

-void __stdcall RdosSetSignal(int Handle);

-void __stdcall RdosFreeSignal(int Handle);

-void __stdcall RdosAddWaitForSignal(int Handle, int SignalHandle, void *ID);

-

-long __stdcall RdosGetIp();

-int __stdcall RdosNameToIp(const char *HostName);

-int __stdcall RdosIpToName(int Ip, char *HostName, int MaxSize);

-

-int __stdcall RdosCreateTcpListen(int Port, int MaxConnections, int BufferSize);

-int __stdcall RdosGetTcpListen(int Handle);

-void __stdcall RdosCloseTcpListen(int Handle);

-void __stdcall RdosAddWaitForTcpListen(int Handle, int ConHandle, void *ID);

-

-int __stdcall RdosOpenTcpConnection(int RemoteIp, int LocalPort, int RemotePort, int Timeout, int BufferSize);

-int __stdcall RdosWaitForTcpConnection(int Handle, long Timeout);

-void __stdcall RdosAddWaitForTcpConnection(int Handle, int ConHandle, void *ID);

-void __stdcall RdosCloseTcpConnection(int Handle);

-void __stdcall RdosDeleteTcpConnection(int Handle);

-void __stdcall RdosAbortTcpConnection(int Handle);

-void __stdcall RdosPushTcpConnection(int Handle);

-int __stdcall RdosIsTcpConnectionClosed(int Handle);

-long __stdcall RdosGetRemoteTcpConnectionIP(int Handle);

-int __stdcall RdosGetRemoteTcpConnectionPort(int Handle);

-int __stdcall RdosGetLocalTcpConnectionPort(int Handle);

-int __stdcall RdosReadTcpConnection(int Handle, void *Buf, int Size);

-int __stdcall RdosWriteTcpConnection(int Handle, const void *Buf, int Size);

-int __stdcall RdosPollTcpConnection(int Handle);

-

-int __stdcall RdosGetLocalMailslot(const char *Name);

-int __stdcall RdosGetRemoteMailslot(long Ip, const char *Name);

-void __stdcall RdosFreeMailslot(int Handle);

-int __stdcall RdosSendMailslot(int Handle, const void *Msg, int Size, void *ReplyBuf, int MaxReplySize);

-

-void __stdcall RdosDefineMailslot(const char *Name, int MaxSize);

-int __stdcall RdosReceiveMailslot(void *Msg);

-void __stdcall RdosReplyMailslot(const void *Msg, int Size);

-

-void __stdcall RdosSetFocus(char FocusKey);

-char __stdcall RdosGetFocus();

-

-void __stdcall RdosClearKeyboard();

-int __stdcall RdosPollKeyboard();

-int __stdcall RdosReadKeyboard();

-int __stdcall RdosGetKeyboardState();

-int __stdcall RdosPutKeyboard(int KeyCode, int VirtualKey, int ScanCode);

-int __stdcall RdosPeekKeyEvent(int *ExtKey, int *KeyState, int *VirtualKey, int *ScanCode);

-int __stdcall RdosReadKeyEvent(int *ExtKey, int *KeyState, int *VirtualKey, int *ScanCode);

-

-void __stdcall RdosHideMouse();

-void __stdcall RdosShowMouse();

-void __stdcall RdosGetMousePosition(int *x, int *y);

-void __stdcall RdosSetMousePosition(int x, int y);

-void __stdcall RdosSetMouseWindow(int StartX, int StartY, int EndX, int EndY);

-void __stdcall RdosSetMouseMickey(int x, int y);

-int __stdcall RdosGetLeftButton();

-int __stdcall RdosGetRightButton();

-void __stdcall RdosGetLeftButtonPressPosition(int *x, int *y);

-void __stdcall RdosGetRightButtonPressPosition(int *x, int *y);

-void __stdcall RdosGetLeftButtonReleasePosition(int *x, int *y);

-void __stdcall RdosGetRightButtonReleasePosition(int *x, int *y);

-

-void __stdcall RdosGetCursorPosition(int *Row, int *Col);

-void __stdcall RdosSetCursorPosition(int Row, int Col);

-void __stdcall RdosWriteChar(char ch);

-void __stdcall RdosWriteSizeString(const char *Buf, int Size);

-void __stdcall RdosWriteString(const char *Buf);

-int __stdcall RdosReadLine(char *Buf, int MaxSize);

-

-int __stdcall RdosPing(long Node, long Timeout);

-

-int __stdcall RdosGetIdeDisc(int UnitNr);

-int __stdcall RdosGetFloppyDisc(int UnitNr);

-

-int __stdcall RdosSetDiscInfo(int DiscNr, int SectorSize, long Sectors, int BiosSectorsPerCyl, int BiosHeads);

-int __stdcall RdosGetDiscInfo(int DiscNr, int *SectorSize, long *Sectors, int *BiosSectorsPerCyl, int *BiosHeads);

-int __stdcall RdosReadDisc(int DiscNr, long Sector, char *Buf, int Size);

-int __stdcall RdosWriteDisc(int DiscNr, long Sector, const char *Buf, int Size);

-

-void __stdcall RdosGetRdfsInfo(void *CryptTab, void *KeyTab, void *ExtentSizeTab);

-void __stdcall RdosDemandLoadDrive(int DriveNr);

-int __stdcall RdosFormatDrive(int DiscNr, long StartSector, int Size, const char *FsName);

-

-int __stdcall RdosAllocateFixedDrive(int DriveNr);

-int __stdcall RdosAllocateStaticDrive();

-int __stdcall RdosAllocateDynamicDrive();

-

-int __stdcall RdosGetDriveInfo(int DriveNr, long *FreeUnits, int *BytesPerUnit, long *TotalUnits);

-int __stdcall RdosGetDriveDiscParam(int DriveNr, int *DiscNr, long *StartSector, long *TotalSectors);

-

-int __stdcall RdosCreateFileDrive(int Drive, long Size, const char *FsName, const char *FileName);

-int __stdcall RdosOpenFileDrive(int Drive, const char *FileName);

-

-int __stdcall RdosGetModuleHandle();

-const char * __stdcall RdosGetExeName();

-int __stdcall RdosLoadDll(const char *Name);

-void __stdcall RdosFreeDll(int handle);

-int __stdcall RdosReadResource(int handle, int ID, char *Buf, int Size);

-int __stdcall RdosReadBinaryResource(int handle, int ID, char *Buf, int Size);

-

-int __stdcall RdosOpenAdc(int channel);

-void __stdcall RdosCloseAdc(int handle);

-void __stdcall RdosDefineAdcTime(int handle, unsigned long msg, unsigned long lsb);

-long __stdcall RdosReadAdc(int handle);

-

-int __stdcall RdosReadSerialLines(int device, int *val);

-int __stdcall RdosToggleSerialLine(int device, int line);

-int __stdcall RdosReadSerialVal(int device, int line, int *val);

-int __stdcall RdosWriteSerialVal(int device, int line, int val);

-int __stdcall RdosReadSerialRaw(int device, int line, int *val);

-int __stdcall RdosWriteSerialRaw(int device, int line, int val);

-

-int __stdcall RdosOpenSysEnv();

-int __stdcall RdosOpenProcessEnv();

-void __stdcall RdosCloseEnv(int handle);

-void __stdcall RdosAddEnvVar(int handle, const char *var, const char *value);

-void __stdcall RdosDeleteEnvVar(int handle, const char *var);

-int __stdcall RdosFindEnvVar(int handle, const char *var, char *value);

-void __stdcall RdosGetEnvData(int handle, char *buf);

-void __stdcall RdosSetEnvData(int handle, const char *buf);

-

-int __stdcall RdosOpenSysIni();

-void __stdcall RdosCloseIni(int handle);

-int __stdcall RdosGotoIniSection(int handle, const char *name);

-int __stdcall RdosRemoveIniSection(int handle);

-int __stdcall RdosReadIni(int handle, const char *var, char *str, int maxsize);

-int __stdcall RdosWriteIni(int handle, const char *var, const char *str);

-int __stdcall RdosDeleteIni(int handle, const char *var);

-

-void __stdcall RdosEnableStatusLED();

-void __stdcall RdosDisableStatusLED();

-

-void __stdcall RdosStartWatchdog(int timeout);

-void __stdcall RdosKickWatchdog();

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

-

-

diff --git a/newlib/libc/sys/rdos/rdoshelp.c b/newlib/libc/sys/rdos/rdoshelp.c
deleted file mode 100644
index 20d25353d..000000000
--- a/newlib/libc/sys/rdos/rdoshelp.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# rdoshelp.c                                                                
-# implementation of various structures and helpers
-#
-##########################################################################*/
-
-#include <reent.h>
-#include <rdos.h>
-#include <stdio.h>
-
-char *__env[1] = { 0 }; 
-char **environ = __env; 
-
-static int once_section;
-static int key_section;
-
-/*##########################################################################
-#
-#   Name       : _get_impure_data_size
-#
-#   Purpose....: Get size of _reent structure
-#
-#   In params..: *
-#   Out params.: *
-#   Returns....: size
-#
-##########################################################################*/
-int get_impure_data_size()
-{
-	return sizeof(struct _reent);
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_once
-#
-#   Purpose....: Emulate GCC pthread_once
-#
-#   In params..: Handle initially 0
-#              : function to initially call
-#   Out params.: *
-#   Returns....: result
-#
-##########################################################################*/
-int __rdos_thread_once (int *handle, void (*func) (void))
-{
-    if (handle == 0 || func == 0)
-        return 0;
-         
-    RdosEnterSection(once_section);
-    if (*handle == 0)
-        (*func)();
-    else
-        *handle = 1;
-    RdosLeaveSection(once_section);
-    return 0;
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_mutex_init
-#
-#   Purpose....: Emulate GCC pthread_thread_mutex_init
-#
-#   In params..: *
-#   Out params.: *
-#   Returns....: handle
-#
-##########################################################################*/
-int __rdos_thread_mutex_init (void)
-{
-    return RdosCreateSection();
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_mutex_lock
-#
-#   Purpose....: Emulate GCC pthread_thread_mutex_lock
-#
-#   In params..: handle
-#   Out params.: *
-#   Returns....: *
-#
-##########################################################################*/
-int __rdos_thread_mutex_lock (int handle)
-{
-    RdosEnterSection(handle);
-    return 0;
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_mutex_trylock
-#
-#   Purpose....: Emulate GCC pthread_thread_mutex_trylock
-#                Try is not yet implemented, and lock is used.
-#
-#   In params..: handle
-#   Out params.: *
-#   Returns....: *
-#
-##########################################################################*/
-int __rdos_thread_mutex_trylock (int handle)
-{
-    RdosEnterSection(handle);
-    return 0;
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_mutex_unlock
-#
-#   Purpose....: Emulate GCC pthread_thread_mutex_unlock
-#
-#   In params..: handle
-#   Out params.: *
-#   Returns....: *
-#
-##########################################################################*/
-int __rdos_thread_mutex_unlock (int handle)
-{
-    RdosLeaveSection(handle);
-    return 0;
-}
-
-/*##########################################################################
-#
-#   Name       : __init_rdos
-#
-#   Purpose....: Init RDOS specific data
-#
-#   In params..: reent structure
-#   Out params.: *
-#   Returns....: *
-#
-##########################################################################*/
-void __init_rdos(struct _reent *reent)
-{
-	once_section = RdosCreateSection();
-	_REENT_INIT_PTR(reent);
-	__sinit(reent);
-}
diff --git a/newlib/libc/sys/rdos/read.c b/newlib/libc/sys/rdos/read.c
deleted file mode 100644
index e9f3464f3..000000000
--- a/newlib/libc/sys/rdos/read.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, or

-# (at your option) any later version.

-#

-# This library is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-# GNU Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# read.c                                                                

-# read function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include "rdos.h"

-

-int read(int file, char *ptr, int len)

-{

-    return RdosReadFile(file, ptr, len);

-}

diff --git a/newlib/libc/sys/rdos/readlink.c b/newlib/libc/sys/rdos/readlink.c
deleted file mode 100755
index ad4c69d1c..000000000
--- a/newlib/libc/sys/rdos/readlink.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include <sys/types.h>

-

-int readlink(const char *path, char *buf, size_t bufsize)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/sbrk.c b/newlib/libc/sys/rdos/sbrk.c
deleted file mode 100644
index fdcb5fba5..000000000
--- a/newlib/libc/sys/rdos/sbrk.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, or

-# (at your option) any later version.

-#

-# This library is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-# GNU Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# sbrk.c                                                                

-# sbrk function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_syslist.h>

-#include "rdos.h"

-

-void *sbrk (int incr)

-{ 

-   return RdosAllocateMem(incr);

-} 

diff --git a/newlib/libc/sys/rdos/stat.c b/newlib/libc/sys/rdos/stat.c
deleted file mode 100755
index f1683b63a..000000000
--- a/newlib/libc/sys/rdos/stat.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <errno.h>

-

-int stat(const char *file, struct stat *st)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/symlink.c b/newlib/libc/sys/rdos/symlink.c
deleted file mode 100755
index 4d5fa1e6f..000000000
--- a/newlib/libc/sys/rdos/symlink.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int symlink(const char *path1, const char *path2)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/times.c b/newlib/libc/sys/rdos/times.c
deleted file mode 100644
index 47a540b23..000000000
--- a/newlib/libc/sys/rdos/times.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <sys/times.h>

-#include <errno.h>

-

-clock_t times(struct tms *buf)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/unlink.c b/newlib/libc/sys/rdos/unlink.c
deleted file mode 100644
index d6c3736b3..000000000
--- a/newlib/libc/sys/rdos/unlink.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int unlink(char *name)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/user.def b/newlib/libc/sys/rdos/user.def
deleted file mode 100644
index f5af3066e..000000000
--- a/newlib/libc/sys/rdos/user.def
+++ /dev/null
@@ -1,368 +0,0 @@
-
-allocate_dos_mem_nr			= 0
-allocate_local_mem_nr		= 1
-free_mem_nr					= 2
-available_local_linear_nr	= 3
-used_local_linear_nr		= 4
-available_vm_linear_nr		= 5
-used_vm_linear_nr			= 6
-
-reserve_pe_mem_nr			= 7
-set_flat_linear_valid_nr	= 8
-set_flat_linear_invalid_nr	= 9
-set_flat_linear_read_nr		= 10
-set_flat_linear_readwrite_nr = 11
-
-get_raw_switch_ads_nr		= 12
-raw_switch_nr				= 13
-get_exception_nr			= 14
-set_exception_nr			= 15
-get_pm_int_nr				= 16
-set_pm_int_nr				= 17
-get_vm_int_nr				= 18
-set_vm_int_nr				= 19
-dpmi_int_nr					= 20
-dpmi_call_int_nr			= 21
-dpmi_call_nr				= 22
-allocate_vm_callback_nr		= 23
-free_vm_callback_nr			= 24
-
-wait_milli_nr				= 25
-wait_micro_nr				= 26
-wait_until_nr				= 27
-create_thread_nr			= 28
-terminate_thread_nr			= 29
-get_thread_nr				= 30
-swap_nr						= 31
-
-create_user_section_nr		= 32
-create_blocked_user_section_nr = 33
-delete_user_section_nr		= 34
-enter_user_section_nr		= 35
-leave_user_section_nr		= 36
-
-get_local_mailslot_nr		= 37
-get_remote_mailslot_nr		= 38
-free_mailslot_nr			= 39
-send_mailslot_nr			= 40
-define_mailslot_nr			= 41
-receive_mailslot_nr			= 42
-reply_mailslot_nr			= 43
-
-load_exe_nr					= 44
-spawn_exe_nr				= 45
-unload_exe_nr				= 46
-get_exit_code_nr			= 47
-get_exe_name_nr				= 48
-get_cmd_line_nr				= 49
-get_env_nr					= 50
-load_dll_nr					= 51
-free_dll_nr					= 52
-get_dll_proc_nr				= 53
-get_dll_resource_nr			= 54
-get_dll_name_nr				= 55
-get_dll_nr					= 56
-allocate_app_mem_nr			= 57
-free_app_mem_nr				= 58
-get_psp_sel_nr				= 59
-
-get_debug_tss_nr			= 60
-get_debug_thread_nr			= 61
-debug_trace_nr				= 62
-debug_pace_nr				= 63
-debug_go_nr					= 64
-debug_next_nr				= 65
-
-wait_for_pe_debug_nr		= 68
-continue_pe_debug_nr		= 69
-notify_pe_exception_nr		= 70
-read_thread_mem_nr			= 71
-write_thread_mem_nr			= 72
-get_thread_tss_nr			= 73
-set_thread_tss_nr			= 74
-
-get_cpu_time_nr				= 75
-get_system_time_nr			= 76
-get_time_nr					= 77
-time_to_system_time_nr		= 78
-system_time_to_time_nr		= 79
-days_in_month_nr			= 80
-adjust_time_nr				= 81
-passed_days_nr				= 82
-time_to_binary_nr			= 83
-binary_to_time_nr			= 84
-sync_time_nr				= 85
-
-set_focus_nr				= 86
-enable_focus_nr				= 87
-
-get_dns_nr					= 88
-get_ppp_dns_nr				= 89
-open_tcp_connection_nr		= 90
-wait_for_tcp_connection_nr	= 92
-close_tcp_connection_nr		= 93
-delete_tcp_connection_nr	= 94
-is_tcp_connection_closed_nr	= 95
-abort_tcp_connection_nr		= 96
-read_tcp_connection_nr		= 97
-write_tcp_connection_nr		= 98
-push_tcp_connection_nr		= 99
-get_ip_address_nr			= 100
-name_to_ip_nr				= 101
-ip_to_name_nr				= 102
-ping_nr						= 103 
-
-get_disc_info_nr			= 104
-format_drive_nr				= 105
-get_rdfs_info_nr			= 106
-read_disc_nr				= 107
-write_disc_nr				= 108
-get_drive_info_nr			= 109
-
-set_cur_drive_nr			= 110
-get_cur_drive_nr			= 111
-set_cur_dir_nr				= 112
-get_cur_dir_nr				= 113
-make_dir_nr					= 114
-remove_dir_nr				= 115
-rename_file_nr				= 116
-delete_file_nr				= 117
-get_file_attribute_nr		= 118
-set_file_attribute_nr		= 119
-open_dir_nr					= 120
-close_dir_nr				= 121
-read_dir_nr					= 122
-
-open_file_nr				= 123
-create_file_nr				= 124
-close_file_nr				= 125
-dupl_file_nr				= 126
-get_ioctl_data_nr			= 127
-get_file_size_nr			= 128
-set_file_size_nr			= 129
-get_file_pos_nr				= 130
-set_file_pos_nr				= 131
-get_file_time_nr			= 132
-set_file_time_nr			= 133
-read_file_nr				= 134
-write_file_nr				= 135
-read_con_nr					= 136
-
-create_mapping_nr			= 137
-create_named_mapping_nr		= 138
-create_file_mapping_nr		= 139
-create_named_file_mapping_nr = 140
-open_named_mapping_nr		= 141
-sync_mapping_nr				= 142
-close_mapping_nr			= 143
-map_view_nr					= 144
-unmap_view_nr				= 145
-
-read_keyboard_nr			= 146
-poll_keyboard_nr			= 147
-flush_keyboard_nr			= 148
-get_keyboard_state_nr		= 151
-
-show_mouse_nr				= 152
-hide_mouse_nr				= 153
-get_mouse_position_nr		= 154
-set_mouse_position_nr		= 155
-set_mouse_window_nr			= 156
-set_mouse_mickey_nr			= 157
-get_left_button_nr			= 158
-get_right_button_nr			= 159
-get_left_button_press_position_nr	= 160
-get_right_button_press_position_nr	= 161
-get_left_button_release_position_nr	= 162
-get_right_button_release_position_nr	= 163
-hook_mouse_nr				= 164
-unhook_mouse_nr				= 165
-
-lock_cd_nr					= 166
-unlock_cd_nr				= 167
-eject_cd_nr					= 168
-insert_cd_nr				= 169
-
-open_com_nr					= 170
-close_com_nr				= 171
-flush_com_nr				= 172
-add_wait_for_com_nr			= 174
-read_com_nr					= 175
-write_com_nr				= 176
-set_dtr_nr					= 177
-reset_dtr_nr				= 178
-
-init_printer_nr				= 179
-check_printer_nr			= 180
-write_printer_nr			= 181
-
-set_cursor_position_nr		= 182
-get_cursor_position_nr		= 183
-write_char_nr				= 184
-write_asciiz_nr				= 185
-write_size_string_nr		= 186
-
-set_video_mode_nr			= 187
-set_vga_mode_nr				= 188
-set_forecolor_nr			= 189
-set_backcolor_nr			= 190
-get_string_metrics_nr		= 193
-set_font_nr					= 194
-get_video_mode_nr           = 195
-draw_string_nr				= 197
-
-xms_handler_nr				= 198
-ems_handler_nr				= 199
-
-test_nr						= 200
-
-resize_flat_linear_nr		= 201
-
-set_drawcolor_nr			= 202
-set_lgop_nr					= 203
-set_hollow_style_nr			= 204
-set_filled_style_nr			= 205
-get_pixel_nr				= 206
-set_pixel_nr				= 207
-draw_line_nr				= 208
-draw_rect_nr				= 209
-draw_ellipse_nr				= 210
-create_bitmap_nr			= 211
-close_bitmap_nr				= 212
-blit_nr						= 213
-open_font_nr				= 215
-close_font_nr				= 216
-create_string_bitmap_nr		= 217
-get_bitmap_info_nr			= 218
-draw_mask_nr				= 219
-
-create_sprite_nr            = 220
-close_sprite_nr             = 221
-show_sprite_nr              = 222
-hide_sprite_nr              = 223
-move_sprite_nr              = 224
-
-dup_bitmap_handle_nr        = 225
-set_clip_rect_nr            = 226
-clear_clip_rect_nr          = 227
-
-set_rts_nr                  = 228
-reset_rts_nr                = 229
-get_com_receive_space_nr    = 230
-get_com_send_space_nr       = 231
-
-get_char_attrib_nr			= 232
-
-create_wait_nr              = 233
-close_wait_nr               = 234
-is_wait_idle_nr				= 235
-wait_no_timeout_nr          = 236
-wait_timeout_nr				= 237
-stop_wait_nr                = 238
-add_wait_for_keyboard_nr    = 239
-
-peek_key_event_nr           = 240
-read_key_event_nr           = 241
-
-add_wait_for_mouse_nr		= 242
-remove_wait_nr              = 243
-
-add_wait_for_adc_nr			= 244
-open_adc_nr					= 245
-close_adc_nr				= 246
-define_adc_time_nr 			= 247
-read_adc_nr					= 248
-
-free_v86_nr                 = 249
-
-read_serial_lines_nr		= 250
-toggle_serial_line_nr		= 251
-
-read_serial_val_nr			= 252
-write_serial_val_nr			= 253
-
-create_file_drive_nr        = 254
-open_file_drive_nr          = 255
-
-dos_ext_exec_nr				= 256
-
-open_sys_env_nr             = 257
-open_proc_env_nr            = 258
-close_env_nr                = 259
-add_env_var_nr              = 260
-delete_env_var_nr           = 261
-find_env_var_nr             = 262
-get_env_data_nr     	    = 263
-set_env_data_nr 	        = 264
-
-open_sys_ini_nr				= 265
-close_ini_nr				= 266
-goto_ini_section_nr         = 267
-remove_ini_section_nr       = 268
-read_ini_nr                 = 269
-write_ini_nr                = 270
-delete_ini_nr               = 271
-
-app_debug_nr				= 272
-get_version_nr              = 273
-
-enable_status_led_nr        = 274
-disable_status_led_nr       = 275
-
-start_watchdog_nr           = 276
-kick_watchdog_nr            = 277
-
-erase_disc_sectors_nr       = 278
-
-cpu_reset_nr                = 279
-
-enable_cts_nr               = 280
-disable_cts_nr              = 281
-
-wait_for_send_completed_com_nr  = 282
-
-add_wait_for_tcp_connection_nr  = 283
-
-get_remote_tcp_connection_ip_nr        = 284
-get_remote_tcp_connection_port_nr      = 285
-get_local_tcp_connection_port_nr       = 286
-
-enable_auto_rts_nr          = 287
-disable_auto_rts_nr         = 288
-
-put_keyboard_code_nr        = 289
-
-poll_tcp_connection_nr		= 290
-
-create_signal_nr            = 291
-free_signal_nr              = 292
-add_wait_for_signal_nr      = 293
-set_signal_nr               = 294
-reset_signal_nr             = 295
-is_signalled_nr             = 296
-
-get_drive_disc_param_nr     = 297
-
-get_ide_disc_nr             = 298
-get_floppy_disc_nr          = 299
-demand_load_drive_nr        = 300
-set_disc_info_nr            = 301
-
-get_thread_state_nr			= 302
-suspend_thread_nr	    	= 303
-resume_thread_nr	    	= 304
-
-update_time_nr				= 305
-
-allocate_static_drive_nr	= 306
-allocate_fixed_drive_nr		= 307
-allocate_dynamic_drive_nr	= 308
-
-get_focus_nr                = 309
-
-add_wait_for_tcp_listen_nr  = 310
-create_tcp_listen_nr        = 311
-get_tcp_listen_nr           = 312
-close_tcp_listen_nr         = 313
-
-usergate_entries			= 340
diff --git a/newlib/libc/sys/rdos/wait.c b/newlib/libc/sys/rdos/wait.c
deleted file mode 100644
index a7bc8aab5..000000000
--- a/newlib/libc/sys/rdos/wait.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int wait(int *status)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/write.c b/newlib/libc/sys/rdos/write.c
deleted file mode 100644
index d02faec29..000000000
--- a/newlib/libc/sys/rdos/write.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, or

-# (at your option) any later version.

-#

-# This library is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-# GNU Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# write.c                                                                

-# write function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include "rdos.h"

-

-int write(int file, char *ptr, int len)

-{

-    return RdosWriteFile(file, ptr, len);

-}

diff --git a/newlib/libc/sys/rtems/aclocal.m4 b/newlib/libc/sys/rtems/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/rtems/aclocal.m4
+++ b/newlib/libc/sys/rtems/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/rtems/configure b/newlib/libc/sys/rtems/configure
index b2d1fbd00..112cfebe8 100755
--- a/newlib/libc/sys/rtems/configure
+++ b/newlib/libc/sys/rtems/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/rtems/crt0.c b/newlib/libc/sys/rtems/crt0.c
index 47332b752..e40a8fc03 100644
--- a/newlib/libc/sys/rtems/crt0.c
+++ b/newlib/libc/sys/rtems/crt0.c
@@ -21,27 +21,10 @@ void *realloc() { return 0; }
 void free() { ; }
 void abort() { ; }
 int raise() { return -1; }
-
-#if defined(__GNUC__)
-/*
- * stubs for libstdc++ rtems-threads support functions from gcc/gthr-rtems.h
- */
-int rtems_gxx_once() { return -1; }
-int rtems_gxx_key_create() { return -1; }
-int rtems_gxx_key_delete() { return -1; }
-void *rtems_gxx_getspecific() { return 0; }
-int rtems_gxx_setspecific() { return -1; }
-
 void rtems_gxx_mutex_init() { }
 int rtems_gxx_mutex_lock() { return -1; }
-int rtems_gxx_mutex_trylock() { return -1; }
 int rtems_gxx_mutex_unlock() { return -1; }
-
-void rtems_gxx_recursive_mutex_init() { }
-int rtems_gxx_recursive_mutex_lock() { return -1; }
-int rtems_gxx_recursive_mutex_trylock() { return -1; }
-int rtems_gxx_recursive_mutex_unlock() { return -1; }
-#endif
+int rtems_gxx_once() { return -1; }
 
 /* stubs for functions from reent.h */
 int _close_r (struct _reent *r, int fd) { return -1; }
diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/sys/rtems/include/inttypes.h
index 0bcbd31c0..5f4f918ed 100644
--- a/newlib/libc/include/inttypes.h
+++ b/newlib/libc/sys/rtems/include/inttypes.h
@@ -14,8 +14,6 @@
 #define _INTTYPES_H
 
 #include <stdint.h>
-#define __need_wchar_t
-#include <stddef.h>
 
 #define __STRINGIFY(a) #a
 
@@ -112,7 +110,7 @@
 #define SCNxFAST16	__SCN16(x)
 
 /* 32-bit types */
-#if __have_long32
+#if defined(__have_long32)
 #define __PRI32(x) __STRINGIFY(l##x)
 #define __SCN32(x) __STRINGIFY(l##x)
 #else
@@ -163,10 +161,10 @@
 
 
 /* 64-bit types */
-#if __have_longlong64
+#if defined(__have_longlong64)
 #define __PRI64(x) __STRINGIFY(ll##x)
 #define __SCN64(x) __STRINGIFY(ll##x)
-#elif __have_long64
+#elif defined(__have_long64)
 #define __PRI64(x) __STRINGIFY(l##x)
 #define __SCN64(x) __STRINGIFY(l##x)
 #else
@@ -217,10 +215,10 @@
 #endif
 
 /* max-bit types */
-#if __have_longlong64
+#if defined(__have_longlong64)
 #define __PRIMAX(x) __STRINGIFY(ll##x)
 #define __SCNMAX(x) __STRINGIFY(ll##x)
-#elif __have_long64
+#elif defined(__have_long64)
 #define __PRIMAX(x) __STRINGIFY(l##x)
 #define __SCNMAX(x) __STRINGIFY(l##x)
 #else
@@ -242,10 +240,10 @@
 #define SCNxMAX		__SCNMAX(x)
 
 /* ptr types */
-#if __have_longlong64
+#if defined(__have_longlong64)
 #define __PRIPTR(x) __STRINGIFY(ll##x)
 #define __SCNPTR(x) __STRINGIFY(ll##x)
-#elif __have_long64
+#elif defined(__have_long64)
 #define __PRIPTR(x) __STRINGIFY(l##x)
 #define __SCNPTR(x) __STRINGIFY(l##x)
 #else
diff --git a/newlib/libc/sys/rtems/include/stdint.h b/newlib/libc/sys/rtems/include/stdint.h
new file mode 100644
index 000000000..d108d05fd
--- /dev/null
+++ b/newlib/libc/sys/rtems/include/stdint.h
@@ -0,0 +1,282 @@
+/*
+ * Copyright (c) 2004, 2005 by
+ * Ralf Corsepius, Ulm/Germany. All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software
+ * is freely granted, provided that this notice is preserved.
+ */
+
+/*
+ * @todo - Add fast<N>_t types.
+ * @todo - Add support for wint_t types.
+ */
+
+#ifndef _STDINT_H
+#define _STDINT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__GNUC__) && (__GNUC__ >= 3 ) \
+  && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ > 2 ) 
+#define __EXP(x) __##x##__
+#else
+#define __EXP(x) x
+#include <limits.h>
+#endif
+
+#if __EXP(SCHAR_MAX) == 0x7f
+typedef signed char int8_t ;
+typedef unsigned char uint8_t ;
+#define __int8_t_defined 1
+#endif
+
+#if __int8_t_defined
+typedef signed char int_least8_t;
+typedef unsigned char uint_least8_t;
+#define __int_least8_t_defined 1
+#endif
+
+#if __EXP(SHRT_MAX) == 0x7fff
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+#define __int16_t_defined 1
+#elif __EXP(INT_MAX) == 0x7fff
+typedef signed int int16_t;
+typedef unsigned int uint16_t;
+#define __int16_t_defined 1
+#elif __EXP(SCHAR_MAX) == 0x7fff
+typedef signed char int16_t;
+typedef unsigned char uint16_t;
+#define __int16_t_defined 1
+#endif
+
+#if __int16_t_defined
+typedef int16_t   	int_least16_t;
+typedef uint16_t 	uint_least16_t;
+#define __int_least16_t_defined 1
+
+#ifndef __int_least8_t_defined
+typedef int16_t	   	int_least8_t;
+typedef uint16_t  	uint_least8_t;
+#define __int_least8_t_defined 1
+#endif
+#endif
+
+#if __EXP(INT_MAX) == 0x7fffffffL
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+#define __int32_t_defined 1
+#elif __EXP(LONG_MAX) == 0x7fffffffL
+typedef signed long int32_t;
+typedef unsigned long uint32_t;
+#define __int32_t_defined 1
+#define __have_long32 1
+#elif __EXP(SHRT_MAX) == 0x7fffffffL
+typedef signed short int32_t;
+typedef unsigned short uint32_t;
+#define __int32_t_defined 1
+#elif __EXP(SCHAR_MAX) == 0x7fffffffL
+typedef signed char int32_t;
+typedef unsigned char uint32_t;
+#define __int32_t_defined 1
+#endif
+
+#if __int32_t_defined
+typedef int32_t   	int_least32_t;
+typedef uint32_t 	uint_least32_t;
+#define __int_least32_t_defined 1
+
+#ifndef __int_least8_t_defined
+typedef int32_t	   	int_least8_t;
+typedef uint32_t  	uint_least8_t;
+#define __int_least8_t_defined 1
+#endif
+
+#ifndef __int_least16_t_defined
+typedef int32_t	   	int_least16_t;
+typedef uint32_t  	uint_least16_t;
+#define __int_least16_t_defined 1
+#endif
+#endif
+
+#if __EXP(LONG_MAX) > 0x7fffffff
+typedef signed long int64_t;
+typedef unsigned long uint64_t;
+#define __int64_t_defined 1
+#define __have_long64 1
+#elif  defined(__LONG_LONG_MAX__) && (__LONG_LONG_MAX__ > 0x7fffffff)
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+#define __int64_t_defined 1
+#define __have_longlong64 1
+#elif  defined(LLONG_MAX) && (LLONG_MAX > 0x7fffffff)
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+#define __int64_t_defined 1
+#define __have_longlong64 1
+#elif  __EXP(INT_MAX) > 0x7fffffff
+typedef signed int int64_t;
+typedef unsigned int uint64_t;
+#define __int64_t_defined 1
+#endif
+
+#if __int64_t_defined
+typedef int64_t   	int_least64_t;
+typedef uint64_t 	uint_least64_t;
+#define __int_least64_t_defined 1
+
+#ifndef __int_least8_t_defined
+typedef int64_t	   	int_least8_t;
+typedef uint64_t  	uint_least8_t;
+#define __int_least8_t_defined 1
+#endif
+
+#ifndef __int_least16_t_defined
+typedef int64_t	   	int_least16_t;
+typedef uint64_t  	uint_least16_t;
+#define __int_least16_t_defined 1
+#endif
+
+#ifndef __int_least32_t_defined
+typedef int64_t	   	int_least32_t;
+typedef uint64_t  	uint_least32_t;
+#define __int_least32_t_defined 1
+#endif
+#endif
+
+#if __have_longlong64
+typedef signed long long intmax_t;
+typedef unsigned long long uintmax_t;
+#else
+typedef signed long intmax_t;
+typedef unsigned long uintmax_t;
+#endif
+
+/*
+ * GCC doesn't provide an propriate macro for [u]intptr_t
+ * For now, use __PTRDIFF_TYPE__
+ */
+#if defined(__PTRDIFF_TYPE__)
+typedef signed __PTRDIFF_TYPE__ intptr_t;
+typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
+#else
+/*
+ * Fallback to hardcoded values, 
+ * should be valid on cpu's with 32bit int/32bit void*
+ */
+typedef signed long intptr_t;
+typedef unsigned long uintptr_t;
+#endif
+
+/* Limits of Specified-Width Integer Types */
+
+#if __int8_t_defined
+#define INT8_MIN 	-128
+#define INT8_MAX 	 127
+#define UINT8_MAX 	 255
+#endif
+
+#if __int_least8_t_defined
+#define INTLEAST8_MIN 	-128
+#define INTLEAST8_MAX 	 127
+#define UINTLEAST8_MAX 	 255
+#else
+#error required type int_least8_t missing
+#endif
+
+#if __int16_t_defined
+#define INT16_MIN 	-32768
+#define INT16_MAX 	 32767
+#define UINT16_MAX 	 65535
+#endif
+
+#if __int_least16_t_defined
+#define INTLEAST16_MIN 	-32768
+#define INTLEAST16_MAX 	 32767
+#define UINTLEAST16_MAX  65535
+#else
+#error required type int_least16_t missing
+#endif
+
+#if __int32_t_defined
+#define INT32_MIN 	-2147483648
+#define INT32_MAX 	 2147483647
+#define UINT32_MAX       4294967295
+#endif
+
+#if __int_least32_t_defined
+#define INTLEAST32_MIN 	-2147483648
+#define INTLEAST32_MAX 	 2147483647
+#define UINTLEAST32_MAX  4294967295
+#else
+#error required type int_least32_t missing
+#endif
+
+#if __int64_t_defined
+#define INT64_MIN 	-9223372036854775808
+#define INT64_MAX 	 9223372036854775807
+#define UINT64_MAX 	18446744073709551615
+#endif
+
+#if __int_least64_t_defined
+#define INTLEAST64_MIN 	-9223372036854775808
+#define INTLEAST64_MAX 	 9223372036854775807
+#define UINTLEAST64_MAX 18446744073709551615
+#endif
+
+/* This must match size_t in stddef.h, currently long unsigned int */
+#define SIZE_MIN (-__EXP(LONG_MAX) - 1L)
+#define SIZE_MAX __EXP(LONG_MAX)
+
+/* This must match sig_atomic_t in <signal.h> (currently int) */
+#define SIG_ATOMIC_MIN (-__EXP(INT_MAX) - 1)
+#define SIG_ATOMIC_MAX __EXP(INT_MAX)
+
+/* This must match ptrdiff_t  in <stddef.h> (currently long int) */
+#define PTRDIFF_MIN (-__EXP(LONG_MAX) - 1L)
+#define PTHDIFF_MAX __EXT(LONG_MAX)
+
+#undef __EXP
+
+/** Macros for minimum-width integer constant expressions */
+#define INT8_C(x)	x
+#define UINT8_C(x)	x##U
+
+#define INT16_C(x)	x
+#define UINT16_C(x)	x##U
+
+#if __have_long32
+#define INT32_C(x)	x##L
+#define UINT32_C(x)	x##UL
+#else
+#define INT32_C(x)	x
+#define UINT32_C(x)	x##U
+#endif
+
+#if __int64_t_defined
+#if __have_longlong64
+#define INT64_C(x)	x##LL
+#define UINT64_C(x)	x##ULL
+#else
+#define INT64_C(x)	x##L
+#define UINT64_C(x)	x##UL
+#endif
+#endif
+
+/** Macros for greatest-width integer constant expression */
+#if __have_longlong64
+#define INTMAX_C(x)	x##LL
+#define UINTMAX_C(x)	x##ULL
+#else
+#define INTMAX_C(x)	x##L
+#define UINTMAX_C(x)	x##UL
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _STDINT_H */
diff --git a/newlib/libc/sys/sh/aclocal.m4 b/newlib/libc/sys/sh/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/sh/aclocal.m4
+++ b/newlib/libc/sys/sh/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/sh/configure b/newlib/libc/sys/sh/configure
index 091e11fe7..cf9254bff 100755
--- a/newlib/libc/sys/sh/configure
+++ b/newlib/libc/sys/sh/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/sparc64/aclocal.m4 b/newlib/libc/sys/sparc64/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/sparc64/aclocal.m4
+++ b/newlib/libc/sys/sparc64/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/sparc64/configure b/newlib/libc/sys/sparc64/configure
index ebf1e5b5f..024f19110 100755
--- a/newlib/libc/sys/sparc64/configure
+++ b/newlib/libc/sys/sparc64/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/sun4/aclocal.m4 b/newlib/libc/sys/sun4/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/sun4/aclocal.m4
+++ b/newlib/libc/sys/sun4/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/sun4/configure b/newlib/libc/sys/sun4/configure
index eede7cf12..182785c45 100755
--- a/newlib/libc/sys/sun4/configure
+++ b/newlib/libc/sys/sun4/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/sysmec/aclocal.m4 b/newlib/libc/sys/sysmec/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/sysmec/aclocal.m4
+++ b/newlib/libc/sys/sysmec/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/sysmec/configure b/newlib/libc/sys/sysmec/configure
index 1efee2bcc..c3fe7f351 100755
--- a/newlib/libc/sys/sysmec/configure
+++ b/newlib/libc/sys/sysmec/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/sysnec810/aclocal.m4 b/newlib/libc/sys/sysnec810/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/sysnec810/aclocal.m4
+++ b/newlib/libc/sys/sysnec810/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/sysnec810/configure b/newlib/libc/sys/sysnec810/configure
index 6c6f10aeb..8acbb73ae 100755
--- a/newlib/libc/sys/sysnec810/configure
+++ b/newlib/libc/sys/sysnec810/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/sysnecv850/aclocal.m4 b/newlib/libc/sys/sysnecv850/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/sysnecv850/aclocal.m4
+++ b/newlib/libc/sys/sysnecv850/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/sysnecv850/configure b/newlib/libc/sys/sysnecv850/configure
index 1efee2bcc..c3fe7f351 100755
--- a/newlib/libc/sys/sysnecv850/configure
+++ b/newlib/libc/sys/sysnecv850/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/sysvi386/aclocal.m4 b/newlib/libc/sys/sysvi386/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/sysvi386/aclocal.m4
+++ b/newlib/libc/sys/sysvi386/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/sysvi386/configure b/newlib/libc/sys/sysvi386/configure
index 0ae9cc4d1..9076487fe 100755
--- a/newlib/libc/sys/sysvi386/configure
+++ b/newlib/libc/sys/sysvi386/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/sysvnecv70/aclocal.m4 b/newlib/libc/sys/sysvnecv70/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/sysvnecv70/aclocal.m4
+++ b/newlib/libc/sys/sysvnecv70/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/sysvnecv70/configure b/newlib/libc/sys/sysvnecv70/configure
index 88386a9e3..7814031e1 100755
--- a/newlib/libc/sys/sysvnecv70/configure
+++ b/newlib/libc/sys/sysvnecv70/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/tic80/aclocal.m4 b/newlib/libc/sys/tic80/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/tic80/aclocal.m4
+++ b/newlib/libc/sys/tic80/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/tic80/configure b/newlib/libc/sys/tic80/configure
index c97c3f425..d5e1fc3ee 100755
--- a/newlib/libc/sys/tic80/configure
+++ b/newlib/libc/sys/tic80/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/w65/aclocal.m4 b/newlib/libc/sys/w65/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/w65/aclocal.m4
+++ b/newlib/libc/sys/w65/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/w65/configure b/newlib/libc/sys/w65/configure
index 9050c416e..52291f899 100755
--- a/newlib/libc/sys/w65/configure
+++ b/newlib/libc/sys/w65/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/sys/z8ksim/aclocal.m4 b/newlib/libc/sys/z8ksim/aclocal.m4
index 55d5e67ce..0a1490998 100644
--- a/newlib/libc/sys/z8ksim/aclocal.m4
+++ b/newlib/libc/sys/z8ksim/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libc/sys/z8ksim/configure b/newlib/libc/sys/z8ksim/configure
index 4330a5fb5..04155f15b 100755
--- a/newlib/libc/sys/z8ksim/configure
+++ b/newlib/libc/sys/z8ksim/configure
@@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1424: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1454,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1458: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,7 +1464,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
diff --git a/newlib/libc/time/Makefile.am b/newlib/libc/time/Makefile.am
index f5c9a02a7..3e0ae571a 100644
--- a/newlib/libc/time/Makefile.am
+++ b/newlib/libc/time/Makefile.am
@@ -23,8 +23,7 @@ LIB_SOURCES = \
 	time.c		\
 	tzlock.c	\
 	tzset.c		\
-	tzset_r.c	\
-	tzvars.c
+	tzset_r.c
 
 libtime_la_LDFLAGS = -Xcompiler -nostdlib
 
diff --git a/newlib/libc/time/Makefile.in b/newlib/libc/time/Makefile.in
index abdfc6530..c56c998ad 100644
--- a/newlib/libc/time/Makefile.in
+++ b/newlib/libc/time/Makefile.in
@@ -110,7 +110,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-LIB_SOURCES =  	asctime.c		asctime_r.c		clock.c			ctime.c			ctime_r.c		difftime.c		gettzinfo.c		gmtime.c		gmtime_r.c		lcltime.c		lcltime_r.c		mktime.c		mktm_r.c		strftime.c  		strptime.c		time.c			tzlock.c		tzset.c			tzset_r.c		tzvars.c
+LIB_SOURCES =  	asctime.c		asctime_r.c		clock.c			ctime.c			ctime_r.c		difftime.c		gettzinfo.c		gmtime.c		gmtime_r.c		lcltime.c		lcltime_r.c		mktime.c		mktm_r.c		strftime.c  		strptime.c		time.c			tzlock.c		tzset.c			tzset_r.c
 
 
 libtime_la_LDFLAGS = -Xcompiler -nostdlib
@@ -149,7 +149,7 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@lcltime_r.$(OBJEXT) mktime.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@mktm_r.$(OBJEXT) strftime.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@strptime.$(OBJEXT) time.$(OBJEXT) tzlock.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@tzset.$(OBJEXT) tzset_r.$(OBJEXT) tzvars.$(OBJEXT)
+@USE_LIBTOOL_FALSE@tzset.$(OBJEXT) tzset_r.$(OBJEXT)
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libtime_la_LIBADD = 
@@ -157,7 +157,7 @@ libtime_la_LIBADD =
 @USE_LIBTOOL_TRUE@ctime.lo ctime_r.lo difftime.lo gettzinfo.lo \
 @USE_LIBTOOL_TRUE@gmtime.lo gmtime_r.lo lcltime.lo lcltime_r.lo \
 @USE_LIBTOOL_TRUE@mktime.lo mktm_r.lo strftime.lo strptime.lo time.lo \
-@USE_LIBTOOL_TRUE@tzlock.lo tzset.lo tzset_r.lo tzvars.lo
+@USE_LIBTOOL_TRUE@tzlock.lo tzset.lo tzset_r.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/newlib/libc/time/strptime.c b/newlib/libc/time/strptime.c
index 127772460..1d625d61e 100644
--- a/newlib/libc/time/strptime.c
+++ b/newlib/libc/time/strptime.c
@@ -249,12 +249,8 @@ _DEFUN (strptime, (buf, format, timeptr),
 		timeptr->tm_year = (ret * 100) - tm_year_base;
 		buf = s;
 		break;
-	    case 'c' :		/* %a %b %e %H:%M:%S %Y */
-		s = strptime (buf, "%a %b %e %H:%M:%S %Y", timeptr);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
+	    case 'c' :
+		abort ();
 	    case 'D' :		/* %m/%d/%y */
 		s = strptime (buf, "%m/%d/%y", timeptr);
 		if (s == NULL)
@@ -416,8 +412,7 @@ _DEFUN (strptime, (buf, format, timeptr),
 		buf = s;
 		break;
 	    case 'Z' :
-		/* Unsupported. Just ignore.  */
-		break;
+		abort ();
 	    case '\0' :
 		--format;
 		/* FALLTHROUGH */
diff --git a/newlib/libc/time/tzlock.c b/newlib/libc/time/tzlock.c
index ccfef7891..f3c289620 100644
--- a/newlib/libc/time/tzlock.c
+++ b/newlib/libc/time/tzlock.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-<<__tz_lock>>, <<__tz_unlock>>---lock time zone global variables
+<<__tz_lock>>, <<__tz_unlock>>--lock time zone global variables
 
 INDEX
 	__tz_lock
diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c
index 36b87d7b2..49e519de5 100644
--- a/newlib/libc/time/tzset_r.c
+++ b/newlib/libc/time/tzset_r.c
@@ -11,6 +11,11 @@ static char __tzname_std[11];
 static char __tzname_dst[11];
 static char *prev_tzenv = NULL;
 
+/* default to GMT */
+char *_tzname[2] = {"GMT", "GMT"};
+int _daylight = 0;
+long _timezone = 0;
+
 _VOID
 _DEFUN (_tzset_r, (reent_ptr),
         struct _reent *reent_ptr)
diff --git a/newlib/libc/time/tzvars.c b/newlib/libc/time/tzvars.c
deleted file mode 100644
index d1f17649b..000000000
--- a/newlib/libc/time/tzvars.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <time.h>
-
-/* Global timezone variables.  */
-
-/* Default timezone to GMT */
-char *_tzname[2] = {"GMT", "GMT"};
-int _daylight = 0;
-long _timezone = 0;
-
-
diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am
index 6ecee1397..24d1bfb5c 100644
--- a/newlib/libc/unix/Makefile.am
+++ b/newlib/libc/unix/Makefile.am
@@ -15,8 +15,6 @@ ELIX_2_OBJS = \
 	ttyname.$(oext)
 
 ELIX_4_OBJS = \
-	basename.$(oext)	\
-	dirname.$(oext)		\
 	getlogin.$(oext)	\
 	getpass.$(oext) 	\
 	getpwent.$(oext) 	\
@@ -31,10 +29,12 @@ else
 if ELIX_LEVEL_3
 LIB_OBJS = $(ELIX_2_OBJS)
 else
+if ELIX_LEVEL_4
 LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS)
 endif
 endif
 endif
+endif
 
 libunix_la_LDFLAGS = -Xcompiler -nostdlib
 
diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in
index 7d049ce14..cdc056b90 100644
--- a/newlib/libc/unix/Makefile.in
+++ b/newlib/libc/unix/Makefile.in
@@ -116,12 +116,12 @@ GENERAL_SOURCES =  	getcwd.c 		pread.c 		pwrite.c 		sigset.c
 ELIX_2_OBJS =  	ttyname.$(oext)
 
 
-ELIX_4_OBJS =  	basename.$(oext)		dirname.$(oext)			getlogin.$(oext)		getpass.$(oext) 		getpwent.$(oext) 		getut.$(oext)
+ELIX_4_OBJS =  	getlogin.$(oext)		getpass.$(oext) 		getpwent.$(oext) 		getut.$(oext)
 
 @ELIX_LEVEL_1_TRUE@LIB_OBJS = 
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS)
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@ELIX_LEVEL_4_TRUE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS)
 
 libunix_la_LDFLAGS = -Xcompiler -nostdlib
 
diff --git a/newlib/libc/unix/basename.c b/newlib/libc/unix/basename.c
deleted file mode 100644
index 703e532d5..000000000
--- a/newlib/libc/unix/basename.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2005 Shaun Jackman
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <libgen.h>
-#include <string.h>
-
-char* 
-_DEFUN (basename, (path),
-	char *path)
-{
-	char *p;
-	if( path == NULL || *path == '\0' )
-		return ".";
-	p = path + strlen(path) - 1;
-	while( *p == '/' ) {
-		if( p == path )
-			return path;
-		*p-- = '\0';
-	}
-	while( p >= path && *p != '/' )
-		p--;
-	return p + 1;
-}
diff --git a/newlib/libc/unix/dirname.c b/newlib/libc/unix/dirname.c
deleted file mode 100644
index f026e3056..000000000
--- a/newlib/libc/unix/dirname.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2005 Shaun Jackman
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <libgen.h>
-#include <string.h>
-
-char *
-_DEFUN (dirname, (path),
-	char *path)
-{
-	char *p;
-	if( path == NULL || *path == '\0' )
-		return ".";
-	p = path + strlen(path) - 1;
-	while( *p == '/' ) {
-		if( p == path )
-			return path;
-		*p-- = '\0';
-	}
-	while( p >= path && *p != '/' )
-		p--;
-	return
-		p < path ? "." :
-		p == path ? "/" :
-		(*p = '\0', path);
-}
diff --git a/newlib/libc/unix/getcwd.c b/newlib/libc/unix/getcwd.c
index f57e14742..826fc789d 100644
--- a/newlib/libc/unix/getcwd.c
+++ b/newlib/libc/unix/getcwd.c
@@ -124,7 +124,7 @@ getcwd (pt, size)
   for (first = 1;; first = 0)
     {
       /* Stat the current level. */
-      if (stat (up, &s))
+      if (_stat (up, &s))
 	goto err;
 
       /* Save current node values. */
@@ -165,7 +165,7 @@ getcwd (pt, size)
       *bup = '\0';
 
       /* Open and stat parent directory. */
-      if (!(dir = opendir (up)) || fstat (__dirfd (dir), &s))
+      if (!(dir = _opendir (up)) || _fstat (__dirfd (dir), &s))
 	goto err;
 
       /* Add trailing slash for next directory. */
@@ -182,7 +182,7 @@ getcwd (pt, size)
 	{
 	  for (;;)
 	    {
-	      if (!(dp = readdir (dir)))
+	      if (!(dp = _readdir (dir)))
 		goto notfound;
 	      if (dp->d_ino == ino)
 		break;
@@ -191,7 +191,7 @@ getcwd (pt, size)
       else
 	for (;;)
 	  {
-	    if (!(dp = readdir (dir)))
+	    if (!(dp = _readdir (dir)))
 	      goto notfound;
 	    if (ISDOT (dp))
 	      continue;
@@ -238,7 +238,7 @@ getcwd (pt, size)
 	*--bpt = '/';
       bpt -= strlen (dp->d_name);
       bcopy (dp->d_name, bpt, strlen (dp->d_name));
-      (void) closedir (dir);
+      (void) _closedir (dir);
 
       /* Truncate any file name. */
       *bup = '\0';
diff --git a/newlib/libc/unix/getlogin.c b/newlib/libc/unix/getlogin.c
index ea4ca2983..e043b029f 100644
--- a/newlib/libc/unix/getlogin.c
+++ b/newlib/libc/unix/getlogin.c
@@ -19,24 +19,24 @@ getlogin ()
       || ((tty = ttyname (2)) == 0))
     return 0;
 
-  if ((utmp_fd = open (UTMP_FILE, O_RDONLY)) == -1)
+  if ((utmp_fd = _open (UTMP_FILE, O_RDONLY)) == -1)
     return 0;
 
   if (!strncmp (tty, "/dev/", 5))
     tty += 5;
 
-  while (read (utmp_fd, &utmp_buf, sizeof (utmp_buf)) == sizeof (utmp_buf))
+  while (_read (utmp_fd, &utmp_buf, sizeof (utmp_buf)) == sizeof (utmp_buf))
     {
       if (!strncmp (tty, utmp_buf.ut_line, sizeof (utmp_buf.ut_line))
 	  && utmp_buf.ut_type == USER_PROCESS)
 	{
-	  close (utmp_fd);
+	  _close (utmp_fd);
 	  memset (buf, 0, sizeof (buf));
 	  strncpy (buf, utmp_buf.ut_user, sizeof (utmp_buf.ut_user));
 	  return buf;
 	}
     }
 
-  close (utmp_fd);
+  _close (utmp_fd);
   return 0;
 }
diff --git a/newlib/libc/unix/getpass.c b/newlib/libc/unix/getpass.c
index 69327ba05..db0e52d61 100644
--- a/newlib/libc/unix/getpass.c
+++ b/newlib/libc/unix/getpass.c
@@ -90,7 +90,7 @@ getpass (prompt)
     if (p < buf + _PASSWORD_LEN)
       *p++ = ch;
   *p = '\0';
-  (void) write (fileno (outfp), "\n", 1);
+  (void) _write (fileno (outfp), "\n", 1);
   if (echo)
     {
       term.c_lflag |= ECHO;
diff --git a/newlib/libc/unix/getut.c b/newlib/libc/unix/getut.c
index 554ed3ca1..1e2b75596 100644
--- a/newlib/libc/unix/getut.c
+++ b/newlib/libc/unix/getut.c
@@ -16,15 +16,15 @@ setutent ()
 {
   if (utmp_fd == -2)
     {
-      utmp_fd = open (utmp_file, O_RDONLY);
+      utmp_fd = _open (utmp_file, O_RDONLY);
     }
-  lseek (utmp_fd, 0, SEEK_SET);
+  _lseek (utmp_fd, 0, SEEK_SET);
 }
 
 void
 endutent ()
 {
-  close (utmp_fd);
+  _close (utmp_fd);
   utmp_fd = -2;
 }
 
@@ -39,7 +39,7 @@ getutent ()
 {
   if (utmp_fd == -2)
     setutent ();
-  if (read (utmp_fd, &utmp_data, sizeof (utmp_data)) < sizeof (utmp_data))
+  if (_read (utmp_fd, &utmp_data, sizeof (utmp_data)) < sizeof (utmp_data))
     return 0;
   return &utmp_data;
 }
@@ -47,7 +47,7 @@ getutent ()
 struct utmp *
 getutid (struct utmp *id)
 {
-  while (read (utmp_fd, &utmp_data, sizeof (utmp_data)) == sizeof (utmp_data))
+  while (_read (utmp_fd, &utmp_data, sizeof (utmp_data)) == sizeof (utmp_data))
     {
       switch (id->ut_type)
 	{
@@ -73,7 +73,7 @@ getutid (struct utmp *id)
 struct utmp *
 getutline (struct utmp *line)
 {
-  while (read (utmp_fd, &utmp_data, sizeof (utmp_data)) == sizeof (utmp_data))
+  while (_read (utmp_fd, &utmp_data, sizeof (utmp_data)) == sizeof (utmp_data))
     {
       if ((utmp_data.ut_type == LOGIN_PROCESS ||
 	   utmp_data.ut_type == USER_PROCESS) &&
diff --git a/newlib/libc/unix/ttyname.c b/newlib/libc/unix/ttyname.c
index 09f12a337..258ba25fe 100644
--- a/newlib/libc/unix/ttyname.c
+++ b/newlib/libc/unix/ttyname.c
@@ -56,19 +56,20 @@ ttyname (fd)
   struct dirent *dirp;
   DIR *dp;
   struct stat dsb;
+  char *rval;
 
   /* Must be a terminal. */
   if (tcgetattr (fd, &tty) < 0)
     return NULL;
 
   /* Must be a character device. */
-  if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
+  if (_fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
     return NULL;
 
-  if ((dp = opendir (_PATH_DEV)) == NULL)
+  if ((dp = _opendir (_PATH_DEV)) == NULL)
     return NULL;
 
-  while ((dirp = readdir (dp)) != NULL)
+  for (rval = NULL; dirp = _readdir (dp);)
     {
       if (dirp->d_ino != sb.st_ino)
 	continue;
@@ -76,9 +77,10 @@ ttyname (fd)
       if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
 	  sb.st_ino != dsb.st_ino)
 	continue;
-      (void) closedir (dp);
-      return buf;
+      (void) _closedir (dp);
+      rval = buf;
+      break;
     }
-  (void) closedir (dp);
-  return NULL;
+  (void) _closedir (dp);
+  return rval;
 }
diff --git a/newlib/libm/aclocal.m4 b/newlib/libm/aclocal.m4
index 34da4a63f..612e7ce2d 100644
--- a/newlib/libm/aclocal.m4
+++ b/newlib/libm/aclocal.m4
@@ -130,7 +130,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -178,9 +178,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am
index d6d7e510d..685219dd0 100644
--- a/newlib/libm/common/Makefile.am
+++ b/newlib/libm/common/Makefile.am
@@ -5,9 +5,8 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 src = 	s_finite.c s_copysign.c s_modf.c s_scalbn.c \
-	s_cbrt.c s_expm1.c s_ilogb.c s_infconst.c \
-	s_infinity.c s_isinf.c s_isinfd.c s_isnan.c s_isnand.c \
-	s_log1p.c s_nan.c s_nextafter.c \
+	s_cbrt.c s_expm1.c s_ilogb.c \
+	s_infinity.c s_log1p.c s_nan.c s_nextafter.c \
 	s_rint.c s_logb.c s_matherr.c s_lib_ver.c \
 	s_fdim.c s_fma.c s_fmax.c s_fmin.c s_fpclassify.c s_lrint.c \
 	s_lround.c s_nearbyint.c s_remquo.c s_round.c s_scalbln.c \
@@ -15,8 +14,7 @@ src = 	s_finite.c s_copysign.c s_modf.c s_scalbn.c \
 
 fsrc =	sf_finite.c sf_copysign.c sf_modf.c sf_scalbn.c \
 	sf_cbrt.c sf_expm1.c sf_ilogb.c \
-	sf_infinity.c sf_isinf.c sf_isinff.c sf_isnan.c sf_isnanf.c \
-	sf_log1p.c sf_nan.c sf_nextafter.c \
+	sf_infinity.c sf_log1p.c sf_nan.c sf_nextafter.c \
 	sf_rint.c sf_logb.c \
 	sf_fdim.c sf_fma.c sf_fmax.c sf_fmin.c sf_lrint.c \
 	sf_lround.c sf_nearbyint.c sf_remquo.c sf_round.c \
@@ -37,7 +35,7 @@ endif # USE_LIBTOOL
 include $(srcdir)/../../Makefile.shared
 
 chobj =	scbrt.def scopysign.def sexpm1.def silogb.def \
-	sinfinity.def sisnan.def slog1p.def smatherr.def smodf.def \
+	sinfinity.def slog1p.def smatherr.def smodf.def \
 	snan.def snextafter.def sscalbn.def
 
 SUFFIXES = .def
@@ -51,6 +49,7 @@ CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
 TARGETDOC = ../tmp.texi
 
 doc: $(chobj)
+	cat $(srcdir)/common.tex >> $(TARGETDOC)
 
 CLEANFILES = $(chobj) *.ref
 
@@ -93,10 +92,6 @@ sinfinity.def: s_infinity.c
 	$(CHEW) < $(srcdir)/s_infinity.c >$@ 2>/dev/null
 	touch stmp-def
 
-sisnan.def: s_isnan.c
-	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
-	touch stmp-def
-
 slog1p.def: s_log1p.c
 	$(CHEW) < $(srcdir)/s_log1p.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in
index 4e9db8b25..81c78f50a 100644
--- a/newlib/libm/common/Makefile.in
+++ b/newlib/libm/common/Makefile.in
@@ -98,10 +98,10 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-src = s_finite.c s_copysign.c s_modf.c s_scalbn.c 	s_cbrt.c s_expm1.c s_ilogb.c s_infconst.c 	s_infinity.c s_isinf.c s_isinfd.c s_isnan.c s_isnand.c 	s_log1p.c s_nan.c s_nextafter.c 	s_rint.c s_logb.c s_matherr.c s_lib_ver.c 	s_fdim.c s_fma.c s_fmax.c s_fmin.c s_fpclassify.c s_lrint.c 	s_lround.c s_nearbyint.c s_remquo.c s_round.c s_scalbln.c 	s_signbit.c s_trunc.c
+src = s_finite.c s_copysign.c s_modf.c s_scalbn.c 	s_cbrt.c s_expm1.c s_ilogb.c 	s_infinity.c s_log1p.c s_nan.c s_nextafter.c 	s_rint.c s_logb.c s_matherr.c s_lib_ver.c 	s_fdim.c s_fma.c s_fmax.c s_fmin.c s_fpclassify.c s_lrint.c 	s_lround.c s_nearbyint.c s_remquo.c s_round.c s_scalbln.c 	s_signbit.c s_trunc.c
 
 
-fsrc = sf_finite.c sf_copysign.c sf_modf.c sf_scalbn.c 	sf_cbrt.c sf_expm1.c sf_ilogb.c 	sf_infinity.c sf_isinf.c sf_isinff.c sf_isnan.c sf_isnanf.c 	sf_log1p.c sf_nan.c sf_nextafter.c 	sf_rint.c sf_logb.c 	sf_fdim.c sf_fma.c sf_fmax.c sf_fmin.c sf_lrint.c 	sf_lround.c sf_nearbyint.c sf_remquo.c sf_round.c 	sf_scalbln.c sf_trunc.c
+fsrc = sf_finite.c sf_copysign.c sf_modf.c sf_scalbn.c 	sf_cbrt.c sf_expm1.c sf_ilogb.c 	sf_infinity.c sf_log1p.c sf_nan.c sf_nextafter.c 	sf_rint.c sf_logb.c 	sf_fdim.c sf_fma.c sf_fmax.c sf_fmin.c sf_lrint.c 	sf_lround.c sf_nearbyint.c sf_remquo.c sf_round.c 	sf_scalbln.c sf_trunc.c
 
 
 libcommon_la_LDFLAGS = -Xcompiler -nostdlib
@@ -113,7 +113,7 @@ libcommon_la_LDFLAGS = -Xcompiler -nostdlib
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
 @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc)
 
-chobj = scbrt.def scopysign.def sexpm1.def silogb.def 	sinfinity.def sisnan.def slog1p.def smatherr.def smodf.def 	snan.def snextafter.def sscalbn.def
+chobj = scbrt.def scopysign.def sexpm1.def silogb.def 	sinfinity.def slog1p.def smatherr.def smodf.def 	snan.def snextafter.def sscalbn.def
 
 
 SUFFIXES = .def
@@ -136,47 +136,41 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@s_copysign.$(OBJEXT) s_modf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@s_scalbn.$(OBJEXT) s_cbrt.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@s_expm1.$(OBJEXT) s_ilogb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_infconst.$(OBJEXT) s_infinity.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_isinf.$(OBJEXT) s_isinfd.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_isnan.$(OBJEXT) s_isnand.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_log1p.$(OBJEXT) s_nan.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_nextafter.$(OBJEXT) s_rint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_logb.$(OBJEXT) s_matherr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_lib_ver.$(OBJEXT) s_fdim.$(OBJEXT) s_fma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_fmax.$(OBJEXT) s_fmin.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_fpclassify.$(OBJEXT) s_lrint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_lround.$(OBJEXT) s_nearbyint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_remquo.$(OBJEXT) s_round.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_scalbln.$(OBJEXT) s_signbit.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_trunc.$(OBJEXT) sf_finite.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_copysign.$(OBJEXT) sf_modf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_scalbn.$(OBJEXT) sf_cbrt.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_expm1.$(OBJEXT) sf_ilogb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_infinity.$(OBJEXT) sf_isinf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_isinff.$(OBJEXT) sf_isnan.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_isnanf.$(OBJEXT) sf_log1p.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_nan.$(OBJEXT) sf_nextafter.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_rint.$(OBJEXT) sf_logb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_fdim.$(OBJEXT) sf_fma.$(OBJEXT) sf_fmax.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_fmin.$(OBJEXT) sf_lrint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_lround.$(OBJEXT) sf_nearbyint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_remquo.$(OBJEXT) sf_round.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_scalbln.$(OBJEXT) sf_trunc.$(OBJEXT)
+@USE_LIBTOOL_FALSE@s_infinity.$(OBJEXT) s_log1p.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_nan.$(OBJEXT) s_nextafter.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_rint.$(OBJEXT) s_logb.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_matherr.$(OBJEXT) s_lib_ver.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_fdim.$(OBJEXT) s_fma.$(OBJEXT) s_fmax.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_fmin.$(OBJEXT) s_fpclassify.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_lrint.$(OBJEXT) s_lround.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_nearbyint.$(OBJEXT) s_remquo.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_round.$(OBJEXT) s_scalbln.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_signbit.$(OBJEXT) s_trunc.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_finite.$(OBJEXT) sf_copysign.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_modf.$(OBJEXT) sf_scalbn.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_cbrt.$(OBJEXT) sf_expm1.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_ilogb.$(OBJEXT) sf_infinity.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_log1p.$(OBJEXT) sf_nan.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_nextafter.$(OBJEXT) sf_rint.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_logb.$(OBJEXT) sf_fdim.$(OBJEXT) sf_fma.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_fmax.$(OBJEXT) sf_fmin.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_lrint.$(OBJEXT) sf_lround.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_nearbyint.$(OBJEXT) sf_remquo.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_round.$(OBJEXT) sf_scalbln.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_trunc.$(OBJEXT)
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libcommon_la_LIBADD = 
 @USE_LIBTOOL_TRUE@libcommon_la_OBJECTS =  s_finite.lo s_copysign.lo \
 @USE_LIBTOOL_TRUE@s_modf.lo s_scalbn.lo s_cbrt.lo s_expm1.lo s_ilogb.lo \
-@USE_LIBTOOL_TRUE@s_infconst.lo s_infinity.lo s_isinf.lo s_isinfd.lo \
-@USE_LIBTOOL_TRUE@s_isnan.lo s_isnand.lo s_log1p.lo s_nan.lo \
-@USE_LIBTOOL_TRUE@s_nextafter.lo s_rint.lo s_logb.lo s_matherr.lo \
-@USE_LIBTOOL_TRUE@s_lib_ver.lo s_fdim.lo s_fma.lo s_fmax.lo s_fmin.lo \
+@USE_LIBTOOL_TRUE@s_infinity.lo s_log1p.lo s_nan.lo s_nextafter.lo \
+@USE_LIBTOOL_TRUE@s_rint.lo s_logb.lo s_matherr.lo s_lib_ver.lo \
+@USE_LIBTOOL_TRUE@s_fdim.lo s_fma.lo s_fmax.lo s_fmin.lo \
 @USE_LIBTOOL_TRUE@s_fpclassify.lo s_lrint.lo s_lround.lo s_nearbyint.lo \
 @USE_LIBTOOL_TRUE@s_remquo.lo s_round.lo s_scalbln.lo s_signbit.lo \
 @USE_LIBTOOL_TRUE@s_trunc.lo sf_finite.lo sf_copysign.lo sf_modf.lo \
 @USE_LIBTOOL_TRUE@sf_scalbn.lo sf_cbrt.lo sf_expm1.lo sf_ilogb.lo \
-@USE_LIBTOOL_TRUE@sf_infinity.lo sf_isinf.lo sf_isinff.lo sf_isnan.lo \
-@USE_LIBTOOL_TRUE@sf_isnanf.lo sf_log1p.lo sf_nan.lo sf_nextafter.lo \
+@USE_LIBTOOL_TRUE@sf_infinity.lo sf_log1p.lo sf_nan.lo sf_nextafter.lo \
 @USE_LIBTOOL_TRUE@sf_rint.lo sf_logb.lo sf_fdim.lo sf_fma.lo sf_fmax.lo \
 @USE_LIBTOOL_TRUE@sf_fmin.lo sf_lrint.lo sf_lround.lo sf_nearbyint.lo \
 @USE_LIBTOOL_TRUE@sf_remquo.lo sf_round.lo sf_scalbln.lo sf_trunc.lo
@@ -416,6 +410,7 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
 	touch stmp-def
 
 doc: $(chobj)
+	cat $(srcdir)/common.tex >> $(TARGETDOC)
 
 # Texinfo does not appear to support underscores in file names, so we
 # name the .def files without underscores.
@@ -456,10 +451,6 @@ sinfinity.def: s_infinity.c
 	$(CHEW) < $(srcdir)/s_infinity.c >$@ 2>/dev/null
 	touch stmp-def
 
-sisnan.def: s_isnan.c
-	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
-	touch stmp-def
-
 slog1p.def: s_log1p.c
 	$(CHEW) < $(srcdir)/s_log1p.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/common/common.tex b/newlib/libm/common/common.tex
new file mode 100644
index 000000000..0e8a9863f
--- /dev/null
+++ b/newlib/libm/common/common.tex
@@ -0,0 +1,12 @@
+@page
+@include common/scbrt.def
+@include common/scopysign.def
+@include common/sexpm1.def
+@include common/silogb.def
+@include common/sinfinity.def
+@include common/slog1p.def
+@include common/smatherr.def
+@include common/smodf.def
+@include common/snan.def
+@include common/snextafter.def
+@include common/sscalbn.def
diff --git a/newlib/libm/common/s_fmax.c b/newlib/libm/common/s_fmax.c
index 53e1559e3..2de04efab 100644
--- a/newlib/libm/common/s_fmax.c
+++ b/newlib/libm/common/s_fmax.c
@@ -17,9 +17,9 @@
 #endif
 {
   if (__fpclassifyd(x) == FP_NAN)
-    return y;
-  if (__fpclassifyd(y) == FP_NAN)
     return x;
+  if (__fpclassifyd(y) == FP_NAN)
+    return y;
   
   return x > y ? x : y;
 }
diff --git a/newlib/libm/common/s_fmin.c b/newlib/libm/common/s_fmin.c
index 65e0b1c6d..f9eb51cdd 100644
--- a/newlib/libm/common/s_fmin.c
+++ b/newlib/libm/common/s_fmin.c
@@ -17,9 +17,9 @@
 #endif
 {
   if (__fpclassifyd(x) == FP_NAN)
-    return y;
-  if (__fpclassifyd(y) == FP_NAN)
     return x;
+  if (__fpclassifyd(y) == FP_NAN)
+    return y;
   
   return x < y ? x : y;
 }
diff --git a/newlib/libm/common/s_infconst.c b/newlib/libm/common/s_infconst.c
deleted file mode 100644
index 9447b97cc..000000000
--- a/newlib/libm/common/s_infconst.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Infinity as a constant value.   This is used for HUGE_VAL.
- * Added by Cygnus Support.
- */
-
-#include <float.h>
-#include "fdlibm.h"
-
-/* Float version of infinity.  */
-const union __fmath __infinityf[1] = {{{0x7f800000}}};
-
-/* Double version of infinity.  */
-#ifndef _DOUBLE_IS_32BITS
- #ifdef __IEEE_BIG_ENDIAN
-  const union __dmath __infinity[1] = {{{0x7ff00000, 0}}};
- #else
-  const union __dmath __infinity[1] = {{{0, 0x7ff00000}}};
- #endif
-#else /* defined (_DOUBLE_IS_32BITS) */
- const union __dmath __infinity[1] = {{{0x7f800000, 0}}};
-#endif /* defined (_DOUBLE_IS_32BITS) */
-
-/* Long double version of infinity.  */
-#ifdef __IEEE_BIG_ENDIAN
- #if LDBL_MANT_DIG == 24
-  const union __ldmath __infinityld[1] = {{{0x7f800000, 0, 0, 0}}};
- #elif LDBL_MANT_DIG == 53
-  const union __ldmath __infinityld[1] = {{{0x7ff00000, 0, 0, 0}}};
- #else
-  const union __ldmath __infinityld[1] = {{{0x7fff0000, 0, 0, 0}}};
- #endif /* LDBL_MANT_DIG size  */
-#else /* __IEEE_LITTLE_ENDIAN  */
- #if LDBL_MANT_DIG == 24
-  const union __ldmath __infinityld[1] = {{{0x7f800000, 0, 0, 0}}};
- #elif LDBL_MANT_DIG == 53
-  const union __ldmath __infinityld[1] = {{{0, 0x7ff00000, 0, 0}}};
- #else
-  const union __ldmath __infinityld[1] = {{{0, 0x80000000, 0x00007fff, 0}}};
- #endif /* LDBL_MANT_DIG size  */
-#endif /* __IEEE_LITTLE_ENDIAN  */
-
diff --git a/newlib/libm/common/s_isinf.c b/newlib/libm/common/s_isinf.c
deleted file mode 100644
index db8e8f82b..000000000
--- a/newlib/libm/common/s_isinf.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * isinf(x) returns 1 if x is infinity, else 0;
- * no branching!
- *
- * isinf is a <math.h> macro in the C99 standard.  It was previously
- * implemented as a function by newlib and is declared as such in
- * <ieeefp.h>.  Newlib supplies it here as a function if the user
- * chooses to use <ieeefp.h> or needs to link older code compiled with the
- * previous <math.h> declaration.
- */
-
-#include "fdlibm.h"
-#include <ieeefp.h>
-
-#ifndef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (isinf, (x),
-	double x)
-{
-	__int32_t hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-	hx &= 0x7fffffff;
-	hx |= (__uint32_t)(lx|(-lx))>>31;	
-	hx = 0x7ff00000 - hx;
-	return 1 - (int)((__uint32_t)(hx|(-hx))>>31);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_isnan.c b/newlib/libm/common/s_isnan.c
deleted file mode 100644
index b0c40369a..000000000
--- a/newlib/libm/common/s_isnan.c
+++ /dev/null
@@ -1,135 +0,0 @@
-
-/* @(#)s_isnan.c 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
-FUNCTION
-	<<isnan>>, <<isnanf>>, <<isinf>>, <<isinff>>, <<finite>>, <<finitef>>---test for exceptional numbers
-
-INDEX
-	isnan
-INDEX
-	isinf
-INDEX
-	finite
-
-INDEX
-	isnanf
-INDEX
-	isinff
-INDEX
-	finitef
-
-ANSI_SYNOPSIS
-	#include <ieeefp.h>
-	int isnan(double <[arg]>);
-	int isinf(double <[arg]>);
-	int finite(double <[arg]>);
-	int isnanf(float <[arg]>);
-	int isinff(float <[arg]>);
-	int finitef(float <[arg]>);
-
-TRAD_SYNOPSIS
-	#include <ieeefp.h>
-	int isnan(<[arg]>)
-	double <[arg]>;
-	int isinf(<[arg]>)
-	double <[arg]>;
-	int finite(<[arg]>);
-	double <[arg]>;
-	int isnanf(<[arg]>);
-	float <[arg]>;
-	int isinff(<[arg]>);
-	float <[arg]>;
-	int finitef(<[arg]>);
-	float <[arg]>;
-
-
-DESCRIPTION
-	These functions provide information on the floating-point
-	argument supplied.
-
-	There are five major number formats:
-	o+
-	o zero
-	  A number which contains all zero bits.
-	o subnormal
-	  A number with a zero exponent but a nonzero fraction.
-	o normal
-	  A number with an exponent and a fraction.
-     	o infinity
-	  A number with an all 1's exponent and a zero fraction.
-	o NAN
-	  A number with an all 1's exponent and a nonzero fraction.
-
-	o-
-
-	<<isnan>> returns 1 if the argument is a nan. <<isinf>>
-	returns 1 if the argument is infinity.  <<finite>> returns 1 if the
-	argument is zero, subnormal or normal.
-	
-	The <<isnanf>>, <<isinff>> and <<finitef>> functions perform the same
-	operations as their <<isnan>>, <<isinf>> and <<finite>>
-	counterparts, but on single-precision floating-point numbers.
-
-	It should be noted that the C99 standard dictates that <<isnan>>
-	and <<isinf>> are macros that operate on multiple types of
-	floating-point.  The SUSv2 standard declares <<isnan>> as
-	a function taking double.  Newlib has decided to declare
-	them both as macros in math.h and as functions in ieeefp.h.
-
-QUICKREF
-	isnan - pure
-QUICKREF
-	isinf - pure
-QUICKREF
-	finite - pure
-QUICKREF
-	isnan - pure
-QUICKREF
-	isinf - pure
-QUICKREF
-	finite - pure
-*/
-
-/*
- * isnan(x) returns 1 is x is nan, else 0;
- * no branching!
- *
- * The C99 standard dictates that isnan is a macro taking
- * multiple floating-point types while the SUSv2 standard
- * notes it is a function taking a double argument.  Newlib
- * has chosen to implement it as a macro in <math.h> and
- * declare it as a function in <ieeefp.h>.
- */
-
-#include "fdlibm.h"
-#include <ieeefp.h>
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	int isnan(double x)
-#else
-	int isnan(x)
-	double x;
-#endif
-{
-	__int32_t hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-	hx &= 0x7fffffff;
-	hx |= (__uint32_t)(lx|(-lx))>>31;	
-	hx = 0x7ff00000 - hx;
-	return (int)(((__uint32_t)(hx))>>31);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_lrint.c b/newlib/libm/common/s_lrint.c
index 7d3b561b1..541bf2c7e 100644
--- a/newlib/libm/common/s_lrint.c
+++ b/newlib/libm/common/s_lrint.c
@@ -54,11 +54,7 @@ TWO52[2]={
   long int result;
   
   EXTRACT_WORDS(i0,i1,x);
-
-  /* Extract sign bit. */
   sx = (i0>>31)&1;
-
-  /* Extract exponent field. */
   j0 = ((i0 & 0x7ff00000) >> 20) - 1023;
   
   if(j0 < 20)
@@ -70,21 +66,16 @@ TWO52[2]={
           w = TWO52[sx] + x;
           t = w - TWO52[sx];
           GET_HIGH_WORD(i0, t);
-          /* Detect the all-zeros representation of plus and
-             minus zero, which fails the calculation below. */
-          if ((i0 & ~(1 << 31)) == 0)
-              return 0;
           j0 = ((i0 & 0x7ff00000) >> 20) - 1023;
           i0 &= 0x000fffff;
           i0 |= 0x00100000;
           result = i0 >> (20 - j0);
         }
     }
-  else if (j0 < (int)(8 * sizeof (long int)) - 1)
+  else if (j0 < (8 * sizeof (long int)) - 1)
     {
       if (j0 >= 52)
-        result = ((long int) ((i0 & 0x000fffff) | 0x0010000) << (j0 - 20)) | 
-                   (i1 << (j0 - 52));
+        result = ((long int) i0 << (j0 - 20)) | (i1 << (j0 - 52));
       else
         {
           w = TWO52[sx] + x;
diff --git a/newlib/libm/common/s_modf.c b/newlib/libm/common/s_modf.c
index 2e9bfb125..01151397d 100644
--- a/newlib/libm/common/s_modf.c
+++ b/newlib/libm/common/s_modf.c
@@ -41,7 +41,7 @@ DESCRIPTION
 	storing the integer part in <<*<[ipart]>>>.  No rounding
 	whatsoever is done; the sum of the integer and fractional
 	parts is guaranteed to be exactly  equal to <[val]>.   That
-	is, if <[realpart]> = modf(<[val]>, &<[intpart]>); then
+	is, if . <[realpart]> = modf(<[val]>, &<[intpart]>); then
 	`<<<[realpart]>+<[intpart]>>>' is the same as <[val]>.
 	<<modff>> is identical, save that it takes and returns
 	<<float>> rather than <<double>> values. 
diff --git a/newlib/libm/common/sf_fmax.c b/newlib/libm/common/sf_fmax.c
index ac1bf46f5..292b99edf 100644
--- a/newlib/libm/common/sf_fmax.c
+++ b/newlib/libm/common/sf_fmax.c
@@ -15,9 +15,9 @@
 #endif
 {
   if (__fpclassifyf(x) == FP_NAN)
-    return y;
-  if (__fpclassifyf(y) == FP_NAN)
     return x;
+  if (__fpclassifyf(y) == FP_NAN)
+    return y;
   
   return x > y ? x : y;
 }
diff --git a/newlib/libm/common/sf_fmin.c b/newlib/libm/common/sf_fmin.c
index f0e344455..4ef3510aa 100644
--- a/newlib/libm/common/sf_fmin.c
+++ b/newlib/libm/common/sf_fmin.c
@@ -15,9 +15,9 @@
 #endif
 {
   if (__fpclassifyf(x) == FP_NAN)
-    return y;
-  if (__fpclassifyf(y) == FP_NAN)
     return x;
+  if (__fpclassifyf(y) == FP_NAN)
+    return y;
   
   return x < y ? x : y;
 }
diff --git a/newlib/libm/common/sf_isinff.c b/newlib/libm/common/sf_isinff.c
deleted file mode 100644
index 9d0e742e5..000000000
--- a/newlib/libm/common/sf_isinff.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * __isinff(x) returns 1 if x is +-infinity, else 0;
- * Added by Cygnus Support.
- */
-
-#include "fdlibm.h"
-
-int
-_DEFUN (__isinff, (x),
-	float x)
-{
-	__int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	return FLT_UWORD_IS_INFINITE(ix);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (__isinfd, (x),
-	double x)
-{
-	return __isinff((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_isnanf.c b/newlib/libm/common/sf_isnanf.c
deleted file mode 100644
index 0b0d9bbaf..000000000
--- a/newlib/libm/common/sf_isnanf.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * __isnanf(x) returns 1 is x is nan, else 0;
- */
-
-#include "fdlibm.h"
-
-int
-_DEFUN (__isnanf, (x),
-	float x)
-{
-	__int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	return FLT_UWORD_IS_NAN(ix);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (__isnand, (x),
-	double x)
-{
-	return __isnanf((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_lrint.c b/newlib/libm/common/sf_lrint.c
index 3165705d1..a58508f02 100644
--- a/newlib/libm/common/sf_lrint.c
+++ b/newlib/libm/common/sf_lrint.c
@@ -28,10 +28,6 @@ static const float
 #else
 static float 
 #endif
-/* Adding a float, x, to 2^23 will cause the result to be rounded based on
-   the fractional part of x, according to the implementation's current rounding
-   mode.  2^23 is the smallest float that can be represented using all 23 significant
-   digits. */
 TWO23[2]={
   8.3886080000e+06, /* 0x4b000000 */
  -8.3886080000e+06, /* 0xcb000000 */
@@ -58,21 +54,17 @@ TWO23[2]={
   /* Extract exponent field. */
   j0 = ((i0 & 0x7f800000) >> 23) - 127;
   
-  if (j0 < (int)(sizeof (long int) * 8) - 1)
+  if (j0 < (sizeof (long int) * 8) - 1)
     {
       if (j0 < -1)
         return 0;
       else if (j0 >= 23)
-        result = (long int) ((i0 & 0x7fffff) | 0x800000) << (j0 - 23);
+        result = (long int) i0 << (j0 - 23);
       else
         {
           w = TWO23[sx] + x;
           t = w - TWO23[sx];
           GET_FLOAT_WORD (i0, t);
-          /* Detect the all-zeros representation of plus and
-             minus zero, which fails the calculation below. */
-          if ((i0 & ~(1 << 31)) == 0)
-              return 0;
           j0 = ((i0 >> 23) & 0xff) - 0x7f;
           i0 &= 0x7fffff;
           i0 |= 0x800000;
diff --git a/newlib/libm/configure b/newlib/libm/configure
index 075165c8d..8535bc9ff 100755
--- a/newlib/libm/configure
+++ b/newlib/libm/configure
@@ -1033,7 +1033,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1455,11 +1455,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1463: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1460: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1493,7 +1490,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1497: checking for executable suffix" >&5
+echo "configure:1494: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1503,7 +1500,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1679,7 +1676,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1683: checking for $ac_word" >&5
+echo "configure:1680: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1709,7 +1706,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1713: checking for $ac_word" >&5
+echo "configure:1710: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1760,7 +1757,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1764: checking for $ac_word" >&5
+echo "configure:1761: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1792,7 +1789,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1796: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1793: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1803,12 +1800,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1807 "configure"
+#line 1804 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1834,12 +1831,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1838: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1835: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1843: checking whether we are using GNU C" >&5
+echo "configure:1840: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1848,7 +1845,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1867,7 +1864,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1871: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1868: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1910,7 +1907,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1914: checking for ld used by GCC" >&5
+echo "configure:1911: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1940,10 +1937,10 @@ echo "configure:1914: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1944: checking for GNU ld" >&5
+echo "configure:1941: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1947: checking for non-GNU ld" >&5
+echo "configure:1944: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1978,7 +1975,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1982: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1979: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1995,7 +1992,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1999: checking for $LD option to reload object files" >&5
+echo "configure:1996: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2007,7 +2004,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2011: checking for BSD-compatible nm" >&5
+echo "configure:2008: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2045,7 +2042,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2049: checking whether ln -s works" >&5
+echo "configure:2046: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2066,7 +2063,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2070: checking how to recognise dependant libraries" >&5
+echo "configure:2067: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2239,13 +2236,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2243: checking for object suffix" >&5
+echo "configure:2240: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2269,7 +2266,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2273: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2270: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2331,7 +2328,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2335: checking for file" >&5
+echo "configure:2332: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2402,7 +2399,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2406: checking for $ac_word" >&5
+echo "configure:2403: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2434,7 +2431,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2438: checking for $ac_word" >&5
+echo "configure:2435: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2469,7 +2466,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2473: checking for $ac_word" >&5
+echo "configure:2470: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2501,7 +2498,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2505: checking for $ac_word" >&5
+echo "configure:2502: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2568,8 +2565,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2572 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2569 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2588,7 +2585,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2606,7 +2603,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2610: checking whether the C compiler needs -belf" >&5
+echo "configure:2607: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2619,14 +2616,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2623 "configure"
+#line 2620 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2656,7 +2653,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2660: checking for $ac_word" >&5
+echo "configure:2657: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2688,7 +2685,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2692: checking for $ac_word" >&5
+echo "configure:2689: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2723,7 +2720,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2727: checking for $ac_word" >&5
+echo "configure:2724: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2755,7 +2752,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2759: checking for $ac_word" >&5
+echo "configure:2756: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2790,7 +2787,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2794: checking for $ac_word" >&5
+echo "configure:2791: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2822,7 +2819,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2826: checking for $ac_word" >&5
+echo "configure:2823: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2858,12 +2855,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2862: checking if libtool should supply DllMain function" >&5
+echo "configure:2859: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2867 "configure"
+#line 2864 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2871,7 +2868,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2892,19 +2889,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2896: checking how to link DLLs" >&5
+echo "configure:2893: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2901 "configure"
+#line 2898 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
diff --git a/newlib/libm/libm.texinfo b/newlib/libm/libm.texinfo
index 309f39f30..4a9d57942 100644
--- a/newlib/libm/libm.texinfo
+++ b/newlib/libm/libm.texinfo
@@ -61,8 +61,8 @@ into another language, under the above conditions for modified versions.
 @titlepage
 @title The Red Hat newlib C Math Library
 @sp 1
-@subtitle @code{libm} 1.14.0
-@subtitle December 2005
+@subtitle @code{libm} 1.13.0
+@subtitle January 2004
 @author {Steve Chamberlain}
 @author {Roland Pesch}
 @author {Red Hat Support}
diff --git a/newlib/libm/machine/aclocal.m4 b/newlib/libm/machine/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libm/machine/aclocal.m4
+++ b/newlib/libm/machine/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libm/machine/configure b/newlib/libm/machine/configure
index 09ca607a9..7d0deb5ed 100755
--- a/newlib/libm/machine/configure
+++ b/newlib/libm/machine/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1655,7 +1652,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1682,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1765,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1886,7 +1883,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
+echo "configure:1887: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1917: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1920: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1954,7 +1951,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
+echo "configure:1972: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:2022: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2042,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
+echo "configure:2043: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
+echo "configure:2216: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2245,7 +2242,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2246: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2304,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
+echo "configure:2308: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2378,7 +2375,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
+echo "configure:2379: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
+echo "configure:2411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,7 +2442,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
+echo "configure:2446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
+echo "configure:2478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2545 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2564,7 +2561,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2582,7 +2579,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:2583: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2596 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:2633: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2696,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2732: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2763,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2799: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2834,12 +2831,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
+echo "configure:2835: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
+echo "configure:2869: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
diff --git a/newlib/libm/machine/i386/aclocal.m4 b/newlib/libm/machine/i386/aclocal.m4
index 35519acf9..c0a206827 100644
--- a/newlib/libm/machine/i386/aclocal.m4
+++ b/newlib/libm/machine/i386/aclocal.m4
@@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.13.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
diff --git a/newlib/libm/machine/i386/configure b/newlib/libm/machine/i386/configure
index 6a01f4342..806c49298 100755
--- a/newlib/libm/machine/i386/configure
+++ b/newlib/libm/machine/i386/configure
@@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" &&
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.13.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1436: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1466,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1470: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1476,7 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
       *.c | *.o | *.obj) ;;
@@ -1655,7 +1652,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1656: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1682,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1733,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1765,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1807,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1811: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1840,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1844: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1886,7 +1883,7 @@ ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
+echo "configure:1887: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -1916,10 +1913,10 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1917: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1920: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1954,7 +1951,7 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1955: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1971,7 +1968,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
+echo "configure:1972: checking for $LD option to reload object files" >&5
 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1983,7 +1980,7 @@ reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +2018,7 @@ NM="$lt_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:2022: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2042,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
+echo "configure:2043: checking how to recognise dependant libraries" >&5
 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,13 +2212,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
+echo "configure:2216: checking for object suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   rm -f conftest*
 echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   for ac_file in conftest.*; do
     case $ac_file in
     *.c) ;;
@@ -2245,7 +2242,7 @@ case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
+echo "configure:2246: checking for ${ac_tool_prefix}file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2304,7 @@ fi
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
+echo "configure:2308: checking for file" >&5
 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2378,7 +2375,7 @@ esac
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
+echo "configure:2379: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2410,7 +2407,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
+echo "configure:2411: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2445,7 +2442,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
+echo "configure:2446: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2477,7 +2474,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
+echo "configure:2478: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2544,8 +2541,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 2545 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -2564,7 +2561,7 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -2582,7 +2579,7 @@ ia64-*-hpux*)
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:2583: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2595,14 +2592,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
      cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+#line 2596 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2632,7 +2629,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:2633: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2661,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2696,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2700: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2728,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2732: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2763,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2795,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2799: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2834,12 +2831,12 @@ fi
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
   echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
+echo "configure:2835: checking if libtool should supply DllMain function" >&5
 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
       DllMain (0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_need_dllmain=no
 else
@@ -2868,19 +2865,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
     echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
+echo "configure:2869: checking how to link DLLs" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_dll_switch=-mdll
 else
diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am
index f5971fac9..6f7195a38 100644
--- a/newlib/libm/math/Makefile.am
+++ b/newlib/libm/math/Makefile.am
@@ -22,9 +22,10 @@ src = 	k_standard.c k_rem_pio2.c \
 	w_cabs.c w_drem.c \
 	s_asinh.c s_atan.c s_ceil.c \
 	s_cos.c s_erf.c s_fabs.c s_floor.c \
-	s_frexp.c s_ldexp.c \
+	s_frexp.c s_isnan.c s_ldexp.c \
 	s_signif.c s_sin.c \
 	s_tan.c s_tanh.c \
+	s_isinf.c s_infconst.c \
 	w_exp2.c w_tgamma.c
 
 fsrc =	kf_rem_pio2.c \
@@ -45,9 +46,10 @@ fsrc =	kf_rem_pio2.c \
 	wf_cabs.c wf_drem.c \
 	sf_asinh.c sf_atan.c sf_ceil.c \
 	sf_cos.c sf_erf.c sf_fabs.c sf_floor.c \
-	sf_frexp.c sf_ldexp.c \
+	sf_frexp.c sf_isnan.c sf_ldexp.c \
 	sf_signif.c sf_sin.c \
 	sf_tan.c sf_tanh.c \
+	sf_isinf.c \
 	wf_exp2.c wf_tgamma.c
 
 libmath_la_LDFLAGS = -Xcompiler -nostdlib
@@ -71,7 +73,8 @@ chobj =	wacos.def wacosh.def wasin.def sasinh.def \
 	wgamma.def whypot.def sldexp.def wlog.def \
 	wlog10.def \
 	wpow.def wremainder.def ssin.def wsinh.def \
-	wsqrt.def stan.def stanh.def
+	wsqrt.def stan.def stanh.def \
+	sisnan.def
 
 SUFFIXES = .def
 
@@ -175,6 +178,9 @@ stan.def: s_tan.c
 stanh.def: s_tanh.c
 	$(CHEW) < $(srcdir)/s_tanh.c >$@ 2>/dev/null
 	touch stmp-def
+sisnan.def: s_isnan.c
+	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
+	touch stmp-def
 
 # A partial dependency list.
 
diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in
index f00e189c7..49a8daf5e 100644
--- a/newlib/libm/math/Makefile.in
+++ b/newlib/libm/math/Makefile.in
@@ -98,10 +98,10 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-src = k_standard.c k_rem_pio2.c 	k_cos.c k_sin.c k_tan.c 	e_acos.c e_acosh.c e_asin.c e_atan2.c 	e_atanh.c e_cosh.c e_exp.c e_fmod.c 	er_gamma.c e_hypot.c e_j0.c 	e_j1.c e_jn.c er_lgamma.c 	e_log.c e_log10.c e_pow.c e_rem_pio2.c e_remainder.c 	e_scalb.c e_sinh.c e_sqrt.c 	w_acos.c w_acosh.c w_asin.c w_atan2.c 	w_atanh.c w_cosh.c w_exp.c w_fmod.c 	w_gamma.c wr_gamma.c w_hypot.c w_j0.c 	w_j1.c w_jn.c w_lgamma.c wr_lgamma.c 	w_log.c w_log10.c w_pow.c w_remainder.c 	w_scalb.c w_sinh.c w_sqrt.c 	w_sincos.c 	w_cabs.c w_drem.c 	s_asinh.c s_atan.c s_ceil.c 	s_cos.c s_erf.c s_fabs.c s_floor.c 	s_frexp.c s_ldexp.c 	s_signif.c s_sin.c 	s_tan.c s_tanh.c 	w_exp2.c w_tgamma.c
+src = k_standard.c k_rem_pio2.c 	k_cos.c k_sin.c k_tan.c 	e_acos.c e_acosh.c e_asin.c e_atan2.c 	e_atanh.c e_cosh.c e_exp.c e_fmod.c 	er_gamma.c e_hypot.c e_j0.c 	e_j1.c e_jn.c er_lgamma.c 	e_log.c e_log10.c e_pow.c e_rem_pio2.c e_remainder.c 	e_scalb.c e_sinh.c e_sqrt.c 	w_acos.c w_acosh.c w_asin.c w_atan2.c 	w_atanh.c w_cosh.c w_exp.c w_fmod.c 	w_gamma.c wr_gamma.c w_hypot.c w_j0.c 	w_j1.c w_jn.c w_lgamma.c wr_lgamma.c 	w_log.c w_log10.c w_pow.c w_remainder.c 	w_scalb.c w_sinh.c w_sqrt.c 	w_sincos.c 	w_cabs.c w_drem.c 	s_asinh.c s_atan.c s_ceil.c 	s_cos.c s_erf.c s_fabs.c s_floor.c 	s_frexp.c s_isnan.c s_ldexp.c 	s_signif.c s_sin.c 	s_tan.c s_tanh.c 	s_isinf.c s_infconst.c 	w_exp2.c w_tgamma.c
 
 
-fsrc = kf_rem_pio2.c 	kf_cos.c kf_sin.c kf_tan.c 	ef_acos.c ef_acosh.c ef_asin.c ef_atan2.c 	ef_atanh.c ef_cosh.c ef_exp.c ef_fmod.c 	erf_gamma.c ef_hypot.c ef_j0.c 	ef_j1.c ef_jn.c erf_lgamma.c 	ef_log.c ef_log10.c ef_pow.c ef_rem_pio2.c ef_remainder.c 	ef_scalb.c ef_sinh.c ef_sqrt.c 	wf_acos.c wf_acosh.c wf_asin.c wf_atan2.c 	wf_atanh.c wf_cosh.c wf_exp.c wf_fmod.c 	wf_gamma.c wrf_gamma.c wf_hypot.c wf_j0.c 	wf_j1.c wf_jn.c wf_lgamma.c wrf_lgamma.c 	wf_log.c wf_log10.c wf_pow.c wf_remainder.c 	wf_scalb.c wf_sinh.c wf_sqrt.c 	wf_sincos.c 	wf_cabs.c wf_drem.c 	sf_asinh.c sf_atan.c sf_ceil.c 	sf_cos.c sf_erf.c sf_fabs.c sf_floor.c 	sf_frexp.c sf_ldexp.c 	sf_signif.c sf_sin.c 	sf_tan.c sf_tanh.c 	wf_exp2.c wf_tgamma.c
+fsrc = kf_rem_pio2.c 	kf_cos.c kf_sin.c kf_tan.c 	ef_acos.c ef_acosh.c ef_asin.c ef_atan2.c 	ef_atanh.c ef_cosh.c ef_exp.c ef_fmod.c 	erf_gamma.c ef_hypot.c ef_j0.c 	ef_j1.c ef_jn.c erf_lgamma.c 	ef_log.c ef_log10.c ef_pow.c ef_rem_pio2.c ef_remainder.c 	ef_scalb.c ef_sinh.c ef_sqrt.c 	wf_acos.c wf_acosh.c wf_asin.c wf_atan2.c 	wf_atanh.c wf_cosh.c wf_exp.c wf_fmod.c 	wf_gamma.c wrf_gamma.c wf_hypot.c wf_j0.c 	wf_j1.c wf_jn.c wf_lgamma.c wrf_lgamma.c 	wf_log.c wf_log10.c wf_pow.c wf_remainder.c 	wf_scalb.c wf_sinh.c wf_sqrt.c 	wf_sincos.c 	wf_cabs.c wf_drem.c 	sf_asinh.c sf_atan.c sf_ceil.c 	sf_cos.c sf_erf.c sf_fabs.c sf_floor.c 	sf_frexp.c sf_isnan.c sf_ldexp.c 	sf_signif.c sf_sin.c 	sf_tan.c sf_tanh.c 	sf_isinf.c 	wf_exp2.c wf_tgamma.c
 
 
 libmath_la_LDFLAGS = -Xcompiler -nostdlib
@@ -113,7 +113,7 @@ libmath_la_LDFLAGS = -Xcompiler -nostdlib
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
 @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc)
 
-chobj = wacos.def wacosh.def wasin.def sasinh.def 	satan.def watan2.def watanh.def wj0.def 	wcosh.def serf.def wexp.def 	sfabs.def sfloor.def wfmod.def sfrexp.def 	wgamma.def whypot.def sldexp.def wlog.def 	wlog10.def 	wpow.def wremainder.def ssin.def wsinh.def 	wsqrt.def stan.def stanh.def
+chobj = wacos.def wacosh.def wasin.def sasinh.def 	satan.def watan2.def watanh.def wj0.def 	wcosh.def serf.def wexp.def 	sfabs.def sfloor.def wfmod.def sfrexp.def 	wgamma.def whypot.def sldexp.def wlog.def 	wlog10.def 	wpow.def wremainder.def ssin.def wsinh.def 	wsqrt.def stan.def stanh.def 	sisnan.def
 
 
 SUFFIXES = .def
@@ -154,14 +154,16 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@w_cabs.$(OBJEXT) w_drem.$(OBJEXT) s_asinh.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@s_atan.$(OBJEXT) s_ceil.$(OBJEXT) s_cos.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@s_erf.$(OBJEXT) s_fabs.$(OBJEXT) s_floor.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_frexp.$(OBJEXT) s_ldexp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_signif.$(OBJEXT) s_sin.$(OBJEXT) s_tan.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_tanh.$(OBJEXT) w_exp2.$(OBJEXT) w_tgamma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@kf_rem_pio2.$(OBJEXT) kf_cos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@kf_sin.$(OBJEXT) kf_tan.$(OBJEXT) ef_acos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_acosh.$(OBJEXT) ef_asin.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_atan2.$(OBJEXT) ef_atanh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_cosh.$(OBJEXT) ef_exp.$(OBJEXT) ef_fmod.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_frexp.$(OBJEXT) s_isnan.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_ldexp.$(OBJEXT) s_signif.$(OBJEXT) s_sin.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_tan.$(OBJEXT) s_tanh.$(OBJEXT) s_isinf.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_infconst.$(OBJEXT) w_exp2.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@w_tgamma.$(OBJEXT) kf_rem_pio2.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@kf_cos.$(OBJEXT) kf_sin.$(OBJEXT) kf_tan.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@ef_acos.$(OBJEXT) ef_acosh.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@ef_asin.$(OBJEXT) ef_atan2.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@ef_atanh.$(OBJEXT) ef_cosh.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@ef_exp.$(OBJEXT) ef_fmod.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@erf_gamma.$(OBJEXT) ef_hypot.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@ef_j0.$(OBJEXT) ef_j1.$(OBJEXT) ef_jn.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@erf_lgamma.$(OBJEXT) ef_log.$(OBJEXT) \
@@ -184,9 +186,11 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@sf_atan.$(OBJEXT) sf_ceil.$(OBJEXT) sf_cos.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sf_erf.$(OBJEXT) sf_fabs.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sf_floor.$(OBJEXT) sf_frexp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_ldexp.$(OBJEXT) sf_signif.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_sin.$(OBJEXT) sf_tan.$(OBJEXT) sf_tanh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_exp2.$(OBJEXT) wf_tgamma.$(OBJEXT)
+@USE_LIBTOOL_FALSE@sf_isnan.$(OBJEXT) sf_ldexp.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_signif.$(OBJEXT) sf_sin.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_tan.$(OBJEXT) sf_tanh.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_isinf.$(OBJEXT) wf_exp2.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@wf_tgamma.$(OBJEXT)
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libmath_la_LIBADD = 
@@ -203,24 +207,25 @@ libmath_la_LIBADD =
 @USE_LIBTOOL_TRUE@w_remainder.lo w_scalb.lo w_sinh.lo w_sqrt.lo \
 @USE_LIBTOOL_TRUE@w_sincos.lo w_cabs.lo w_drem.lo s_asinh.lo s_atan.lo \
 @USE_LIBTOOL_TRUE@s_ceil.lo s_cos.lo s_erf.lo s_fabs.lo s_floor.lo \
-@USE_LIBTOOL_TRUE@s_frexp.lo s_ldexp.lo s_signif.lo s_sin.lo s_tan.lo \
-@USE_LIBTOOL_TRUE@s_tanh.lo w_exp2.lo w_tgamma.lo kf_rem_pio2.lo \
-@USE_LIBTOOL_TRUE@kf_cos.lo kf_sin.lo kf_tan.lo ef_acos.lo ef_acosh.lo \
-@USE_LIBTOOL_TRUE@ef_asin.lo ef_atan2.lo ef_atanh.lo ef_cosh.lo \
-@USE_LIBTOOL_TRUE@ef_exp.lo ef_fmod.lo erf_gamma.lo ef_hypot.lo \
-@USE_LIBTOOL_TRUE@ef_j0.lo ef_j1.lo ef_jn.lo erf_lgamma.lo ef_log.lo \
-@USE_LIBTOOL_TRUE@ef_log10.lo ef_pow.lo ef_rem_pio2.lo ef_remainder.lo \
-@USE_LIBTOOL_TRUE@ef_scalb.lo ef_sinh.lo ef_sqrt.lo wf_acos.lo \
-@USE_LIBTOOL_TRUE@wf_acosh.lo wf_asin.lo wf_atan2.lo wf_atanh.lo \
-@USE_LIBTOOL_TRUE@wf_cosh.lo wf_exp.lo wf_fmod.lo wf_gamma.lo \
-@USE_LIBTOOL_TRUE@wrf_gamma.lo wf_hypot.lo wf_j0.lo wf_j1.lo wf_jn.lo \
-@USE_LIBTOOL_TRUE@wf_lgamma.lo wrf_lgamma.lo wf_log.lo wf_log10.lo \
-@USE_LIBTOOL_TRUE@wf_pow.lo wf_remainder.lo wf_scalb.lo wf_sinh.lo \
-@USE_LIBTOOL_TRUE@wf_sqrt.lo wf_sincos.lo wf_cabs.lo wf_drem.lo \
-@USE_LIBTOOL_TRUE@sf_asinh.lo sf_atan.lo sf_ceil.lo sf_cos.lo sf_erf.lo \
-@USE_LIBTOOL_TRUE@sf_fabs.lo sf_floor.lo sf_frexp.lo sf_ldexp.lo \
+@USE_LIBTOOL_TRUE@s_frexp.lo s_isnan.lo s_ldexp.lo s_signif.lo s_sin.lo \
+@USE_LIBTOOL_TRUE@s_tan.lo s_tanh.lo s_isinf.lo s_infconst.lo w_exp2.lo \
+@USE_LIBTOOL_TRUE@w_tgamma.lo kf_rem_pio2.lo kf_cos.lo kf_sin.lo \
+@USE_LIBTOOL_TRUE@kf_tan.lo ef_acos.lo ef_acosh.lo ef_asin.lo \
+@USE_LIBTOOL_TRUE@ef_atan2.lo ef_atanh.lo ef_cosh.lo ef_exp.lo \
+@USE_LIBTOOL_TRUE@ef_fmod.lo erf_gamma.lo ef_hypot.lo ef_j0.lo ef_j1.lo \
+@USE_LIBTOOL_TRUE@ef_jn.lo erf_lgamma.lo ef_log.lo ef_log10.lo \
+@USE_LIBTOOL_TRUE@ef_pow.lo ef_rem_pio2.lo ef_remainder.lo ef_scalb.lo \
+@USE_LIBTOOL_TRUE@ef_sinh.lo ef_sqrt.lo wf_acos.lo wf_acosh.lo \
+@USE_LIBTOOL_TRUE@wf_asin.lo wf_atan2.lo wf_atanh.lo wf_cosh.lo \
+@USE_LIBTOOL_TRUE@wf_exp.lo wf_fmod.lo wf_gamma.lo wrf_gamma.lo \
+@USE_LIBTOOL_TRUE@wf_hypot.lo wf_j0.lo wf_j1.lo wf_jn.lo wf_lgamma.lo \
+@USE_LIBTOOL_TRUE@wrf_lgamma.lo wf_log.lo wf_log10.lo wf_pow.lo \
+@USE_LIBTOOL_TRUE@wf_remainder.lo wf_scalb.lo wf_sinh.lo wf_sqrt.lo \
+@USE_LIBTOOL_TRUE@wf_sincos.lo wf_cabs.lo wf_drem.lo sf_asinh.lo \
+@USE_LIBTOOL_TRUE@sf_atan.lo sf_ceil.lo sf_cos.lo sf_erf.lo sf_fabs.lo \
+@USE_LIBTOOL_TRUE@sf_floor.lo sf_frexp.lo sf_isnan.lo sf_ldexp.lo \
 @USE_LIBTOOL_TRUE@sf_signif.lo sf_sin.lo sf_tan.lo sf_tanh.lo \
-@USE_LIBTOOL_TRUE@wf_exp2.lo wf_tgamma.lo
+@USE_LIBTOOL_TRUE@sf_isinf.lo wf_exp2.lo wf_tgamma.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -546,6 +551,9 @@ stan.def: s_tan.c
 stanh.def: s_tanh.c
 	$(CHEW) < $(srcdir)/s_tanh.c >$@ 2>/dev/null
 	touch stmp-def
+sisnan.def: s_isnan.c
+	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
+	touch stmp-def
 
 # A partial dependency list.
 
diff --git a/newlib/libm/math/ef_atan2.c b/newlib/libm/math/ef_atan2.c
index d57480b03..45b5acb0c 100644
--- a/newlib/libm/math/ef_atan2.c
+++ b/newlib/libm/math/ef_atan2.c
@@ -25,8 +25,8 @@ tiny  = 1.0e-30,
 zero  = 0.0,
 pi_o_4  = 7.8539818525e-01, /* 0x3f490fdb */
 pi_o_2  = 1.5707963705e+00, /* 0x3fc90fdb */
-pi      = 3.1415927410e+00,  /* 0x40490fdb */
-pi_lo   = -8.7422776573e-08; /* 0xb3bbbd2e */
+pi      = 3.1415925026e+00, /* 0x40490fda */
+pi_lo   = 1.5099578832e-07; /* 0x34222168 */
 
 #ifdef __STDC__
 	float __ieee754_atan2f(float y, float x)
diff --git a/newlib/libm/math/ef_hypot.c b/newlib/libm/math/ef_hypot.c
index 9368eb41c..b78b968ef 100644
--- a/newlib/libm/math/ef_hypot.c
+++ b/newlib/libm/math/ef_hypot.c
@@ -50,7 +50,7 @@
 	    if(FLT_UWORD_IS_ZERO(hb)) {
 	        return a;
 	    } else if(FLT_UWORD_IS_SUBNORMAL(hb)) {
-		SET_FLOAT_WORD(t1,0x7e800000L);	/* t1=2^126 */
+		SET_FLOAT_WORD(t1,0x3f000000L);	/* t1=2^126 */
 		b *= t1;
 		a *= t1;
 		k -= 126;
diff --git a/newlib/libm/math/math.tex b/newlib/libm/math/math.tex
index 7bc56ce9a..0b1e596fb 100644
--- a/newlib/libm/math/math.tex
+++ b/newlib/libm/math/math.tex
@@ -25,7 +25,7 @@ Since the error handling code calls @code{fputs}, the mathematical
 subroutines require stubs or minimal implementations for the same list
 of OS subroutines as @code{fputs}: @code{close}, @code{fstat},
 @code{isatty}, @code{lseek}, @code{read}, @code{sbrk}, @code{write}.
-@xref{syscalls,,System Calls, libc.info, The Red Hat newlib C Library},
+@xref{syscalls,,System Calls, libc.info, The Cygnus C Support Library},
 for a discussion and for sample minimal implementations of these support
 subroutines.
 
@@ -139,12 +139,6 @@ The library is set to X/Open mode by default.
 @include math/wj0.def
 
 @page
-@include common/scbrt.def
-
-@page
-@include common/scopysign.def
-
-@page
 @include math/wcosh.def
 
 @page
@@ -154,9 +148,6 @@ The library is set to X/Open mode by default.
 @include math/wexp.def
 
 @page
-@include common/sexpm1.def
-
-@page
 @include math/sfabs.def
 
 @page
@@ -175,13 +166,7 @@ The library is set to X/Open mode by default.
 @include math/whypot.def
 
 @page
-@include common/silogb.def
-
-@page
-@include common/sinfinity.def
-
-@page
-@include common/sisnan.def
+@include math/sisnan.def
 
 @page
 @include math/sldexp.def
@@ -193,30 +178,12 @@ The library is set to X/Open mode by default.
 @include math/wlog10.def
 
 @page
-@include common/slog1p.def
-
-@page
-@include common/smatherr.def
-
-@page
-@include common/smodf.def
-
-@page
-@include common/snan.def
-
-@page
-@include common/snextafter.def
-
-@page
 @include math/wpow.def
 
 @page
 @include math/wremainder.def
 
 @page
-@include common/sscalbn.def
-
-@page
 @include math/wsqrt.def
 
 @page
diff --git a/newlib/libm/math/s_infconst.c b/newlib/libm/math/s_infconst.c
new file mode 100644
index 000000000..6b63afbca
--- /dev/null
+++ b/newlib/libm/math/s_infconst.c
@@ -0,0 +1,15 @@
+/* Infinity as a constant value.   This is used for HUGE_VAL.
+ * Added by Cygnus Support.
+ */
+
+#include "fdlibm.h"
+
+#ifndef _DOUBLE_IS_32BITS
+#ifdef __IEEE_BIG_ENDIAN
+const union __dmath __infinity[1] = {{{ 0x7ff00000, 0 }}};
+#else
+const union __dmath __infinity[1] = {{{ 0, 0x7ff00000 }}};
+#endif
+#else /* defined (_DOUBLE_IS_32BITS) */
+const union __dmath __infinity[1] = {{{ 0x7f800000, 0 }}};
+#endif /* defined (_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/s_isinfd.c b/newlib/libm/math/s_isinf.c
index 5a2b04d4e..87f099566 100644
--- a/newlib/libm/common/s_isinfd.c
+++ b/newlib/libm/math/s_isinf.c
@@ -1,5 +1,5 @@
 /*
- * __isinfd(x) returns 1 if x is infinity, else 0;
+ * isinf(x) returns 1 if x is infinity, else 0;
  * no branching!
  * Added by Cygnus Support.
  */
@@ -8,9 +8,12 @@
 
 #ifndef _DOUBLE_IS_32BITS
 
-int
-_DEFUN (__isinfd, (x),
-	double x)
+#ifdef __STDC__
+	int isinf(double x)
+#else
+	int isinf(x)
+	double x;
+#endif
 {
 	__int32_t hx,lx;
 	EXTRACT_WORDS(hx,lx,x);
diff --git a/newlib/libm/common/s_isnand.c b/newlib/libm/math/s_isnan.c
index 75538d907..0338cfe47 100644
--- a/newlib/libm/common/s_isnand.c
+++ b/newlib/libm/math/s_isnan.c
@@ -1,3 +1,5 @@
+
+/* @(#)s_isnan.c 5.1 93/09/24 */
 /*
  * ====================================================
  * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -11,7 +13,7 @@
 
 /*
 FUNCTION
-	<<isnan>>, <<isnanf>>, <<isinf>>, <<isinff>>, <<finite>>, <<finitef>>---test for exceptional numbers
+	<<isnan>>,<<isnanf>>,<<isinf>>,<<isinff>>,<<finite>>,<<finitef>>---test for exceptional numbers
 
 INDEX
 	isnan
@@ -56,14 +58,14 @@ DESCRIPTION
 	These functions provide information on the floating-point
 	argument supplied.
 
-	There are five major number formats:
+	There are five major number formats - 
 	o+
 	o zero
-	  A number which contains all zero bits.
+	 a number which contains all zero bits.
 	o subnormal
-	  A number with a zero exponent but a nonzero fraction.
-	o normal
-	  A number with an exponent and a fraction.
+	 Is used to represent  number with a zero exponent, but a nonzero fraction.
+	 o normal
+	  A number with an exponent, and a fraction
      	o infinity
 	  A number with an all 1's exponent and a zero fraction.
 	o NAN
@@ -74,13 +76,8 @@ DESCRIPTION
 	<<isnan>> returns 1 if the argument is a nan. <<isinf>>
 	returns 1 if the argument is infinity.  <<finite>> returns 1 if the
 	argument is zero, subnormal or normal.
-
-	Note that by the C99 standard, <<isnan>> and <<isinf>> are macros
-	taking any type of floating-point and are declared in
-	<<math.h>>.  Newlib has chosen to declare these as macros in
-	<<math.h>> and as functions in <<ieeefp.h>>.
 	
-	The <<isnanf>>, <<isinff>> and <<finitef>> functions perform the same
+	The <<isnanf>>, <<isinff>> and <<finitef>> perform the same
 	operations as their <<isnan>>, <<isinf>> and <<finite>>
 	counterparts, but on single-precision floating-point numbers.
 
@@ -99,7 +96,7 @@ QUICKREF
 */
 
 /*
- * __isnand(x) returns 1 is x is nan, else 0;
+ * isnan(x) returns 1 is x is nan, else 0;
  * no branching!
  */
 
@@ -107,9 +104,12 @@ QUICKREF
 
 #ifndef _DOUBLE_IS_32BITS
 
-int
-_DEFUN (__isnand, (x),
-	double x)
+#ifdef __STDC__
+	int isnan(double x)
+#else
+	int isnan(x)
+	double x;
+#endif
 {
 	__int32_t hx,lx;
 	EXTRACT_WORDS(hx,lx,x);
diff --git a/newlib/libm/math/s_ldexp.c b/newlib/libm/math/s_ldexp.c
index adc7d5d0e..e5d45633d 100644
--- a/newlib/libm/math/s_ldexp.c
+++ b/newlib/libm/math/s_ldexp.c
@@ -56,7 +56,7 @@ On underflow, <<ldexp>> and <<ldexpf>> return 0.0.
 On overflow, <<ldexp>> returns plus or minus <<HUGE_VAL>>.
 
 PORTABILITY
-<<ldexp>> is ANSI. <<ldexpf>> is an extension.
+<<ldexp>> is ANSI, <<ldexpf>> is an extension.
               
 */   
 
diff --git a/newlib/libm/common/sf_isinf.c b/newlib/libm/math/sf_isinf.c
index 74ba4edf7..43a8abdf2 100644
--- a/newlib/libm/common/sf_isinf.c
+++ b/newlib/libm/math/sf_isinf.c
@@ -1,15 +1,16 @@
 /*
  * isinff(x) returns 1 if x is +-infinity, else 0;
- *
- * isinff is an extension declared in <ieeefp.h> and
- * <math.h>.
+ * Added by Cygnus Support.
  */
 
 #include "fdlibm.h"
 
-int
-_DEFUN (isinff, (x),
-	float x)
+#ifdef __STDC__
+	int isinff(float x)
+#else
+	int isinff(x)
+	float x;
+#endif
 {
 	__int32_t ix;
 	GET_FLOAT_WORD(ix,x);
@@ -19,11 +20,12 @@ _DEFUN (isinff, (x),
 
 #ifdef _DOUBLE_IS_32BITS
 
-#undef isinf
-
-int
-_DEFUN (isinf, (x),
-	double x)
+#ifdef __STDC__
+	int isinf(double x)
+#else
+	int isinf(x)
+	double x;
+#endif
 {
 	return isinff((float) x);
 }
diff --git a/newlib/libm/common/sf_isnan.c b/newlib/libm/math/sf_isnan.c
index befc3b2b2..0b4be3e9c 100644
--- a/newlib/libm/common/sf_isnan.c
+++ b/newlib/libm/math/sf_isnan.c
@@ -1,4 +1,5 @@
-/* sf_c_isnan.c -- float version of s_c_isnan.c.
+/* sf_isnan.c -- float version of s_isnan.c.
+ * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
  */
 
 /*
@@ -14,15 +15,16 @@
 
 /*
  * isnanf(x) returns 1 is x is nan, else 0;
- *
- * isnanf is an extension declared in <ieeefp.h> and <math.h>.
  */
 
 #include "fdlibm.h"
 
-int
-_DEFUN (isnanf, (x),
-	float x)
+#ifdef __STDC__
+	int isnanf(float x)
+#else
+	int isnanf(x)
+	float x;
+#endif
 {
 	__int32_t ix;
 	GET_FLOAT_WORD(ix,x);
@@ -32,11 +34,12 @@ _DEFUN (isnanf, (x),
 
 #ifdef _DOUBLE_IS_32BITS
 
-#undef isnan
-
-int
-_DEFUN (isnan, (x),
-	double x)
+#ifdef __STDC__
+	int isnan(double x)
+#else
+	int isnan(x)
+	double x;
+#endif
 {
 	return isnanf((float) x);
 }
diff --git a/newlib/libm/math/w_j0.c b/newlib/libm/math/w_j0.c
index e4dde5ccb..2bf663316 100644
--- a/newlib/libm/math/w_j0.c
+++ b/newlib/libm/math/w_j0.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-<<jN>>, <<jNf>>, <<yN>>, <<yNf>>---Bessel functions 
+<<jN>>,<<jNf>>,<<yN>>,<<yNf>>---Bessel functions 
 
 INDEX
 j0
diff --git a/newlib/libm/math/w_log.c b/newlib/libm/math/w_log.c
index 3e750ad85..dcc8b9762 100644
--- a/newlib/libm/math/w_log.c
+++ b/newlib/libm/math/w_log.c
@@ -49,7 +49,7 @@ When <[x]> is negative, the returned value is <<-HUGE_VAL>> and
 <<matherr>>.
 
 PORTABILITY
-<<log>> is ANSI. <<logf>> is an extension.
+<<log>> is ANSI, <<logf>> is an extension.
 */
 
 /*
diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am
index e529022a6..92688c43d 100644
--- a/newlib/libm/mathfp/Makefile.am
+++ b/newlib/libm/mathfp/Makefile.am
@@ -16,12 +16,12 @@ src =	s_acos.c s_frexp.c s_mathcnst.c \
 	s_sincos.c \
 	s_atangent.c s_logarithm.c \
 	s_sineh.c \
-	s_ceil.c \
+	s_ceil.c s_isnan.c s_isinf.c \
 	e_acosh.c e_atanh.c e_remainder.c \
 	er_gamma.c er_lgamma.c \
 	s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c \
 	w_cabs.c w_drem.c s_asinh.c s_fmod.c \
-	e_scalb.c s_signif.c \
+	e_scalb.c s_infconst.c s_signif.c \
 	s_exp2.c s_tgamma.c
 
 fsrc =	sf_ceil.c \
@@ -36,6 +36,7 @@ fsrc =	sf_ceil.c \
 	sf_sincos.c \
 	sf_atangent.c sf_logarithm.c sf_sineh.c \
 	sf_log.c sf_sineh.c \
+	sf_isnan.c sf_isinf.c \
 	ef_acosh.c ef_atanh.c ef_remainder.c \
 	erf_gamma.c erf_lgamma.c \
 	sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c \
@@ -75,6 +76,7 @@ chobj = eacosh.def \
 	sfloor.def \
 	sfmod.def \
 	sfrexp.def \
+	sisnan.def \
 	sldexp.def \
 	slog10.def \
 	slogarithm.def \
@@ -158,6 +160,9 @@ sfmod.def: s_fmod.c
 sfrexp.def: s_frexp.c
 	$(CHEW) < $(srcdir)/s_frexp.c >$@ 2>/dev/null
 	touch stmp-def
+sisnan.def: s_isnan.c
+	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
+	touch stmp-def
 sldexp.def: s_ldexp.c
 	$(CHEW) < $(srcdir)/s_ldexp.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in
index b11e8130f..8157e1273 100644
--- a/newlib/libm/mathfp/Makefile.in
+++ b/newlib/libm/mathfp/Makefile.in
@@ -98,10 +98,10 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-src = s_acos.c s_frexp.c s_mathcnst.c 	s_cos.c s_sinh.c 	s_asin.c 	s_asine.c s_cosh.c s_ispos.c s_numtest.c s_sqrt.c 	s_exp.c s_ldexp.c s_pow.c s_tan.c 	s_atan.c 	s_atan2.c s_fabs.c s_log.c s_tanh.c 	s_log10.c s_sin.c 	s_floor.c s_sine.c 	s_sincos.c 	s_atangent.c s_logarithm.c 	s_sineh.c 	s_ceil.c 	e_acosh.c e_atanh.c e_remainder.c 	er_gamma.c er_lgamma.c 	s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c 	w_cabs.c w_drem.c s_asinh.c s_fmod.c 	e_scalb.c s_signif.c 	s_exp2.c s_tgamma.c
+src = s_acos.c s_frexp.c s_mathcnst.c 	s_cos.c s_sinh.c 	s_asin.c 	s_asine.c s_cosh.c s_ispos.c s_numtest.c s_sqrt.c 	s_exp.c s_ldexp.c s_pow.c s_tan.c 	s_atan.c 	s_atan2.c s_fabs.c s_log.c s_tanh.c 	s_log10.c s_sin.c 	s_floor.c s_sine.c 	s_sincos.c 	s_atangent.c s_logarithm.c 	s_sineh.c 	s_ceil.c s_isnan.c s_isinf.c 	e_acosh.c e_atanh.c e_remainder.c 	er_gamma.c er_lgamma.c 	s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c 	w_cabs.c w_drem.c s_asinh.c s_fmod.c 	e_scalb.c s_infconst.c s_signif.c 	s_exp2.c s_tgamma.c
 
 
-fsrc = sf_ceil.c 	sf_acos.c sf_frexp.c 	sf_cos.c sf_sinh.c 	sf_asine.c sf_cosh.c sf_ispos.c sf_numtest.c sf_sqrt.c 	sf_asin.c 	sf_exp.c sf_ldexp.c sf_pow.c sf_tan.c 	sf_atan2.c sf_fabs.c sf_tanh.c 	sf_atan.c sf_log10.c sf_sin.c 	sf_floor.c sf_sine.c 	sf_sincos.c 	sf_atangent.c sf_logarithm.c sf_sineh.c 	sf_log.c sf_sineh.c 	ef_acosh.c ef_atanh.c ef_remainder.c 	erf_gamma.c erf_lgamma.c 	sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c 	wf_cabs.c wf_drem.c sf_asinh.c sf_fmod.c 	ef_scalb.c sf_signif.c 	sf_exp2.c sf_tgamma.c
+fsrc = sf_ceil.c 	sf_acos.c sf_frexp.c 	sf_cos.c sf_sinh.c 	sf_asine.c sf_cosh.c sf_ispos.c sf_numtest.c sf_sqrt.c 	sf_asin.c 	sf_exp.c sf_ldexp.c sf_pow.c sf_tan.c 	sf_atan2.c sf_fabs.c sf_tanh.c 	sf_atan.c sf_log10.c sf_sin.c 	sf_floor.c sf_sine.c 	sf_sincos.c 	sf_atangent.c sf_logarithm.c sf_sineh.c 	sf_log.c sf_sineh.c 	sf_isnan.c sf_isinf.c 	ef_acosh.c ef_atanh.c ef_remainder.c 	erf_gamma.c erf_lgamma.c 	sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c 	wf_cabs.c wf_drem.c sf_asinh.c sf_fmod.c 	ef_scalb.c sf_signif.c 	sf_exp2.c sf_tgamma.c
 
 
 libmathfp_la_LDFLAGS = -Xcompiler -nostdlib
@@ -113,7 +113,7 @@ libmathfp_la_LDFLAGS = -Xcompiler -nostdlib
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
 @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc)
 
-chobj = eacosh.def 	eatanh.def 	ehypot.def 	eremainder.def 	erlgamma.def 	sacos.def 	sasine.def 	sasinh.def 	satan.def 	satan2.def 	satangent.def 	scosh.def 	serf.def 	sexp.def 	sfabs.def 	sfloor.def 	sfmod.def 	sfrexp.def 	sldexp.def 	slog10.def 	slogarithm.def 	spow.def 	ssine.def 	ssineh.def 	ssqrt.def 	stan.def 	stanh.def 	wjn.def
+chobj = eacosh.def 	eatanh.def 	ehypot.def 	eremainder.def 	erlgamma.def 	sacos.def 	sasine.def 	sasinh.def 	satan.def 	satan2.def 	satangent.def 	scosh.def 	serf.def 	sexp.def 	sfabs.def 	sfloor.def 	sfmod.def 	sfrexp.def 	sisnan.def 	sldexp.def 	slog10.def 	slogarithm.def 	spow.def 	ssine.def 	ssineh.def 	ssqrt.def 	stan.def 	stanh.def 	wjn.def
 
 
 SUFFIXES = .def
@@ -143,19 +143,21 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@s_sin.$(OBJEXT) s_floor.$(OBJEXT) s_sine.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@s_sincos.$(OBJEXT) s_atangent.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@s_logarithm.$(OBJEXT) s_sineh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_ceil.$(OBJEXT) e_acosh.$(OBJEXT) e_atanh.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_ceil.$(OBJEXT) s_isnan.$(OBJEXT) s_isinf.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@e_acosh.$(OBJEXT) e_atanh.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@e_remainder.$(OBJEXT) er_gamma.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@er_lgamma.$(OBJEXT) s_erf.$(OBJEXT) e_j0.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@e_j1.$(OBJEXT) w_jn.$(OBJEXT) e_hypot.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@w_cabs.$(OBJEXT) w_drem.$(OBJEXT) s_asinh.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@s_fmod.$(OBJEXT) e_scalb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_signif.$(OBJEXT) s_exp2.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_tgamma.$(OBJEXT) sf_ceil.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_acos.$(OBJEXT) sf_frexp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_cos.$(OBJEXT) sf_sinh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_asine.$(OBJEXT) sf_cosh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_ispos.$(OBJEXT) sf_numtest.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_sqrt.$(OBJEXT) sf_asin.$(OBJEXT) sf_exp.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_infconst.$(OBJEXT) s_signif.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_exp2.$(OBJEXT) s_tgamma.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_ceil.$(OBJEXT) sf_acos.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_frexp.$(OBJEXT) sf_cos.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_sinh.$(OBJEXT) sf_asine.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_cosh.$(OBJEXT) sf_ispos.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_numtest.$(OBJEXT) sf_sqrt.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_asin.$(OBJEXT) sf_exp.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sf_ldexp.$(OBJEXT) sf_pow.$(OBJEXT) sf_tan.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sf_atan2.$(OBJEXT) sf_fabs.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sf_tanh.$(OBJEXT) sf_atan.$(OBJEXT) \
@@ -164,6 +166,7 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@sf_sincos.$(OBJEXT) sf_atangent.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sf_logarithm.$(OBJEXT) sf_sineh.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sf_log.$(OBJEXT) sf_sineh.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@sf_isnan.$(OBJEXT) sf_isinf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@ef_acosh.$(OBJEXT) ef_atanh.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@ef_remainder.$(OBJEXT) erf_gamma.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@erf_lgamma.$(OBJEXT) sf_erf.$(OBJEXT) \
@@ -182,10 +185,11 @@ libmathfp_la_LIBADD =
 @USE_LIBTOOL_TRUE@s_ldexp.lo s_pow.lo s_tan.lo s_atan.lo s_atan2.lo \
 @USE_LIBTOOL_TRUE@s_fabs.lo s_log.lo s_tanh.lo s_log10.lo s_sin.lo \
 @USE_LIBTOOL_TRUE@s_floor.lo s_sine.lo s_sincos.lo s_atangent.lo \
-@USE_LIBTOOL_TRUE@s_logarithm.lo s_sineh.lo s_ceil.lo e_acosh.lo \
-@USE_LIBTOOL_TRUE@e_atanh.lo e_remainder.lo er_gamma.lo er_lgamma.lo \
-@USE_LIBTOOL_TRUE@s_erf.lo e_j0.lo e_j1.lo w_jn.lo e_hypot.lo w_cabs.lo \
-@USE_LIBTOOL_TRUE@w_drem.lo s_asinh.lo s_fmod.lo e_scalb.lo s_signif.lo \
+@USE_LIBTOOL_TRUE@s_logarithm.lo s_sineh.lo s_ceil.lo s_isnan.lo \
+@USE_LIBTOOL_TRUE@s_isinf.lo e_acosh.lo e_atanh.lo e_remainder.lo \
+@USE_LIBTOOL_TRUE@er_gamma.lo er_lgamma.lo s_erf.lo e_j0.lo e_j1.lo \
+@USE_LIBTOOL_TRUE@w_jn.lo e_hypot.lo w_cabs.lo w_drem.lo s_asinh.lo \
+@USE_LIBTOOL_TRUE@s_fmod.lo e_scalb.lo s_infconst.lo s_signif.lo \
 @USE_LIBTOOL_TRUE@s_exp2.lo s_tgamma.lo sf_ceil.lo sf_acos.lo \
 @USE_LIBTOOL_TRUE@sf_frexp.lo sf_cos.lo sf_sinh.lo sf_asine.lo \
 @USE_LIBTOOL_TRUE@sf_cosh.lo sf_ispos.lo sf_numtest.lo sf_sqrt.lo \
@@ -193,12 +197,12 @@ libmathfp_la_LIBADD =
 @USE_LIBTOOL_TRUE@sf_atan2.lo sf_fabs.lo sf_tanh.lo sf_atan.lo \
 @USE_LIBTOOL_TRUE@sf_log10.lo sf_sin.lo sf_floor.lo sf_sine.lo \
 @USE_LIBTOOL_TRUE@sf_sincos.lo sf_atangent.lo sf_logarithm.lo \
-@USE_LIBTOOL_TRUE@sf_sineh.lo sf_log.lo sf_sineh.lo ef_acosh.lo \
-@USE_LIBTOOL_TRUE@ef_atanh.lo ef_remainder.lo erf_gamma.lo \
-@USE_LIBTOOL_TRUE@erf_lgamma.lo sf_erf.lo ef_j0.lo ef_j1.lo wf_jn.lo \
-@USE_LIBTOOL_TRUE@ef_hypot.lo wf_cabs.lo wf_drem.lo sf_asinh.lo \
-@USE_LIBTOOL_TRUE@sf_fmod.lo ef_scalb.lo sf_signif.lo sf_exp2.lo \
-@USE_LIBTOOL_TRUE@sf_tgamma.lo
+@USE_LIBTOOL_TRUE@sf_sineh.lo sf_log.lo sf_sineh.lo sf_isnan.lo \
+@USE_LIBTOOL_TRUE@sf_isinf.lo ef_acosh.lo ef_atanh.lo ef_remainder.lo \
+@USE_LIBTOOL_TRUE@erf_gamma.lo erf_lgamma.lo sf_erf.lo ef_j0.lo \
+@USE_LIBTOOL_TRUE@ef_j1.lo wf_jn.lo ef_hypot.lo wf_cabs.lo wf_drem.lo \
+@USE_LIBTOOL_TRUE@sf_asinh.lo sf_fmod.lo ef_scalb.lo sf_signif.lo \
+@USE_LIBTOOL_TRUE@sf_exp2.lo sf_tgamma.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -494,6 +498,9 @@ sfmod.def: s_fmod.c
 sfrexp.def: s_frexp.c
 	$(CHEW) < $(srcdir)/s_frexp.c >$@ 2>/dev/null
 	touch stmp-def
+sisnan.def: s_isnan.c
+	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
+	touch stmp-def
 sldexp.def: s_ldexp.c
 	$(CHEW) < $(srcdir)/s_ldexp.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/mathfp/mathfp.tex b/newlib/libm/mathfp/mathfp.tex
index 0b9f08557..6286405a0 100644
--- a/newlib/libm/mathfp/mathfp.tex
+++ b/newlib/libm/mathfp/mathfp.tex
@@ -25,7 +25,7 @@ Since the error handling code calls @code{fputs}, the mathematical
 subroutines require stubs or minimal implementations for the same list
 of OS subroutines as @code{fputs}: @code{close}, @code{fstat},
 @code{isatty}, @code{lseek}, @code{read}, @code{sbrk}, @code{write}.
-@xref{syscalls,,System Calls, libc.info, The Red Hat newlib C Library},
+@xref{syscalls,,System Calls, libc.info, The Cygnus C Support Library},
 for a discussion and for sample minimal implementations of these support
 subroutines.
 
@@ -139,12 +139,6 @@ The library is set to X/Open mode by default.
 @include mathfp/wjn.def
 
 @page
-@include common/scbrt.def
-
-@page
-@include common/scopysign.def
-
-@page
 @include mathfp/scosh.def
 
 @page
@@ -154,9 +148,6 @@ The library is set to X/Open mode by default.
 @include mathfp/sexp.def
 
 @page
-@include common/sexpm1.def
-
-@page
 @include mathfp/sfabs.def
 
 @page
@@ -175,13 +166,7 @@ The library is set to X/Open mode by default.
 @include mathfp/ehypot.def
 
 @page
-@include common/silogb.def
-
-@page
-@include common/sinfinity.def
-
-@page
-@include common/sisnan.def
+@include mathfp/sisnan.def
 
 @page
 @include mathfp/sldexp.def
@@ -193,30 +178,12 @@ The library is set to X/Open mode by default.
 @include mathfp/slog10.def
 
 @page
-@include common/slog1p.def
-
-@page
-@include common/smatherr.def
-
-@page
-@include common/smodf.def
-
-@page
-@include common/snan.def
-
-@page
-@include common/snextafter.def
-
-@page
 @include mathfp/spow.def
 
 @page
 @include mathfp/eremainder.def
 
 @page
-@include common/sscalbn.def
-
-@page
 @include mathfp/ssqrt.def
 
 @page
diff --git a/newlib/libm/mathfp/s_atangent.c b/newlib/libm/mathfp/s_atangent.c
index 0a7c4d2f8..981e1c822 100644
--- a/newlib/libm/mathfp/s_atangent.c
+++ b/newlib/libm/mathfp/s_atangent.c
@@ -197,9 +197,9 @@ _DEFUN (atangent, (double, double, double, int),
 
   if (arctan2)
     {
-      if (u < 0.0)
+      if (u < 0.0 || branch == 2)
         res = __PI - res;
-      if (v < 0.0)
+      if (v < 0.0 || branch == 1)
         res = -res;
     }
   else if (x < 0.0)
diff --git a/newlib/libm/mathfp/s_frexp.c b/newlib/libm/mathfp/s_frexp.c
index 54fa336c8..08611e9a7 100644
--- a/newlib/libm/mathfp/s_frexp.c
+++ b/newlib/libm/mathfp/s_frexp.c
@@ -82,17 +82,6 @@ double frexp (double d, int *exp)
   double f;
   __uint32_t hd, ld, hf, lf;
 
-  /* Check for special values. */
-  switch (numtest (d))
-    {
-      case NAN:
-      case INF:
-        errno = EDOM;
-      case 0:
-        *exp = 0;
-        return (d);
-    }
-
   EXTRACT_WORDS (hd, ld, d);
 
   /* Get the exponent. */
@@ -105,6 +94,16 @@ double frexp (double d, int *exp)
 
   INSERT_WORDS (f, hf, lf);
 
+  /* Check for special values. */
+  switch (numtest (f))
+    {
+      case NAN:
+      case INF:
+        errno = EDOM;
+        *exp = 0;
+        return (f);
+    }
+
   return (f);
 }
 
diff --git a/newlib/libm/mathfp/s_infconst.c b/newlib/libm/mathfp/s_infconst.c
new file mode 100644
index 000000000..e6b86d497
--- /dev/null
+++ b/newlib/libm/mathfp/s_infconst.c
@@ -0,0 +1,15 @@
+/* Infinity as a constant value.   This is used for HUGE_VAL.
+ * Added by Cygnus Support.
+ */
+
+#include "fdlibm.h"
+
+#ifndef _DOUBLE_IS_32BITS
+#ifdef __IEEE_BIG_ENDIAN
+const union __dmath __infinity[1] = {{ 0x7ff00000, 0 }};
+#else
+const union __dmath __infinity[1] = {{ 0, 0x7ff00000 }};
+#endif
+#else /* defined (_DOUBLE_IS_32BITS) */
+const union __dmath __infinity[1] = {{ 0x7f800000, 0 }};
+#endif /* defined (_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/mathfp/s_isinf.c b/newlib/libm/mathfp/s_isinf.c
new file mode 100644
index 000000000..fe9f54799
--- /dev/null
+++ b/newlib/libm/mathfp/s_isinf.c
@@ -0,0 +1,37 @@
+
+/* @(#)z_isinf.c 1.0 98/08/13 */
+/******************************************************************
+ * isinf
+ *
+ * Input:
+ *   x - pointer to a floating point value
+ *
+ * Output:
+ *   An integer that indicates if the number is infinite.
+ *
+ * Description:
+ *   This routine returns an integer that indicates if the number
+ *   passed in is infinite (1) or is finite (0).
+ *
+ *****************************************************************/
+
+#include "fdlibm.h"
+#include "zmath.h"
+
+#ifndef _DOUBLE_IS_32BITS
+
+int isinf (double x)
+{
+  __uint32_t lx, hx;
+  int exp;
+
+  EXTRACT_WORDS (hx, lx, x);
+  exp = (hx & 0x7ff00000) >> 20;
+
+  if ((exp == 0x7ff) && ((hx & 0xf0000 || lx) == 0))
+    return (1);
+  else
+    return (0);
+}
+
+#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/mathfp/s_isnan.c b/newlib/libm/mathfp/s_isnan.c
new file mode 100644
index 000000000..03cfeee59
--- /dev/null
+++ b/newlib/libm/mathfp/s_isnan.c
@@ -0,0 +1,125 @@
+
+/* @(#)z_isnan.c 1.0 98/08/13 */
+
+/*
+FUNCTION
+        <<isnan>>,<<isnanf>>,<<isinf>>,<<isinff>>,<<finite>>,<<finitef>>---test
+for exceptional numbers
+
+INDEX
+        isnan
+INDEX
+        isinf
+INDEX
+        finite
+
+INDEX
+        isnanf
+INDEX
+        isinff
+INDEX
+        finitef
+
+ANSI_SYNOPSIS
+        #include <ieeefp.h>
+        int isnan(double <[arg]>);
+        int isinf(double <[arg]>);
+        int finite(double <[arg]>);
+        int isnanf(float <[arg]>);
+        int isinff(float <[arg]>);
+        int finitef(float <[arg]>);
+
+TRAD_SYNOPSIS
+        #include <ieeefp.h>
+        int isnan(<[arg]>)
+        double <[arg]>;
+        int isinf(<[arg]>)
+        double <[arg]>;
+        int finite(<[arg]>);
+        double <[arg]>;
+        int isnanf(<[arg]>);
+        float <[arg]>;
+        int isinff(<[arg]>);
+        float <[arg]>;
+        int finitef(<[arg]>);
+        float <[arg]>;
+
+
+DESCRIPTION
+        These functions provide information on the floating-point
+        argument supplied.
+
+        There are five major number formats -
+        o+
+        o zero
+         a number which contains all zero bits.
+        o subnormal
+         Is used to represent  number with a zero exponent, but a nonzero fract
+ion.
+         o normal
+          A number with an exponent, and a fraction
+        o infinity
+          A number with an all 1's exponent and a zero fraction.
+        o NAN
+          A number with an all 1's exponent and a nonzero fraction.
+
+        o-
+
+        <<isnan>> returns 1 if the argument is a nan. <<isinf>>
+        returns 1 if the argument is infinity.  <<finite>> returns 1 if the
+        argument is zero, subnormal or normal.
+
+        The <<isnanf>>, <<isinff>> and <<finitef>> perform the same
+        operations as their <<isnan>>, <<isinf>> and <<finite>>
+        counterparts, but on single-precision floating-point numbers.
+
+QUICKREF
+        isnan - pure
+QUICKREF
+        isinf - pure
+QUICKREF
+        finite - pure
+QUICKREF
+        isnan - pure
+QUICKREF
+        isinf - pure
+QUICKREF
+        finite - pure
+*/
+
+
+/******************************************************************
+ * isnan
+ *
+ * Input:
+ *   x - pointer to a floating-point value
+ *
+ * Output:
+ *   An integer that indicates if the number is NaN.
+ *
+ * Description:
+ *   This routine returns an integer that indicates if the number
+ *   passed in is NaN (1) or is finite (0).
+ *
+ *****************************************************************/
+
+#include "fdlibm.h"
+#include "zmath.h"
+
+#ifndef _DOUBLE_IS_32BITS
+
+int isnan (double x)
+{
+  __uint32_t lx, hx;
+  int exp;
+
+  EXTRACT_WORDS (hx, lx, x);
+  exp = (hx & 0x7ff00000) >> 20;
+
+  if ((exp == 0x7ff) && (hx & 0xf0000 || lx))
+    return (1);
+  else
+    return (0);
+}
+
+#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/mathfp/s_ldexp.c b/newlib/libm/mathfp/s_ldexp.c
index 6da41284b..5ce2710ac 100644
--- a/newlib/libm/mathfp/s_ldexp.c
+++ b/newlib/libm/mathfp/s_ldexp.c
@@ -45,7 +45,7 @@ On underflow, <<ldexp>> and <<ldexpf>> return 0.0.
 On overflow, <<ldexp>> returns plus or minus <<HUGE_VAL>>.
 
 PORTABILITY
-<<ldexp>> is ANSI. <<ldexpf>> is an extension.
+<<ldexp>> is ANSI, <<ldexpf>> is an extension.
 
 */
 
diff --git a/newlib/libm/mathfp/s_logarithm.c b/newlib/libm/mathfp/s_logarithm.c
index 3e07949c8..ee7c7069e 100644
--- a/newlib/libm/mathfp/s_logarithm.c
+++ b/newlib/libm/mathfp/s_logarithm.c
@@ -56,9 +56,8 @@ When <[x]> is negative, the returned value is <<-HUGE_VAL>> and
 <<matherr>>.
 
 PORTABILITY
-<<log>> is ANSI. <<logf>> is an extension.
-
-<<log10>> is ANSI. <<log10f>> is an extension.
+<<log>> is ANSI, <<logf>> is an extension.
+<<log10>> is ANSI, <<log10f>> is an extension.
 */
 
 
diff --git a/newlib/libm/mathfp/s_mathcnst.c b/newlib/libm/mathfp/s_mathcnst.c
index a847ee430..7865c7f78 100644
--- a/newlib/libm/mathfp/s_mathcnst.c
+++ b/newlib/libm/mathfp/s_mathcnst.c
@@ -12,13 +12,13 @@ ufloat z_hugeval_f  = { 0x7f800000 };
 ufloat z_infinity_f = { 0x7f800000 };
 ufloat z_notanum_f  = { 0xffd00000 };
 
-#ifdef __IEEE_BIG_ENDIAN
+#ifdef ___IEEE_LITTLE_ENDIAN
 udouble z_hugeval  = { 0x7ff00000, 0 };
 udouble z_infinity = { 0x7ff00000, 0 };
 udouble z_notanum  = { 0xfff80000, 0 };
-#else /* __IEEE_LITTLE_ENDIAN  */
+#else
 udouble z_hugeval  = { 0, 0x7ff00000 };
 udouble z_infinity = { 0, 0x7ff00000 };
 udouble z_notanum  = { 0, 0xfff80000 };
-#endif /* __IEEE_LITTLE_ENDIAN */
+#endif /* ___IEEE_LITTLE_ENDIAN */
 
diff --git a/newlib/libm/mathfp/s_pow.c b/newlib/libm/mathfp/s_pow.c
index 90d9d0b5f..3514510d0 100644
--- a/newlib/libm/mathfp/s_pow.c
+++ b/newlib/libm/mathfp/s_pow.c
@@ -75,10 +75,9 @@ double pow (double x, double y)
         }
     }
 
-  if (x == 0.0)
+  if (x == 0.0 && y <= 0.0)
     {
-      if (y <= 0.0)
-        errno = EDOM;
+      errno = EDOM;
     }
   else if ((t = y * log (fabs (x))) >= BIGX) 
     {
diff --git a/newlib/libm/mathfp/sf_atangent.c b/newlib/libm/mathfp/sf_atangent.c
index 7a8f0cebe..55a90063c 100644
--- a/newlib/libm/mathfp/sf_atangent.c
+++ b/newlib/libm/mathfp/sf_atangent.c
@@ -126,9 +126,9 @@ _DEFUN (atangentf, (float, float, float, int),
 
   if (arctan2)
     {
-      if (u < 0.0)
+      if (u < 0.0 || branch == 2)
         res = __PI - res;
-      if (v < 0.0)
+      if (v < 0.0 || branch == 1)
         res = -res;
     }
   else if (x < 0.0)
diff --git a/newlib/libm/mathfp/sf_frexp.c b/newlib/libm/mathfp/sf_frexp.c
index 7f25195c8..c2751f65c 100644
--- a/newlib/libm/mathfp/sf_frexp.c
+++ b/newlib/libm/mathfp/sf_frexp.c
@@ -24,17 +24,6 @@ float frexpf (float d, int *exp)
   float f;
   __int32_t wf, wd;
 
-  /* Check for special values. */
-  switch (numtestf (d))
-    {
-      case NAN:
-      case INF:
-        errno = EDOM;
-      case 0:
-        *exp = 0;
-        return (d);
-    }
-
   GET_FLOAT_WORD (wd, d);
 
   /* Get the exponent. */
@@ -46,6 +35,16 @@ float frexpf (float d, int *exp)
 
   SET_FLOAT_WORD (f, wf);
 
+  /* Check for special values. */
+  switch (numtestf (f))
+    {
+      case NAN:
+      case INF:
+        errno = EDOM;
+        *exp = 0;
+        return (f);
+    }
+
   return (f);
 }
 
diff --git a/newlib/libm/mathfp/sf_isinf.c b/newlib/libm/mathfp/sf_isinf.c
new file mode 100644
index 000000000..84ab3f71c
--- /dev/null
+++ b/newlib/libm/mathfp/sf_isinf.c
@@ -0,0 +1,48 @@
+
+/* @(#)z_isinff.c 1.0 98/08/13 */
+/******************************************************************
+ * isinff
+ *
+ * Input:
+ *   x - pointer to a floating point value
+ *
+ * Output:
+ *   An integer that indicates if the number is infinite.
+ *
+ * Description:
+ *   This routine returns an integer that indicates if the number
+ *   passed in is infinite (1) or is finite (0).
+ *
+ *****************************************************************/
+
+#include "fdlibm.h"
+#include "zmath.h"
+
+int 
+_DEFUN (isinff, (float),
+	float x)
+{
+  __uint32_t wx;
+  int exp;
+
+  GET_FLOAT_WORD (wx, x);
+  exp = (wx & 0x7f800000) >> 23;
+
+  if ((exp == 0x7f8) && !(wx & 0xf0000))
+    return (1);
+  else
+    return (0);
+}
+
+#ifdef _DOUBLE_IS_32BITS
+
+int
+_DEFUN (isinf, (double),
+        double x)
+{
+  return isinff ((float) x);
+}
+
+#endif /* defined(_DOUBLE_IS_32BITS) */
+
+
diff --git a/newlib/libm/mathfp/sf_isnan.c b/newlib/libm/mathfp/sf_isnan.c
new file mode 100644
index 000000000..ac557a6b8
--- /dev/null
+++ b/newlib/libm/mathfp/sf_isnan.c
@@ -0,0 +1,48 @@
+
+/* @(#)z_isnanf.c 1.0 98/08/13 */
+/******************************************************************
+ * isnanf
+ *
+ * Input:
+ *   x - pointer to a floating point value
+ *
+ * Output:
+ *   An integer that indicates if the number is NaN.
+ *
+ * Description:
+ *   This routine returns an integer that indicates if the number
+ *   passed in is NaN (1) or is finite (0).
+ *
+ *****************************************************************/
+
+#include "fdlibm.h"
+#include "zmath.h"
+
+int
+_DEFUN (isnanf, (float),
+        float x)
+{
+  __int32_t wx;
+  int exp;
+
+  GET_FLOAT_WORD (wx, x);
+  exp = (wx & 0x7f800000) >> 23;
+
+  if ((exp == 0x7f8) && (wx & 0x7fffff))
+    return (1);
+  else
+    return (0);
+}
+
+
+#ifdef _DOUBLE_IS_32BITS
+
+int
+_DEFUN (isnan, (double),
+        double x)
+{
+  return isnanf((float) x);
+}
+
+#endif /* defined(_DOUBLE_IS_32BITS) */
+
diff --git a/newlib/libm/mathfp/sf_pow.c b/newlib/libm/mathfp/sf_pow.c
index 489a71dd0..932e75dbb 100644
--- a/newlib/libm/mathfp/sf_pow.c
+++ b/newlib/libm/mathfp/sf_pow.c
@@ -29,10 +29,9 @@ float powf (float x, float y)
         }
     }
 
-  if (x == 0.0)
+  if (x == 0.0 && y <= 0.0)
     {
-      if (y <= 0.0)
-        errno = EDOM;
+      errno = EDOM;
     }
   else if ((t = y * log (fabsf (x))) >= BIGX) 
     {
diff --git a/newlib/libm/mathfp/w_jn.c b/newlib/libm/mathfp/w_jn.c
index 14c2225f0..bd7878104 100644
--- a/newlib/libm/mathfp/w_jn.c
+++ b/newlib/libm/mathfp/w_jn.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-<<jN>>, <<jNf>>, <<yN>>, <<yNf>>---Bessel functions
+<<jN>>,<<jNf>>,<<yN>>,<<yNf>>---Bessel functions
 
 INDEX
 j0
diff --git a/newlib/newlib.hin b/newlib/newlib.hin
index 207192897..b08160cdb 100644
--- a/newlib/newlib.hin
+++ b/newlib/newlib.hin
@@ -1,4 +1,3 @@
-/* newlib.hin.  Generated automatically from configure.in by autoheader.  */
 #ifndef __NEWLIB_H__
 
 #define __NEWLIB_H__ 1
@@ -30,16 +29,6 @@
 /* Enable ICONV external CCS files loading capabilities */
 #undef _ICONV_ENABLE_EXTERNAL_CCS
 
-/* Define if the linker supports .preinit_array/.init_array/.fini_array
- * sections.  */
-#undef  HAVE_INITFINI_ARRAY
-
-/* True if atexit() may dynamically allocate space for cleanup
-   functions.  */
-#undef  _ATEXIT_DYNAMIC_ALLOC
-
-/* Define if the compiler supports aliasing an array to an address.  */
-#undef  _HAVE_ARRAY_ALIASING
 /*
  * Iconv encodings enabled ("to" direction)
  */
@@ -148,5 +137,12 @@
 #undef _ICONV_FROM_ENCODING_WIN_1257
 #undef _ICONV_FROM_ENCODING_WIN_1258
 
+/* Define if the linker supports .preinit_array/.init_array/.fini_array
+ * sections.  */
+#undef  HAVE_INITFINI_ARRAY
+
+/* Define if the compiler supports aliasing an array to an address.  */
+#undef  _HAVE_ARRAY_ALIASING
+
 #endif /* !__NEWLIB_H__ */
 
diff --git a/newlib/stamp-h.in b/newlib/stamp-h.in
index 9788f7023..e69de29bb 100644
--- a/newlib/stamp-h.in
+++ b/newlib/stamp-h.in
@@ -1 +0,0 @@
-timestamp
diff --git a/newlib/testsuite/lib/checkoutput.exp b/newlib/testsuite/lib/checkoutput.exp
index 146f87b00..8cb46925f 100644
--- a/newlib/testsuite/lib/checkoutput.exp
+++ b/newlib/testsuite/lib/checkoutput.exp
@@ -9,19 +9,17 @@
 # It assumes one line of output per test.
 
 proc newlib_check_output { srcfile expectlist } {
-    global subdir srcdir tmpdir
+    global objdir subdir srcdir
 
     set srcfullname "$srcdir/$subdir/$srcfile"
-    set test_driver "$tmpdir/[file tail [file rootname $srcfullname].x]"
+    set test_driver "$objdir/testsuite/[file tail [file rootname $srcfullname].x]"
 
     set comp_output [newlib_target_compile "$srcfullname" "$test_driver" "executable" ""]
 
     if { $comp_output != "" } {
-	fail "$subdir/$srcfile compilation"
-	unresolved "$subdir/$srcfile output"
+	fail "Failed to compile $srcfile.\n"
 	return
     }
-    pass "$subdir/$srcfile compilation"
 
     set result [newlib_load $test_driver ""]
     set status [lindex $result 0]
@@ -32,12 +30,11 @@ proc newlib_check_output { srcfile expectlist } {
     foreach { expectedval } $expectlist {
 	set gotval [string trim [lindex $output_lines 0] "\r"]
 	if { ! [string match $expectedval $gotval] } {
-	    verbose -log "$subdir/$srcfile: Expected: $expectedval Got: $gotval "
-	    fail "$subdir/$srcfile output"
+	    fail "$srcfile: Expected: $expectedval Got: $gotval "
 	    return
 	}
 	set output_lines [lrange $output_lines 1 end]
     }
 
-    pass "$subdir/$srcfile output"
+    pass $srcfile
 }
diff --git a/newlib/testsuite/lib/flags.exp b/newlib/testsuite/lib/flags.exp
index ebc69286f..f6bffde1f 100644
--- a/newlib/testsuite/lib/flags.exp
+++ b/newlib/testsuite/lib/flags.exp
@@ -12,20 +12,12 @@
 # directories, rather than in the build and source paths of the
 # compiler being used.
 
-if {![llength [info procs saved_libgloss_link_flags]]} {
-    rename libgloss_link_flags saved_libgloss_link_flags
-}
-
 proc libgloss_link_flags { args } {
     global target_cpu
     # These values come from the local site.exp.
     global srcdir objdir
     global multibuildtop
 
-    if {![info exists multibuildtop]} {
-	return [saved_libgloss_link_flags $args]
-    }
-
     verbose "In newlib version of libgloss_link_flags...\n"
 
     if [isnative] {
diff --git a/newlib/testsuite/lib/newlib.exp b/newlib/testsuite/lib/newlib.exp
index f1df40e52..c53a8a819 100644
--- a/newlib/testsuite/lib/newlib.exp
+++ b/newlib/testsuite/lib/newlib.exp
@@ -23,7 +23,7 @@ proc newlib_init { args } {
     global newlib_initialized
     global target_info
     # These values are initialized in the local site.exp file.
-    global srcdir objdir tmpdir
+    global srcdir objdir
     global host_triplet target_triplet
     global old_ld_library_path
 
@@ -34,7 +34,7 @@ proc newlib_init { args } {
     if {[target_info needs_status_wrapper] != "" && \
 	    [target_info needs_status_wrapper] != "0" && \
 	    ![info exists gluefile]} {
-	set gluefile ${tmpdir}/testglue.o;
+	set gluefile ${objdir}/testsuite/testglue.o;
 	set result [build_wrapper $gluefile];
 	if { $result != "" } {
 	    set gluefile [lindex $result 0];
diff --git a/newlib/testsuite/lib/passfail.exp b/newlib/testsuite/lib/passfail.exp
index 5e7eb21e7..82dc0093c 100644
--- a/newlib/testsuite/lib/passfail.exp
+++ b/newlib/testsuite/lib/passfail.exp
@@ -32,21 +32,19 @@ proc newlib_pass_fail_all { flag exclude_list } {
 # compiles and runs.
 
 proc newlib_pass_fail { srcfile } {
-    global srcdir tmpdir subdir
+    global srcdir objdir subdir
 
     set fullsrcfile "$srcdir/$subdir/$srcfile"
 
-    set test_driver "$tmpdir/[file rootname $srcfile].x"
+    set test_driver "$objdir/testsuite/[file rootname $srcfile].x"
 
     set comp_output [newlib_target_compile "$fullsrcfile" "$test_driver" "executable" ""]
 
     if { $comp_output != "" } {
-	fail "$subdir/$srcfile compilation"
-	unresolved "$subdir/$srcfile execution"
+	fail "Failed to compile $fullsrcfile.\n"
     } else {
-	pass "$subdir/$srcfile compilation"
 	set result [newlib_load $test_driver ""]
 	set status [lindex $result 0]
-	$status "$subdir/$srcfile execution"
+	$status "$fullsrcfile"
     }
 }
diff --git a/setup.com b/setup.com
index 6083dda32..553afd55a 100644
--- a/setup.com
+++ b/setup.com
@@ -3,5 +3,6 @@ $!
 $ define aout [-.INCLUDE.AOUT]
 $ define coff [-.INCLUDE.COFF]
 $ define elf [-.INCLUDE.ELF]
+$ define mpw [-.INCLUDE.MPW]
 $ define nlm [-.INCLUDE.NLM]
 $ define opcode [-.INCLUDE.OPCODE]
diff --git a/src-release b/src-release
index 40a34d877..9837ba3dc 100644
--- a/src-release
+++ b/src-release
@@ -13,7 +13,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
 # This Makefile contains release scripts for gdb, binutils, and other
@@ -159,6 +159,14 @@ do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
 	done
 	cd etc && $(MAKE) info
 	$(MAKE) distclean
+	# Kludge for pr gdb/708.  'configure' configures in
+	# dejagnu/example/calc, but 'make distclean' does not clean in
+	# dejagnu/example.  Someday somebody might fix this in dejagnu,
+	# and then import a new dejagnu into sourceware.  Right now, a
+	# couple of 'rm' commands will get the gdb snapshots working
+	# again.  -- chastain 2003-08-15
+	rm -f dejagnu/example/calc/config.status
+	rm -f dejagnu/example/calc/config.log
 	# Kludge for pr gdb/857.  intl/Makefile.in lacks a couple
 	# of files in the distclean rule.  Zack W is planning to make
 	# the gcc version of intl/ the master version and then push
@@ -276,6 +284,30 @@ gdb.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
 		MD5PROG="$(MD5PROG)" \
 		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
 
+DEJAGNU_SUPPORT_DIRS=  tcl expect libiberty
+.PHONY: dejagnu.tar.bz2
+dejagnu.tar.bz2: $(DIST_SUPPORT) $(DEJAGNU_SUPPORT_DIRS) dejagnu
+	$(MAKE) -f $(SELF) gdb-taz TOOL=dejagnu \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(DEJAGNU_SUPPORT_DIRS)"
+.PHONY: dejagnu.tar
+dejagnu.tar: $(DIST_SUPPORT) $(DEJAGNU_SUPPORT_DIRS) dejagnu
+	$(MAKE) -f $(SELF) gdb-tar TOOL=dejagnu \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(DEJAGNU_SUPPORT_DIRS)"
+
+.PHONY: gdb+dejagnu.tar.bz2
+GDBD_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl expect dejagnu
+gdb+dejagnu.tar.bz2: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
+	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb PACKAGE=gdb+dejagnu \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"
+.PHONY: gdb+dejagnu.tar
+gdb+dejagnu.tar: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
+	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb PACKAGE=gdb+dejagnu \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"
+
 .PHONY: insight.tar.bz2
 INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl libgui
 insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
@@ -288,5 +320,17 @@ insight.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
 		MD5PROG="$(MD5PROG)" \
 		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
 
+.PHONY: insight+dejagnu.tar.bz2
+INSIGHTD_SUPPORT_DIRS= $(INSIGHT_SUPPORT_DIRS) expect dejagnu
+insight+dejagnu.tar.bz2: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
+	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb PACKAGE="insight+dejagnu" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"
+.PHONY: insight+dejagnu.tar
+insight+dejagnu.tar: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
+	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb PACKAGE="insight+dejagnu" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"
+
 .NOEXPORT:
 MAKEOVERRIDES=
diff --git a/symlink-tree b/symlink-tree
index a9d50831b..22132c76a 100755
--- a/symlink-tree
+++ b/symlink-tree
@@ -15,8 +15,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/ylwrap b/ylwrap
index 102bd893f..2288ccde3 100755
--- a/ylwrap
+++ b/ylwrap
@@ -1,11 +1,6 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-#
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -20,84 +15,58 @@ scriptversion=2005-05-14.22
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# Usage:
+#     ylwrap PROGRAM INPUT [OUTPUT DESIRED]... -- [ARGS]...
+# * PROGRAM is program to run.
+# * INPUT is the input file
+# * OUTPUT is file PROG generates
+# * DESIRED is file we actually want
+# * ARGS are passed to PROG
+# Any number of OUTPUT,DESIRED pairs may be used.
 
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case "$1" in
-  '')
-    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
-    exit 1
-    ;;
-  --basedir)
-    basedir=$2
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-
-Wrapper for lex/yacc invocations, renaming files as desired.
-
-  INPUT is the input file
-  OUTPUT is one file PROG generates
-  DESIRED is the file we actually want instead of OUTPUT
-  PROGRAM is program to run
-  ARGS are passed to PROG
-
-Any number of OUTPUT,DESIRED pairs may be used.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v|--v*)
-    echo "ylwrap $scriptversion"
-    exit $?
-    ;;
+# The program to run.
+prog="$1"
+shift
+# Make any relative path in $prog absolute.
+case "$prog" in
+ /* | [A-Za-z]:\\*) ;;
+ */*) prog="`pwd`/$prog" ;;
 esac
 
-
 # The input.
 input="$1"
 shift
 case "$input" in
-  [\\/]* | ?:[\\/]*)
+ /* | [A-Za-z]:\\*)
     # Absolute path; do nothing.
     ;;
-  *)
-    # Relative path.  Make it absolute.
+ *)
+    # Relative path.  Make it absolute.  Why?  Because otherwise any
+    # debugging info in the generated file will point to the wrong
+    # place.  This is really gross.
     input="`pwd`/$input"
     ;;
 esac
 
+# We don't want to use the absolute path if the input in the current
+# directory like when making a tar ball.
+input_base=`echo $input | sed -e 's|.*/||'`
+if test -f $input_base && cmp $input_base $input >/dev/null 2>&1; then
+  input=$input_base
+fi
+
 pairlist=
 while test "$#" -ne 0; do
-  if test "$1" = "--"; then
-    shift
-    break
-  fi
-  pairlist="$pairlist $1"
-  shift
+   if test "$1" = "--"; then
+      shift
+      break
+   fi
+   pairlist="$pairlist $1"
+   shift
 done
 
-# The program to run.
-prog="$1"
-shift
-# Make any relative path in $prog absolute.
-case "$prog" in
-  [\\/]* | ?:[\\/]*) ;;
-  *[\\/]*) prog="`pwd`/$prog" ;;
-esac
-
 # FIXME: add hostname here for parallel makes that run commands on
 # other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
@@ -105,119 +74,50 @@ trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
 mkdir $dirname || exit 1
 
 cd $dirname
-
-case $# in
-  0) $prog "$input" ;;
-  *) $prog "$@" "$input" ;;
+case "$input" in
+ /* | [A-Za-z]:\\*)
+    # Absolute path; do nothing.
+    ;;
+ *)
+    # Make a symbolic link, hard link or hardcopy.
+    ln -s ../"$input" . > /dev/null 2>&1 || ln ../"$input" . > /dev/null 2>&1 || cp ../"$input" .
+    ;;
 esac
-ret=$?
-
-if test $ret -eq 0; then
-  set X $pairlist
-  shift
-  first=yes
-  # Since DOS filename conventions don't allow two dots,
-  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-  y_tab_nodot="no"
-  if test -f y_tab.c || test -f y_tab.h; then
-    y_tab_nodot="yes"
-  fi
-
-  # The directory holding the input.
-  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-  # Quote $INPUT_DIR so we can use it in a regexp.
-  # FIXME: really we should care about more than `.' and `\'.
-  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
-
-  while test "$#" -ne 0; do
-    from="$1"
-    # Handle y_tab.c and y_tab.h output by DOS
-    if test $y_tab_nodot = "yes"; then
-      if test $from = "y.tab.c"; then
-    	from="y_tab.c"
+$prog ${1+"$@"} "$input"
+status=$?
+
+if test $status -eq 0; then
+   set X $pairlist
+   shift
+   first=yes
+   while test "$#" -ne 0; do
+      if test -f "$1"; then
+         # If $2 is an absolute path name, then just use that,
+         # otherwise prepend `../'.
+         case "$2" in
+	   /* | [A-Za-z]:\\*) target="$2";;
+	   *) target="../$2";;
+	 esac
+	 mv "$1" "$target" || status=$?
       else
-    	if test $from = "y.tab.h"; then
-    	  from="y_tab.h"
-    	fi
-      fi
-    fi
-    if test -f "$from"; then
-      # If $2 is an absolute path name, then just use that,
-      # otherwise prepend `../'.
-      case "$2" in
-    	[\\/]* | ?:[\\/]*) target="$2";;
-    	*) target="../$2";;
-      esac
-
-      # We do not want to overwrite a header file if it hasn't
-      # changed.  This avoid useless recompilations.  However the
-      # parser itself (the first file) should always be updated,
-      # because it is the destination of the .y.c rule in the
-      # Makefile.  Divert the output of all other files to a temporary
-      # file so we can compare them to existing versions.
-      if test $first = no; then
-	realtarget="$target"
-	target="tmp-`echo $target | sed s/.*[\\/]//g`"
+	 # A missing file is only an error for the first file.  This
+	 # is a blatant hack to let us support using "yacc -d".  If -d
+	 # is not specified, we don't want an error when the header
+	 # file is "missing".
+	 if test $first = yes; then
+	    status=1
+	 fi
       fi
-      # Edit out `#line' or `#' directives.
-      #
-      # We don't want the resulting debug information to point at
-      # an absolute srcdir; it is better for it to just mention the
-      # .y file with no path.
-      #
-      # We want to use the real output file name, not yy.lex.c for
-      # instance.
-      #
-      # We want the include guards to be adjusted too.
-      FROM=`echo "$from" | sed \
-            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-      TARGET=`echo "$2" | sed \
-            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-
-      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
-
-      # Check whether header files must be updated.
-      if test $first = no; then
-	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-	  echo "$2" is unchanged
-	  rm -f "$target"
-	else
-          echo updating "$2"
-          mv -f "$target" "$realtarget"
-        fi
-      fi
-    else
-      # A missing file is only an error for the first file.  This
-      # is a blatant hack to let us support using "yacc -d".  If -d
-      # is not specified, we don't want an error when the header
-      # file is "missing".
-      if test $first = yes; then
-        ret=1
-      fi
-    fi
-    shift
-    shift
-    first=no
-  done
+      shift
+      shift
+      first=no
+   done
 else
-  ret=$?
+   status=$?
 fi
 
 # Remove the directory.
 cd ..
 rm -rf $dirname
 
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
+exit $status