[Debian-coldfire-commits] r14 - in trunk/binutils: . bfd bfd/doc bfd/hosts bfd/po binutils binutils/doc binutils/po binutils/testsuite binutils/testsuite/config binutils/testsuite/lib config cpu debian debian/patches etc gas gas/config gas/doc gas/po gas/testsuite gas/testsuite/gas/all gas/testsuite/gas/arm gas/testsuite/gas/i386 gas/testsuite/gas/ia64 gas/testsuite/gas/m68k gas/testsuite/gas/macros gas/testsuite/gas/mips gas/testsuite/gas/mmix gas/testsuite/gas/sparc gas/testsuite/gas/tic54x gas/testsuite/gas/v850 gprof gprof/po include include/coff include/elf include/opcode intl ld ld/emulparams ld/emultempl ld/po ld/scripttempl ld/testsuite ld/testsuite/ld-arm ld/testsuite/ld-elf ld/testsuite/ld-i386 ld/testsuite/ld-mips-elf ld/testsuite/ld-mmix ld/testsuite/ld-powerpc ld/testsuite/ld-sparc ld/testsuite/ld-x86-64 ld/testsuite/lib libiberty libiberty/testsuite opcodes opcodes/po

Wouter Verhelst wouter at costa.debian.org
Sun Apr 23 11:34:43 UTC 2006


Author: wouter
Date: 2006-04-23 11:31:49 +0000 (Sun, 23 Apr 2006)
New Revision: 14

Added:
   trunk/binutils/bfd/ChangeLog-2004
   trunk/binutils/bfd/ChangeLog-2005
   trunk/binutils/bfd/cpu-xc16x.c
   trunk/binutils/bfd/elf32-xc16x.c
   trunk/binutils/bfd/hosts/vaxlinux.h
   trunk/binutils/binutils/ChangeLog-2004
   trunk/binutils/binutils/ChangeLog-2005
   trunk/binutils/binutils/po/vi.po
   trunk/binutils/config/mh-ppc-aix
   trunk/binutils/config/stdint.m4
   trunk/binutils/cpu/xc16x.cpu
   trunk/binutils/cpu/xc16x.opc
   trunk/binutils/debian/README.cross
   trunk/binutils/debian/control.cross.in
   trunk/binutils/gas/ChangeLog-2004
   trunk/binutils/gas/ChangeLog-2005
   trunk/binutils/gas/config/tc-xc16x.c
   trunk/binutils/gas/config/tc-xc16x.h
   trunk/binutils/gas/doc/c-xc16x.texi
   trunk/binutils/gas/testsuite/ChangeLog-2004
   trunk/binutils/gas/testsuite/ChangeLog-2005
   trunk/binutils/gas/testsuite/gas/arm/abs12.d
   trunk/binutils/gas/testsuite/gas/arm/abs12.s
   trunk/binutils/gas/testsuite/gas/arm/arch7.d
   trunk/binutils/gas/testsuite/gas/arm/arch7.s
   trunk/binutils/gas/testsuite/gas/arm/arch7m-bad.d
   trunk/binutils/gas/testsuite/gas/arm/arch7m-bad.l
   trunk/binutils/gas/testsuite/gas/arm/arch7m-bad.s
   trunk/binutils/gas/testsuite/gas/arm/blx-local.d
   trunk/binutils/gas/testsuite/gas/arm/blx-local.s
   trunk/binutils/gas/testsuite/gas/arm/nomapping.d
   trunk/binutils/gas/testsuite/gas/arm/nomapping.s
   trunk/binutils/gas/testsuite/gas/arm/pic_vxworks.d
   trunk/binutils/gas/testsuite/gas/arm/svc.d
   trunk/binutils/gas/testsuite/gas/arm/svc.s
   trunk/binutils/gas/testsuite/gas/arm/thumb2_bcond.d
   trunk/binutils/gas/testsuite/gas/arm/thumb2_bcond.s
   trunk/binutils/gas/testsuite/gas/arm/thumb2_invert.d
   trunk/binutils/gas/testsuite/gas/arm/thumb2_invert.s
   trunk/binutils/gas/testsuite/gas/arm/thumb2_it_bad.d
   trunk/binutils/gas/testsuite/gas/arm/thumb2_it_bad.l
   trunk/binutils/gas/testsuite/gas/arm/thumb2_it_bad.s
   trunk/binutils/gas/testsuite/gas/arm/thumb2_pool.d
   trunk/binutils/gas/testsuite/gas/arm/thumb2_pool.s
   trunk/binutils/gas/testsuite/gas/i386/merom.d
   trunk/binutils/gas/testsuite/gas/i386/merom.s
   trunk/binutils/gas/testsuite/gas/i386/rep-suffix.d
   trunk/binutils/gas/testsuite/gas/i386/rep-suffix.s
   trunk/binutils/gas/testsuite/gas/i386/rep.d
   trunk/binutils/gas/testsuite/gas/i386/rep.s
   trunk/binutils/gas/testsuite/gas/i386/rex.d
   trunk/binutils/gas/testsuite/gas/i386/rex.s
   trunk/binutils/gas/testsuite/gas/i386/x86-64-crx-suffix.d
   trunk/binutils/gas/testsuite/gas/i386/x86-64-crx.d
   trunk/binutils/gas/testsuite/gas/i386/x86-64-crx.s
   trunk/binutils/gas/testsuite/gas/i386/x86-64-drx-suffix.d
   trunk/binutils/gas/testsuite/gas/i386/x86-64-drx.d
   trunk/binutils/gas/testsuite/gas/i386/x86-64-drx.s
   trunk/binutils/gas/testsuite/gas/i386/x86-64-merom.d
   trunk/binutils/gas/testsuite/gas/i386/x86-64-merom.s
   trunk/binutils/gas/testsuite/gas/i386/x86-64-rep-suffix.d
   trunk/binutils/gas/testsuite/gas/i386/x86-64-rep-suffix.s
   trunk/binutils/gas/testsuite/gas/i386/x86-64-rep.d
   trunk/binutils/gas/testsuite/gas/i386/x86-64-rep.s
   trunk/binutils/gas/testsuite/gas/ia64/ltoff22x-2.d
   trunk/binutils/gas/testsuite/gas/ia64/ltoff22x-2.s
   trunk/binutils/gas/testsuite/gas/ia64/ltoff22x-3.d
   trunk/binutils/gas/testsuite/gas/ia64/ltoff22x-3.s
   trunk/binutils/gas/testsuite/gas/ia64/ltoff22x-4.d
   trunk/binutils/gas/testsuite/gas/ia64/ltoff22x-4.s
   trunk/binutils/gas/testsuite/gas/ia64/ltoff22x-5.d
   trunk/binutils/gas/testsuite/gas/ia64/ltoff22x-5.s
   trunk/binutils/gas/testsuite/gas/m68k/arch-cpu-1.d
   trunk/binutils/gas/testsuite/gas/m68k/arch-cpu-1.s
   trunk/binutils/gas/testsuite/gas/m68k/mcf-fpu.d
   trunk/binutils/gas/testsuite/gas/m68k/mcf-fpu.s
   trunk/binutils/gas/testsuite/gas/macros/paren.d
   trunk/binutils/gas/testsuite/gas/macros/paren.s
   trunk/binutils/gas/testsuite/gas/mips/vxworks1-xgot.d
   trunk/binutils/gas/testsuite/gas/mips/vxworks1.d
   trunk/binutils/gas/testsuite/gas/mips/vxworks1.s
   trunk/binutils/gas/testsuite/gas/mmix/hex2.d
   trunk/binutils/gas/testsuite/gas/mmix/hex2.s
   trunk/binutils/gas/testsuite/gas/sparc/rdhpr.d
   trunk/binutils/gas/testsuite/gas/sparc/rdhpr.s
   trunk/binutils/gas/testsuite/gas/sparc/vxworks-pic.d
   trunk/binutils/gas/testsuite/gas/sparc/vxworks-pic.s
   trunk/binutils/gas/testsuite/gas/sparc/window.d
   trunk/binutils/gas/testsuite/gas/sparc/window.s
   trunk/binutils/gas/testsuite/gas/sparc/wrhpr.d
   trunk/binutils/gas/testsuite/gas/sparc/wrhpr.s
   trunk/binutils/gprof/ChangeLog-2004
   trunk/binutils/gprof/ChangeLog-2005
   trunk/binutils/include/elf/xc16x.h
   trunk/binutils/ld/ChangeLog-2004
   trunk/binutils/ld/ChangeLog-2005
   trunk/binutils/ld/elf-hints-local.h
   trunk/binutils/ld/emulparams/elf32_sparc_vxworks.sh
   trunk/binutils/ld/emulparams/elf32bfinfd.sh
   trunk/binutils/ld/emulparams/elf32ebmipvxworks.sh
   trunk/binutils/ld/emulparams/elf32elmipvxworks.sh
   trunk/binutils/ld/emulparams/elf32ppccommon.sh
   trunk/binutils/ld/emulparams/elf32xc16x.sh
   trunk/binutils/ld/emulparams/elf32xc16xl.sh
   trunk/binutils/ld/emulparams/elf32xc16xs.sh
   trunk/binutils/ld/emultempl/vxworks.em
   trunk/binutils/ld/po/vi.po
   trunk/binutils/ld/po/zh_CN.po
   trunk/binutils/ld/scripttempl/elf32xc16x.sc
   trunk/binutils/ld/scripttempl/elf32xc16xl.sc
   trunk/binutils/ld/scripttempl/elf32xc16xs.sc
   trunk/binutils/ld/testsuite/ChangeLog-2004
   trunk/binutils/ld/testsuite/ChangeLog-2005
   trunk/binutils/ld/testsuite/ld-arm/thumb-entry.d
   trunk/binutils/ld/testsuite/ld-arm/thumb-entry.s
   trunk/binutils/ld/testsuite/ld-arm/vxworks1-lib.dd
   trunk/binutils/ld/testsuite/ld-arm/vxworks1-lib.nd
   trunk/binutils/ld/testsuite/ld-arm/vxworks1-lib.rd
   trunk/binutils/ld/testsuite/ld-arm/vxworks1-lib.s
   trunk/binutils/ld/testsuite/ld-arm/vxworks1-static.d
   trunk/binutils/ld/testsuite/ld-arm/vxworks1.dd
   trunk/binutils/ld/testsuite/ld-arm/vxworks1.ld
   trunk/binutils/ld/testsuite/ld-arm/vxworks1.rd
   trunk/binutils/ld/testsuite/ld-arm/vxworks1.s
   trunk/binutils/ld/testsuite/ld-arm/vxworks2-static.sd
   trunk/binutils/ld/testsuite/ld-arm/vxworks2.s
   trunk/binutils/ld/testsuite/ld-arm/vxworks2.sd
   trunk/binutils/ld/testsuite/ld-elf/orphan2.d
   trunk/binutils/ld/testsuite/ld-elf/orphan2.s
   trunk/binutils/ld/testsuite/ld-elf/unknown2.d
   trunk/binutils/ld/testsuite/ld-elf/unknown2.s
   trunk/binutils/ld/testsuite/ld-i386/emit-relocs.d
   trunk/binutils/ld/testsuite/ld-i386/emit-relocs.s
   trunk/binutils/ld/testsuite/ld-i386/tlsbindesc.dd
   trunk/binutils/ld/testsuite/ld-i386/tlsbindesc.rd
   trunk/binutils/ld/testsuite/ld-i386/tlsbindesc.s
   trunk/binutils/ld/testsuite/ld-i386/tlsbindesc.sd
   trunk/binutils/ld/testsuite/ld-i386/tlsbindesc.td
   trunk/binutils/ld/testsuite/ld-i386/tlsdesc.dd
   trunk/binutils/ld/testsuite/ld-i386/tlsdesc.rd
   trunk/binutils/ld/testsuite/ld-i386/tlsdesc.s
   trunk/binutils/ld/testsuite/ld-i386/tlsdesc.sd
   trunk/binutils/ld/testsuite/ld-i386/tlsdesc.td
   trunk/binutils/ld/testsuite/ld-i386/tlsgdesc.dd
   trunk/binutils/ld/testsuite/ld-i386/tlsgdesc.rd
   trunk/binutils/ld/testsuite/ld-i386/tlsgdesc.s
   trunk/binutils/ld/testsuite/ld-i386/vxworks1-lib.dd
   trunk/binutils/ld/testsuite/ld-i386/vxworks1-lib.nd
   trunk/binutils/ld/testsuite/ld-i386/vxworks1-lib.rd
   trunk/binutils/ld/testsuite/ld-i386/vxworks1-lib.s
   trunk/binutils/ld/testsuite/ld-i386/vxworks1-static.d
   trunk/binutils/ld/testsuite/ld-i386/vxworks1.dd
   trunk/binutils/ld/testsuite/ld-i386/vxworks1.ld
   trunk/binutils/ld/testsuite/ld-i386/vxworks1.rd
   trunk/binutils/ld/testsuite/ld-i386/vxworks1.s
   trunk/binutils/ld/testsuite/ld-i386/vxworks2-static.sd
   trunk/binutils/ld/testsuite/ld-i386/vxworks2.s
   trunk/binutils/ld/testsuite/ld-i386/vxworks2.sd
   trunk/binutils/ld/testsuite/ld-mips-elf/emit-relocs-1.d
   trunk/binutils/ld/testsuite/ld-mips-elf/emit-relocs-1.ld
   trunk/binutils/ld/testsuite/ld-mips-elf/emit-relocs-1a.s
   trunk/binutils/ld/testsuite/ld-mips-elf/emit-relocs-1b.s
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden2-got.d
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden2.d
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden2a.s
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden2b.s
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden3.d
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden3.got
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden3.ld
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden3.r
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden3a.s
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden3b.s
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden4.got
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden4.r
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden4a.s
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-hidden4b.s
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks1-lib.dd
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks1-lib.nd
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks1-lib.rd
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks1-lib.s
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks1-static.d
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks1.dd
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks1.ld
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks1.rd
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks1.s
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks2-static.sd
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks2.s
   trunk/binutils/ld/testsuite/ld-mips-elf/vxworks2.sd
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1-lib.dd
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1-lib.nd
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1-lib.rd
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1-lib.s
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1-lib.sd
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1-static.d
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1.dd
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1.ld
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1.rd
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks1.s
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks2-static.sd
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks2.s
   trunk/binutils/ld/testsuite/ld-powerpc/vxworks2.sd
   trunk/binutils/ld/testsuite/ld-sparc/vxworks1-lib.dd
   trunk/binutils/ld/testsuite/ld-sparc/vxworks1-lib.nd
   trunk/binutils/ld/testsuite/ld-sparc/vxworks1-lib.rd
   trunk/binutils/ld/testsuite/ld-sparc/vxworks1-lib.s
   trunk/binutils/ld/testsuite/ld-sparc/vxworks1-static.d
   trunk/binutils/ld/testsuite/ld-sparc/vxworks1.dd
   trunk/binutils/ld/testsuite/ld-sparc/vxworks1.ld
   trunk/binutils/ld/testsuite/ld-sparc/vxworks1.rd
   trunk/binutils/ld/testsuite/ld-sparc/vxworks1.s
   trunk/binutils/ld/testsuite/ld-sparc/vxworks2-static.sd
   trunk/binutils/ld/testsuite/ld-sparc/vxworks2.s
   trunk/binutils/ld/testsuite/ld-sparc/vxworks2.sd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsbindesc.dd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsbindesc.rd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsbindesc.s
   trunk/binutils/ld/testsuite/ld-x86-64/tlsbindesc.sd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsbindesc.td
   trunk/binutils/ld/testsuite/ld-x86-64/tlsdesc.dd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsdesc.pd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsdesc.rd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsdesc.s
   trunk/binutils/ld/testsuite/ld-x86-64/tlsdesc.sd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsdesc.td
   trunk/binutils/ld/testsuite/ld-x86-64/tlsgdesc.dd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsgdesc.rd
   trunk/binutils/ld/testsuite/ld-x86-64/tlsgdesc.s
   trunk/binutils/libiberty/testsuite/test-expandargv.c
   trunk/binutils/opcodes/ChangeLog-2004
   trunk/binutils/opcodes/ChangeLog-2005
   trunk/binutils/opcodes/mt-asm.c
   trunk/binutils/opcodes/mt-desc.c
   trunk/binutils/opcodes/mt-desc.h
   trunk/binutils/opcodes/mt-dis.c
   trunk/binutils/opcodes/mt-ibld.c
   trunk/binutils/opcodes/mt-opc.c
   trunk/binutils/opcodes/mt-opc.h
   trunk/binutils/opcodes/po/zh_CN.po
   trunk/binutils/opcodes/xc16x-asm.c
   trunk/binutils/opcodes/xc16x-desc.c
   trunk/binutils/opcodes/xc16x-desc.h
   trunk/binutils/opcodes/xc16x-dis.c
   trunk/binutils/opcodes/xc16x-ibld.c
   trunk/binutils/opcodes/xc16x-opc.c
   trunk/binutils/opcodes/xc16x-opc.h
Modified:
   trunk/binutils/COPYING.NEWLIB
   trunk/binutils/ChangeLog
   trunk/binutils/MAINTAINERS
   trunk/binutils/Makefile.def
   trunk/binutils/Makefile.in
   trunk/binutils/Makefile.tpl
   trunk/binutils/bfd/ChangeLog
   trunk/binutils/bfd/Makefile.am
   trunk/binutils/bfd/Makefile.in
   trunk/binutils/bfd/aix386-core.c
   trunk/binutils/bfd/aix5ppc-core.c
   trunk/binutils/bfd/aoutx.h
   trunk/binutils/bfd/archures.c
   trunk/binutils/bfd/bfd-in.h
   trunk/binutils/bfd/bfd-in2.h
   trunk/binutils/bfd/bfd.c
   trunk/binutils/bfd/cisco-core.c
   trunk/binutils/bfd/coff-arm.c
   trunk/binutils/bfd/coff-h8300.c
   trunk/binutils/bfd/coff-h8500.c
   trunk/binutils/bfd/coff-ppc.c
   trunk/binutils/bfd/coff-w65.c
   trunk/binutils/bfd/coff-z80.c
   trunk/binutils/bfd/coff-z8k.c
   trunk/binutils/bfd/cofflink.c
   trunk/binutils/bfd/config.bfd
   trunk/binutils/bfd/configure
   trunk/binutils/bfd/configure.host
   trunk/binutils/bfd/configure.in
   trunk/binutils/bfd/corefile.c
   trunk/binutils/bfd/cpu-arm.c
   trunk/binutils/bfd/cpu-avr.c
   trunk/binutils/bfd/cpu-ia64-opc.c
   trunk/binutils/bfd/cpu-m68k.c
   trunk/binutils/bfd/cpu-mt.c
   trunk/binutils/bfd/doc/ChangeLog
   trunk/binutils/bfd/doc/Makefile.am
   trunk/binutils/bfd/doc/Makefile.in
   trunk/binutils/bfd/dwarf2.c
   trunk/binutils/bfd/ecoff.c
   trunk/binutils/bfd/ecofflink.c
   trunk/binutils/bfd/elf-bfd.h
   trunk/binutils/bfd/elf-eh-frame.c
   trunk/binutils/bfd/elf-m10300.c
   trunk/binutils/bfd/elf-strtab.c
   trunk/binutils/bfd/elf-vxworks.c
   trunk/binutils/bfd/elf-vxworks.h
   trunk/binutils/bfd/elf.c
   trunk/binutils/bfd/elf32-arm.c
   trunk/binutils/bfd/elf32-avr.c
   trunk/binutils/bfd/elf32-bfin.c
   trunk/binutils/bfd/elf32-cris.c
   trunk/binutils/bfd/elf32-frv.c
   trunk/binutils/bfd/elf32-hppa.c
   trunk/binutils/bfd/elf32-i386.c
   trunk/binutils/bfd/elf32-m32c.c
   trunk/binutils/bfd/elf32-m32r.c
   trunk/binutils/bfd/elf32-m68hc1x.c
   trunk/binutils/bfd/elf32-m68k.c
   trunk/binutils/bfd/elf32-mips.c
   trunk/binutils/bfd/elf32-mt.c
   trunk/binutils/bfd/elf32-ppc.c
   trunk/binutils/bfd/elf32-s390.c
   trunk/binutils/bfd/elf32-sh.c
   trunk/binutils/bfd/elf32-sparc.c
   trunk/binutils/bfd/elf32-vax.c
   trunk/binutils/bfd/elf32-xtensa.c
   trunk/binutils/bfd/elf64-alpha.c
   trunk/binutils/bfd/elf64-hppa.c
   trunk/binutils/bfd/elf64-ppc.c
   trunk/binutils/bfd/elf64-s390.c
   trunk/binutils/bfd/elf64-sh64.c
   trunk/binutils/bfd/elf64-x86-64.c
   trunk/binutils/bfd/elflink.c
   trunk/binutils/bfd/elfxx-ia64.c
   trunk/binutils/bfd/elfxx-mips.c
   trunk/binutils/bfd/elfxx-mips.h
   trunk/binutils/bfd/elfxx-sparc.c
   trunk/binutils/bfd/elfxx-sparc.h
   trunk/binutils/bfd/elfxx-target.h
   trunk/binutils/bfd/hash.c
   trunk/binutils/bfd/hppabsd-core.c
   trunk/binutils/bfd/hpux-core.c
   trunk/binutils/bfd/i386linux.c
   trunk/binutils/bfd/ieee.c
   trunk/binutils/bfd/irix-core.c
   trunk/binutils/bfd/libaout.h
   trunk/binutils/bfd/libbfd-in.h
   trunk/binutils/bfd/libbfd.h
   trunk/binutils/bfd/libcoff-in.h
   trunk/binutils/bfd/libcoff.h
   trunk/binutils/bfd/linker.c
   trunk/binutils/bfd/lynx-core.c
   trunk/binutils/bfd/m68klinux.c
   trunk/binutils/bfd/mach-o.c
   trunk/binutils/bfd/merge.c
   trunk/binutils/bfd/netbsd-core.c
   trunk/binutils/bfd/opncls.c
   trunk/binutils/bfd/osf-core.c
   trunk/binutils/bfd/pdp11.c
   trunk/binutils/bfd/peXXigen.c
   trunk/binutils/bfd/po/Make-in
   trunk/binutils/bfd/po/SRC-POTFILES.in
   trunk/binutils/bfd/ptrace-core.c
   trunk/binutils/bfd/reloc.c
   trunk/binutils/bfd/sco5-core.c
   trunk/binutils/bfd/section.c
   trunk/binutils/bfd/sparclinux.c
   trunk/binutils/bfd/stabs.c
   trunk/binutils/bfd/sunos.c
   trunk/binutils/bfd/targets.c
   trunk/binutils/bfd/trad-core.c
   trunk/binutils/bfd/version.h
   trunk/binutils/bfd/vms.c
   trunk/binutils/bfd/xcofflink.c
   trunk/binutils/binutils/BRANCHES
   trunk/binutils/binutils/ChangeLog
   trunk/binutils/binutils/MAINTAINERS
   trunk/binutils/binutils/Makefile.am
   trunk/binutils/binutils/Makefile.in
   trunk/binutils/binutils/addr2line.c
   trunk/binutils/binutils/bucomm.c
   trunk/binutils/binutils/bucomm.h
   trunk/binutils/binutils/config.in
   trunk/binutils/binutils/configure
   trunk/binutils/binutils/configure.in
   trunk/binutils/binutils/dlltool.c
   trunk/binutils/binutils/doc/Makefile.am
   trunk/binutils/binutils/doc/Makefile.in
   trunk/binutils/binutils/doc/binutils.texi
   trunk/binutils/binutils/dwarf.c
   trunk/binutils/binutils/ieee.c
   trunk/binutils/binutils/objcopy.c
   trunk/binutils/binutils/objdump.c
   trunk/binutils/binutils/po/Make-in
   trunk/binutils/binutils/rddbg.c
   trunk/binutils/binutils/readelf.c
   trunk/binutils/binutils/resbin.c
   trunk/binutils/binutils/testsuite/ChangeLog
   trunk/binutils/binutils/testsuite/config/default.exp
   trunk/binutils/binutils/testsuite/lib/utils-lib.exp
   trunk/binutils/binutils/wrstabs.c
   trunk/binutils/config.guess
   trunk/binutils/config.sub
   trunk/binutils/config/ChangeLog
   trunk/binutils/config/acx.m4
   trunk/binutils/configure
   trunk/binutils/configure.in
   trunk/binutils/cpu/ChangeLog
   trunk/binutils/cpu/iq2000.opc
   trunk/binutils/cpu/m32c.cpu
   trunk/binutils/cpu/m32c.opc
   trunk/binutils/cpu/mt.cpu
   trunk/binutils/cpu/mt.opc
   trunk/binutils/debian/changelog
   trunk/binutils/debian/control
   trunk/binutils/debian/copyright
   trunk/binutils/debian/patches/00list
   trunk/binutils/debian/patches/120_mips_xgot_multigot_workaround.dpatch
   trunk/binutils/debian/rules
   trunk/binutils/etc/ChangeLog
   trunk/binutils/etc/Makefile.in
   trunk/binutils/etc/configure
   trunk/binutils/etc/configure.in
   trunk/binutils/etc/configure.texi
   trunk/binutils/etc/standards.texi
   trunk/binutils/gas/ChangeLog
   trunk/binutils/gas/Makefile.am
   trunk/binutils/gas/Makefile.in
   trunk/binutils/gas/NEWS
   trunk/binutils/gas/app.c
   trunk/binutils/gas/as.c
   trunk/binutils/gas/as.h
   trunk/binutils/gas/config.in
   trunk/binutils/gas/config/bfin-defs.h
   trunk/binutils/gas/config/bfin-lex.l
   trunk/binutils/gas/config/bfin-parse.y
   trunk/binutils/gas/config/tc-arc.c
   trunk/binutils/gas/config/tc-arm.c
   trunk/binutils/gas/config/tc-avr.c
   trunk/binutils/gas/config/tc-bfin.c
   trunk/binutils/gas/config/tc-crx.c
   trunk/binutils/gas/config/tc-frv.c
   trunk/binutils/gas/config/tc-i370.c
   trunk/binutils/gas/config/tc-i386.c
   trunk/binutils/gas/config/tc-i386.h
   trunk/binutils/gas/config/tc-ia64.c
   trunk/binutils/gas/config/tc-m32c.c
   trunk/binutils/gas/config/tc-m32c.h
   trunk/binutils/gas/config/tc-m68k.c
   trunk/binutils/gas/config/tc-m68k.h
   trunk/binutils/gas/config/tc-mips.c
   trunk/binutils/gas/config/tc-mips.h
   trunk/binutils/gas/config/tc-mmix.c
   trunk/binutils/gas/config/tc-mn10200.c
   trunk/binutils/gas/config/tc-mn10300.c
   trunk/binutils/gas/config/tc-mt.c
   trunk/binutils/gas/config/tc-mt.h
   trunk/binutils/gas/config/tc-sparc.c
   trunk/binutils/gas/config/tc-tic54x.c
   trunk/binutils/gas/config/tc-v850.c
   trunk/binutils/gas/config/tc-vax.c
   trunk/binutils/gas/config/tc-vax.h
   trunk/binutils/gas/config/tc-xtensa.c
   trunk/binutils/gas/config/tc-xtensa.h
   trunk/binutils/gas/config/tc-z80.c
   trunk/binutils/gas/config/tc-z80.h
   trunk/binutils/gas/config/xtensa-istack.h
   trunk/binutils/gas/config/xtensa-relax.c
   trunk/binutils/gas/configure
   trunk/binutils/gas/configure.in
   trunk/binutils/gas/configure.tgt
   trunk/binutils/gas/doc/Makefile.am
   trunk/binutils/gas/doc/Makefile.in
   trunk/binutils/gas/doc/all.texi
   trunk/binutils/gas/doc/as.texinfo
   trunk/binutils/gas/doc/c-arm.texi
   trunk/binutils/gas/doc/c-m68k.texi
   trunk/binutils/gas/doc/c-mt.texi
   trunk/binutils/gas/doc/c-z80.texi
   trunk/binutils/gas/dw2gencfi.c
   trunk/binutils/gas/dwarf2dbg.c
   trunk/binutils/gas/expr.c
   trunk/binutils/gas/frags.c
   trunk/binutils/gas/frags.h
   trunk/binutils/gas/macro.c
   trunk/binutils/gas/messages.c
   trunk/binutils/gas/po/Make-in
   trunk/binutils/gas/po/POTFILES.in
   trunk/binutils/gas/symbols.c
   trunk/binutils/gas/symbols.h
   trunk/binutils/gas/testsuite/ChangeLog
   trunk/binutils/gas/testsuite/gas/all/altmac2.s
   trunk/binutils/gas/testsuite/gas/all/altmacro.s
   trunk/binutils/gas/testsuite/gas/all/cond.l
   trunk/binutils/gas/testsuite/gas/all/cond.s
   trunk/binutils/gas/testsuite/gas/arm/armv1.d
   trunk/binutils/gas/testsuite/gas/arm/inst.d
   trunk/binutils/gas/testsuite/gas/arm/iwmmxt-bad.l
   trunk/binutils/gas/testsuite/gas/arm/iwmmxt-bad.s
   trunk/binutils/gas/testsuite/gas/arm/pic.d
   trunk/binutils/gas/testsuite/gas/arm/thumb.d
   trunk/binutils/gas/testsuite/gas/arm/thumb32.d
   trunk/binutils/gas/testsuite/gas/arm/thumb32.s
   trunk/binutils/gas/testsuite/gas/arm/unwind_vxworks.d
   trunk/binutils/gas/testsuite/gas/arm/wince_inst.d
   trunk/binutils/gas/testsuite/gas/i386/equ.e
   trunk/binutils/gas/testsuite/gas/i386/equ.s
   trunk/binutils/gas/testsuite/gas/i386/i386.exp
   trunk/binutils/gas/testsuite/gas/i386/naked.d
   trunk/binutils/gas/testsuite/gas/i386/reloc64.d
   trunk/binutils/gas/testsuite/gas/i386/reloc64.l
   trunk/binutils/gas/testsuite/gas/i386/reloc64.s
   trunk/binutils/gas/testsuite/gas/i386/x86_64.d
   trunk/binutils/gas/testsuite/gas/ia64/dv-raw-err.l
   trunk/binutils/gas/testsuite/gas/ia64/dv-raw-err.s
   trunk/binutils/gas/testsuite/gas/ia64/ia64.exp
   trunk/binutils/gas/testsuite/gas/ia64/opc-b.d
   trunk/binutils/gas/testsuite/gas/ia64/opc-b.s
   trunk/binutils/gas/testsuite/gas/ia64/opc-i.d
   trunk/binutils/gas/testsuite/gas/ia64/opc-i.s
   trunk/binutils/gas/testsuite/gas/ia64/pseudo.d
   trunk/binutils/gas/testsuite/gas/ia64/pseudo.s
   trunk/binutils/gas/testsuite/gas/m68k/all.exp
   trunk/binutils/gas/testsuite/gas/macros/macros.exp
   trunk/binutils/gas/testsuite/gas/mips/mips.exp
   trunk/binutils/gas/testsuite/gas/sparc/rdpr.d
   trunk/binutils/gas/testsuite/gas/sparc/rdpr.s
   trunk/binutils/gas/testsuite/gas/sparc/sparc.exp
   trunk/binutils/gas/testsuite/gas/sparc/wrpr.d
   trunk/binutils/gas/testsuite/gas/sparc/wrpr.s
   trunk/binutils/gas/testsuite/gas/tic54x/address.d
   trunk/binutils/gas/testsuite/gas/tic54x/addrfar.d
   trunk/binutils/gas/testsuite/gas/tic54x/align.d
   trunk/binutils/gas/testsuite/gas/tic54x/all-opcodes.d
   trunk/binutils/gas/testsuite/gas/tic54x/asg.d
   trunk/binutils/gas/testsuite/gas/tic54x/cons.d
   trunk/binutils/gas/testsuite/gas/tic54x/consfar.d
   trunk/binutils/gas/testsuite/gas/tic54x/extaddr.d
   trunk/binutils/gas/testsuite/gas/tic54x/field.d
   trunk/binutils/gas/testsuite/gas/tic54x/labels.d
   trunk/binutils/gas/testsuite/gas/tic54x/loop.d
   trunk/binutils/gas/testsuite/gas/tic54x/lp.d
   trunk/binutils/gas/testsuite/gas/tic54x/macro.d
   trunk/binutils/gas/testsuite/gas/tic54x/math.d
   trunk/binutils/gas/testsuite/gas/tic54x/opcodes.d
   trunk/binutils/gas/testsuite/gas/tic54x/sections.d
   trunk/binutils/gas/testsuite/gas/tic54x/set.d
   trunk/binutils/gas/testsuite/gas/tic54x/struct.d
   trunk/binutils/gas/testsuite/gas/tic54x/subsym.d
   trunk/binutils/gas/testsuite/gas/v850/v850e1.d
   trunk/binutils/gprof/ChangeLog
   trunk/binutils/gprof/Makefile.am
   trunk/binutils/gprof/Makefile.in
   trunk/binutils/gprof/aclocal.m4
   trunk/binutils/gprof/configure
   trunk/binutils/gprof/configure.in
   trunk/binutils/gprof/corefile.c
   trunk/binutils/gprof/gconfig.in
   trunk/binutils/gprof/po/Make-in
   trunk/binutils/gprof/po/sv.po
   trunk/binutils/include/ChangeLog
   trunk/binutils/include/bfdlink.h
   trunk/binutils/include/coff/ChangeLog
   trunk/binutils/include/coff/internal.h
   trunk/binutils/include/dis-asm.h
   trunk/binutils/include/elf/ChangeLog
   trunk/binutils/include/elf/arm.h
   trunk/binutils/include/elf/avr.h
   trunk/binutils/include/elf/bfin.h
   trunk/binutils/include/elf/common.h
   trunk/binutils/include/elf/dwarf2.h
   trunk/binutils/include/elf/hppa.h
   trunk/binutils/include/elf/i386.h
   trunk/binutils/include/elf/ia64.h
   trunk/binutils/include/elf/internal.h
   trunk/binutils/include/elf/m32c.h
   trunk/binutils/include/elf/m68k.h
   trunk/binutils/include/elf/mips.h
   trunk/binutils/include/elf/mt.h
   trunk/binutils/include/elf/x86-64.h
   trunk/binutils/include/libiberty.h
   trunk/binutils/include/md5.h
   trunk/binutils/include/opcode/ChangeLog
   trunk/binutils/include/opcode/arm.h
   trunk/binutils/include/opcode/avr.h
   trunk/binutils/include/opcode/hppa.h
   trunk/binutils/include/opcode/i386.h
   trunk/binutils/include/opcode/ia64.h
   trunk/binutils/include/opcode/m68k.h
   trunk/binutils/include/xtensa-config.h
   trunk/binutils/intl/ChangeLog
   trunk/binutils/intl/Makefile.in
   trunk/binutils/ld/ChangeLog
   trunk/binutils/ld/Makefile.am
   trunk/binutils/ld/Makefile.in
   trunk/binutils/ld/NEWS
   trunk/binutils/ld/configure
   trunk/binutils/ld/configure.in
   trunk/binutils/ld/configure.tgt
   trunk/binutils/ld/deffile.h
   trunk/binutils/ld/deffilep.y
   trunk/binutils/ld/emulparams/armelf_vxworks.sh
   trunk/binutils/ld/emulparams/bfin.sh
   trunk/binutils/ld/emulparams/elf32mt.sh
   trunk/binutils/ld/emulparams/elf32ppc.sh
   trunk/binutils/ld/emulparams/elf32ppcvxworks.sh
   trunk/binutils/ld/emulparams/h8300.sh
   trunk/binutils/ld/emulparams/h8300elf.sh
   trunk/binutils/ld/emulparams/h8300sxelf.sh
   trunk/binutils/ld/emulparams/vxworks.sh
   trunk/binutils/ld/emultempl/armelf.em
   trunk/binutils/ld/emultempl/elf32.em
   trunk/binutils/ld/emultempl/ia64elf.em
   trunk/binutils/ld/emultempl/irix.em
   trunk/binutils/ld/emultempl/xtensaelf.em
   trunk/binutils/ld/genscripts.sh
   trunk/binutils/ld/ld.texinfo
   trunk/binutils/ld/ldcref.c
   trunk/binutils/ld/ldlang.c
   trunk/binutils/ld/ldmain.c
   trunk/binutils/ld/ldmisc.c
   trunk/binutils/ld/pe-dll.c
   trunk/binutils/ld/po/Make-in
   trunk/binutils/ld/po/ld.pot
   trunk/binutils/ld/scripttempl/avr.sc
   trunk/binutils/ld/scripttempl/elf.sc
   trunk/binutils/ld/testsuite/ChangeLog
   trunk/binutils/ld/testsuite/ld-arm/arm-elf.exp
   trunk/binutils/ld/testsuite/ld-i386/i386.exp
   trunk/binutils/ld/testsuite/ld-i386/pcrel16.d
   trunk/binutils/ld/testsuite/ld-i386/pcrel8.d
   trunk/binutils/ld/testsuite/ld-mips-elf/mips-elf.exp
   trunk/binutils/ld/testsuite/ld-mips-elf/rel32-n32.d
   trunk/binutils/ld/testsuite/ld-mips-elf/rel32-o32.d
   trunk/binutils/ld/testsuite/ld-mips-elf/rel64.d
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
   trunk/binutils/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
   trunk/binutils/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
   trunk/binutils/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
   trunk/binutils/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
   trunk/binutils/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
   trunk/binutils/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
   trunk/binutils/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
   trunk/binutils/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
   trunk/binutils/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
   trunk/binutils/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
   trunk/binutils/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
   trunk/binutils/ld/testsuite/ld-mips-elf/tlslib-o32.got
   trunk/binutils/ld/testsuite/ld-mmix/sec-1.d
   trunk/binutils/ld/testsuite/ld-powerpc/powerpc.exp
   trunk/binutils/ld/testsuite/ld-powerpc/tls32.s
   trunk/binutils/ld/testsuite/ld-sparc/sparc.exp
   trunk/binutils/ld/testsuite/ld-x86-64/x86-64.exp
   trunk/binutils/ld/testsuite/lib/ld-lib.exp
   trunk/binutils/libiberty/ChangeLog
   trunk/binutils/libiberty/Makefile.in
   trunk/binutils/libiberty/argv.c
   trunk/binutils/libiberty/configure
   trunk/binutils/libiberty/configure.ac
   trunk/binutils/libiberty/floatformat.c
   trunk/binutils/libiberty/functions.texi
   trunk/binutils/libiberty/partition.c
   trunk/binutils/libiberty/pex-common.c
   trunk/binutils/libiberty/pex-common.h
   trunk/binutils/libiberty/pex-djgpp.c
   trunk/binutils/libiberty/pex-msdos.c
   trunk/binutils/libiberty/pex-unix.c
   trunk/binutils/libiberty/pex-win32.c
   trunk/binutils/libiberty/pexecute.c
   trunk/binutils/libiberty/pexecute.txh
   trunk/binutils/libiberty/testsuite/Makefile.in
   trunk/binutils/libtool.m4
   trunk/binutils/ltmain.sh
   trunk/binutils/opcodes/ChangeLog
   trunk/binutils/opcodes/Makefile.am
   trunk/binutils/opcodes/Makefile.in
   trunk/binutils/opcodes/arm-dis.c
   trunk/binutils/opcodes/avr-dis.c
   trunk/binutils/opcodes/bfin-dis.c
   trunk/binutils/opcodes/cgen-ibld.in
   trunk/binutils/opcodes/configure
   trunk/binutils/opcodes/configure.in
   trunk/binutils/opcodes/disassemble.c
   trunk/binutils/opcodes/fr30-ibld.c
   trunk/binutils/opcodes/frv-ibld.c
   trunk/binutils/opcodes/i386-dis.c
   trunk/binutils/opcodes/ia64-asmtab.c
   trunk/binutils/opcodes/ia64-gen.c
   trunk/binutils/opcodes/ia64-ic.tbl
   trunk/binutils/opcodes/ia64-opc-b.c
   trunk/binutils/opcodes/ia64-opc-i.c
   trunk/binutils/opcodes/ia64-opc.h
   trunk/binutils/opcodes/ia64-raw.tbl
   trunk/binutils/opcodes/ia64-waw.tbl
   trunk/binutils/opcodes/ip2k-ibld.c
   trunk/binutils/opcodes/iq2000-asm.c
   trunk/binutils/opcodes/iq2000-ibld.c
   trunk/binutils/opcodes/m32c-asm.c
   trunk/binutils/opcodes/m32c-desc.c
   trunk/binutils/opcodes/m32c-desc.h
   trunk/binutils/opcodes/m32c-dis.c
   trunk/binutils/opcodes/m32c-ibld.c
   trunk/binutils/opcodes/m32c-opc.c
   trunk/binutils/opcodes/m32c-opc.h
   trunk/binutils/opcodes/m32r-ibld.c
   trunk/binutils/opcodes/m68k-dis.c
   trunk/binutils/opcodes/m68k-opc.c
   trunk/binutils/opcodes/mips-opc.c
   trunk/binutils/opcodes/openrisc-ibld.c
   trunk/binutils/opcodes/pdp11-opc.c
   trunk/binutils/opcodes/pj-opc.c
   trunk/binutils/opcodes/po/Make-in
   trunk/binutils/opcodes/po/POTFILES.in
   trunk/binutils/opcodes/po/sv.po
   trunk/binutils/opcodes/po/vi.po
   trunk/binutils/opcodes/sparc-dis.c
   trunk/binutils/opcodes/sparc-opc.c
   trunk/binutils/opcodes/xstormy16-ibld.c
   trunk/binutils/opcodes/z80-dis.c
Log:
Merge package update

Modified: trunk/binutils/COPYING.NEWLIB
===================================================================
--- trunk/binutils/COPYING.NEWLIB	2006-04-23 11:09:39 UTC (rev 13)
+++ trunk/binutils/COPYING.NEWLIB	2006-04-23 11:31:49 UTC (rev 14)
@@ -731,7 +731,7 @@
 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 Red Hat Incorporated.
+Copyright (c) 1994, 1997, 2001, 2002, 2003, 2004, 2005 Red Hat Incorporated.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without 

Modified: trunk/binutils/ChangeLog
===================================================================
--- trunk/binutils/ChangeLog	2006-04-23 11:09:39 UTC (rev 13)
+++ trunk/binutils/ChangeLog	2006-04-23 11:31:49 UTC (rev 14)
@@ -1,3 +1,234 @@
+2006-04-10  Ben Elliston  <bje at au.ibm.com>
+
+	* contrib: Remove directory.
+
+2006-04-06  Carlos O'Donell <carlos at codesourcery.com>
+
+	* Makefile.tpl: Add install-html target.
+	* Makefile.def: Add install-html target.
+	* Makefile.in: Regenerate.
+	* configure.in: Add --with-datarootdir, --with-docdir,
+	and --with-htmldir options.
+	* configure: Regenerate.
+
+2006-03-31  Ben Elliston  <bje at au.ibm.com>
+
+	PR binutils/1860
+	* configure.in: Require makeinfo 4.4 or higher.
+	* configure: Regenerate.
+
+2006-03-14  Paolo Bonzini  <bonzini at gnu.org>
+
+	* Makefile.in: Regenerate.
+
+2006-03-14  Paolo Bonzini  <bonzini at gnu.org>
+
+	Sync with gcc:
+	2006-03-10  Aldy Hernandez  <aldyh at redhat.com>
+
+        * configure.in: Handle --disable-<component> generically.
+        * configure: Regenerate.
+
+	2006-02-21 Rafael Avila de Espindola <rafael.espindola at 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 at intel.com>
+
+	PR libgcj/17311
+	* ltmain.sh: Don't use "$finalize_rpath" for compile.
+
+2006-02-20  Paolo Bonzini  <bonzini at 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 at gnu.org>
+
+	Sync from gcc:
+
+	2006-01-31  Richard Guenther  <rguenther at suse.de>
+		    Paolo Bonzini  <bonzini at 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 at redhat.com>
+	            Jakub Jelinek  <jakub at redhat.com>
+	            Diego Novillo  <dnovillo at 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 at gnu.org>
+	    Andreas Schwab  <schwab at suse.de>
+	 
+	* configure: Regenerate.
+
+2006-01-16  Paolo Bonzini  <bonzini at 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 at redhat.com>
+
+        * config.sub, config.guess: Sync from config repository.
+
+2006-01-05  Alexandre Oliva  <aoliva at redhat.com>
+
+	* Makefile.tpl (clean-stage[+id+]-[+prefix+][+module+]): Remove
+	@ from continuation.
+	* Makefile.in: Rebuilt.
+
+2006-01-04  Paolo Bonzini  <bonzini at gnu.org>
+
+	Sync from gcc:
+
+	2006-01-04  Paolo Bonzini  <bonzini at 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 at suse.de>
+
+        * configure.in: When reconfiguring remove Makefile in
+        all stage directories.
+        * configure: Regenerate.
+
+2005-12-27  Leif Ekblad  <leif at rdos.net>
+
+	* configure.in: Add support for RDOS target.
+	* configure: Regenerate.
+
+2005-12-27  Nick Clifton  <nickc at redhat.com>
+
+	PR binutils/1990
+	* libtool.m4: Synchronize with version in GCC sources.
+
+2005-12-20  Paolo Bonzini  <bonzini at 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 at 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 at redhat.com>
+
+	* COPYING.NEWLIB: Update copyright year for default
+	copyright.
+
+2005-12-15  Paolo Bonzini  <bonzini at 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 at gnu.org>
+
+	* configure.in: Flip the top-level bootstrap switch.
+	* configure: Regenerate.
+
+	Merge from gcc:
+
+	2005-12-14  Daniel Jacobowitz  <dan at 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 at codesourcery.com>
 
 	* config.sub: Replace ms1 arch with mt.  Allow ms1 as alias.
@@ -8,6 +239,16 @@
 
 	Sync with gcc:
 
+2005-12-12  Nathan Sidwell  <nathan at 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 at gnu.org>
+
+	Sync with gcc:
+
 	2005-12-05  Paolo Bonzini  <bonzini at gnu.org>
 
         * configure.in (CONFIGURED_BISON, CONFIGURED_YACC, CONFIGURED_M4,

Modified: trunk/binutils/MAINTAINERS
===================================================================
--- trunk/binutils/MAINTAINERS	2006-04-23 11:09:39 UTC (rev 13)
+++ trunk/binutils/MAINTAINERS	2006-04-23 11:31:49 UTC (rev 14)
@@ -5,7 +5,11 @@
 	http://gnu.org.
 
 Makefile.*; configure; configure.in; src-release
-	Please notify the following of any committed patches.
+	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:
 		binutils at sources.redhat.com
 		gdb-patches at sources.redhat.com
 
@@ -94,10 +98,18 @@
 	General discussion cygwin at sources.redhat.com.
 	See also winsup/MAINTAINERS.
 
-config-ml.in; setup.com; missing; makefile.vms; utils/; config/;
-makefile.vms; missing; ylwrap; mkdep; etc/; install-sh; intl/
-	Ask DJ Delorie <dj at redhat.com> after reading the libiberty entry.
+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.
+
 modules file
 	Obviously changes to this file should not go through
 	overseers at sources.redhat.com.  If you understand the file

Modified: trunk/binutils/Makefile.def
===================================================================
--- trunk/binutils/Makefile.def	2006-04-23 11:09:39 UTC (rev 13)
+++ trunk/binutils/Makefile.def	2006-04-23 11:31:49 UTC (rev 14)
@@ -4,7 +4,7 @@
 // Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
 // This file was originally written by Nathanael Nerode.
 //
-//   Copyright 2002, 2003 Free Software Foundation
+//   Copyright 2002, 2003, 2004, 2005, 2006 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
@@ -117,6 +117,7 @@
 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; };
@@ -137,6 +138,7 @@
 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.
@@ -153,6 +155,9 @@
 recursive_targets = { make_target= install-info; 
                       depend=configure;
                       depend=info; };
+recursive_targets = { make_target= install-html; 
+                      depend=configure;
+                      depend=html; };
 recursive_targets = { make_target= installcheck; 
                       depend=configure; };
 recursive_targets = { make_target= mostlyclean; };
@@ -170,7 +175,10 @@
 flags_to_pass = { flag= datadir ; };
 flags_to_pass = { flag= exec_prefix ; };
 flags_to_pass = { flag= includedir ; };
+flags_to_pass = { flag= datarootdir ; };
+flags_to_pass = { flag= docdir ; };
 flags_to_pass = { flag= infodir ; };
+flags_to_pass = { flag= htmldir ; };
 flags_to_pass = { flag= libdir ; };
 flags_to_pass = { flag= libexecdir ; };
 flags_to_pass = { flag= lispdir ; };
@@ -205,12 +213,18 @@
 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 ; };
@@ -234,6 +248,10 @@
 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
@@ -452,7 +470,7 @@
 	id=1 ;
 	stage_configure_flags='--disable-intermodule \
 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
-	stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; };
+	stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"' ; };
 bootstrap_stage = {
 	id=2 ; prev=1 ;
 	bootstrap_target=bootstrap2 ;

Modified: trunk/binutils/Makefile.in
===================================================================
--- trunk/binutils/Makefile.in	2006-04-23 11:09:39 UTC (rev 13)
+++ trunk/binutils/Makefile.in	2006-04-23 11:31:49 UTC (rev 14)
@@ -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 Free Software Foundation
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 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
@@ -50,6 +50,9 @@
 includedir = @includedir@
 oldincludedir = @oldincludedir@
 infodir = @infodir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+htmldir = @htmldir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
@@ -84,8 +87,6 @@
 # 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
@@ -178,9 +179,6 @@
 	  -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
@@ -252,6 +250,7 @@
 # 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@
@@ -281,6 +280,7 @@
 LD = @LD@
 LIPO = @LIPO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 WINDRES = @WINDRES@
@@ -354,7 +354,7 @@
 
 # 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)$(HOST_LIB_PATH_gcc)
+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)
 
 @if target-libstdc++-v3
 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/.libs:
@@ -368,8 +368,16 @@
 TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
 @endif target-libssp
 
+ at if target-libgcc-math
+TARGET_LIB_PATH_libgcc-math = $$r/$(TARGET_SUBDIR)/libgcc-math/.libs:
+ at endif target-libgcc-math
 
+ at if target-libgomp
+TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs:
+ at endif target-libgomp
 
+
+
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the host machine work.
 HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes)
@@ -400,7 +408,10 @@
 	"datadir=$(datadir)" \
 	"exec_prefix=$(exec_prefix)" \
 	"includedir=$(includedir)" \
+	"datarootdir=$(datarootdir)" \
+	"docdir=$(docdir)" \
 	"infodir=$(infodir)" \
+	"htmldir=$(htmldir)" \
 	"libdir=$(libdir)" \
 	"libexecdir=$(libexecdir)" \
 	"lispdir=$(lispdir)" \
@@ -431,12 +442,18 @@
 	"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)" \
@@ -457,6 +474,8 @@
 	"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)" 
 
@@ -474,6 +493,7 @@
 	'LD=$(LD)' \
 	'LIPO=$(LIPO)' \
 	'NM=$(NM)' \
+	'OBJDUMP=$(OBJDUMP)' \
 	'RANLIB=$(RANLIB)' \
 	'STRIP=$(STRIP)' \
 	'WINDRES=$(WINDRES)'
@@ -493,21 +513,22 @@
 	'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; the variables
-# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.
+# 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.
 EXTRA_TARGET_FLAGS = \
 	'AR=$$(AR_FOR_TARGET)' \
-	'AS=$$(COMPILER_AS_FOR_TARGET)' \
+	'AS=$(COMPILER_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)' \
+	'LD=$(COMPILER_LD_FOR_TARGET)' \
 	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
 	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-	'NM=$$(COMPILER_NM_FOR_TARGET)' \
+	'NM=$(COMPILER_NM_FOR_TARGET)' \
 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)'
@@ -521,18 +542,12 @@
 # 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)" \
-	"`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 '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=/'`"
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
@@ -611,6 +626,7 @@
     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 \
@@ -626,7 +642,8 @@
     maybe-configure-target-boehm-gc \
     maybe-configure-target-qthreads \
     maybe-configure-target-rda \
-    maybe-configure-target-libada
+    maybe-configure-target-libada \
+    maybe-configure-target-libgomp
 
 # The target built for a native non-bootstrap build.
 .PHONY: all
@@ -635,9 +652,9 @@
 	[ -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; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble
 @endif gcc-bootstrap
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	if [ -f stage_last ]; then \
@@ -645,109 +662,134 @@
 	else \
 	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
 	fi
-	@$(stage)
 
 .PHONY: all-build
-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
+
+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
+
 .PHONY: all-host
-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-libdecnumber \
-    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
+
+all-host: maybe-all-ash
+all-host: maybe-all-autoconf
+all-host: maybe-all-automake
+all-host: maybe-all-bash
+ at if bfd-no-bootstrap
+all-host: maybe-all-bfd
+ at endif bfd-no-bootstrap
+ at if opcodes-no-bootstrap
+all-host: maybe-all-opcodes
+ at endif opcodes-no-bootstrap
+ at if binutils-no-bootstrap
+all-host: maybe-all-binutils
+ at 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
+ at if gas-no-bootstrap
+all-host: maybe-all-gas
+ at endif gas-no-bootstrap
+ at if gcc-no-bootstrap
+all-host: maybe-all-gcc
+ at 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
+ at if intl-no-bootstrap
+all-host: maybe-all-intl
+ at endif intl-no-bootstrap
+all-host: maybe-all-tcl
+all-host: maybe-all-itcl
+ at if ld-no-bootstrap
+all-host: maybe-all-ld
+ at endif ld-no-bootstrap
+ at if libcpp-no-bootstrap
+all-host: maybe-all-libcpp
+ at endif libcpp-no-bootstrap
+ at if libdecnumber-no-bootstrap
+all-host: maybe-all-libdecnumber
+ at endif libdecnumber-no-bootstrap
+all-host: maybe-all-libgui
+ at if libiberty-no-bootstrap
+all-host: maybe-all-libiberty
+ at 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
+ at if zlib-no-bootstrap
+all-host: maybe-all-zlib
+ at 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
+
 .PHONY: all-target
-all-target:  \
-    maybe-all-target-libstdc++-v3 \
-    maybe-all-target-libmudflap \
-    maybe-all-target-libssp \
-    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
 
+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
+
 # 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
 # dependency (below) of X upon do-X, a ``make X'' will also do this,
@@ -755,1038 +797,1152 @@
 
 .PHONY: do-info
 do-info:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
 	  info-target
-	@$(stage)
 
 
 .PHONY: info-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: info-target
-info-target:  \
-    maybe-info-target-libstdc++-v3 \
-    maybe-info-target-libmudflap \
-    maybe-info-target-libssp \
-    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
 
+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
+
 .PHONY: do-dvi
 do-dvi:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
 	  dvi-target
-	@$(stage)
 
 
 .PHONY: dvi-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: dvi-target
-dvi-target:  \
-    maybe-dvi-target-libstdc++-v3 \
-    maybe-dvi-target-libmudflap \
-    maybe-dvi-target-libssp \
-    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
 
+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
+
 .PHONY: do-html
 do-html:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
 	  html-target
-	@$(stage)
 
 
 .PHONY: html-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: html-target
-html-target:  \
-    maybe-html-target-libstdc++-v3 \
-    maybe-html-target-libmudflap \
-    maybe-html-target-libssp \
-    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
 
+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
+
 .PHONY: do-TAGS
 do-TAGS:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
 	  TAGS-target
-	@$(stage)
 
 
 .PHONY: TAGS-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: TAGS-target
-TAGS-target:  \
-    maybe-TAGS-target-libstdc++-v3 \
-    maybe-TAGS-target-libmudflap \
-    maybe-TAGS-target-libssp \
-    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
 
+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
+
 .PHONY: do-install-info
 do-install-info:
-	@$(unstage)
+	@: $(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
-	@$(stage)
 
 
 .PHONY: install-info-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: install-info-target
-install-info-target:  \
-    maybe-install-info-target-libstdc++-v3 \
-    maybe-install-info-target-libmudflap \
-    maybe-install-info-target-libssp \
-    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
 
+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
+
+.PHONY: do-install-html
+do-install-html:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-html-host \
+	  install-html-target
+
+
+.PHONY: install-html-host
+
+install-html-host: maybe-install-html-ash
+install-html-host: maybe-install-html-autoconf
+install-html-host: maybe-install-html-automake
+install-html-host: maybe-install-html-bash
+install-html-host: maybe-install-html-bfd
+install-html-host: maybe-install-html-opcodes
+install-html-host: maybe-install-html-binutils
+install-html-host: maybe-install-html-bison
+install-html-host: maybe-install-html-byacc
+install-html-host: maybe-install-html-bzip2
+install-html-host: maybe-install-html-dejagnu
+install-html-host: maybe-install-html-diff
+install-html-host: maybe-install-html-dosutils
+install-html-host: maybe-install-html-etc
+install-html-host: maybe-install-html-fastjar
+install-html-host: maybe-install-html-fileutils
+install-html-host: maybe-install-html-findutils
+install-html-host: maybe-install-html-find
+install-html-host: maybe-install-html-fixincludes
+install-html-host: maybe-install-html-flex
+install-html-host: maybe-install-html-gas
+install-html-host: maybe-install-html-gcc
+install-html-host: maybe-install-html-gawk
+install-html-host: maybe-install-html-gettext
+install-html-host: maybe-install-html-gnuserv
+install-html-host: maybe-install-html-gprof
+install-html-host: maybe-install-html-gzip
+install-html-host: maybe-install-html-hello
+install-html-host: maybe-install-html-indent
+install-html-host: maybe-install-html-intl
+install-html-host: maybe-install-html-tcl
+install-html-host: maybe-install-html-itcl
+install-html-host: maybe-install-html-ld
+install-html-host: maybe-install-html-libcpp
+install-html-host: maybe-install-html-libdecnumber
+install-html-host: maybe-install-html-libgui
+install-html-host: maybe-install-html-libiberty
+install-html-host: maybe-install-html-libtool
+install-html-host: maybe-install-html-m4
+install-html-host: maybe-install-html-make
+install-html-host: maybe-install-html-mmalloc
+install-html-host: maybe-install-html-patch
+install-html-host: maybe-install-html-perl
+install-html-host: maybe-install-html-prms
+install-html-host: maybe-install-html-rcs
+install-html-host: maybe-install-html-readline
+install-html-host: maybe-install-html-release
+install-html-host: maybe-install-html-recode
+install-html-host: maybe-install-html-sed
+install-html-host: maybe-install-html-send-pr
+install-html-host: maybe-install-html-shellutils
+install-html-host: maybe-install-html-sid
+install-html-host: maybe-install-html-sim
+install-html-host: maybe-install-html-tar
+install-html-host: maybe-install-html-texinfo
+install-html-host: maybe-install-html-textutils
+install-html-host: maybe-install-html-time
+install-html-host: maybe-install-html-uudecode
+install-html-host: maybe-install-html-wdiff
+install-html-host: maybe-install-html-zip
+install-html-host: maybe-install-html-zlib
+install-html-host: maybe-install-html-gdb
+install-html-host: maybe-install-html-expect
+install-html-host: maybe-install-html-guile
+install-html-host: maybe-install-html-tk
+install-html-host: maybe-install-html-libtermcap
+install-html-host: maybe-install-html-utils
+install-html-host: maybe-install-html-gnattools
+
+.PHONY: install-html-target
+
+install-html-target: maybe-install-html-target-libstdc++-v3
+install-html-target: maybe-install-html-target-libmudflap
+install-html-target: maybe-install-html-target-libssp
+install-html-target: maybe-install-html-target-libgcc-math
+install-html-target: maybe-install-html-target-newlib
+install-html-target: maybe-install-html-target-libgfortran
+install-html-target: maybe-install-html-target-libobjc
+install-html-target: maybe-install-html-target-libtermcap
+install-html-target: maybe-install-html-target-winsup
+install-html-target: maybe-install-html-target-libgloss
+install-html-target: maybe-install-html-target-libiberty
+install-html-target: maybe-install-html-target-gperf
+install-html-target: maybe-install-html-target-examples
+install-html-target: maybe-install-html-target-libffi
+install-html-target: maybe-install-html-target-libjava
+install-html-target: maybe-install-html-target-zlib
+install-html-target: maybe-install-html-target-boehm-gc
+install-html-target: maybe-install-html-target-qthreads
+install-html-target: maybe-install-html-target-rda
+install-html-target: maybe-install-html-target-libada
+install-html-target: maybe-install-html-target-libgomp
+
 .PHONY: do-installcheck
 do-installcheck:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
 	  installcheck-target
-	@$(stage)
 
 
 .PHONY: installcheck-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: installcheck-target
-installcheck-target:  \
-    maybe-installcheck-target-libstdc++-v3 \
-    maybe-installcheck-target-libmudflap \
-    maybe-installcheck-target-libssp \
-    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
 
+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
+
 .PHONY: do-mostlyclean
 do-mostlyclean:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
 	  mostlyclean-target
-	@$(stage)
 
 
 .PHONY: mostlyclean-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: mostlyclean-target
-mostlyclean-target:  \
-    maybe-mostlyclean-target-libstdc++-v3 \
-    maybe-mostlyclean-target-libmudflap \
-    maybe-mostlyclean-target-libssp \
-    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
 
+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
+
 .PHONY: do-clean
 do-clean:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
 	  clean-target
-	@$(stage)
 
 
 .PHONY: clean-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: clean-target
-clean-target:  \
-    maybe-clean-target-libstdc++-v3 \
-    maybe-clean-target-libmudflap \
-    maybe-clean-target-libssp \
-    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
 
+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
+
 .PHONY: do-distclean
 do-distclean:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
 	  distclean-target
-	@$(stage)
 
 
 .PHONY: distclean-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: distclean-target
-distclean-target:  \
-    maybe-distclean-target-libstdc++-v3 \
-    maybe-distclean-target-libmudflap \
-    maybe-distclean-target-libssp \
-    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
 
+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
+
 .PHONY: do-maintainer-clean
 do-maintainer-clean:
-	@$(unstage)
+	@: $(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
-	@$(stage)
 
 
 .PHONY: maintainer-clean-host
-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-libdecnumber \
-    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
 
+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
+
 .PHONY: maintainer-clean-target
-maintainer-clean-target:  \
-    maybe-maintainer-clean-target-libstdc++-v3 \
-    maybe-maintainer-clean-target-libmudflap \
-    maybe-maintainer-clean-target-libssp \
-    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
 
+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
 
+
 # Here are the targets which correspond to the do-X targets.
 
-.PHONY: info installcheck dvi html install-info
+.PHONY: info installcheck dvi html install-info install-html
 .PHONY: clean distclean mostlyclean maintainer-clean realclean
 .PHONY: local-clean local-distclean local-maintainer-clean
 info: do-info
@@ -1804,12 +1960,14 @@
 	  $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
 	else true ; fi
 
+install-html: do-install-html
+
 local-clean:
 	-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E *.log
 
 local-distclean:
 	-rm -f Makefile config.status config.cache mh-frag mt-frag
-	-rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
+	-rm -f maybedep.tmp serdep.tmp
 	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
 	  rm -rf $(TARGET_SUBDIR); \
 	else true; fi
@@ -1921,6 +2079,7 @@
     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 \
@@ -1936,14 +2095,14 @@
     maybe-check-target-boehm-gc \
     maybe-check-target-qthreads \
     maybe-check-target-rda \
-    maybe-check-target-libada
+    maybe-check-target-libada \
+    maybe-check-target-libgomp
 
 do-check:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
-	@$(stage)
 
 # Automated reporting of test results.
 
@@ -1970,11 +2129,10 @@
 
 .PHONY: install uninstall
 install:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
-	@$(stage)
 
 .PHONY: install-host-nogcc
 install-host-nogcc:  \
@@ -2122,6 +2280,7 @@
     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 \
@@ -2137,7 +2296,8 @@
     maybe-install-target-boehm-gc \
     maybe-install-target-qthreads \
     maybe-install-target-rda \
-    maybe-install-target-libada
+    maybe-install-target-libada \
+    maybe-install-target-libgomp
 
 uninstall:
 	@echo "the uninstall target is not supported in this tree"
@@ -2146,6 +2306,7 @@
 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) ; \
@@ -2207,11 +2368,11 @@
 @if build-libiberty
 maybe-configure-build-libiberty: configure-build-libiberty
 configure-build-libiberty: 
-	@$(unstage)
-	@test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -2238,7 +2399,7 @@
 TARGET-build-libiberty=all
 maybe-all-build-libiberty: all-build-libiberty
 all-build-libiberty: configure-build-libiberty
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2255,11 +2416,11 @@
 @if build-bison
 maybe-configure-build-bison: configure-build-bison
 configure-build-bison: 
-	@$(unstage)
-	@test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -2286,7 +2447,7 @@
 TARGET-build-bison=all
 maybe-all-build-bison: all-build-bison
 all-build-bison: configure-build-bison
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2303,11 +2464,11 @@
 @if build-byacc
 maybe-configure-build-byacc: configure-build-byacc
 configure-build-byacc: 
-	@$(unstage)
-	@test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -2334,7 +2495,7 @@
 TARGET-build-byacc=all
 maybe-all-build-byacc: all-build-byacc
 all-build-byacc: configure-build-byacc
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2351,11 +2512,11 @@
 @if build-flex
 maybe-configure-build-flex: configure-build-flex
 configure-build-flex: 
-	@$(unstage)
-	@test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -2382,7 +2543,7 @@
 TARGET-build-flex=all
 maybe-all-build-flex: all-build-flex
 all-build-flex: configure-build-flex
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2399,11 +2560,11 @@
 @if build-m4
 maybe-configure-build-m4: configure-build-m4
 configure-build-m4: 
-	@$(unstage)
-	@test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -2430,7 +2591,7 @@
 TARGET-build-m4=all
 maybe-all-build-m4: all-build-m4
 all-build-m4: configure-build-m4
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2447,11 +2608,11 @@
 @if build-texinfo
 maybe-configure-build-texinfo: configure-build-texinfo
 configure-build-texinfo: 
-	@$(unstage)
-	@test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -2478,7 +2639,7 @@
 TARGET-build-texinfo=all
 maybe-all-build-texinfo: all-build-texinfo
 all-build-texinfo: configure-build-texinfo
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2495,11 +2656,11 @@
 @if build-fixincludes
 maybe-configure-build-fixincludes: configure-build-fixincludes
 configure-build-fixincludes: 
-	@$(unstage)
-	@test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -2526,7 +2687,7 @@
 TARGET-build-fixincludes=all
 maybe-all-build-fixincludes: all-build-fixincludes
 all-build-fixincludes: configure-build-fixincludes
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(BUILD_EXPORTS) \
@@ -2548,11 +2709,11 @@
 @if ash
 maybe-configure-ash: configure-ash
 configure-ash: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -2578,7 +2739,7 @@
 TARGET-ash=all
 maybe-all-ash: all-ash
 all-ash: configure-ash
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2595,7 +2756,7 @@
 maybe-check-ash: check-ash
 
 check-ash:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2610,7 +2771,7 @@
 maybe-install-ash: install-ash
 
 install-ash: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2628,7 +2789,7 @@
 
 info-ash: \
     configure-ash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2654,7 +2815,7 @@
 
 dvi-ash: \
     configure-ash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2680,7 +2841,7 @@
 
 html-ash: \
     configure-ash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2706,7 +2867,7 @@
 
 TAGS-ash: \
     configure-ash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2733,7 +2894,7 @@
 install-info-ash: \
     configure-ash \
     info-ash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2752,6 +2913,33 @@
 
 @endif ash
 
+.PHONY: maybe-install-html-ash install-html-ash
+maybe-install-html-ash:
+ at if ash
+maybe-install-html-ash: install-html-ash
+
+install-html-ash: \
+    configure-ash \
+    html-ash 
+	@: $(MAKE); $(unstage)
+	@[ -f ./ash/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-html in ash" ; \
+	(cd $(HOST_SUBDIR)/ash && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif ash
+
 .PHONY: maybe-installcheck-ash installcheck-ash
 maybe-installcheck-ash:
 @if ash
@@ -2759,7 +2947,7 @@
 
 installcheck-ash: \
     configure-ash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2784,7 +2972,7 @@
 maybe-mostlyclean-ash: mostlyclean-ash
 
 mostlyclean-ash: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2809,7 +2997,7 @@
 maybe-clean-ash: clean-ash
 
 clean-ash: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2834,7 +3022,7 @@
 maybe-distclean-ash: distclean-ash
 
 distclean-ash: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2859,7 +3047,7 @@
 maybe-maintainer-clean-ash: maintainer-clean-ash
 
 maintainer-clean-ash: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./ash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2885,11 +3073,11 @@
 @if autoconf
 maybe-configure-autoconf: configure-autoconf
 configure-autoconf: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -2915,7 +3103,7 @@
 TARGET-autoconf=all
 maybe-all-autoconf: all-autoconf
 all-autoconf: configure-autoconf
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2932,7 +3120,7 @@
 maybe-check-autoconf: check-autoconf
 
 check-autoconf:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2947,7 +3135,7 @@
 maybe-install-autoconf: install-autoconf
 
 install-autoconf: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -2965,7 +3153,7 @@
 
 info-autoconf: \
     configure-autoconf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -2991,7 +3179,7 @@
 
 dvi-autoconf: \
     configure-autoconf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3017,7 +3205,7 @@
 
 html-autoconf: \
     configure-autoconf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3043,7 +3231,7 @@
 
 TAGS-autoconf: \
     configure-autoconf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3070,7 +3258,7 @@
 install-info-autoconf: \
     configure-autoconf \
     info-autoconf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3089,6 +3277,33 @@
 
 @endif autoconf
 
+.PHONY: maybe-install-html-autoconf install-html-autoconf
+maybe-install-html-autoconf:
+ at if autoconf
+maybe-install-html-autoconf: install-html-autoconf
+
+install-html-autoconf: \
+    configure-autoconf \
+    html-autoconf 
+	@: $(MAKE); $(unstage)
+	@[ -f ./autoconf/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-html in autoconf" ; \
+	(cd $(HOST_SUBDIR)/autoconf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif autoconf
+
 .PHONY: maybe-installcheck-autoconf installcheck-autoconf
 maybe-installcheck-autoconf:
 @if autoconf
@@ -3096,7 +3311,7 @@
 
 installcheck-autoconf: \
     configure-autoconf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3121,7 +3336,7 @@
 maybe-mostlyclean-autoconf: mostlyclean-autoconf
 
 mostlyclean-autoconf: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3146,7 +3361,7 @@
 maybe-clean-autoconf: clean-autoconf
 
 clean-autoconf: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3171,7 +3386,7 @@
 maybe-distclean-autoconf: distclean-autoconf
 
 distclean-autoconf: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3196,7 +3411,7 @@
 maybe-maintainer-clean-autoconf: maintainer-clean-autoconf
 
 maintainer-clean-autoconf: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./autoconf/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3222,11 +3437,11 @@
 @if automake
 maybe-configure-automake: configure-automake
 configure-automake: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -3252,7 +3467,7 @@
 TARGET-automake=all
 maybe-all-automake: all-automake
 all-automake: configure-automake
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3269,7 +3484,7 @@
 maybe-check-automake: check-automake
 
 check-automake:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3284,7 +3499,7 @@
 maybe-install-automake: install-automake
 
 install-automake: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3302,7 +3517,7 @@
 
 info-automake: \
     configure-automake 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3328,7 +3543,7 @@
 
 dvi-automake: \
     configure-automake 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3354,7 +3569,7 @@
 
 html-automake: \
     configure-automake 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3380,7 +3595,7 @@
 
 TAGS-automake: \
     configure-automake 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3407,7 +3622,7 @@
 install-info-automake: \
     configure-automake \
     info-automake 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3426,6 +3641,33 @@
 
 @endif automake
 
+.PHONY: maybe-install-html-automake install-html-automake
+maybe-install-html-automake:
+ at if automake
+maybe-install-html-automake: install-html-automake
+
+install-html-automake: \
+    configure-automake \
+    html-automake 
+	@: $(MAKE); $(unstage)
+	@[ -f ./automake/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-html in automake" ; \
+	(cd $(HOST_SUBDIR)/automake && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif automake
+
 .PHONY: maybe-installcheck-automake installcheck-automake
 maybe-installcheck-automake:
 @if automake
@@ -3433,7 +3675,7 @@
 
 installcheck-automake: \
     configure-automake 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3458,7 +3700,7 @@
 maybe-mostlyclean-automake: mostlyclean-automake
 
 mostlyclean-automake: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3483,7 +3725,7 @@
 maybe-clean-automake: clean-automake
 
 clean-automake: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3508,7 +3750,7 @@
 maybe-distclean-automake: distclean-automake
 
 distclean-automake: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3533,7 +3775,7 @@
 maybe-maintainer-clean-automake: maintainer-clean-automake
 
 maintainer-clean-automake: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./automake/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3559,11 +3801,11 @@
 @if bash
 maybe-configure-bash: configure-bash
 configure-bash: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -3589,7 +3831,7 @@
 TARGET-bash=all
 maybe-all-bash: all-bash
 all-bash: configure-bash
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3606,7 +3848,7 @@
 maybe-check-bash: check-bash
 
 check-bash:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3621,7 +3863,7 @@
 maybe-install-bash: install-bash
 
 install-bash: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -3639,7 +3881,7 @@
 
 info-bash: \
     configure-bash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3665,7 +3907,7 @@
 
 dvi-bash: \
     configure-bash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3691,7 +3933,7 @@
 
 html-bash: \
     configure-bash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3717,7 +3959,7 @@
 
 TAGS-bash: \
     configure-bash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3744,7 +3986,7 @@
 install-info-bash: \
     configure-bash \
     info-bash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3763,6 +4005,33 @@
 
 @endif bash
 
+.PHONY: maybe-install-html-bash install-html-bash
+maybe-install-html-bash:
+ at if bash
+maybe-install-html-bash: install-html-bash
+
+install-html-bash: \
+    configure-bash \
+    html-bash 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bash/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-html in bash" ; \
+	(cd $(HOST_SUBDIR)/bash && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif bash
+
 .PHONY: maybe-installcheck-bash installcheck-bash
 maybe-installcheck-bash:
 @if bash
@@ -3770,7 +4039,7 @@
 
 installcheck-bash: \
     configure-bash 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3795,7 +4064,7 @@
 maybe-mostlyclean-bash: mostlyclean-bash
 
 mostlyclean-bash: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3820,7 +4089,7 @@
 maybe-clean-bash: clean-bash
 
 clean-bash: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3845,7 +4114,7 @@
 maybe-distclean-bash: distclean-bash
 
 distclean-bash: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3870,7 +4139,7 @@
 maybe-maintainer-clean-bash: maintainer-clean-bash
 
 maintainer-clean-bash: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bash/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -3896,11 +4165,15 @@
 @if bfd
 maybe-configure-bfd: configure-bfd
 configure-bfd: 
-	@test -f stage_last && exit 0; \
+ at endif bfd
+ at if bfd-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif bfd-bootstrap
+ at if bfd
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -3922,13 +4195,15 @@
 maybe-configure-stage1-bfd:
 @if bfd-bootstrap
 maybe-configure-stage1-bfd: configure-stage1-bfd
-configure-stage1-bfd: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -3946,14 +4221,16 @@
 maybe-configure-stage2-bfd:
 @if bfd-bootstrap
 maybe-configure-stage2-bfd: configure-stage2-bfd
-configure-stage2-bfd: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -3971,14 +4248,16 @@
 maybe-configure-stage3-bfd:
 @if bfd-bootstrap
 maybe-configure-stage3-bfd: configure-stage3-bfd
-configure-stage3-bfd: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -3996,14 +4275,16 @@
 maybe-configure-stage4-bfd:
 @if bfd-bootstrap
 maybe-configure-stage4-bfd: configure-stage4-bfd
-configure-stage4-bfd: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -4021,14 +4302,16 @@
 maybe-configure-stageprofile-bfd:
 @if bfd-bootstrap
 maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
-configure-stageprofile-bfd: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -4046,14 +4329,16 @@
 maybe-configure-stagefeedback-bfd:
 @if bfd-bootstrap
 maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
-configure-stagefeedback-bfd: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -4077,8 +4362,12 @@
 TARGET-bfd=all
 maybe-all-bfd: all-bfd
 all-bfd: configure-bfd
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif bfd
+ at if bfd-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif bfd-bootstrap
+ at if bfd
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/bfd && \
@@ -4096,12 +4385,12 @@
 all-stage1: all-stage1-bfd
 TARGET-stage1-bfd = $(TARGET-bfd)
 all-stage1-bfd: configure-stage1-bfd
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-bfd)
 
 maybe-clean-stage1-bfd: clean-stage1-bfd
@@ -4109,10 +4398,10 @@
 clean-stage1-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif bfd-bootstrap
 
 
@@ -4125,7 +4414,7 @@
 all-stage2: all-stage2-bfd
 TARGET-stage2-bfd = $(TARGET-bfd)
 all-stage2-bfd: configure-stage2-bfd
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4139,7 +4428,7 @@
 clean-stage2-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4156,7 +4445,7 @@
 all-stage3: all-stage3-bfd
 TARGET-stage3-bfd = $(TARGET-bfd)
 all-stage3-bfd: configure-stage3-bfd
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4170,7 +4459,7 @@
 clean-stage3-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4187,7 +4476,7 @@
 all-stage4: all-stage4-bfd
 TARGET-stage4-bfd = $(TARGET-bfd)
 all-stage4-bfd: configure-stage4-bfd
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4201,7 +4490,7 @@
 clean-stage4-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4218,7 +4507,7 @@
 all-stageprofile: all-stageprofile-bfd
 TARGET-stageprofile-bfd = $(TARGET-bfd)
 all-stageprofile-bfd: configure-stageprofile-bfd
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4232,7 +4521,7 @@
 clean-stageprofile-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4249,7 +4538,7 @@
 all-stagefeedback: all-stagefeedback-bfd
 TARGET-stagefeedback-bfd = $(TARGET-bfd)
 all-stagefeedback-bfd: configure-stagefeedback-bfd
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4263,7 +4552,7 @@
 clean-stagefeedback-bfd:
 	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4280,7 +4569,7 @@
 maybe-check-bfd: check-bfd
 
 check-bfd:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4295,7 +4584,7 @@
 maybe-install-bfd: install-bfd
 
 install-bfd: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4432,6 +4721,32 @@
 
 @endif bfd
 
+.PHONY: maybe-install-html-bfd install-html-bfd
+maybe-install-html-bfd:
+ at if bfd
+maybe-install-html-bfd: install-html-bfd
+
+install-html-bfd: \
+    configure-bfd \
+    html-bfd 
+	@[ -f ./bfd/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-html in bfd" ; \
+	(cd $(HOST_SUBDIR)/bfd && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif bfd
+
 .PHONY: maybe-installcheck-bfd installcheck-bfd
 maybe-installcheck-bfd:
 @if bfd
@@ -4560,11 +4875,15 @@
 @if opcodes
 maybe-configure-opcodes: configure-opcodes
 configure-opcodes: 
-	@test -f stage_last && exit 0; \
+ at endif opcodes
+ at if opcodes-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif opcodes-bootstrap
+ at if opcodes
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -4586,13 +4905,15 @@
 maybe-configure-stage1-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage1-opcodes: configure-stage1-opcodes
-configure-stage1-opcodes: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -4610,14 +4931,16 @@
 maybe-configure-stage2-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage2-opcodes: configure-stage2-opcodes
-configure-stage2-opcodes: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -4635,14 +4958,16 @@
 maybe-configure-stage3-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage3-opcodes: configure-stage3-opcodes
-configure-stage3-opcodes: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -4660,14 +4985,16 @@
 maybe-configure-stage4-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stage4-opcodes: configure-stage4-opcodes
-configure-stage4-opcodes: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -4685,14 +5012,16 @@
 maybe-configure-stageprofile-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
-configure-stageprofile-opcodes: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -4710,14 +5039,16 @@
 maybe-configure-stagefeedback-opcodes:
 @if opcodes-bootstrap
 maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
-configure-stagefeedback-opcodes: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -4741,8 +5072,12 @@
 TARGET-opcodes=all
 maybe-all-opcodes: all-opcodes
 all-opcodes: configure-opcodes
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif opcodes
+ at if opcodes-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif opcodes-bootstrap
+ at if opcodes
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/opcodes && \
@@ -4760,12 +5095,12 @@
 all-stage1: all-stage1-opcodes
 TARGET-stage1-opcodes = $(TARGET-opcodes)
 all-stage1-opcodes: configure-stage1-opcodes
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-opcodes)
 
 maybe-clean-stage1-opcodes: clean-stage1-opcodes
@@ -4773,10 +5108,10 @@
 clean-stage1-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif opcodes-bootstrap
 
 
@@ -4789,7 +5124,7 @@
 all-stage2: all-stage2-opcodes
 TARGET-stage2-opcodes = $(TARGET-opcodes)
 all-stage2-opcodes: configure-stage2-opcodes
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4803,7 +5138,7 @@
 clean-stage2-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4820,7 +5155,7 @@
 all-stage3: all-stage3-opcodes
 TARGET-stage3-opcodes = $(TARGET-opcodes)
 all-stage3-opcodes: configure-stage3-opcodes
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4834,7 +5169,7 @@
 clean-stage3-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4851,7 +5186,7 @@
 all-stage4: all-stage4-opcodes
 TARGET-stage4-opcodes = $(TARGET-opcodes)
 all-stage4-opcodes: configure-stage4-opcodes
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4865,7 +5200,7 @@
 clean-stage4-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4882,7 +5217,7 @@
 all-stageprofile: all-stageprofile-opcodes
 TARGET-stageprofile-opcodes = $(TARGET-opcodes)
 all-stageprofile-opcodes: configure-stageprofile-opcodes
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4896,7 +5231,7 @@
 clean-stageprofile-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4913,7 +5248,7 @@
 all-stagefeedback: all-stagefeedback-opcodes
 TARGET-stagefeedback-opcodes = $(TARGET-opcodes)
 all-stagefeedback-opcodes: configure-stagefeedback-opcodes
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4927,7 +5262,7 @@
 clean-stagefeedback-opcodes:
 	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -4944,7 +5279,7 @@
 maybe-check-opcodes: check-opcodes
 
 check-opcodes:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -4959,7 +5294,7 @@
 maybe-install-opcodes: install-opcodes
 
 install-opcodes: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5096,6 +5431,32 @@
 
 @endif opcodes
 
+.PHONY: maybe-install-html-opcodes install-html-opcodes
+maybe-install-html-opcodes:
+ at if opcodes
+maybe-install-html-opcodes: install-html-opcodes
+
+install-html-opcodes: \
+    configure-opcodes \
+    html-opcodes 
+	@[ -f ./opcodes/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-html in opcodes" ; \
+	(cd $(HOST_SUBDIR)/opcodes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif opcodes
+
 .PHONY: maybe-installcheck-opcodes installcheck-opcodes
 maybe-installcheck-opcodes:
 @if opcodes
@@ -5224,11 +5585,15 @@
 @if binutils
 maybe-configure-binutils: configure-binutils
 configure-binutils: 
-	@test -f stage_last && exit 0; \
+ at endif binutils
+ at if binutils-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif binutils-bootstrap
+ at if binutils
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -5250,13 +5615,15 @@
 maybe-configure-stage1-binutils:
 @if binutils-bootstrap
 maybe-configure-stage1-binutils: configure-stage1-binutils
-configure-stage1-binutils: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -5274,14 +5641,16 @@
 maybe-configure-stage2-binutils:
 @if binutils-bootstrap
 maybe-configure-stage2-binutils: configure-stage2-binutils
-configure-stage2-binutils: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -5299,14 +5668,16 @@
 maybe-configure-stage3-binutils:
 @if binutils-bootstrap
 maybe-configure-stage3-binutils: configure-stage3-binutils
-configure-stage3-binutils: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -5324,14 +5695,16 @@
 maybe-configure-stage4-binutils:
 @if binutils-bootstrap
 maybe-configure-stage4-binutils: configure-stage4-binutils
-configure-stage4-binutils: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -5349,14 +5722,16 @@
 maybe-configure-stageprofile-binutils:
 @if binutils-bootstrap
 maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
-configure-stageprofile-binutils: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -5374,14 +5749,16 @@
 maybe-configure-stagefeedback-binutils:
 @if binutils-bootstrap
 maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
-configure-stagefeedback-binutils: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -5405,8 +5782,12 @@
 TARGET-binutils=all
 maybe-all-binutils: all-binutils
 all-binutils: configure-binutils
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif binutils
+ at if binutils-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif binutils-bootstrap
+ at if binutils
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/binutils && \
@@ -5424,12 +5805,12 @@
 all-stage1: all-stage1-binutils
 TARGET-stage1-binutils = $(TARGET-binutils)
 all-stage1-binutils: configure-stage1-binutils
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-binutils)
 
 maybe-clean-stage1-binutils: clean-stage1-binutils
@@ -5437,10 +5818,10 @@
 clean-stage1-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif binutils-bootstrap
 
 
@@ -5453,7 +5834,7 @@
 all-stage2: all-stage2-binutils
 TARGET-stage2-binutils = $(TARGET-binutils)
 all-stage2-binutils: configure-stage2-binutils
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5467,7 +5848,7 @@
 clean-stage2-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5484,7 +5865,7 @@
 all-stage3: all-stage3-binutils
 TARGET-stage3-binutils = $(TARGET-binutils)
 all-stage3-binutils: configure-stage3-binutils
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5498,7 +5879,7 @@
 clean-stage3-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5515,7 +5896,7 @@
 all-stage4: all-stage4-binutils
 TARGET-stage4-binutils = $(TARGET-binutils)
 all-stage4-binutils: configure-stage4-binutils
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5529,7 +5910,7 @@
 clean-stage4-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5546,7 +5927,7 @@
 all-stageprofile: all-stageprofile-binutils
 TARGET-stageprofile-binutils = $(TARGET-binutils)
 all-stageprofile-binutils: configure-stageprofile-binutils
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5560,7 +5941,7 @@
 clean-stageprofile-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5577,7 +5958,7 @@
 all-stagefeedback: all-stagefeedback-binutils
 TARGET-stagefeedback-binutils = $(TARGET-binutils)
 all-stagefeedback-binutils: configure-stagefeedback-binutils
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5591,7 +5972,7 @@
 clean-stagefeedback-binutils:
 	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -5608,7 +5989,7 @@
 maybe-check-binutils: check-binutils
 
 check-binutils:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5623,7 +6004,7 @@
 maybe-install-binutils: install-binutils
 
 install-binutils: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5760,6 +6141,32 @@
 
 @endif binutils
 
+.PHONY: maybe-install-html-binutils install-html-binutils
+maybe-install-html-binutils:
+ at if binutils
+maybe-install-html-binutils: install-html-binutils
+
+install-html-binutils: \
+    configure-binutils \
+    html-binutils 
+	@[ -f ./binutils/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-html in binutils" ; \
+	(cd $(HOST_SUBDIR)/binutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif binutils
+
 .PHONY: maybe-installcheck-binutils installcheck-binutils
 maybe-installcheck-binutils:
 @if binutils
@@ -5888,11 +6295,11 @@
 @if bison
 maybe-configure-bison: configure-bison
 configure-bison: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -5918,7 +6325,7 @@
 TARGET-bison=all
 maybe-all-bison: all-bison
 all-bison: configure-bison
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5936,7 +6343,7 @@
 
 # This module is only tested in a native toolchain.
 check-bison:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5953,7 +6360,7 @@
 maybe-install-bison: install-bison
 
 install-bison: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -5971,7 +6378,7 @@
 
 info-bison: \
     configure-bison 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -5997,7 +6404,7 @@
 
 dvi-bison: \
     configure-bison 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6023,7 +6430,7 @@
 
 html-bison: \
     configure-bison 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6049,7 +6456,7 @@
 
 TAGS-bison: \
     configure-bison 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6076,7 +6483,7 @@
 install-info-bison: \
     configure-bison \
     info-bison 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6095,6 +6502,33 @@
 
 @endif bison
 
+.PHONY: maybe-install-html-bison install-html-bison
+maybe-install-html-bison:
+ at if bison
+maybe-install-html-bison: install-html-bison
+
+install-html-bison: \
+    configure-bison \
+    html-bison 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bison/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-html in bison" ; \
+	(cd $(HOST_SUBDIR)/bison && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif bison
+
 .PHONY: maybe-installcheck-bison installcheck-bison
 maybe-installcheck-bison:
 @if bison
@@ -6102,7 +6536,7 @@
 
 installcheck-bison: \
     configure-bison 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6127,7 +6561,7 @@
 maybe-mostlyclean-bison: mostlyclean-bison
 
 mostlyclean-bison: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6152,7 +6586,7 @@
 maybe-clean-bison: clean-bison
 
 clean-bison: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6177,7 +6611,7 @@
 maybe-distclean-bison: distclean-bison
 
 distclean-bison: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6202,7 +6636,7 @@
 maybe-maintainer-clean-bison: maintainer-clean-bison
 
 maintainer-clean-bison: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bison/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6228,11 +6662,11 @@
 @if byacc
 maybe-configure-byacc: configure-byacc
 configure-byacc: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -6258,7 +6692,7 @@
 TARGET-byacc=all
 maybe-all-byacc: all-byacc
 all-byacc: configure-byacc
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6276,7 +6710,7 @@
 
 # This module is only tested in a native toolchain.
 check-byacc:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6293,7 +6727,7 @@
 maybe-install-byacc: install-byacc
 
 install-byacc: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6311,7 +6745,7 @@
 
 info-byacc: \
     configure-byacc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6337,7 +6771,7 @@
 
 dvi-byacc: \
     configure-byacc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6363,7 +6797,7 @@
 
 html-byacc: \
     configure-byacc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6389,7 +6823,7 @@
 
 TAGS-byacc: \
     configure-byacc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6416,7 +6850,7 @@
 install-info-byacc: \
     configure-byacc \
     info-byacc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6435,6 +6869,33 @@
 
 @endif byacc
 
+.PHONY: maybe-install-html-byacc install-html-byacc
+maybe-install-html-byacc:
+ at if byacc
+maybe-install-html-byacc: install-html-byacc
+
+install-html-byacc: \
+    configure-byacc \
+    html-byacc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./byacc/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-html in byacc" ; \
+	(cd $(HOST_SUBDIR)/byacc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif byacc
+
 .PHONY: maybe-installcheck-byacc installcheck-byacc
 maybe-installcheck-byacc:
 @if byacc
@@ -6442,7 +6903,7 @@
 
 installcheck-byacc: \
     configure-byacc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6467,7 +6928,7 @@
 maybe-mostlyclean-byacc: mostlyclean-byacc
 
 mostlyclean-byacc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6492,7 +6953,7 @@
 maybe-clean-byacc: clean-byacc
 
 clean-byacc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6517,7 +6978,7 @@
 maybe-distclean-byacc: distclean-byacc
 
 distclean-byacc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6542,7 +7003,7 @@
 maybe-maintainer-clean-byacc: maintainer-clean-byacc
 
 maintainer-clean-byacc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./byacc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6568,11 +7029,11 @@
 @if bzip2
 maybe-configure-bzip2: configure-bzip2
 configure-bzip2: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -6598,7 +7059,7 @@
 TARGET-bzip2=all
 maybe-all-bzip2: all-bzip2
 all-bzip2: configure-bzip2
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6615,7 +7076,7 @@
 maybe-check-bzip2: check-bzip2
 
 check-bzip2:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6630,7 +7091,7 @@
 maybe-install-bzip2: install-bzip2
 
 install-bzip2: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6648,7 +7109,7 @@
 
 info-bzip2: \
     configure-bzip2 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6674,7 +7135,7 @@
 
 dvi-bzip2: \
     configure-bzip2 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6700,7 +7161,7 @@
 
 html-bzip2: \
     configure-bzip2 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6726,7 +7187,7 @@
 
 TAGS-bzip2: \
     configure-bzip2 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6753,7 +7214,7 @@
 install-info-bzip2: \
     configure-bzip2 \
     info-bzip2 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6772,6 +7233,33 @@
 
 @endif bzip2
 
+.PHONY: maybe-install-html-bzip2 install-html-bzip2
+maybe-install-html-bzip2:
+ at if bzip2
+maybe-install-html-bzip2: install-html-bzip2
+
+install-html-bzip2: \
+    configure-bzip2 \
+    html-bzip2 
+	@: $(MAKE); $(unstage)
+	@[ -f ./bzip2/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-html in bzip2" ; \
+	(cd $(HOST_SUBDIR)/bzip2 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif bzip2
+
 .PHONY: maybe-installcheck-bzip2 installcheck-bzip2
 maybe-installcheck-bzip2:
 @if bzip2
@@ -6779,7 +7267,7 @@
 
 installcheck-bzip2: \
     configure-bzip2 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6804,7 +7292,7 @@
 maybe-mostlyclean-bzip2: mostlyclean-bzip2
 
 mostlyclean-bzip2: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6829,7 +7317,7 @@
 maybe-clean-bzip2: clean-bzip2
 
 clean-bzip2: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6854,7 +7342,7 @@
 maybe-distclean-bzip2: distclean-bzip2
 
 distclean-bzip2: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6879,7 +7367,7 @@
 maybe-maintainer-clean-bzip2: maintainer-clean-bzip2
 
 maintainer-clean-bzip2: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./bzip2/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -6905,11 +7393,11 @@
 @if dejagnu
 maybe-configure-dejagnu: configure-dejagnu
 configure-dejagnu: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -6935,7 +7423,7 @@
 TARGET-dejagnu=all
 maybe-all-dejagnu: all-dejagnu
 all-dejagnu: configure-dejagnu
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6952,7 +7440,7 @@
 maybe-check-dejagnu: check-dejagnu
 
 check-dejagnu:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6967,7 +7455,7 @@
 maybe-install-dejagnu: install-dejagnu
 
 install-dejagnu: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -6985,7 +7473,7 @@
 
 info-dejagnu: \
     configure-dejagnu 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7011,7 +7499,7 @@
 
 dvi-dejagnu: \
     configure-dejagnu 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7037,7 +7525,7 @@
 
 html-dejagnu: \
     configure-dejagnu 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7063,7 +7551,7 @@
 
 TAGS-dejagnu: \
     configure-dejagnu 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7090,7 +7578,7 @@
 install-info-dejagnu: \
     configure-dejagnu \
     info-dejagnu 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7109,6 +7597,33 @@
 
 @endif dejagnu
 
+.PHONY: maybe-install-html-dejagnu install-html-dejagnu
+maybe-install-html-dejagnu:
+ at if dejagnu
+maybe-install-html-dejagnu: install-html-dejagnu
+
+install-html-dejagnu: \
+    configure-dejagnu \
+    html-dejagnu 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dejagnu/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-html in dejagnu" ; \
+	(cd $(HOST_SUBDIR)/dejagnu && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif dejagnu
+
 .PHONY: maybe-installcheck-dejagnu installcheck-dejagnu
 maybe-installcheck-dejagnu:
 @if dejagnu
@@ -7116,7 +7631,7 @@
 
 installcheck-dejagnu: \
     configure-dejagnu 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7141,7 +7656,7 @@
 maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
 
 mostlyclean-dejagnu: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7166,7 +7681,7 @@
 maybe-clean-dejagnu: clean-dejagnu
 
 clean-dejagnu: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7191,7 +7706,7 @@
 maybe-distclean-dejagnu: distclean-dejagnu
 
 distclean-dejagnu: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7216,7 +7731,7 @@
 maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
 
 maintainer-clean-dejagnu: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dejagnu/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7242,11 +7757,11 @@
 @if diff
 maybe-configure-diff: configure-diff
 configure-diff: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -7272,7 +7787,7 @@
 TARGET-diff=all
 maybe-all-diff: all-diff
 all-diff: configure-diff
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7289,7 +7804,7 @@
 maybe-check-diff: check-diff
 
 check-diff:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7304,7 +7819,7 @@
 maybe-install-diff: install-diff
 
 install-diff: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7322,7 +7837,7 @@
 
 info-diff: \
     configure-diff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7348,7 +7863,7 @@
 
 dvi-diff: \
     configure-diff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7374,7 +7889,7 @@
 
 html-diff: \
     configure-diff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7400,7 +7915,7 @@
 
 TAGS-diff: \
     configure-diff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7427,7 +7942,7 @@
 install-info-diff: \
     configure-diff \
     info-diff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7446,6 +7961,33 @@
 
 @endif diff
 
+.PHONY: maybe-install-html-diff install-html-diff
+maybe-install-html-diff:
+ at if diff
+maybe-install-html-diff: install-html-diff
+
+install-html-diff: \
+    configure-diff \
+    html-diff 
+	@: $(MAKE); $(unstage)
+	@[ -f ./diff/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-html in diff" ; \
+	(cd $(HOST_SUBDIR)/diff && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif diff
+
 .PHONY: maybe-installcheck-diff installcheck-diff
 maybe-installcheck-diff:
 @if diff
@@ -7453,7 +7995,7 @@
 
 installcheck-diff: \
     configure-diff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7478,7 +8020,7 @@
 maybe-mostlyclean-diff: mostlyclean-diff
 
 mostlyclean-diff: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7503,7 +8045,7 @@
 maybe-clean-diff: clean-diff
 
 clean-diff: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7528,7 +8070,7 @@
 maybe-distclean-diff: distclean-diff
 
 distclean-diff: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7553,7 +8095,7 @@
 maybe-maintainer-clean-diff: maintainer-clean-diff
 
 maintainer-clean-diff: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./diff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7579,11 +8121,11 @@
 @if dosutils
 maybe-configure-dosutils: configure-dosutils
 configure-dosutils: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -7609,7 +8151,7 @@
 TARGET-dosutils=all
 maybe-all-dosutils: all-dosutils
 all-dosutils: configure-dosutils
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7635,7 +8177,7 @@
 maybe-install-dosutils: install-dosutils
 
 install-dosutils: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7653,7 +8195,7 @@
 
 info-dosutils: \
     configure-dosutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7679,7 +8221,7 @@
 
 dvi-dosutils: \
     configure-dosutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7705,7 +8247,7 @@
 
 html-dosutils: \
     configure-dosutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7731,7 +8273,7 @@
 
 TAGS-dosutils: \
     configure-dosutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7758,7 +8300,7 @@
 install-info-dosutils: \
     configure-dosutils \
     info-dosutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7777,6 +8319,33 @@
 
 @endif dosutils
 
+.PHONY: maybe-install-html-dosutils install-html-dosutils
+maybe-install-html-dosutils:
+ at if dosutils
+maybe-install-html-dosutils: install-html-dosutils
+
+install-html-dosutils: \
+    configure-dosutils \
+    html-dosutils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./dosutils/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-html in dosutils" ; \
+	(cd $(HOST_SUBDIR)/dosutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif dosutils
+
 .PHONY: maybe-installcheck-dosutils installcheck-dosutils
 maybe-installcheck-dosutils:
 @if dosutils
@@ -7784,7 +8353,7 @@
 
 installcheck-dosutils: \
     configure-dosutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7809,7 +8378,7 @@
 maybe-mostlyclean-dosutils: mostlyclean-dosutils
 
 mostlyclean-dosutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7834,7 +8403,7 @@
 maybe-clean-dosutils: clean-dosutils
 
 clean-dosutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7859,7 +8428,7 @@
 maybe-distclean-dosutils: distclean-dosutils
 
 distclean-dosutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7884,7 +8453,7 @@
 maybe-maintainer-clean-dosutils: maintainer-clean-dosutils
 
 maintainer-clean-dosutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./dosutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -7910,11 +8479,11 @@
 @if etc
 maybe-configure-etc: configure-etc
 configure-etc: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -7940,7 +8509,7 @@
 TARGET-etc=all
 maybe-all-etc: all-etc
 all-etc: configure-etc
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7957,7 +8526,7 @@
 maybe-check-etc: check-etc
 
 check-etc:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7972,7 +8541,7 @@
 maybe-install-etc: install-etc
 
 install-etc: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -7990,7 +8559,7 @@
 
 info-etc: \
     configure-etc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8016,7 +8585,7 @@
 
 dvi-etc: \
     configure-etc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8042,7 +8611,7 @@
 
 html-etc: \
     configure-etc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8068,7 +8637,7 @@
 
 TAGS-etc: \
     configure-etc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8095,7 +8664,7 @@
 install-info-etc: \
     configure-etc \
     info-etc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8114,6 +8683,33 @@
 
 @endif etc
 
+.PHONY: maybe-install-html-etc install-html-etc
+maybe-install-html-etc:
+ at if etc
+maybe-install-html-etc: install-html-etc
+
+install-html-etc: \
+    configure-etc \
+    html-etc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./etc/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-html in etc" ; \
+	(cd $(HOST_SUBDIR)/etc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif etc
+
 .PHONY: maybe-installcheck-etc installcheck-etc
 maybe-installcheck-etc:
 @if etc
@@ -8121,7 +8717,7 @@
 
 installcheck-etc: \
     configure-etc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8146,7 +8742,7 @@
 maybe-mostlyclean-etc: mostlyclean-etc
 
 mostlyclean-etc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8171,7 +8767,7 @@
 maybe-clean-etc: clean-etc
 
 clean-etc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8196,7 +8792,7 @@
 maybe-distclean-etc: distclean-etc
 
 distclean-etc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8221,7 +8817,7 @@
 maybe-maintainer-clean-etc: maintainer-clean-etc
 
 maintainer-clean-etc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./etc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8247,11 +8843,11 @@
 @if fastjar
 maybe-configure-fastjar: configure-fastjar
 configure-fastjar: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -8277,7 +8873,7 @@
 TARGET-fastjar=all
 maybe-all-fastjar: all-fastjar
 all-fastjar: configure-fastjar
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8295,7 +8891,7 @@
 
 # This module is only tested in a native toolchain.
 check-fastjar:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8312,7 +8908,7 @@
 maybe-install-fastjar: install-fastjar
 
 install-fastjar: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8330,7 +8926,7 @@
 
 info-fastjar: \
     configure-fastjar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8356,7 +8952,7 @@
 
 dvi-fastjar: \
     configure-fastjar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8382,7 +8978,7 @@
 
 html-fastjar: \
     configure-fastjar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8408,7 +9004,7 @@
 
 TAGS-fastjar: \
     configure-fastjar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8435,7 +9031,7 @@
 install-info-fastjar: \
     configure-fastjar \
     info-fastjar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8454,6 +9050,33 @@
 
 @endif fastjar
 
+.PHONY: maybe-install-html-fastjar install-html-fastjar
+maybe-install-html-fastjar:
+ at if fastjar
+maybe-install-html-fastjar: install-html-fastjar
+
+install-html-fastjar: \
+    configure-fastjar \
+    html-fastjar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fastjar/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-html in fastjar" ; \
+	(cd $(HOST_SUBDIR)/fastjar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif fastjar
+
 .PHONY: maybe-installcheck-fastjar installcheck-fastjar
 maybe-installcheck-fastjar:
 @if fastjar
@@ -8461,7 +9084,7 @@
 
 installcheck-fastjar: \
     configure-fastjar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8486,7 +9109,7 @@
 maybe-mostlyclean-fastjar: mostlyclean-fastjar
 
 mostlyclean-fastjar: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8511,7 +9134,7 @@
 maybe-clean-fastjar: clean-fastjar
 
 clean-fastjar: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8536,7 +9159,7 @@
 maybe-distclean-fastjar: distclean-fastjar
 
 distclean-fastjar: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8561,7 +9184,7 @@
 maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
 
 maintainer-clean-fastjar: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fastjar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8587,11 +9210,11 @@
 @if fileutils
 maybe-configure-fileutils: configure-fileutils
 configure-fileutils: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -8617,7 +9240,7 @@
 TARGET-fileutils=all
 maybe-all-fileutils: all-fileutils
 all-fileutils: configure-fileutils
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8634,7 +9257,7 @@
 maybe-check-fileutils: check-fileutils
 
 check-fileutils:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8649,7 +9272,7 @@
 maybe-install-fileutils: install-fileutils
 
 install-fileutils: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8667,7 +9290,7 @@
 
 info-fileutils: \
     configure-fileutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8693,7 +9316,7 @@
 
 dvi-fileutils: \
     configure-fileutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8719,7 +9342,7 @@
 
 html-fileutils: \
     configure-fileutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8745,7 +9368,7 @@
 
 TAGS-fileutils: \
     configure-fileutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8772,7 +9395,7 @@
 install-info-fileutils: \
     configure-fileutils \
     info-fileutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8791,6 +9414,33 @@
 
 @endif fileutils
 
+.PHONY: maybe-install-html-fileutils install-html-fileutils
+maybe-install-html-fileutils:
+ at if fileutils
+maybe-install-html-fileutils: install-html-fileutils
+
+install-html-fileutils: \
+    configure-fileutils \
+    html-fileutils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fileutils/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-html in fileutils" ; \
+	(cd $(HOST_SUBDIR)/fileutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif fileutils
+
 .PHONY: maybe-installcheck-fileutils installcheck-fileutils
 maybe-installcheck-fileutils:
 @if fileutils
@@ -8798,7 +9448,7 @@
 
 installcheck-fileutils: \
     configure-fileutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8823,7 +9473,7 @@
 maybe-mostlyclean-fileutils: mostlyclean-fileutils
 
 mostlyclean-fileutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8848,7 +9498,7 @@
 maybe-clean-fileutils: clean-fileutils
 
 clean-fileutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8873,7 +9523,7 @@
 maybe-distclean-fileutils: distclean-fileutils
 
 distclean-fileutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8898,7 +9548,7 @@
 maybe-maintainer-clean-fileutils: maintainer-clean-fileutils
 
 maintainer-clean-fileutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fileutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -8924,11 +9574,11 @@
 @if findutils
 maybe-configure-findutils: configure-findutils
 configure-findutils: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -8954,7 +9604,7 @@
 TARGET-findutils=all
 maybe-all-findutils: all-findutils
 all-findutils: configure-findutils
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8971,7 +9621,7 @@
 maybe-check-findutils: check-findutils
 
 check-findutils:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -8986,7 +9636,7 @@
 maybe-install-findutils: install-findutils
 
 install-findutils: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9004,7 +9654,7 @@
 
 info-findutils: \
     configure-findutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9030,7 +9680,7 @@
 
 dvi-findutils: \
     configure-findutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9056,7 +9706,7 @@
 
 html-findutils: \
     configure-findutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9082,7 +9732,7 @@
 
 TAGS-findutils: \
     configure-findutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9109,7 +9759,7 @@
 install-info-findutils: \
     configure-findutils \
     info-findutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9128,6 +9778,33 @@
 
 @endif findutils
 
+.PHONY: maybe-install-html-findutils install-html-findutils
+maybe-install-html-findutils:
+ at if findutils
+maybe-install-html-findutils: install-html-findutils
+
+install-html-findutils: \
+    configure-findutils \
+    html-findutils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./findutils/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-html in findutils" ; \
+	(cd $(HOST_SUBDIR)/findutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif findutils
+
 .PHONY: maybe-installcheck-findutils installcheck-findutils
 maybe-installcheck-findutils:
 @if findutils
@@ -9135,7 +9812,7 @@
 
 installcheck-findutils: \
     configure-findutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9160,7 +9837,7 @@
 maybe-mostlyclean-findutils: mostlyclean-findutils
 
 mostlyclean-findutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9185,7 +9862,7 @@
 maybe-clean-findutils: clean-findutils
 
 clean-findutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9210,7 +9887,7 @@
 maybe-distclean-findutils: distclean-findutils
 
 distclean-findutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9235,7 +9912,7 @@
 maybe-maintainer-clean-findutils: maintainer-clean-findutils
 
 maintainer-clean-findutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./findutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9261,11 +9938,11 @@
 @if find
 maybe-configure-find: configure-find
 configure-find: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -9291,7 +9968,7 @@
 TARGET-find=all
 maybe-all-find: all-find
 all-find: configure-find
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9308,7 +9985,7 @@
 maybe-check-find: check-find
 
 check-find:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9323,7 +10000,7 @@
 maybe-install-find: install-find
 
 install-find: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9341,7 +10018,7 @@
 
 info-find: \
     configure-find 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9367,7 +10044,7 @@
 
 dvi-find: \
     configure-find 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9393,7 +10070,7 @@
 
 html-find: \
     configure-find 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9419,7 +10096,7 @@
 
 TAGS-find: \
     configure-find 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9446,7 +10123,7 @@
 install-info-find: \
     configure-find \
     info-find 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9465,6 +10142,33 @@
 
 @endif find
 
+.PHONY: maybe-install-html-find install-html-find
+maybe-install-html-find:
+ at if find
+maybe-install-html-find: install-html-find
+
+install-html-find: \
+    configure-find \
+    html-find 
+	@: $(MAKE); $(unstage)
+	@[ -f ./find/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-html in find" ; \
+	(cd $(HOST_SUBDIR)/find && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif find
+
 .PHONY: maybe-installcheck-find installcheck-find
 maybe-installcheck-find:
 @if find
@@ -9472,7 +10176,7 @@
 
 installcheck-find: \
     configure-find 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9497,7 +10201,7 @@
 maybe-mostlyclean-find: mostlyclean-find
 
 mostlyclean-find: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9522,7 +10226,7 @@
 maybe-clean-find: clean-find
 
 clean-find: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9547,7 +10251,7 @@
 maybe-distclean-find: distclean-find
 
 distclean-find: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9572,7 +10276,7 @@
 maybe-maintainer-clean-find: maintainer-clean-find
 
 maintainer-clean-find: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./find/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9598,11 +10302,11 @@
 @if fixincludes
 maybe-configure-fixincludes: configure-fixincludes
 configure-fixincludes: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -9628,7 +10332,7 @@
 TARGET-fixincludes=all
 maybe-all-fixincludes: all-fixincludes
 all-fixincludes: configure-fixincludes
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9645,7 +10349,7 @@
 maybe-check-fixincludes: check-fixincludes
 
 check-fixincludes:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9660,7 +10364,7 @@
 maybe-install-fixincludes: install-fixincludes
 
 install-fixincludes: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9698,7 +10402,7 @@
 
 html-fixincludes: \
     configure-fixincludes 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9737,6 +10441,33 @@
 
 @endif fixincludes
 
+.PHONY: maybe-install-html-fixincludes install-html-fixincludes
+maybe-install-html-fixincludes:
+ at if fixincludes
+maybe-install-html-fixincludes: install-html-fixincludes
+
+install-html-fixincludes: \
+    configure-fixincludes \
+    html-fixincludes 
+	@: $(MAKE); $(unstage)
+	@[ -f ./fixincludes/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-html in fixincludes" ; \
+	(cd $(HOST_SUBDIR)/fixincludes && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif fixincludes
+
 .PHONY: maybe-installcheck-fixincludes installcheck-fixincludes
 maybe-installcheck-fixincludes:
 @if fixincludes
@@ -9753,7 +10484,7 @@
 maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
 
 mostlyclean-fixincludes: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9778,7 +10509,7 @@
 maybe-clean-fixincludes: clean-fixincludes
 
 clean-fixincludes: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9803,7 +10534,7 @@
 maybe-distclean-fixincludes: distclean-fixincludes
 
 distclean-fixincludes: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9828,7 +10559,7 @@
 maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
 
 maintainer-clean-fixincludes: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./fixincludes/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9854,11 +10585,11 @@
 @if flex
 maybe-configure-flex: configure-flex
 configure-flex: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -9884,7 +10615,7 @@
 TARGET-flex=all
 maybe-all-flex: all-flex
 all-flex: configure-flex
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9902,7 +10633,7 @@
 
 # This module is only tested in a native toolchain.
 check-flex:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9919,7 +10650,7 @@
 maybe-install-flex: install-flex
 
 install-flex: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -9937,7 +10668,7 @@
 
 info-flex: \
     configure-flex 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9963,7 +10694,7 @@
 
 dvi-flex: \
     configure-flex 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -9989,7 +10720,7 @@
 
 html-flex: \
     configure-flex 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10015,7 +10746,7 @@
 
 TAGS-flex: \
     configure-flex 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10042,7 +10773,7 @@
 install-info-flex: \
     configure-flex \
     info-flex 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10061,6 +10792,33 @@
 
 @endif flex
 
+.PHONY: maybe-install-html-flex install-html-flex
+maybe-install-html-flex:
+ at if flex
+maybe-install-html-flex: install-html-flex
+
+install-html-flex: \
+    configure-flex \
+    html-flex 
+	@: $(MAKE); $(unstage)
+	@[ -f ./flex/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-html in flex" ; \
+	(cd $(HOST_SUBDIR)/flex && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif flex
+
 .PHONY: maybe-installcheck-flex installcheck-flex
 maybe-installcheck-flex:
 @if flex
@@ -10068,7 +10826,7 @@
 
 installcheck-flex: \
     configure-flex 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10093,7 +10851,7 @@
 maybe-mostlyclean-flex: mostlyclean-flex
 
 mostlyclean-flex: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10118,7 +10876,7 @@
 maybe-clean-flex: clean-flex
 
 clean-flex: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10143,7 +10901,7 @@
 maybe-distclean-flex: distclean-flex
 
 distclean-flex: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10168,7 +10926,7 @@
 maybe-maintainer-clean-flex: maintainer-clean-flex
 
 maintainer-clean-flex: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./flex/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -10194,11 +10952,15 @@
 @if gas
 maybe-configure-gas: configure-gas
 configure-gas: 
-	@test -f stage_last && exit 0; \
+ at endif gas
+ at if gas-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif gas-bootstrap
+ at if gas
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -10220,13 +10982,15 @@
 maybe-configure-stage1-gas:
 @if gas-bootstrap
 maybe-configure-stage1-gas: configure-stage1-gas
-configure-stage1-gas: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10244,14 +11008,16 @@
 maybe-configure-stage2-gas:
 @if gas-bootstrap
 maybe-configure-stage2-gas: configure-stage2-gas
-configure-stage2-gas: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10269,14 +11035,16 @@
 maybe-configure-stage3-gas:
 @if gas-bootstrap
 maybe-configure-stage3-gas: configure-stage3-gas
-configure-stage3-gas: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10294,14 +11062,16 @@
 maybe-configure-stage4-gas:
 @if gas-bootstrap
 maybe-configure-stage4-gas: configure-stage4-gas
-configure-stage4-gas: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10319,14 +11089,16 @@
 maybe-configure-stageprofile-gas:
 @if gas-bootstrap
 maybe-configure-stageprofile-gas: configure-stageprofile-gas
-configure-stageprofile-gas: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10344,14 +11116,16 @@
 maybe-configure-stagefeedback-gas:
 @if gas-bootstrap
 maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
-configure-stagefeedback-gas: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10375,8 +11149,12 @@
 TARGET-gas=all
 maybe-all-gas: all-gas
 all-gas: configure-gas
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif gas
+ at if gas-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif gas-bootstrap
+ at if gas
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/gas && \
@@ -10394,12 +11172,12 @@
 all-stage1: all-stage1-gas
 TARGET-stage1-gas = $(TARGET-gas)
 all-stage1-gas: configure-stage1-gas
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-gas)
 
 maybe-clean-stage1-gas: clean-stage1-gas
@@ -10407,10 +11185,10 @@
 clean-stage1-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif gas-bootstrap
 
 
@@ -10423,7 +11201,7 @@
 all-stage2: all-stage2-gas
 TARGET-stage2-gas = $(TARGET-gas)
 all-stage2-gas: configure-stage2-gas
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10437,7 +11215,7 @@
 clean-stage2-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10454,7 +11232,7 @@
 all-stage3: all-stage3-gas
 TARGET-stage3-gas = $(TARGET-gas)
 all-stage3-gas: configure-stage3-gas
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10468,7 +11246,7 @@
 clean-stage3-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10485,7 +11263,7 @@
 all-stage4: all-stage4-gas
 TARGET-stage4-gas = $(TARGET-gas)
 all-stage4-gas: configure-stage4-gas
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10499,7 +11277,7 @@
 clean-stage4-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10516,7 +11294,7 @@
 all-stageprofile: all-stageprofile-gas
 TARGET-stageprofile-gas = $(TARGET-gas)
 all-stageprofile-gas: configure-stageprofile-gas
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10530,7 +11308,7 @@
 clean-stageprofile-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10547,7 +11325,7 @@
 all-stagefeedback: all-stagefeedback-gas
 TARGET-stagefeedback-gas = $(TARGET-gas)
 all-stagefeedback-gas: configure-stagefeedback-gas
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10561,7 +11339,7 @@
 clean-stagefeedback-gas:
 	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -10578,7 +11356,7 @@
 maybe-check-gas: check-gas
 
 check-gas:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10593,7 +11371,7 @@
 maybe-install-gas: install-gas
 
 install-gas: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -10730,6 +11508,32 @@
 
 @endif gas
 
+.PHONY: maybe-install-html-gas install-html-gas
+maybe-install-html-gas:
+ at if gas
+maybe-install-html-gas: install-html-gas
+
+install-html-gas: \
+    configure-gas \
+    html-gas 
+	@[ -f ./gas/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-html in gas" ; \
+	(cd $(HOST_SUBDIR)/gas && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif gas
+
 .PHONY: maybe-installcheck-gas installcheck-gas
 maybe-installcheck-gas:
 @if gas
@@ -10858,11 +11662,15 @@
 @if gcc
 maybe-configure-gcc: configure-gcc
 configure-gcc: 
-	@test -f stage_last && exit 0; \
+ at endif gcc
+ at if gcc-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif gcc-bootstrap
+ at if gcc
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -10884,13 +11692,15 @@
 maybe-configure-stage1-gcc:
 @if gcc-bootstrap
 maybe-configure-stage1-gcc: configure-stage1-gcc
-configure-stage1-gcc: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10908,14 +11718,16 @@
 maybe-configure-stage2-gcc:
 @if gcc-bootstrap
 maybe-configure-stage2-gcc: configure-stage2-gcc
-configure-stage2-gcc: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10933,14 +11745,16 @@
 maybe-configure-stage3-gcc:
 @if gcc-bootstrap
 maybe-configure-stage3-gcc: configure-stage3-gcc
-configure-stage3-gcc: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10958,14 +11772,16 @@
 maybe-configure-stage4-gcc:
 @if gcc-bootstrap
 maybe-configure-stage4-gcc: configure-stage4-gcc
-configure-stage4-gcc: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -10983,14 +11799,16 @@
 maybe-configure-stageprofile-gcc:
 @if gcc-bootstrap
 maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
-configure-stageprofile-gcc: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -11008,14 +11826,16 @@
 maybe-configure-stagefeedback-gcc:
 @if gcc-bootstrap
 maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
-configure-stagefeedback-gcc: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -11039,8 +11859,12 @@
 TARGET-gcc=`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi`
 maybe-all-gcc: all-gcc
 all-gcc: configure-gcc
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif gcc
+ at if gcc-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif gcc-bootstrap
+ at if gcc
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/gcc && \
@@ -11058,12 +11882,12 @@
 all-stage1: all-stage1-gcc
 TARGET-stage1-gcc = $(TARGET-gcc)
 all-stage1-gcc: configure-stage1-gcc
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)" $(EXTRA_GCC_FLAGS) \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \
 		$(TARGET-stage1-gcc)
 
 maybe-clean-stage1-gcc: clean-stage1-gcc
@@ -11071,10 +11895,10 @@
 clean-stage1-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
 
@@ -11087,7 +11911,7 @@
 all-stage2: all-stage2-gcc
 TARGET-stage2-gcc = $(TARGET-gcc)
 all-stage2-gcc: configure-stage2-gcc
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11101,7 +11925,7 @@
 clean-stage2-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11118,7 +11942,7 @@
 all-stage3: all-stage3-gcc
 TARGET-stage3-gcc = $(TARGET-gcc)
 all-stage3-gcc: configure-stage3-gcc
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11132,7 +11956,7 @@
 clean-stage3-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11149,7 +11973,7 @@
 all-stage4: all-stage4-gcc
 TARGET-stage4-gcc = $(TARGET-gcc)
 all-stage4-gcc: configure-stage4-gcc
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11163,7 +11987,7 @@
 clean-stage4-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11180,7 +12004,7 @@
 all-stageprofile: all-stageprofile-gcc
 TARGET-stageprofile-gcc = $(TARGET-gcc)
 all-stageprofile-gcc: configure-stageprofile-gcc
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11194,7 +12018,7 @@
 clean-stageprofile-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11211,7 +12035,7 @@
 all-stagefeedback: all-stagefeedback-gcc
 TARGET-stagefeedback-gcc = $(TARGET-gcc)
 all-stagefeedback-gcc: configure-stagefeedback-gcc
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11225,7 +12049,7 @@
 clean-stagefeedback-gcc:
 	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -11242,7 +12066,7 @@
 maybe-check-gcc: check-gcc
 
 check-gcc:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11257,7 +12081,7 @@
 maybe-install-gcc: install-gcc
 
 install-gcc: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11394,6 +12218,32 @@
 
 @endif gcc
 
+.PHONY: maybe-install-html-gcc install-html-gcc
+maybe-install-html-gcc:
+ at if gcc
+maybe-install-html-gcc: install-html-gcc
+
+install-html-gcc: \
+    configure-gcc \
+    html-gcc 
+	@[ -f ./gcc/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gcc" ; \
+	(cd $(HOST_SUBDIR)/gcc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif gcc
+
 .PHONY: maybe-installcheck-gcc installcheck-gcc
 maybe-installcheck-gcc:
 @if gcc
@@ -11522,11 +12372,11 @@
 @if gawk
 maybe-configure-gawk: configure-gawk
 configure-gawk: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -11552,7 +12402,7 @@
 TARGET-gawk=all
 maybe-all-gawk: all-gawk
 all-gawk: configure-gawk
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11569,7 +12419,7 @@
 maybe-check-gawk: check-gawk
 
 check-gawk:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11584,7 +12434,7 @@
 maybe-install-gawk: install-gawk
 
 install-gawk: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11602,7 +12452,7 @@
 
 info-gawk: \
     configure-gawk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11628,7 +12478,7 @@
 
 dvi-gawk: \
     configure-gawk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11654,7 +12504,7 @@
 
 html-gawk: \
     configure-gawk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11680,7 +12530,7 @@
 
 TAGS-gawk: \
     configure-gawk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11707,7 +12557,7 @@
 install-info-gawk: \
     configure-gawk \
     info-gawk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11726,6 +12576,33 @@
 
 @endif gawk
 
+.PHONY: maybe-install-html-gawk install-html-gawk
+maybe-install-html-gawk:
+ at if gawk
+maybe-install-html-gawk: install-html-gawk
+
+install-html-gawk: \
+    configure-gawk \
+    html-gawk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gawk/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-html in gawk" ; \
+	(cd $(HOST_SUBDIR)/gawk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif gawk
+
 .PHONY: maybe-installcheck-gawk installcheck-gawk
 maybe-installcheck-gawk:
 @if gawk
@@ -11733,7 +12610,7 @@
 
 installcheck-gawk: \
     configure-gawk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11758,7 +12635,7 @@
 maybe-mostlyclean-gawk: mostlyclean-gawk
 
 mostlyclean-gawk: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11783,7 +12660,7 @@
 maybe-clean-gawk: clean-gawk
 
 clean-gawk: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11808,7 +12685,7 @@
 maybe-distclean-gawk: distclean-gawk
 
 distclean-gawk: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11833,7 +12710,7 @@
 maybe-maintainer-clean-gawk: maintainer-clean-gawk
 
 maintainer-clean-gawk: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gawk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11859,11 +12736,11 @@
 @if gettext
 maybe-configure-gettext: configure-gettext
 configure-gettext: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -11889,7 +12766,7 @@
 TARGET-gettext=all
 maybe-all-gettext: all-gettext
 all-gettext: configure-gettext
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11906,7 +12783,7 @@
 maybe-check-gettext: check-gettext
 
 check-gettext:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11921,7 +12798,7 @@
 maybe-install-gettext: install-gettext
 
 install-gettext: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -11939,7 +12816,7 @@
 
 info-gettext: \
     configure-gettext 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11965,7 +12842,7 @@
 
 dvi-gettext: \
     configure-gettext 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -11991,7 +12868,7 @@
 
 html-gettext: \
     configure-gettext 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12017,7 +12894,7 @@
 
 TAGS-gettext: \
     configure-gettext 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12044,7 +12921,7 @@
 install-info-gettext: \
     configure-gettext \
     info-gettext 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12063,6 +12940,33 @@
 
 @endif gettext
 
+.PHONY: maybe-install-html-gettext install-html-gettext
+maybe-install-html-gettext:
+ at if gettext
+maybe-install-html-gettext: install-html-gettext
+
+install-html-gettext: \
+    configure-gettext \
+    html-gettext 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gettext/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-html in gettext" ; \
+	(cd $(HOST_SUBDIR)/gettext && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif gettext
+
 .PHONY: maybe-installcheck-gettext installcheck-gettext
 maybe-installcheck-gettext:
 @if gettext
@@ -12070,7 +12974,7 @@
 
 installcheck-gettext: \
     configure-gettext 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12095,7 +12999,7 @@
 maybe-mostlyclean-gettext: mostlyclean-gettext
 
 mostlyclean-gettext: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12120,7 +13024,7 @@
 maybe-clean-gettext: clean-gettext
 
 clean-gettext: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12145,7 +13049,7 @@
 maybe-distclean-gettext: distclean-gettext
 
 distclean-gettext: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12170,7 +13074,7 @@
 maybe-maintainer-clean-gettext: maintainer-clean-gettext
 
 maintainer-clean-gettext: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gettext/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12196,11 +13100,11 @@
 @if gnuserv
 maybe-configure-gnuserv: configure-gnuserv
 configure-gnuserv: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -12226,7 +13130,7 @@
 TARGET-gnuserv=all
 maybe-all-gnuserv: all-gnuserv
 all-gnuserv: configure-gnuserv
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12243,7 +13147,7 @@
 maybe-check-gnuserv: check-gnuserv
 
 check-gnuserv:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12258,7 +13162,7 @@
 maybe-install-gnuserv: install-gnuserv
 
 install-gnuserv: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12276,7 +13180,7 @@
 
 info-gnuserv: \
     configure-gnuserv 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12302,7 +13206,7 @@
 
 dvi-gnuserv: \
     configure-gnuserv 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12328,7 +13232,7 @@
 
 html-gnuserv: \
     configure-gnuserv 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12354,7 +13258,7 @@
 
 TAGS-gnuserv: \
     configure-gnuserv 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12381,7 +13285,7 @@
 install-info-gnuserv: \
     configure-gnuserv \
     info-gnuserv 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12400,6 +13304,33 @@
 
 @endif gnuserv
 
+.PHONY: maybe-install-html-gnuserv install-html-gnuserv
+maybe-install-html-gnuserv:
+ at if gnuserv
+maybe-install-html-gnuserv: install-html-gnuserv
+
+install-html-gnuserv: \
+    configure-gnuserv \
+    html-gnuserv 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnuserv/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-html in gnuserv" ; \
+	(cd $(HOST_SUBDIR)/gnuserv && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif gnuserv
+
 .PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
 maybe-installcheck-gnuserv:
 @if gnuserv
@@ -12407,7 +13338,7 @@
 
 installcheck-gnuserv: \
     configure-gnuserv 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12432,7 +13363,7 @@
 maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
 
 mostlyclean-gnuserv: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12457,7 +13388,7 @@
 maybe-clean-gnuserv: clean-gnuserv
 
 clean-gnuserv: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12482,7 +13413,7 @@
 maybe-distclean-gnuserv: distclean-gnuserv
 
 distclean-gnuserv: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12507,7 +13438,7 @@
 maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
 
 maintainer-clean-gnuserv: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnuserv/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12533,11 +13464,11 @@
 @if gprof
 maybe-configure-gprof: configure-gprof
 configure-gprof: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -12563,7 +13494,7 @@
 TARGET-gprof=all
 maybe-all-gprof: all-gprof
 all-gprof: configure-gprof
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12580,7 +13511,7 @@
 maybe-check-gprof: check-gprof
 
 check-gprof:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12595,7 +13526,7 @@
 maybe-install-gprof: install-gprof
 
 install-gprof: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12613,7 +13544,7 @@
 
 info-gprof: \
     configure-gprof 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12639,7 +13570,7 @@
 
 dvi-gprof: \
     configure-gprof 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12665,7 +13596,7 @@
 
 html-gprof: \
     configure-gprof 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12691,7 +13622,7 @@
 
 TAGS-gprof: \
     configure-gprof 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12718,7 +13649,7 @@
 install-info-gprof: \
     configure-gprof \
     info-gprof 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12737,6 +13668,33 @@
 
 @endif gprof
 
+.PHONY: maybe-install-html-gprof install-html-gprof
+maybe-install-html-gprof:
+ at if gprof
+maybe-install-html-gprof: install-html-gprof
+
+install-html-gprof: \
+    configure-gprof \
+    html-gprof 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gprof/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-html in gprof" ; \
+	(cd $(HOST_SUBDIR)/gprof && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif gprof
+
 .PHONY: maybe-installcheck-gprof installcheck-gprof
 maybe-installcheck-gprof:
 @if gprof
@@ -12744,7 +13702,7 @@
 
 installcheck-gprof: \
     configure-gprof 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12769,7 +13727,7 @@
 maybe-mostlyclean-gprof: mostlyclean-gprof
 
 mostlyclean-gprof: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12794,7 +13752,7 @@
 maybe-clean-gprof: clean-gprof
 
 clean-gprof: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12819,7 +13777,7 @@
 maybe-distclean-gprof: distclean-gprof
 
 distclean-gprof: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12844,7 +13802,7 @@
 maybe-maintainer-clean-gprof: maintainer-clean-gprof
 
 maintainer-clean-gprof: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gprof/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12870,11 +13828,11 @@
 @if gzip
 maybe-configure-gzip: configure-gzip
 configure-gzip: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -12900,7 +13858,7 @@
 TARGET-gzip=all
 maybe-all-gzip: all-gzip
 all-gzip: configure-gzip
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12917,7 +13875,7 @@
 maybe-check-gzip: check-gzip
 
 check-gzip:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12932,7 +13890,7 @@
 maybe-install-gzip: install-gzip
 
 install-gzip: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -12950,7 +13908,7 @@
 
 info-gzip: \
     configure-gzip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -12976,7 +13934,7 @@
 
 dvi-gzip: \
     configure-gzip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13002,7 +13960,7 @@
 
 html-gzip: \
     configure-gzip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13028,7 +13986,7 @@
 
 TAGS-gzip: \
     configure-gzip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13055,7 +14013,7 @@
 install-info-gzip: \
     configure-gzip \
     info-gzip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13074,6 +14032,33 @@
 
 @endif gzip
 
+.PHONY: maybe-install-html-gzip install-html-gzip
+maybe-install-html-gzip:
+ at if gzip
+maybe-install-html-gzip: install-html-gzip
+
+install-html-gzip: \
+    configure-gzip \
+    html-gzip 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gzip/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-html in gzip" ; \
+	(cd $(HOST_SUBDIR)/gzip && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif gzip
+
 .PHONY: maybe-installcheck-gzip installcheck-gzip
 maybe-installcheck-gzip:
 @if gzip
@@ -13081,7 +14066,7 @@
 
 installcheck-gzip: \
     configure-gzip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13106,7 +14091,7 @@
 maybe-mostlyclean-gzip: mostlyclean-gzip
 
 mostlyclean-gzip: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13131,7 +14116,7 @@
 maybe-clean-gzip: clean-gzip
 
 clean-gzip: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13156,7 +14141,7 @@
 maybe-distclean-gzip: distclean-gzip
 
 distclean-gzip: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13181,7 +14166,7 @@
 maybe-maintainer-clean-gzip: maintainer-clean-gzip
 
 maintainer-clean-gzip: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gzip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13207,11 +14192,11 @@
 @if hello
 maybe-configure-hello: configure-hello
 configure-hello: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -13237,7 +14222,7 @@
 TARGET-hello=all
 maybe-all-hello: all-hello
 all-hello: configure-hello
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13254,7 +14239,7 @@
 maybe-check-hello: check-hello
 
 check-hello:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13269,7 +14254,7 @@
 maybe-install-hello: install-hello
 
 install-hello: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13287,7 +14272,7 @@
 
 info-hello: \
     configure-hello 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13313,7 +14298,7 @@
 
 dvi-hello: \
     configure-hello 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13339,7 +14324,7 @@
 
 html-hello: \
     configure-hello 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13365,7 +14350,7 @@
 
 TAGS-hello: \
     configure-hello 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13392,7 +14377,7 @@
 install-info-hello: \
     configure-hello \
     info-hello 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13411,6 +14396,33 @@
 
 @endif hello
 
+.PHONY: maybe-install-html-hello install-html-hello
+maybe-install-html-hello:
+ at if hello
+maybe-install-html-hello: install-html-hello
+
+install-html-hello: \
+    configure-hello \
+    html-hello 
+	@: $(MAKE); $(unstage)
+	@[ -f ./hello/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-html in hello" ; \
+	(cd $(HOST_SUBDIR)/hello && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif hello
+
 .PHONY: maybe-installcheck-hello installcheck-hello
 maybe-installcheck-hello:
 @if hello
@@ -13418,7 +14430,7 @@
 
 installcheck-hello: \
     configure-hello 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13443,7 +14455,7 @@
 maybe-mostlyclean-hello: mostlyclean-hello
 
 mostlyclean-hello: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13468,7 +14480,7 @@
 maybe-clean-hello: clean-hello
 
 clean-hello: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13493,7 +14505,7 @@
 maybe-distclean-hello: distclean-hello
 
 distclean-hello: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13518,7 +14530,7 @@
 maybe-maintainer-clean-hello: maintainer-clean-hello
 
 maintainer-clean-hello: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./hello/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13544,11 +14556,11 @@
 @if indent
 maybe-configure-indent: configure-indent
 configure-indent: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -13574,7 +14586,7 @@
 TARGET-indent=all
 maybe-all-indent: all-indent
 all-indent: configure-indent
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13591,7 +14603,7 @@
 maybe-check-indent: check-indent
 
 check-indent:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13606,7 +14618,7 @@
 maybe-install-indent: install-indent
 
 install-indent: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -13624,7 +14636,7 @@
 
 info-indent: \
     configure-indent 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13650,7 +14662,7 @@
 
 dvi-indent: \
     configure-indent 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13676,7 +14688,7 @@
 
 html-indent: \
     configure-indent 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13702,7 +14714,7 @@
 
 TAGS-indent: \
     configure-indent 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13729,7 +14741,7 @@
 install-info-indent: \
     configure-indent \
     info-indent 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13748,6 +14760,33 @@
 
 @endif indent
 
+.PHONY: maybe-install-html-indent install-html-indent
+maybe-install-html-indent:
+ at if indent
+maybe-install-html-indent: install-html-indent
+
+install-html-indent: \
+    configure-indent \
+    html-indent 
+	@: $(MAKE); $(unstage)
+	@[ -f ./indent/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-html in indent" ; \
+	(cd $(HOST_SUBDIR)/indent && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif indent
+
 .PHONY: maybe-installcheck-indent installcheck-indent
 maybe-installcheck-indent:
 @if indent
@@ -13755,7 +14794,7 @@
 
 installcheck-indent: \
     configure-indent 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13780,7 +14819,7 @@
 maybe-mostlyclean-indent: mostlyclean-indent
 
 mostlyclean-indent: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13805,7 +14844,7 @@
 maybe-clean-indent: clean-indent
 
 clean-indent: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13830,7 +14869,7 @@
 maybe-distclean-indent: distclean-indent
 
 distclean-indent: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13855,7 +14894,7 @@
 maybe-maintainer-clean-indent: maintainer-clean-indent
 
 maintainer-clean-indent: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./indent/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -13881,11 +14920,15 @@
 @if intl
 maybe-configure-intl: configure-intl
 configure-intl: 
-	@test -f stage_last && exit 0; \
+ at endif intl
+ at if intl-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif intl-bootstrap
+ at if intl
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -13907,13 +14950,15 @@
 maybe-configure-stage1-intl:
 @if intl-bootstrap
 maybe-configure-stage1-intl: configure-stage1-intl
-configure-stage1-intl: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -13931,14 +14976,16 @@
 maybe-configure-stage2-intl:
 @if intl-bootstrap
 maybe-configure-stage2-intl: configure-stage2-intl
-configure-stage2-intl: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -13956,14 +15003,16 @@
 maybe-configure-stage3-intl:
 @if intl-bootstrap
 maybe-configure-stage3-intl: configure-stage3-intl
-configure-stage3-intl: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -13981,14 +15030,16 @@
 maybe-configure-stage4-intl:
 @if intl-bootstrap
 maybe-configure-stage4-intl: configure-stage4-intl
-configure-stage4-intl: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -14006,14 +15057,16 @@
 maybe-configure-stageprofile-intl:
 @if intl-bootstrap
 maybe-configure-stageprofile-intl: configure-stageprofile-intl
-configure-stageprofile-intl: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -14031,14 +15084,16 @@
 maybe-configure-stagefeedback-intl:
 @if intl-bootstrap
 maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
-configure-stagefeedback-intl: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -14062,8 +15117,12 @@
 TARGET-intl=all
 maybe-all-intl: all-intl
 all-intl: configure-intl
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif intl
+ at if intl-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif intl-bootstrap
+ at if intl
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/intl && \
@@ -14081,12 +15140,12 @@
 all-stage1: all-stage1-intl
 TARGET-stage1-intl = $(TARGET-intl)
 all-stage1-intl: configure-stage1-intl
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-intl)
 
 maybe-clean-stage1-intl: clean-stage1-intl
@@ -14094,10 +15153,10 @@
 clean-stage1-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif intl-bootstrap
 
 
@@ -14110,7 +15169,7 @@
 all-stage2: all-stage2-intl
 TARGET-stage2-intl = $(TARGET-intl)
 all-stage2-intl: configure-stage2-intl
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14124,7 +15183,7 @@
 clean-stage2-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14141,7 +15200,7 @@
 all-stage3: all-stage3-intl
 TARGET-stage3-intl = $(TARGET-intl)
 all-stage3-intl: configure-stage3-intl
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14155,7 +15214,7 @@
 clean-stage3-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14172,7 +15231,7 @@
 all-stage4: all-stage4-intl
 TARGET-stage4-intl = $(TARGET-intl)
 all-stage4-intl: configure-stage4-intl
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14186,7 +15245,7 @@
 clean-stage4-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14203,7 +15262,7 @@
 all-stageprofile: all-stageprofile-intl
 TARGET-stageprofile-intl = $(TARGET-intl)
 all-stageprofile-intl: configure-stageprofile-intl
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14217,7 +15276,7 @@
 clean-stageprofile-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14234,7 +15293,7 @@
 all-stagefeedback: all-stagefeedback-intl
 TARGET-stagefeedback-intl = $(TARGET-intl)
 all-stagefeedback-intl: configure-stagefeedback-intl
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14248,7 +15307,7 @@
 clean-stagefeedback-intl:
 	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -14265,7 +15324,7 @@
 maybe-check-intl: check-intl
 
 check-intl:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14280,7 +15339,7 @@
 maybe-install-intl: install-intl
 
 install-intl: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14417,6 +15476,32 @@
 
 @endif intl
 
+.PHONY: maybe-install-html-intl install-html-intl
+maybe-install-html-intl:
+ at if intl
+maybe-install-html-intl: install-html-intl
+
+install-html-intl: \
+    configure-intl \
+    html-intl 
+	@[ -f ./intl/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-html in intl" ; \
+	(cd $(HOST_SUBDIR)/intl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif intl
+
 .PHONY: maybe-installcheck-intl installcheck-intl
 maybe-installcheck-intl:
 @if intl
@@ -14545,11 +15630,11 @@
 @if tcl
 maybe-configure-tcl: configure-tcl
 configure-tcl: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -14575,7 +15660,7 @@
 TARGET-tcl=all
 maybe-all-tcl: all-tcl
 all-tcl: configure-tcl
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14592,7 +15677,7 @@
 maybe-check-tcl: check-tcl
 
 check-tcl:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14607,7 +15692,7 @@
 maybe-install-tcl: install-tcl
 
 install-tcl: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14625,7 +15710,7 @@
 
 info-tcl: \
     configure-tcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14651,7 +15736,7 @@
 
 dvi-tcl: \
     configure-tcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14677,7 +15762,7 @@
 
 html-tcl: \
     configure-tcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14703,7 +15788,7 @@
 
 TAGS-tcl: \
     configure-tcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14730,7 +15815,7 @@
 install-info-tcl: \
     configure-tcl \
     info-tcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14749,6 +15834,33 @@
 
 @endif tcl
 
+.PHONY: maybe-install-html-tcl install-html-tcl
+maybe-install-html-tcl:
+ at if tcl
+maybe-install-html-tcl: install-html-tcl
+
+install-html-tcl: \
+    configure-tcl \
+    html-tcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tcl/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-html in tcl" ; \
+	(cd $(HOST_SUBDIR)/tcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif tcl
+
 .PHONY: maybe-installcheck-tcl installcheck-tcl
 maybe-installcheck-tcl:
 @if tcl
@@ -14756,7 +15868,7 @@
 
 installcheck-tcl: \
     configure-tcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14791,7 +15903,7 @@
 maybe-clean-tcl: clean-tcl
 
 clean-tcl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14816,7 +15928,7 @@
 maybe-distclean-tcl: distclean-tcl
 
 distclean-tcl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14841,7 +15953,7 @@
 maybe-maintainer-clean-tcl: maintainer-clean-tcl
 
 maintainer-clean-tcl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14867,11 +15979,11 @@
 @if itcl
 maybe-configure-itcl: configure-itcl
 configure-itcl: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -14897,7 +16009,7 @@
 TARGET-itcl=all
 maybe-all-itcl: all-itcl
 all-itcl: configure-itcl
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14914,7 +16026,7 @@
 maybe-check-itcl: check-itcl
 
 check-itcl:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14929,7 +16041,7 @@
 maybe-install-itcl: install-itcl
 
 install-itcl: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -14947,7 +16059,7 @@
 
 info-itcl: \
     configure-itcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14973,7 +16085,7 @@
 
 dvi-itcl: \
     configure-itcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -14999,7 +16111,7 @@
 
 html-itcl: \
     configure-itcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15025,7 +16137,7 @@
 
 TAGS-itcl: \
     configure-itcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15052,7 +16164,7 @@
 install-info-itcl: \
     configure-itcl \
     info-itcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15071,6 +16183,33 @@
 
 @endif itcl
 
+.PHONY: maybe-install-html-itcl install-html-itcl
+maybe-install-html-itcl:
+ at if itcl
+maybe-install-html-itcl: install-html-itcl
+
+install-html-itcl: \
+    configure-itcl \
+    html-itcl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./itcl/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-html in itcl" ; \
+	(cd $(HOST_SUBDIR)/itcl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif itcl
+
 .PHONY: maybe-installcheck-itcl installcheck-itcl
 maybe-installcheck-itcl:
 @if itcl
@@ -15078,7 +16217,7 @@
 
 installcheck-itcl: \
     configure-itcl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15103,7 +16242,7 @@
 maybe-mostlyclean-itcl: mostlyclean-itcl
 
 mostlyclean-itcl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15128,7 +16267,7 @@
 maybe-clean-itcl: clean-itcl
 
 clean-itcl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15153,7 +16292,7 @@
 maybe-distclean-itcl: distclean-itcl
 
 distclean-itcl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15178,7 +16317,7 @@
 maybe-maintainer-clean-itcl: maintainer-clean-itcl
 
 maintainer-clean-itcl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./itcl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -15204,11 +16343,15 @@
 @if ld
 maybe-configure-ld: configure-ld
 configure-ld: 
-	@test -f stage_last && exit 0; \
+ at endif ld
+ at if ld-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif ld-bootstrap
+ at if ld
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -15230,13 +16373,15 @@
 maybe-configure-stage1-ld:
 @if ld-bootstrap
 maybe-configure-stage1-ld: configure-stage1-ld
-configure-stage1-ld: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15254,14 +16399,16 @@
 maybe-configure-stage2-ld:
 @if ld-bootstrap
 maybe-configure-stage2-ld: configure-stage2-ld
-configure-stage2-ld: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15279,14 +16426,16 @@
 maybe-configure-stage3-ld:
 @if ld-bootstrap
 maybe-configure-stage3-ld: configure-stage3-ld
-configure-stage3-ld: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15304,14 +16453,16 @@
 maybe-configure-stage4-ld:
 @if ld-bootstrap
 maybe-configure-stage4-ld: configure-stage4-ld
-configure-stage4-ld: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15329,14 +16480,16 @@
 maybe-configure-stageprofile-ld:
 @if ld-bootstrap
 maybe-configure-stageprofile-ld: configure-stageprofile-ld
-configure-stageprofile-ld: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15354,14 +16507,16 @@
 maybe-configure-stagefeedback-ld:
 @if ld-bootstrap
 maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
-configure-stagefeedback-ld: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15385,8 +16540,12 @@
 TARGET-ld=all
 maybe-all-ld: all-ld
 all-ld: configure-ld
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif ld
+ at if ld-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif ld-bootstrap
+ at if ld
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/ld && \
@@ -15404,12 +16563,12 @@
 all-stage1: all-stage1-ld
 TARGET-stage1-ld = $(TARGET-ld)
 all-stage1-ld: configure-stage1-ld
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-ld)
 
 maybe-clean-stage1-ld: clean-stage1-ld
@@ -15417,10 +16576,10 @@
 clean-stage1-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif ld-bootstrap
 
 
@@ -15433,7 +16592,7 @@
 all-stage2: all-stage2-ld
 TARGET-stage2-ld = $(TARGET-ld)
 all-stage2-ld: configure-stage2-ld
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15447,7 +16606,7 @@
 clean-stage2-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15464,7 +16623,7 @@
 all-stage3: all-stage3-ld
 TARGET-stage3-ld = $(TARGET-ld)
 all-stage3-ld: configure-stage3-ld
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15478,7 +16637,7 @@
 clean-stage3-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15495,7 +16654,7 @@
 all-stage4: all-stage4-ld
 TARGET-stage4-ld = $(TARGET-ld)
 all-stage4-ld: configure-stage4-ld
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15509,7 +16668,7 @@
 clean-stage4-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15526,7 +16685,7 @@
 all-stageprofile: all-stageprofile-ld
 TARGET-stageprofile-ld = $(TARGET-ld)
 all-stageprofile-ld: configure-stageprofile-ld
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15540,7 +16699,7 @@
 clean-stageprofile-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15557,7 +16716,7 @@
 all-stagefeedback: all-stagefeedback-ld
 TARGET-stagefeedback-ld = $(TARGET-ld)
 all-stagefeedback-ld: configure-stagefeedback-ld
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15571,7 +16730,7 @@
 clean-stagefeedback-ld:
 	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -15588,7 +16747,7 @@
 maybe-check-ld: check-ld
 
 check-ld:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15603,7 +16762,7 @@
 maybe-install-ld: install-ld
 
 install-ld: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -15740,6 +16899,32 @@
 
 @endif ld
 
+.PHONY: maybe-install-html-ld install-html-ld
+maybe-install-html-ld:
+ at if ld
+maybe-install-html-ld: install-html-ld
+
+install-html-ld: \
+    configure-ld \
+    html-ld 
+	@[ -f ./ld/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-html in ld" ; \
+	(cd $(HOST_SUBDIR)/ld && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif ld
+
 .PHONY: maybe-installcheck-ld installcheck-ld
 maybe-installcheck-ld:
 @if ld
@@ -15868,11 +17053,15 @@
 @if libcpp
 maybe-configure-libcpp: configure-libcpp
 configure-libcpp: 
-	@test -f stage_last && exit 0; \
+ at endif libcpp
+ at if libcpp-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif libcpp-bootstrap
+ at if libcpp
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -15894,13 +17083,15 @@
 maybe-configure-stage1-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage1-libcpp: configure-stage1-libcpp
-configure-stage1-libcpp: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15918,14 +17109,16 @@
 maybe-configure-stage2-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage2-libcpp: configure-stage2-libcpp
-configure-stage2-libcpp: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15943,14 +17136,16 @@
 maybe-configure-stage3-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage3-libcpp: configure-stage3-libcpp
-configure-stage3-libcpp: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15968,14 +17163,16 @@
 maybe-configure-stage4-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stage4-libcpp: configure-stage4-libcpp
-configure-stage4-libcpp: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -15993,14 +17190,16 @@
 maybe-configure-stageprofile-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
-configure-stageprofile-libcpp: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -16018,14 +17217,16 @@
 maybe-configure-stagefeedback-libcpp:
 @if libcpp-bootstrap
 maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
-configure-stagefeedback-libcpp: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -16049,8 +17250,12 @@
 TARGET-libcpp=all
 maybe-all-libcpp: all-libcpp
 all-libcpp: configure-libcpp
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif libcpp
+ at if libcpp-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif libcpp-bootstrap
+ at if libcpp
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/libcpp && \
@@ -16068,12 +17273,12 @@
 all-stage1: all-stage1-libcpp
 TARGET-stage1-libcpp = $(TARGET-libcpp)
 all-stage1-libcpp: configure-stage1-libcpp
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-libcpp)
 
 maybe-clean-stage1-libcpp: clean-stage1-libcpp
@@ -16081,10 +17286,10 @@
 clean-stage1-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif libcpp-bootstrap
 
 
@@ -16097,7 +17302,7 @@
 all-stage2: all-stage2-libcpp
 TARGET-stage2-libcpp = $(TARGET-libcpp)
 all-stage2-libcpp: configure-stage2-libcpp
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16111,7 +17316,7 @@
 clean-stage2-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16128,7 +17333,7 @@
 all-stage3: all-stage3-libcpp
 TARGET-stage3-libcpp = $(TARGET-libcpp)
 all-stage3-libcpp: configure-stage3-libcpp
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16142,7 +17347,7 @@
 clean-stage3-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16159,7 +17364,7 @@
 all-stage4: all-stage4-libcpp
 TARGET-stage4-libcpp = $(TARGET-libcpp)
 all-stage4-libcpp: configure-stage4-libcpp
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16173,7 +17378,7 @@
 clean-stage4-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16190,7 +17395,7 @@
 all-stageprofile: all-stageprofile-libcpp
 TARGET-stageprofile-libcpp = $(TARGET-libcpp)
 all-stageprofile-libcpp: configure-stageprofile-libcpp
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16204,7 +17409,7 @@
 clean-stageprofile-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16221,7 +17426,7 @@
 all-stagefeedback: all-stagefeedback-libcpp
 TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
 all-stagefeedback-libcpp: configure-stagefeedback-libcpp
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16235,7 +17440,7 @@
 clean-stagefeedback-libcpp:
 	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16252,7 +17457,7 @@
 maybe-check-libcpp: check-libcpp
 
 check-libcpp:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16267,7 +17472,7 @@
 maybe-install-libcpp: install-libcpp
 
 install-libcpp: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16404,6 +17609,32 @@
 
 @endif libcpp
 
+.PHONY: maybe-install-html-libcpp install-html-libcpp
+maybe-install-html-libcpp:
+ at if libcpp
+maybe-install-html-libcpp: install-html-libcpp
+
+install-html-libcpp: \
+    configure-libcpp \
+    html-libcpp 
+	@[ -f ./libcpp/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-html in libcpp" ; \
+	(cd $(HOST_SUBDIR)/libcpp && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif libcpp
+
 .PHONY: maybe-installcheck-libcpp installcheck-libcpp
 maybe-installcheck-libcpp:
 @if libcpp
@@ -16532,11 +17763,15 @@
 @if libdecnumber
 maybe-configure-libdecnumber: configure-libdecnumber
 configure-libdecnumber: 
-	@test -f stage_last && exit 0; \
+ at endif libdecnumber
+ at if libdecnumber-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif libdecnumber-bootstrap
+ at 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 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
 	cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
@@ -16558,13 +17793,15 @@
 maybe-configure-stage1-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
-configure-stage1-libdecnumber: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -16582,14 +17819,16 @@
 maybe-configure-stage2-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
-configure-stage2-libdecnumber: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -16607,14 +17846,16 @@
 maybe-configure-stage3-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
-configure-stage3-libdecnumber: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -16632,14 +17873,16 @@
 maybe-configure-stage4-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
-configure-stage4-libdecnumber: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -16657,14 +17900,16 @@
 maybe-configure-stageprofile-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
-configure-stageprofile-libdecnumber: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -16682,14 +17927,16 @@
 maybe-configure-stagefeedback-libdecnumber:
 @if libdecnumber-bootstrap
 maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
-configure-stagefeedback-libdecnumber: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -16713,8 +17960,12 @@
 TARGET-libdecnumber=all
 maybe-all-libdecnumber: all-libdecnumber
 all-libdecnumber: configure-libdecnumber
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif libdecnumber
+ at if libdecnumber-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif libdecnumber-bootstrap
+ at if libdecnumber
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/libdecnumber && \
@@ -16732,12 +17983,12 @@
 all-stage1: all-stage1-libdecnumber
 TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
 all-stage1-libdecnumber: configure-stage1-libdecnumber
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-libdecnumber)
 
 maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
@@ -16745,10 +17996,10 @@
 clean-stage1-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif libdecnumber-bootstrap
 
 
@@ -16761,7 +18012,7 @@
 all-stage2: all-stage2-libdecnumber
 TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
 all-stage2-libdecnumber: configure-stage2-libdecnumber
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16775,7 +18026,7 @@
 clean-stage2-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16792,7 +18043,7 @@
 all-stage3: all-stage3-libdecnumber
 TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
 all-stage3-libdecnumber: configure-stage3-libdecnumber
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16806,7 +18057,7 @@
 clean-stage3-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16823,7 +18074,7 @@
 all-stage4: all-stage4-libdecnumber
 TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
 all-stage4-libdecnumber: configure-stage4-libdecnumber
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16837,7 +18088,7 @@
 clean-stage4-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16854,7 +18105,7 @@
 all-stageprofile: all-stageprofile-libdecnumber
 TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
 all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16868,7 +18119,7 @@
 clean-stageprofile-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16885,7 +18136,7 @@
 all-stagefeedback: all-stagefeedback-libdecnumber
 TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
 all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16899,7 +18150,7 @@
 clean-stagefeedback-libdecnumber:
 	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/libdecnumber && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -16916,7 +18167,7 @@
 maybe-check-libdecnumber: check-libdecnumber
 
 check-libdecnumber:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -16931,7 +18182,7 @@
 maybe-install-libdecnumber: install-libdecnumber
 
 install-libdecnumber: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17068,6 +18319,32 @@
 
 @endif libdecnumber
 
+.PHONY: maybe-install-html-libdecnumber install-html-libdecnumber
+maybe-install-html-libdecnumber:
+ at if libdecnumber
+maybe-install-html-libdecnumber: install-html-libdecnumber
+
+install-html-libdecnumber: \
+    configure-libdecnumber \
+    html-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-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}" \
+	          install-html) \
+	  || exit 1
+
+ at endif libdecnumber
+
 .PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
 maybe-installcheck-libdecnumber:
 @if libdecnumber
@@ -17196,11 +18473,11 @@
 @if libgui
 maybe-configure-libgui: configure-libgui
 configure-libgui: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -17226,7 +18503,7 @@
 TARGET-libgui=all
 maybe-all-libgui: all-libgui
 all-libgui: configure-libgui
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17243,7 +18520,7 @@
 maybe-check-libgui: check-libgui
 
 check-libgui:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17258,7 +18535,7 @@
 maybe-install-libgui: install-libgui
 
 install-libgui: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17276,7 +18553,7 @@
 
 info-libgui: \
     configure-libgui 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17302,7 +18579,7 @@
 
 dvi-libgui: \
     configure-libgui 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17328,7 +18605,7 @@
 
 html-libgui: \
     configure-libgui 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17354,7 +18631,7 @@
 
 TAGS-libgui: \
     configure-libgui 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17381,7 +18658,7 @@
 install-info-libgui: \
     configure-libgui \
     info-libgui 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17400,6 +18677,33 @@
 
 @endif libgui
 
+.PHONY: maybe-install-html-libgui install-html-libgui
+maybe-install-html-libgui:
+ at if libgui
+maybe-install-html-libgui: install-html-libgui
+
+install-html-libgui: \
+    configure-libgui \
+    html-libgui 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libgui/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-html in libgui" ; \
+	(cd $(HOST_SUBDIR)/libgui && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif libgui
+
 .PHONY: maybe-installcheck-libgui installcheck-libgui
 maybe-installcheck-libgui:
 @if libgui
@@ -17407,7 +18711,7 @@
 
 installcheck-libgui: \
     configure-libgui 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17432,7 +18736,7 @@
 maybe-mostlyclean-libgui: mostlyclean-libgui
 
 mostlyclean-libgui: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17457,7 +18761,7 @@
 maybe-clean-libgui: clean-libgui
 
 clean-libgui: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17482,7 +18786,7 @@
 maybe-distclean-libgui: distclean-libgui
 
 distclean-libgui: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17507,7 +18811,7 @@
 maybe-maintainer-clean-libgui: maintainer-clean-libgui
 
 maintainer-clean-libgui: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libgui/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -17533,11 +18837,15 @@
 @if libiberty
 maybe-configure-libiberty: configure-libiberty
 configure-libiberty: 
-	@test -f stage_last && exit 0; \
+ at endif libiberty
+ at if libiberty-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif libiberty-bootstrap
+ at if libiberty
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -17559,13 +18867,15 @@
 maybe-configure-stage1-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage1-libiberty: configure-stage1-libiberty
-configure-stage1-libiberty: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -17583,14 +18893,16 @@
 maybe-configure-stage2-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage2-libiberty: configure-stage2-libiberty
-configure-stage2-libiberty: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -17608,14 +18920,16 @@
 maybe-configure-stage3-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage3-libiberty: configure-stage3-libiberty
-configure-stage3-libiberty: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -17633,14 +18947,16 @@
 maybe-configure-stage4-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stage4-libiberty: configure-stage4-libiberty
-configure-stage4-libiberty: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -17658,14 +18974,16 @@
 maybe-configure-stageprofile-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
-configure-stageprofile-libiberty: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -17683,14 +19001,16 @@
 maybe-configure-stagefeedback-libiberty:
 @if libiberty-bootstrap
 maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
-configure-stagefeedback-libiberty: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -17714,8 +19034,12 @@
 TARGET-libiberty=all
 maybe-all-libiberty: all-libiberty
 all-libiberty: configure-libiberty
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif libiberty
+ at if libiberty-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif libiberty-bootstrap
+ at if libiberty
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/libiberty && \
@@ -17733,12 +19057,12 @@
 all-stage1: all-stage1-libiberty
 TARGET-stage1-libiberty = $(TARGET-libiberty)
 all-stage1-libiberty: configure-stage1-libiberty
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-libiberty)
 
 maybe-clean-stage1-libiberty: clean-stage1-libiberty
@@ -17746,10 +19070,10 @@
 clean-stage1-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif libiberty-bootstrap
 
 
@@ -17762,7 +19086,7 @@
 all-stage2: all-stage2-libiberty
 TARGET-stage2-libiberty = $(TARGET-libiberty)
 all-stage2-libiberty: configure-stage2-libiberty
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17776,7 +19100,7 @@
 clean-stage2-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17793,7 +19117,7 @@
 all-stage3: all-stage3-libiberty
 TARGET-stage3-libiberty = $(TARGET-libiberty)
 all-stage3-libiberty: configure-stage3-libiberty
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17807,7 +19131,7 @@
 clean-stage3-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17824,7 +19148,7 @@
 all-stage4: all-stage4-libiberty
 TARGET-stage4-libiberty = $(TARGET-libiberty)
 all-stage4-libiberty: configure-stage4-libiberty
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17838,7 +19162,7 @@
 clean-stage4-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17855,7 +19179,7 @@
 all-stageprofile: all-stageprofile-libiberty
 TARGET-stageprofile-libiberty = $(TARGET-libiberty)
 all-stageprofile-libiberty: configure-stageprofile-libiberty
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17869,7 +19193,7 @@
 clean-stageprofile-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17886,7 +19210,7 @@
 all-stagefeedback: all-stagefeedback-libiberty
 TARGET-stagefeedback-libiberty = $(TARGET-libiberty)
 all-stagefeedback-libiberty: configure-stagefeedback-libiberty
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17900,7 +19224,7 @@
 clean-stagefeedback-libiberty:
 	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -17917,7 +19241,7 @@
 maybe-check-libiberty: check-libiberty
 
 check-libiberty:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -17932,7 +19256,7 @@
 maybe-install-libiberty: install-libiberty
 
 install-libiberty: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18069,6 +19393,32 @@
 
 @endif libiberty
 
+.PHONY: maybe-install-html-libiberty install-html-libiberty
+maybe-install-html-libiberty:
+ at if libiberty
+maybe-install-html-libiberty: install-html-libiberty
+
+install-html-libiberty: \
+    configure-libiberty \
+    html-libiberty 
+	@[ -f ./libiberty/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-html in libiberty" ; \
+	(cd $(HOST_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif libiberty
+
 .PHONY: maybe-installcheck-libiberty installcheck-libiberty
 maybe-installcheck-libiberty:
 @if libiberty
@@ -18197,11 +19547,11 @@
 @if libtool
 maybe-configure-libtool: configure-libtool
 configure-libtool: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -18227,7 +19577,7 @@
 TARGET-libtool=all
 maybe-all-libtool: all-libtool
 all-libtool: configure-libtool
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18244,7 +19594,7 @@
 maybe-check-libtool: check-libtool
 
 check-libtool:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18259,7 +19609,7 @@
 maybe-install-libtool: install-libtool
 
 install-libtool: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18277,7 +19627,7 @@
 
 info-libtool: \
     configure-libtool 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18303,7 +19653,7 @@
 
 dvi-libtool: \
     configure-libtool 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18329,7 +19679,7 @@
 
 html-libtool: \
     configure-libtool 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18355,7 +19705,7 @@
 
 TAGS-libtool: \
     configure-libtool 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18382,7 +19732,7 @@
 install-info-libtool: \
     configure-libtool \
     info-libtool 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18401,6 +19751,33 @@
 
 @endif libtool
 
+.PHONY: maybe-install-html-libtool install-html-libtool
+maybe-install-html-libtool:
+ at if libtool
+maybe-install-html-libtool: install-html-libtool
+
+install-html-libtool: \
+    configure-libtool \
+    html-libtool 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtool/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-html in libtool" ; \
+	(cd $(HOST_SUBDIR)/libtool && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif libtool
+
 .PHONY: maybe-installcheck-libtool installcheck-libtool
 maybe-installcheck-libtool:
 @if libtool
@@ -18408,7 +19785,7 @@
 
 installcheck-libtool: \
     configure-libtool 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18433,7 +19810,7 @@
 maybe-mostlyclean-libtool: mostlyclean-libtool
 
 mostlyclean-libtool: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18458,7 +19835,7 @@
 maybe-clean-libtool: clean-libtool
 
 clean-libtool: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18483,7 +19860,7 @@
 maybe-distclean-libtool: distclean-libtool
 
 distclean-libtool: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18508,7 +19885,7 @@
 maybe-maintainer-clean-libtool: maintainer-clean-libtool
 
 maintainer-clean-libtool: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtool/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18534,11 +19911,11 @@
 @if m4
 maybe-configure-m4: configure-m4
 configure-m4: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -18564,7 +19941,7 @@
 TARGET-m4=all
 maybe-all-m4: all-m4
 all-m4: configure-m4
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18581,7 +19958,7 @@
 maybe-check-m4: check-m4
 
 check-m4:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18596,7 +19973,7 @@
 maybe-install-m4: install-m4
 
 install-m4: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18614,7 +19991,7 @@
 
 info-m4: \
     configure-m4 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18640,7 +20017,7 @@
 
 dvi-m4: \
     configure-m4 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18666,7 +20043,7 @@
 
 html-m4: \
     configure-m4 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18692,7 +20069,7 @@
 
 TAGS-m4: \
     configure-m4 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18719,7 +20096,7 @@
 install-info-m4: \
     configure-m4 \
     info-m4 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18738,6 +20115,33 @@
 
 @endif m4
 
+.PHONY: maybe-install-html-m4 install-html-m4
+maybe-install-html-m4:
+ at if m4
+maybe-install-html-m4: install-html-m4
+
+install-html-m4: \
+    configure-m4 \
+    html-m4 
+	@: $(MAKE); $(unstage)
+	@[ -f ./m4/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-html in m4" ; \
+	(cd $(HOST_SUBDIR)/m4 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif m4
+
 .PHONY: maybe-installcheck-m4 installcheck-m4
 maybe-installcheck-m4:
 @if m4
@@ -18745,7 +20149,7 @@
 
 installcheck-m4: \
     configure-m4 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18770,7 +20174,7 @@
 maybe-mostlyclean-m4: mostlyclean-m4
 
 mostlyclean-m4: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18795,7 +20199,7 @@
 maybe-clean-m4: clean-m4
 
 clean-m4: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18820,7 +20224,7 @@
 maybe-distclean-m4: distclean-m4
 
 distclean-m4: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18845,7 +20249,7 @@
 maybe-maintainer-clean-m4: maintainer-clean-m4
 
 maintainer-clean-m4: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./m4/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18871,11 +20275,11 @@
 @if make
 maybe-configure-make: configure-make
 configure-make: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -18901,7 +20305,7 @@
 TARGET-make=all
 maybe-all-make: all-make
 all-make: configure-make
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18918,7 +20322,7 @@
 maybe-check-make: check-make
 
 check-make:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18933,7 +20337,7 @@
 maybe-install-make: install-make
 
 install-make: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -18951,7 +20355,7 @@
 
 info-make: \
     configure-make 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -18977,7 +20381,7 @@
 
 dvi-make: \
     configure-make 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19003,7 +20407,7 @@
 
 html-make: \
     configure-make 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19029,7 +20433,7 @@
 
 TAGS-make: \
     configure-make 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19056,7 +20460,7 @@
 install-info-make: \
     configure-make \
     info-make 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19075,6 +20479,33 @@
 
 @endif make
 
+.PHONY: maybe-install-html-make install-html-make
+maybe-install-html-make:
+ at if make
+maybe-install-html-make: install-html-make
+
+install-html-make: \
+    configure-make \
+    html-make 
+	@: $(MAKE); $(unstage)
+	@[ -f ./make/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-html in make" ; \
+	(cd $(HOST_SUBDIR)/make && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif make
+
 .PHONY: maybe-installcheck-make installcheck-make
 maybe-installcheck-make:
 @if make
@@ -19082,7 +20513,7 @@
 
 installcheck-make: \
     configure-make 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19107,7 +20538,7 @@
 maybe-mostlyclean-make: mostlyclean-make
 
 mostlyclean-make: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19132,7 +20563,7 @@
 maybe-clean-make: clean-make
 
 clean-make: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19157,7 +20588,7 @@
 maybe-distclean-make: distclean-make
 
 distclean-make: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19182,7 +20613,7 @@
 maybe-maintainer-clean-make: maintainer-clean-make
 
 maintainer-clean-make: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./make/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19208,11 +20639,11 @@
 @if mmalloc
 maybe-configure-mmalloc: configure-mmalloc
 configure-mmalloc: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -19238,7 +20669,7 @@
 TARGET-mmalloc=all
 maybe-all-mmalloc: all-mmalloc
 all-mmalloc: configure-mmalloc
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19264,7 +20695,7 @@
 maybe-install-mmalloc: install-mmalloc
 
 install-mmalloc: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19282,7 +20713,7 @@
 
 info-mmalloc: \
     configure-mmalloc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19308,7 +20739,7 @@
 
 dvi-mmalloc: \
     configure-mmalloc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19334,7 +20765,7 @@
 
 html-mmalloc: \
     configure-mmalloc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19360,7 +20791,7 @@
 
 TAGS-mmalloc: \
     configure-mmalloc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19387,7 +20818,7 @@
 install-info-mmalloc: \
     configure-mmalloc \
     info-mmalloc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19406,6 +20837,33 @@
 
 @endif mmalloc
 
+.PHONY: maybe-install-html-mmalloc install-html-mmalloc
+maybe-install-html-mmalloc:
+ at if mmalloc
+maybe-install-html-mmalloc: install-html-mmalloc
+
+install-html-mmalloc: \
+    configure-mmalloc \
+    html-mmalloc 
+	@: $(MAKE); $(unstage)
+	@[ -f ./mmalloc/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-html in mmalloc" ; \
+	(cd $(HOST_SUBDIR)/mmalloc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif mmalloc
+
 .PHONY: maybe-installcheck-mmalloc installcheck-mmalloc
 maybe-installcheck-mmalloc:
 @if mmalloc
@@ -19413,7 +20871,7 @@
 
 installcheck-mmalloc: \
     configure-mmalloc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19438,7 +20896,7 @@
 maybe-mostlyclean-mmalloc: mostlyclean-mmalloc
 
 mostlyclean-mmalloc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19463,7 +20921,7 @@
 maybe-clean-mmalloc: clean-mmalloc
 
 clean-mmalloc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19488,7 +20946,7 @@
 maybe-distclean-mmalloc: distclean-mmalloc
 
 distclean-mmalloc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19513,7 +20971,7 @@
 maybe-maintainer-clean-mmalloc: maintainer-clean-mmalloc
 
 maintainer-clean-mmalloc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./mmalloc/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19539,11 +20997,11 @@
 @if patch
 maybe-configure-patch: configure-patch
 configure-patch: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -19569,7 +21027,7 @@
 TARGET-patch=all
 maybe-all-patch: all-patch
 all-patch: configure-patch
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19586,7 +21044,7 @@
 maybe-check-patch: check-patch
 
 check-patch:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19601,7 +21059,7 @@
 maybe-install-patch: install-patch
 
 install-patch: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19619,7 +21077,7 @@
 
 info-patch: \
     configure-patch 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19645,7 +21103,7 @@
 
 dvi-patch: \
     configure-patch 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19671,7 +21129,7 @@
 
 html-patch: \
     configure-patch 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19697,7 +21155,7 @@
 
 TAGS-patch: \
     configure-patch 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19724,7 +21182,7 @@
 install-info-patch: \
     configure-patch \
     info-patch 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19743,6 +21201,33 @@
 
 @endif patch
 
+.PHONY: maybe-install-html-patch install-html-patch
+maybe-install-html-patch:
+ at if patch
+maybe-install-html-patch: install-html-patch
+
+install-html-patch: \
+    configure-patch \
+    html-patch 
+	@: $(MAKE); $(unstage)
+	@[ -f ./patch/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-html in patch" ; \
+	(cd $(HOST_SUBDIR)/patch && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif patch
+
 .PHONY: maybe-installcheck-patch installcheck-patch
 maybe-installcheck-patch:
 @if patch
@@ -19750,7 +21235,7 @@
 
 installcheck-patch: \
     configure-patch 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19775,7 +21260,7 @@
 maybe-mostlyclean-patch: mostlyclean-patch
 
 mostlyclean-patch: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19800,7 +21285,7 @@
 maybe-clean-patch: clean-patch
 
 clean-patch: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19825,7 +21310,7 @@
 maybe-distclean-patch: distclean-patch
 
 distclean-patch: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19850,7 +21335,7 @@
 maybe-maintainer-clean-patch: maintainer-clean-patch
 
 maintainer-clean-patch: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./patch/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19876,11 +21361,11 @@
 @if perl
 maybe-configure-perl: configure-perl
 configure-perl: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -19906,7 +21391,7 @@
 TARGET-perl=all
 maybe-all-perl: all-perl
 all-perl: configure-perl
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19923,7 +21408,7 @@
 maybe-check-perl: check-perl
 
 check-perl:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19938,7 +21423,7 @@
 maybe-install-perl: install-perl
 
 install-perl: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -19956,7 +21441,7 @@
 
 info-perl: \
     configure-perl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -19982,7 +21467,7 @@
 
 dvi-perl: \
     configure-perl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20008,7 +21493,7 @@
 
 html-perl: \
     configure-perl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20034,7 +21519,7 @@
 
 TAGS-perl: \
     configure-perl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20061,7 +21546,7 @@
 install-info-perl: \
     configure-perl \
     info-perl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20080,6 +21565,33 @@
 
 @endif perl
 
+.PHONY: maybe-install-html-perl install-html-perl
+maybe-install-html-perl:
+ at if perl
+maybe-install-html-perl: install-html-perl
+
+install-html-perl: \
+    configure-perl \
+    html-perl 
+	@: $(MAKE); $(unstage)
+	@[ -f ./perl/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-html in perl" ; \
+	(cd $(HOST_SUBDIR)/perl && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif perl
+
 .PHONY: maybe-installcheck-perl installcheck-perl
 maybe-installcheck-perl:
 @if perl
@@ -20087,7 +21599,7 @@
 
 installcheck-perl: \
     configure-perl 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20112,7 +21624,7 @@
 maybe-mostlyclean-perl: mostlyclean-perl
 
 mostlyclean-perl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20137,7 +21649,7 @@
 maybe-clean-perl: clean-perl
 
 clean-perl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20162,7 +21674,7 @@
 maybe-distclean-perl: distclean-perl
 
 distclean-perl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20187,7 +21699,7 @@
 maybe-maintainer-clean-perl: maintainer-clean-perl
 
 maintainer-clean-perl: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./perl/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20213,11 +21725,11 @@
 @if prms
 maybe-configure-prms: configure-prms
 configure-prms: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -20243,7 +21755,7 @@
 TARGET-prms=all
 maybe-all-prms: all-prms
 all-prms: configure-prms
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20260,7 +21772,7 @@
 maybe-check-prms: check-prms
 
 check-prms:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20275,7 +21787,7 @@
 maybe-install-prms: install-prms
 
 install-prms: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20293,7 +21805,7 @@
 
 info-prms: \
     configure-prms 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20319,7 +21831,7 @@
 
 dvi-prms: \
     configure-prms 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20345,7 +21857,7 @@
 
 html-prms: \
     configure-prms 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20371,7 +21883,7 @@
 
 TAGS-prms: \
     configure-prms 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20398,7 +21910,7 @@
 install-info-prms: \
     configure-prms \
     info-prms 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20417,6 +21929,33 @@
 
 @endif prms
 
+.PHONY: maybe-install-html-prms install-html-prms
+maybe-install-html-prms:
+ at if prms
+maybe-install-html-prms: install-html-prms
+
+install-html-prms: \
+    configure-prms \
+    html-prms 
+	@: $(MAKE); $(unstage)
+	@[ -f ./prms/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-html in prms" ; \
+	(cd $(HOST_SUBDIR)/prms && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif prms
+
 .PHONY: maybe-installcheck-prms installcheck-prms
 maybe-installcheck-prms:
 @if prms
@@ -20424,7 +21963,7 @@
 
 installcheck-prms: \
     configure-prms 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20449,7 +21988,7 @@
 maybe-mostlyclean-prms: mostlyclean-prms
 
 mostlyclean-prms: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20474,7 +22013,7 @@
 maybe-clean-prms: clean-prms
 
 clean-prms: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20499,7 +22038,7 @@
 maybe-distclean-prms: distclean-prms
 
 distclean-prms: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20524,7 +22063,7 @@
 maybe-maintainer-clean-prms: maintainer-clean-prms
 
 maintainer-clean-prms: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./prms/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20550,11 +22089,11 @@
 @if rcs
 maybe-configure-rcs: configure-rcs
 configure-rcs: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -20580,7 +22119,7 @@
 TARGET-rcs=all
 maybe-all-rcs: all-rcs
 all-rcs: configure-rcs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20597,7 +22136,7 @@
 maybe-check-rcs: check-rcs
 
 check-rcs:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20612,7 +22151,7 @@
 maybe-install-rcs: install-rcs
 
 install-rcs: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20630,7 +22169,7 @@
 
 info-rcs: \
     configure-rcs 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20656,7 +22195,7 @@
 
 dvi-rcs: \
     configure-rcs 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20682,7 +22221,7 @@
 
 html-rcs: \
     configure-rcs 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20708,7 +22247,7 @@
 
 TAGS-rcs: \
     configure-rcs 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20735,7 +22274,7 @@
 install-info-rcs: \
     configure-rcs \
     info-rcs 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20754,6 +22293,33 @@
 
 @endif rcs
 
+.PHONY: maybe-install-html-rcs install-html-rcs
+maybe-install-html-rcs:
+ at if rcs
+maybe-install-html-rcs: install-html-rcs
+
+install-html-rcs: \
+    configure-rcs \
+    html-rcs 
+	@: $(MAKE); $(unstage)
+	@[ -f ./rcs/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-html in rcs" ; \
+	(cd $(HOST_SUBDIR)/rcs && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif rcs
+
 .PHONY: maybe-installcheck-rcs installcheck-rcs
 maybe-installcheck-rcs:
 @if rcs
@@ -20761,7 +22327,7 @@
 
 installcheck-rcs: \
     configure-rcs 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20786,7 +22352,7 @@
 maybe-mostlyclean-rcs: mostlyclean-rcs
 
 mostlyclean-rcs: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20811,7 +22377,7 @@
 maybe-clean-rcs: clean-rcs
 
 clean-rcs: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20836,7 +22402,7 @@
 maybe-distclean-rcs: distclean-rcs
 
 distclean-rcs: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20861,7 +22427,7 @@
 maybe-maintainer-clean-rcs: maintainer-clean-rcs
 
 maintainer-clean-rcs: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./rcs/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20887,11 +22453,11 @@
 @if readline
 maybe-configure-readline: configure-readline
 configure-readline: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -20917,7 +22483,7 @@
 TARGET-readline=all
 maybe-all-readline: all-readline
 all-readline: configure-readline
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20934,7 +22500,7 @@
 maybe-check-readline: check-readline
 
 check-readline:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20949,7 +22515,7 @@
 maybe-install-readline: install-readline
 
 install-readline: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -20967,7 +22533,7 @@
 
 info-readline: \
     configure-readline 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -20993,7 +22559,7 @@
 
 dvi-readline: \
     configure-readline 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21019,7 +22585,7 @@
 
 html-readline: \
     configure-readline 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21045,7 +22611,7 @@
 
 TAGS-readline: \
     configure-readline 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21072,7 +22638,7 @@
 install-info-readline: \
     configure-readline \
     info-readline 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21091,6 +22657,33 @@
 
 @endif readline
 
+.PHONY: maybe-install-html-readline install-html-readline
+maybe-install-html-readline:
+ at if readline
+maybe-install-html-readline: install-html-readline
+
+install-html-readline: \
+    configure-readline \
+    html-readline 
+	@: $(MAKE); $(unstage)
+	@[ -f ./readline/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-html in readline" ; \
+	(cd $(HOST_SUBDIR)/readline && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif readline
+
 .PHONY: maybe-installcheck-readline installcheck-readline
 maybe-installcheck-readline:
 @if readline
@@ -21098,7 +22691,7 @@
 
 installcheck-readline: \
     configure-readline 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21123,7 +22716,7 @@
 maybe-mostlyclean-readline: mostlyclean-readline
 
 mostlyclean-readline: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21148,7 +22741,7 @@
 maybe-clean-readline: clean-readline
 
 clean-readline: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21173,7 +22766,7 @@
 maybe-distclean-readline: distclean-readline
 
 distclean-readline: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21198,7 +22791,7 @@
 maybe-maintainer-clean-readline: maintainer-clean-readline
 
 maintainer-clean-readline: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./readline/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21224,11 +22817,11 @@
 @if release
 maybe-configure-release: configure-release
 configure-release: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -21254,7 +22847,7 @@
 TARGET-release=all
 maybe-all-release: all-release
 all-release: configure-release
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21292,7 +22885,7 @@
 
 info-release: \
     configure-release 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21318,7 +22911,7 @@
 
 dvi-release: \
     configure-release 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21344,7 +22937,7 @@
 
 html-release: \
     configure-release 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21370,7 +22963,7 @@
 
 TAGS-release: \
     configure-release 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21397,7 +22990,7 @@
 install-info-release: \
     configure-release \
     info-release 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21416,6 +23009,33 @@
 
 @endif release
 
+.PHONY: maybe-install-html-release install-html-release
+maybe-install-html-release:
+ at if release
+maybe-install-html-release: install-html-release
+
+install-html-release: \
+    configure-release \
+    html-release 
+	@: $(MAKE); $(unstage)
+	@[ -f ./release/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-html in release" ; \
+	(cd $(HOST_SUBDIR)/release && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif release
+
 .PHONY: maybe-installcheck-release installcheck-release
 maybe-installcheck-release:
 @if release
@@ -21423,7 +23043,7 @@
 
 installcheck-release: \
     configure-release 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21448,7 +23068,7 @@
 maybe-mostlyclean-release: mostlyclean-release
 
 mostlyclean-release: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21473,7 +23093,7 @@
 maybe-clean-release: clean-release
 
 clean-release: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21498,7 +23118,7 @@
 maybe-distclean-release: distclean-release
 
 distclean-release: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21523,7 +23143,7 @@
 maybe-maintainer-clean-release: maintainer-clean-release
 
 maintainer-clean-release: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./release/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21549,11 +23169,11 @@
 @if recode
 maybe-configure-recode: configure-recode
 configure-recode: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -21579,7 +23199,7 @@
 TARGET-recode=all
 maybe-all-recode: all-recode
 all-recode: configure-recode
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21596,7 +23216,7 @@
 maybe-check-recode: check-recode
 
 check-recode:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21611,7 +23231,7 @@
 maybe-install-recode: install-recode
 
 install-recode: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21629,7 +23249,7 @@
 
 info-recode: \
     configure-recode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21655,7 +23275,7 @@
 
 dvi-recode: \
     configure-recode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21681,7 +23301,7 @@
 
 html-recode: \
     configure-recode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21707,7 +23327,7 @@
 
 TAGS-recode: \
     configure-recode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21734,7 +23354,7 @@
 install-info-recode: \
     configure-recode \
     info-recode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21753,6 +23373,33 @@
 
 @endif recode
 
+.PHONY: maybe-install-html-recode install-html-recode
+maybe-install-html-recode:
+ at if recode
+maybe-install-html-recode: install-html-recode
+
+install-html-recode: \
+    configure-recode \
+    html-recode 
+	@: $(MAKE); $(unstage)
+	@[ -f ./recode/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-html in recode" ; \
+	(cd $(HOST_SUBDIR)/recode && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif recode
+
 .PHONY: maybe-installcheck-recode installcheck-recode
 maybe-installcheck-recode:
 @if recode
@@ -21760,7 +23407,7 @@
 
 installcheck-recode: \
     configure-recode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21785,7 +23432,7 @@
 maybe-mostlyclean-recode: mostlyclean-recode
 
 mostlyclean-recode: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21810,7 +23457,7 @@
 maybe-clean-recode: clean-recode
 
 clean-recode: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21835,7 +23482,7 @@
 maybe-distclean-recode: distclean-recode
 
 distclean-recode: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21860,7 +23507,7 @@
 maybe-maintainer-clean-recode: maintainer-clean-recode
 
 maintainer-clean-recode: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./recode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21886,11 +23533,11 @@
 @if sed
 maybe-configure-sed: configure-sed
 configure-sed: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -21916,7 +23563,7 @@
 TARGET-sed=all
 maybe-all-sed: all-sed
 all-sed: configure-sed
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21933,7 +23580,7 @@
 maybe-check-sed: check-sed
 
 check-sed:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21948,7 +23595,7 @@
 maybe-install-sed: install-sed
 
 install-sed: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -21966,7 +23613,7 @@
 
 info-sed: \
     configure-sed 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -21992,7 +23639,7 @@
 
 dvi-sed: \
     configure-sed 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22018,7 +23665,7 @@
 
 html-sed: \
     configure-sed 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22044,7 +23691,7 @@
 
 TAGS-sed: \
     configure-sed 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22071,7 +23718,7 @@
 install-info-sed: \
     configure-sed \
     info-sed 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22090,6 +23737,33 @@
 
 @endif sed
 
+.PHONY: maybe-install-html-sed install-html-sed
+maybe-install-html-sed:
+ at if sed
+maybe-install-html-sed: install-html-sed
+
+install-html-sed: \
+    configure-sed \
+    html-sed 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sed/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-html in sed" ; \
+	(cd $(HOST_SUBDIR)/sed && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif sed
+
 .PHONY: maybe-installcheck-sed installcheck-sed
 maybe-installcheck-sed:
 @if sed
@@ -22097,7 +23771,7 @@
 
 installcheck-sed: \
     configure-sed 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22122,7 +23796,7 @@
 maybe-mostlyclean-sed: mostlyclean-sed
 
 mostlyclean-sed: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22147,7 +23821,7 @@
 maybe-clean-sed: clean-sed
 
 clean-sed: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22172,7 +23846,7 @@
 maybe-distclean-sed: distclean-sed
 
 distclean-sed: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22197,7 +23871,7 @@
 maybe-maintainer-clean-sed: maintainer-clean-sed
 
 maintainer-clean-sed: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sed/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22223,11 +23897,11 @@
 @if send-pr
 maybe-configure-send-pr: configure-send-pr
 configure-send-pr: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -22253,7 +23927,7 @@
 TARGET-send-pr=all
 maybe-all-send-pr: all-send-pr
 all-send-pr: configure-send-pr
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22270,7 +23944,7 @@
 maybe-check-send-pr: check-send-pr
 
 check-send-pr:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22285,7 +23959,7 @@
 maybe-install-send-pr: install-send-pr
 
 install-send-pr: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22303,7 +23977,7 @@
 
 info-send-pr: \
     configure-send-pr 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22329,7 +24003,7 @@
 
 dvi-send-pr: \
     configure-send-pr 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22355,7 +24029,7 @@
 
 html-send-pr: \
     configure-send-pr 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22381,7 +24055,7 @@
 
 TAGS-send-pr: \
     configure-send-pr 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22408,7 +24082,7 @@
 install-info-send-pr: \
     configure-send-pr \
     info-send-pr 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22427,6 +24101,33 @@
 
 @endif send-pr
 
+.PHONY: maybe-install-html-send-pr install-html-send-pr
+maybe-install-html-send-pr:
+ at if send-pr
+maybe-install-html-send-pr: install-html-send-pr
+
+install-html-send-pr: \
+    configure-send-pr \
+    html-send-pr 
+	@: $(MAKE); $(unstage)
+	@[ -f ./send-pr/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-html in send-pr" ; \
+	(cd $(HOST_SUBDIR)/send-pr && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif send-pr
+
 .PHONY: maybe-installcheck-send-pr installcheck-send-pr
 maybe-installcheck-send-pr:
 @if send-pr
@@ -22434,7 +24135,7 @@
 
 installcheck-send-pr: \
     configure-send-pr 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22459,7 +24160,7 @@
 maybe-mostlyclean-send-pr: mostlyclean-send-pr
 
 mostlyclean-send-pr: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22484,7 +24185,7 @@
 maybe-clean-send-pr: clean-send-pr
 
 clean-send-pr: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22509,7 +24210,7 @@
 maybe-distclean-send-pr: distclean-send-pr
 
 distclean-send-pr: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22534,7 +24235,7 @@
 maybe-maintainer-clean-send-pr: maintainer-clean-send-pr
 
 maintainer-clean-send-pr: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./send-pr/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22560,11 +24261,11 @@
 @if shellutils
 maybe-configure-shellutils: configure-shellutils
 configure-shellutils: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -22590,7 +24291,7 @@
 TARGET-shellutils=all
 maybe-all-shellutils: all-shellutils
 all-shellutils: configure-shellutils
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22607,7 +24308,7 @@
 maybe-check-shellutils: check-shellutils
 
 check-shellutils:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22622,7 +24323,7 @@
 maybe-install-shellutils: install-shellutils
 
 install-shellutils: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22640,7 +24341,7 @@
 
 info-shellutils: \
     configure-shellutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22666,7 +24367,7 @@
 
 dvi-shellutils: \
     configure-shellutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22692,7 +24393,7 @@
 
 html-shellutils: \
     configure-shellutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22718,7 +24419,7 @@
 
 TAGS-shellutils: \
     configure-shellutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22745,7 +24446,7 @@
 install-info-shellutils: \
     configure-shellutils \
     info-shellutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22764,6 +24465,33 @@
 
 @endif shellutils
 
+.PHONY: maybe-install-html-shellutils install-html-shellutils
+maybe-install-html-shellutils:
+ at if shellutils
+maybe-install-html-shellutils: install-html-shellutils
+
+install-html-shellutils: \
+    configure-shellutils \
+    html-shellutils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./shellutils/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-html in shellutils" ; \
+	(cd $(HOST_SUBDIR)/shellutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif shellutils
+
 .PHONY: maybe-installcheck-shellutils installcheck-shellutils
 maybe-installcheck-shellutils:
 @if shellutils
@@ -22771,7 +24499,7 @@
 
 installcheck-shellutils: \
     configure-shellutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22796,7 +24524,7 @@
 maybe-mostlyclean-shellutils: mostlyclean-shellutils
 
 mostlyclean-shellutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22821,7 +24549,7 @@
 maybe-clean-shellutils: clean-shellutils
 
 clean-shellutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22846,7 +24574,7 @@
 maybe-distclean-shellutils: distclean-shellutils
 
 distclean-shellutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22871,7 +24599,7 @@
 maybe-maintainer-clean-shellutils: maintainer-clean-shellutils
 
 maintainer-clean-shellutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./shellutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -22897,11 +24625,11 @@
 @if sid
 maybe-configure-sid: configure-sid
 configure-sid: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -22927,7 +24655,7 @@
 TARGET-sid=all
 maybe-all-sid: all-sid
 all-sid: configure-sid
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22944,7 +24672,7 @@
 maybe-check-sid: check-sid
 
 check-sid:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22959,7 +24687,7 @@
 maybe-install-sid: install-sid
 
 install-sid: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -22977,7 +24705,7 @@
 
 info-sid: \
     configure-sid 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23003,7 +24731,7 @@
 
 dvi-sid: \
     configure-sid 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23029,7 +24757,7 @@
 
 html-sid: \
     configure-sid 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23055,7 +24783,7 @@
 
 TAGS-sid: \
     configure-sid 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23082,7 +24810,7 @@
 install-info-sid: \
     configure-sid \
     info-sid 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23101,6 +24829,33 @@
 
 @endif sid
 
+.PHONY: maybe-install-html-sid install-html-sid
+maybe-install-html-sid:
+ at if sid
+maybe-install-html-sid: install-html-sid
+
+install-html-sid: \
+    configure-sid \
+    html-sid 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sid/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-html in sid" ; \
+	(cd $(HOST_SUBDIR)/sid && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif sid
+
 .PHONY: maybe-installcheck-sid installcheck-sid
 maybe-installcheck-sid:
 @if sid
@@ -23108,7 +24863,7 @@
 
 installcheck-sid: \
     configure-sid 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23133,7 +24888,7 @@
 maybe-mostlyclean-sid: mostlyclean-sid
 
 mostlyclean-sid: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23158,7 +24913,7 @@
 maybe-clean-sid: clean-sid
 
 clean-sid: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23183,7 +24938,7 @@
 maybe-distclean-sid: distclean-sid
 
 distclean-sid: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23208,7 +24963,7 @@
 maybe-maintainer-clean-sid: maintainer-clean-sid
 
 maintainer-clean-sid: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sid/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23234,11 +24989,11 @@
 @if sim
 maybe-configure-sim: configure-sim
 configure-sim: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -23264,7 +25019,7 @@
 TARGET-sim=all
 maybe-all-sim: all-sim
 all-sim: configure-sim
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23281,7 +25036,7 @@
 maybe-check-sim: check-sim
 
 check-sim:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23296,7 +25051,7 @@
 maybe-install-sim: install-sim
 
 install-sim: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23314,7 +25069,7 @@
 
 info-sim: \
     configure-sim 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23340,7 +25095,7 @@
 
 dvi-sim: \
     configure-sim 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23366,7 +25121,7 @@
 
 html-sim: \
     configure-sim 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23392,7 +25147,7 @@
 
 TAGS-sim: \
     configure-sim 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23419,7 +25174,7 @@
 install-info-sim: \
     configure-sim \
     info-sim 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23438,6 +25193,33 @@
 
 @endif sim
 
+.PHONY: maybe-install-html-sim install-html-sim
+maybe-install-html-sim:
+ at if sim
+maybe-install-html-sim: install-html-sim
+
+install-html-sim: \
+    configure-sim \
+    html-sim 
+	@: $(MAKE); $(unstage)
+	@[ -f ./sim/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-html in sim" ; \
+	(cd $(HOST_SUBDIR)/sim && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif sim
+
 .PHONY: maybe-installcheck-sim installcheck-sim
 maybe-installcheck-sim:
 @if sim
@@ -23445,7 +25227,7 @@
 
 installcheck-sim: \
     configure-sim 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23470,7 +25252,7 @@
 maybe-mostlyclean-sim: mostlyclean-sim
 
 mostlyclean-sim: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23495,7 +25277,7 @@
 maybe-clean-sim: clean-sim
 
 clean-sim: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23520,7 +25302,7 @@
 maybe-distclean-sim: distclean-sim
 
 distclean-sim: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23545,7 +25327,7 @@
 maybe-maintainer-clean-sim: maintainer-clean-sim
 
 maintainer-clean-sim: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./sim/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23571,11 +25353,11 @@
 @if tar
 maybe-configure-tar: configure-tar
 configure-tar: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -23601,7 +25383,7 @@
 TARGET-tar=all
 maybe-all-tar: all-tar
 all-tar: configure-tar
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23618,7 +25400,7 @@
 maybe-check-tar: check-tar
 
 check-tar:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23633,7 +25415,7 @@
 maybe-install-tar: install-tar
 
 install-tar: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23651,7 +25433,7 @@
 
 info-tar: \
     configure-tar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23677,7 +25459,7 @@
 
 dvi-tar: \
     configure-tar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23703,7 +25485,7 @@
 
 html-tar: \
     configure-tar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23729,7 +25511,7 @@
 
 TAGS-tar: \
     configure-tar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23756,7 +25538,7 @@
 install-info-tar: \
     configure-tar \
     info-tar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23775,6 +25557,33 @@
 
 @endif tar
 
+.PHONY: maybe-install-html-tar install-html-tar
+maybe-install-html-tar:
+ at if tar
+maybe-install-html-tar: install-html-tar
+
+install-html-tar: \
+    configure-tar \
+    html-tar 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tar/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-html in tar" ; \
+	(cd $(HOST_SUBDIR)/tar && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif tar
+
 .PHONY: maybe-installcheck-tar installcheck-tar
 maybe-installcheck-tar:
 @if tar
@@ -23782,7 +25591,7 @@
 
 installcheck-tar: \
     configure-tar 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23807,7 +25616,7 @@
 maybe-mostlyclean-tar: mostlyclean-tar
 
 mostlyclean-tar: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23832,7 +25641,7 @@
 maybe-clean-tar: clean-tar
 
 clean-tar: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23857,7 +25666,7 @@
 maybe-distclean-tar: distclean-tar
 
 distclean-tar: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23882,7 +25691,7 @@
 maybe-maintainer-clean-tar: maintainer-clean-tar
 
 maintainer-clean-tar: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tar/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -23908,11 +25717,11 @@
 @if texinfo
 maybe-configure-texinfo: configure-texinfo
 configure-texinfo: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -23938,7 +25747,7 @@
 TARGET-texinfo=all
 maybe-all-texinfo: all-texinfo
 all-texinfo: configure-texinfo
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23955,7 +25764,7 @@
 maybe-check-texinfo: check-texinfo
 
 check-texinfo:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -23982,7 +25791,7 @@
 
 info-texinfo: \
     configure-texinfo 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24008,7 +25817,7 @@
 
 dvi-texinfo: \
     configure-texinfo 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24034,7 +25843,7 @@
 
 html-texinfo: \
     configure-texinfo 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24060,7 +25869,7 @@
 
 TAGS-texinfo: \
     configure-texinfo 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24087,7 +25896,7 @@
 install-info-texinfo: \
     configure-texinfo \
     info-texinfo 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24106,6 +25915,33 @@
 
 @endif texinfo
 
+.PHONY: maybe-install-html-texinfo install-html-texinfo
+maybe-install-html-texinfo:
+ at if texinfo
+maybe-install-html-texinfo: install-html-texinfo
+
+install-html-texinfo: \
+    configure-texinfo \
+    html-texinfo 
+	@: $(MAKE); $(unstage)
+	@[ -f ./texinfo/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-html in texinfo" ; \
+	(cd $(HOST_SUBDIR)/texinfo && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif texinfo
+
 .PHONY: maybe-installcheck-texinfo installcheck-texinfo
 maybe-installcheck-texinfo:
 @if texinfo
@@ -24113,7 +25949,7 @@
 
 installcheck-texinfo: \
     configure-texinfo 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24138,7 +25974,7 @@
 maybe-mostlyclean-texinfo: mostlyclean-texinfo
 
 mostlyclean-texinfo: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24163,7 +25999,7 @@
 maybe-clean-texinfo: clean-texinfo
 
 clean-texinfo: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24188,7 +26024,7 @@
 maybe-distclean-texinfo: distclean-texinfo
 
 distclean-texinfo: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24213,7 +26049,7 @@
 maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
 
 maintainer-clean-texinfo: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./texinfo/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24239,11 +26075,11 @@
 @if textutils
 maybe-configure-textutils: configure-textutils
 configure-textutils: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -24269,7 +26105,7 @@
 TARGET-textutils=all
 maybe-all-textutils: all-textutils
 all-textutils: configure-textutils
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24286,7 +26122,7 @@
 maybe-check-textutils: check-textutils
 
 check-textutils:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24301,7 +26137,7 @@
 maybe-install-textutils: install-textutils
 
 install-textutils: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24319,7 +26155,7 @@
 
 info-textutils: \
     configure-textutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24345,7 +26181,7 @@
 
 dvi-textutils: \
     configure-textutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24371,7 +26207,7 @@
 
 html-textutils: \
     configure-textutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24397,7 +26233,7 @@
 
 TAGS-textutils: \
     configure-textutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24424,7 +26260,7 @@
 install-info-textutils: \
     configure-textutils \
     info-textutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24443,6 +26279,33 @@
 
 @endif textutils
 
+.PHONY: maybe-install-html-textutils install-html-textutils
+maybe-install-html-textutils:
+ at if textutils
+maybe-install-html-textutils: install-html-textutils
+
+install-html-textutils: \
+    configure-textutils \
+    html-textutils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./textutils/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-html in textutils" ; \
+	(cd $(HOST_SUBDIR)/textutils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif textutils
+
 .PHONY: maybe-installcheck-textutils installcheck-textutils
 maybe-installcheck-textutils:
 @if textutils
@@ -24450,7 +26313,7 @@
 
 installcheck-textutils: \
     configure-textutils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24475,7 +26338,7 @@
 maybe-mostlyclean-textutils: mostlyclean-textutils
 
 mostlyclean-textutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24500,7 +26363,7 @@
 maybe-clean-textutils: clean-textutils
 
 clean-textutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24525,7 +26388,7 @@
 maybe-distclean-textutils: distclean-textutils
 
 distclean-textutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24550,7 +26413,7 @@
 maybe-maintainer-clean-textutils: maintainer-clean-textutils
 
 maintainer-clean-textutils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./textutils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24576,11 +26439,11 @@
 @if time
 maybe-configure-time: configure-time
 configure-time: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -24606,7 +26469,7 @@
 TARGET-time=all
 maybe-all-time: all-time
 all-time: configure-time
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24623,7 +26486,7 @@
 maybe-check-time: check-time
 
 check-time:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24638,7 +26501,7 @@
 maybe-install-time: install-time
 
 install-time: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24656,7 +26519,7 @@
 
 info-time: \
     configure-time 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24682,7 +26545,7 @@
 
 dvi-time: \
     configure-time 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24708,7 +26571,7 @@
 
 html-time: \
     configure-time 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24734,7 +26597,7 @@
 
 TAGS-time: \
     configure-time 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24761,7 +26624,7 @@
 install-info-time: \
     configure-time \
     info-time 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24780,6 +26643,33 @@
 
 @endif time
 
+.PHONY: maybe-install-html-time install-html-time
+maybe-install-html-time:
+ at if time
+maybe-install-html-time: install-html-time
+
+install-html-time: \
+    configure-time \
+    html-time 
+	@: $(MAKE); $(unstage)
+	@[ -f ./time/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-html in time" ; \
+	(cd $(HOST_SUBDIR)/time && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif time
+
 .PHONY: maybe-installcheck-time installcheck-time
 maybe-installcheck-time:
 @if time
@@ -24787,7 +26677,7 @@
 
 installcheck-time: \
     configure-time 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24812,7 +26702,7 @@
 maybe-mostlyclean-time: mostlyclean-time
 
 mostlyclean-time: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24837,7 +26727,7 @@
 maybe-clean-time: clean-time
 
 clean-time: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24862,7 +26752,7 @@
 maybe-distclean-time: distclean-time
 
 distclean-time: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24887,7 +26777,7 @@
 maybe-maintainer-clean-time: maintainer-clean-time
 
 maintainer-clean-time: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./time/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -24913,11 +26803,11 @@
 @if uudecode
 maybe-configure-uudecode: configure-uudecode
 configure-uudecode: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -24943,7 +26833,7 @@
 TARGET-uudecode=all
 maybe-all-uudecode: all-uudecode
 all-uudecode: configure-uudecode
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24960,7 +26850,7 @@
 maybe-check-uudecode: check-uudecode
 
 check-uudecode:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24975,7 +26865,7 @@
 maybe-install-uudecode: install-uudecode
 
 install-uudecode: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -24993,7 +26883,7 @@
 
 info-uudecode: \
     configure-uudecode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25019,7 +26909,7 @@
 
 dvi-uudecode: \
     configure-uudecode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25045,7 +26935,7 @@
 
 html-uudecode: \
     configure-uudecode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25071,7 +26961,7 @@
 
 TAGS-uudecode: \
     configure-uudecode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25098,7 +26988,7 @@
 install-info-uudecode: \
     configure-uudecode \
     info-uudecode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25117,6 +27007,33 @@
 
 @endif uudecode
 
+.PHONY: maybe-install-html-uudecode install-html-uudecode
+maybe-install-html-uudecode:
+ at if uudecode
+maybe-install-html-uudecode: install-html-uudecode
+
+install-html-uudecode: \
+    configure-uudecode \
+    html-uudecode 
+	@: $(MAKE); $(unstage)
+	@[ -f ./uudecode/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-html in uudecode" ; \
+	(cd $(HOST_SUBDIR)/uudecode && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif uudecode
+
 .PHONY: maybe-installcheck-uudecode installcheck-uudecode
 maybe-installcheck-uudecode:
 @if uudecode
@@ -25124,7 +27041,7 @@
 
 installcheck-uudecode: \
     configure-uudecode 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25149,7 +27066,7 @@
 maybe-mostlyclean-uudecode: mostlyclean-uudecode
 
 mostlyclean-uudecode: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25174,7 +27091,7 @@
 maybe-clean-uudecode: clean-uudecode
 
 clean-uudecode: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25199,7 +27116,7 @@
 maybe-distclean-uudecode: distclean-uudecode
 
 distclean-uudecode: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25224,7 +27141,7 @@
 maybe-maintainer-clean-uudecode: maintainer-clean-uudecode
 
 maintainer-clean-uudecode: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./uudecode/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25250,11 +27167,11 @@
 @if wdiff
 maybe-configure-wdiff: configure-wdiff
 configure-wdiff: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -25280,7 +27197,7 @@
 TARGET-wdiff=all
 maybe-all-wdiff: all-wdiff
 all-wdiff: configure-wdiff
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25297,7 +27214,7 @@
 maybe-check-wdiff: check-wdiff
 
 check-wdiff:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25312,7 +27229,7 @@
 maybe-install-wdiff: install-wdiff
 
 install-wdiff: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25330,7 +27247,7 @@
 
 info-wdiff: \
     configure-wdiff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25356,7 +27273,7 @@
 
 dvi-wdiff: \
     configure-wdiff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25382,7 +27299,7 @@
 
 html-wdiff: \
     configure-wdiff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25408,7 +27325,7 @@
 
 TAGS-wdiff: \
     configure-wdiff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25435,7 +27352,7 @@
 install-info-wdiff: \
     configure-wdiff \
     info-wdiff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25454,6 +27371,33 @@
 
 @endif wdiff
 
+.PHONY: maybe-install-html-wdiff install-html-wdiff
+maybe-install-html-wdiff:
+ at if wdiff
+maybe-install-html-wdiff: install-html-wdiff
+
+install-html-wdiff: \
+    configure-wdiff \
+    html-wdiff 
+	@: $(MAKE); $(unstage)
+	@[ -f ./wdiff/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-html in wdiff" ; \
+	(cd $(HOST_SUBDIR)/wdiff && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif wdiff
+
 .PHONY: maybe-installcheck-wdiff installcheck-wdiff
 maybe-installcheck-wdiff:
 @if wdiff
@@ -25461,7 +27405,7 @@
 
 installcheck-wdiff: \
     configure-wdiff 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25486,7 +27430,7 @@
 maybe-mostlyclean-wdiff: mostlyclean-wdiff
 
 mostlyclean-wdiff: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25511,7 +27455,7 @@
 maybe-clean-wdiff: clean-wdiff
 
 clean-wdiff: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25536,7 +27480,7 @@
 maybe-distclean-wdiff: distclean-wdiff
 
 distclean-wdiff: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25561,7 +27505,7 @@
 maybe-maintainer-clean-wdiff: maintainer-clean-wdiff
 
 maintainer-clean-wdiff: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./wdiff/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25587,11 +27531,11 @@
 @if zip
 maybe-configure-zip: configure-zip
 configure-zip: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -25617,7 +27561,7 @@
 TARGET-zip=all
 maybe-all-zip: all-zip
 all-zip: configure-zip
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25635,7 +27579,7 @@
 
 # This module is only tested in a native toolchain.
 check-zip:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25652,7 +27596,7 @@
 maybe-install-zip: install-zip
 
 install-zip: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -25670,7 +27614,7 @@
 
 info-zip: \
     configure-zip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25696,7 +27640,7 @@
 
 dvi-zip: \
     configure-zip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25722,7 +27666,7 @@
 
 html-zip: \
     configure-zip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25748,7 +27692,7 @@
 
 TAGS-zip: \
     configure-zip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25775,7 +27719,7 @@
 install-info-zip: \
     configure-zip \
     info-zip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25794,6 +27738,33 @@
 
 @endif zip
 
+.PHONY: maybe-install-html-zip install-html-zip
+maybe-install-html-zip:
+ at if zip
+maybe-install-html-zip: install-html-zip
+
+install-html-zip: \
+    configure-zip \
+    html-zip 
+	@: $(MAKE); $(unstage)
+	@[ -f ./zip/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-html in zip" ; \
+	(cd $(HOST_SUBDIR)/zip && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif zip
+
 .PHONY: maybe-installcheck-zip installcheck-zip
 maybe-installcheck-zip:
 @if zip
@@ -25801,7 +27772,7 @@
 
 installcheck-zip: \
     configure-zip 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25826,7 +27797,7 @@
 maybe-mostlyclean-zip: mostlyclean-zip
 
 mostlyclean-zip: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25851,7 +27822,7 @@
 maybe-clean-zip: clean-zip
 
 clean-zip: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25876,7 +27847,7 @@
 maybe-distclean-zip: distclean-zip
 
 distclean-zip: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25901,7 +27872,7 @@
 maybe-maintainer-clean-zip: maintainer-clean-zip
 
 maintainer-clean-zip: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./zip/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -25927,11 +27898,15 @@
 @if zlib
 maybe-configure-zlib: configure-zlib
 configure-zlib: 
-	@test -f stage_last && exit 0; \
+ at endif zlib
+ at if zlib-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif zlib-bootstrap
+ at if zlib
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
@@ -25953,13 +27928,15 @@
 maybe-configure-stage1-zlib:
 @if zlib-bootstrap
 maybe-configure-stage1-zlib: configure-stage1-zlib
-configure-stage1-zlib: 
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -25977,14 +27954,16 @@
 maybe-configure-stage2-zlib:
 @if zlib-bootstrap
 maybe-configure-stage2-zlib: configure-stage2-zlib
-configure-stage2-zlib: 
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -26002,14 +27981,16 @@
 maybe-configure-stage3-zlib:
 @if zlib-bootstrap
 maybe-configure-stage3-zlib: configure-stage3-zlib
-configure-stage3-zlib: 
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -26027,14 +28008,16 @@
 maybe-configure-stage4-zlib:
 @if zlib-bootstrap
 maybe-configure-stage4-zlib: configure-stage4-zlib
-configure-stage4-zlib: 
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -26052,14 +28035,16 @@
 maybe-configure-stageprofile-zlib:
 @if zlib-bootstrap
 maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
-configure-stageprofile-zlib: 
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -26077,14 +28062,16 @@
 maybe-configure-stagefeedback-zlib:
 @if zlib-bootstrap
 maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
-configure-stagefeedback-zlib: 
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+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) ;; \
@@ -26108,8 +28095,12 @@
 TARGET-zlib=all
 maybe-all-zlib: all-zlib
 all-zlib: configure-zlib
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
+ at endif zlib
+ at if zlib-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif zlib-bootstrap
+ at if zlib
+	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd $(HOST_SUBDIR)/zlib && \
@@ -26127,12 +28118,12 @@
 all-stage1: all-stage1-zlib
 TARGET-stage1-zlib = $(TARGET-zlib)
 all-stage1-zlib: configure-stage1-zlib
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	@[ $(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)"  \
+	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
 		$(TARGET-stage1-zlib)
 
 maybe-clean-stage1-zlib: clean-stage1-zlib
@@ -26140,10 +28131,10 @@
 clean-stage1-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage1 ] || $(MAKE) stage1-start
+	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)"  clean
+		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif zlib-bootstrap
 
 
@@ -26156,7 +28147,7 @@
 all-stage2: all-stage2-zlib
 TARGET-stage2-zlib = $(TARGET-zlib)
 all-stage2-zlib: configure-stage2-zlib
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26170,7 +28161,7 @@
 clean-stage2-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage2 ] || $(MAKE) stage2-start
+	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26187,7 +28178,7 @@
 all-stage3: all-stage3-zlib
 TARGET-stage3-zlib = $(TARGET-zlib)
 all-stage3-zlib: configure-stage3-zlib
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26201,7 +28192,7 @@
 clean-stage3-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage3 ] || $(MAKE) stage3-start
+	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26218,7 +28209,7 @@
 all-stage4: all-stage4-zlib
 TARGET-stage4-zlib = $(TARGET-zlib)
 all-stage4-zlib: configure-stage4-zlib
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26232,7 +28223,7 @@
 clean-stage4-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage4 ] || $(MAKE) stage4-start
+	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26249,7 +28240,7 @@
 all-stageprofile: all-stageprofile-zlib
 TARGET-stageprofile-zlib = $(TARGET-zlib)
 all-stageprofile-zlib: configure-stageprofile-zlib
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26263,7 +28254,7 @@
 clean-stageprofile-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stageprofile ] || $(MAKE) stageprofile-start
+	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26280,7 +28271,7 @@
 all-stagefeedback: all-stagefeedback-zlib
 TARGET-stagefeedback-zlib = $(TARGET-zlib)
 all-stagefeedback-zlib: configure-stagefeedback-zlib
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26294,7 +28285,7 @@
 clean-stagefeedback-zlib:
 	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stagefeedback ] || $(MAKE) stagefeedback-start
+	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
 	cd $(HOST_SUBDIR)/zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
@@ -26451,6 +28442,32 @@
 
 @endif zlib
 
+.PHONY: maybe-install-html-zlib install-html-zlib
+maybe-install-html-zlib:
+ at if zlib
+maybe-install-html-zlib: install-html-zlib
+
+install-html-zlib: \
+    configure-zlib \
+    html-zlib 
+	@[ -f ./zlib/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-html in zlib" ; \
+	(cd $(HOST_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif zlib
+
 .PHONY: maybe-installcheck-zlib installcheck-zlib
 maybe-installcheck-zlib:
 @if zlib
@@ -26579,11 +28596,11 @@
 @if gdb
 maybe-configure-gdb: configure-gdb
 configure-gdb: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -26609,7 +28626,7 @@
 TARGET-gdb=all
 maybe-all-gdb: all-gdb
 all-gdb: configure-gdb
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26626,7 +28643,7 @@
 maybe-check-gdb: check-gdb
 
 check-gdb:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26641,7 +28658,7 @@
 maybe-install-gdb: install-gdb
 
 install-gdb: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26659,7 +28676,7 @@
 
 info-gdb: \
     configure-gdb 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26685,7 +28702,7 @@
 
 dvi-gdb: \
     configure-gdb 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26711,7 +28728,7 @@
 
 html-gdb: \
     configure-gdb 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26737,7 +28754,7 @@
 
 TAGS-gdb: \
     configure-gdb 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26764,7 +28781,7 @@
 install-info-gdb: \
     configure-gdb \
     info-gdb 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26783,6 +28800,33 @@
 
 @endif gdb
 
+.PHONY: maybe-install-html-gdb install-html-gdb
+maybe-install-html-gdb:
+ at if gdb
+maybe-install-html-gdb: install-html-gdb
+
+install-html-gdb: \
+    configure-gdb \
+    html-gdb 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gdb/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in gdb" ; \
+	(cd $(HOST_SUBDIR)/gdb && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif gdb
+
 .PHONY: maybe-installcheck-gdb installcheck-gdb
 maybe-installcheck-gdb:
 @if gdb
@@ -26790,7 +28834,7 @@
 
 installcheck-gdb: \
     configure-gdb 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26815,7 +28859,7 @@
 maybe-mostlyclean-gdb: mostlyclean-gdb
 
 mostlyclean-gdb: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26840,7 +28884,7 @@
 maybe-clean-gdb: clean-gdb
 
 clean-gdb: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26865,7 +28909,7 @@
 maybe-distclean-gdb: distclean-gdb
 
 distclean-gdb: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26890,7 +28934,7 @@
 maybe-maintainer-clean-gdb: maintainer-clean-gdb
 
 maintainer-clean-gdb: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gdb/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -26916,11 +28960,11 @@
 @if expect
 maybe-configure-expect: configure-expect
 configure-expect: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -26946,7 +28990,7 @@
 TARGET-expect=all
 maybe-all-expect: all-expect
 all-expect: configure-expect
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26963,7 +29007,7 @@
 maybe-check-expect: check-expect
 
 check-expect:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26978,7 +29022,7 @@
 maybe-install-expect: install-expect
 
 install-expect: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -26996,7 +29040,7 @@
 
 info-expect: \
     configure-expect 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27022,7 +29066,7 @@
 
 dvi-expect: \
     configure-expect 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27048,7 +29092,7 @@
 
 html-expect: \
     configure-expect 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27074,7 +29118,7 @@
 
 TAGS-expect: \
     configure-expect 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27101,7 +29145,7 @@
 install-info-expect: \
     configure-expect \
     info-expect 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27120,6 +29164,33 @@
 
 @endif expect
 
+.PHONY: maybe-install-html-expect install-html-expect
+maybe-install-html-expect:
+ at if expect
+maybe-install-html-expect: install-html-expect
+
+install-html-expect: \
+    configure-expect \
+    html-expect 
+	@: $(MAKE); $(unstage)
+	@[ -f ./expect/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in expect" ; \
+	(cd $(HOST_SUBDIR)/expect && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif expect
+
 .PHONY: maybe-installcheck-expect installcheck-expect
 maybe-installcheck-expect:
 @if expect
@@ -27127,7 +29198,7 @@
 
 installcheck-expect: \
     configure-expect 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27152,7 +29223,7 @@
 maybe-mostlyclean-expect: mostlyclean-expect
 
 mostlyclean-expect: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27177,7 +29248,7 @@
 maybe-clean-expect: clean-expect
 
 clean-expect: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27202,7 +29273,7 @@
 maybe-distclean-expect: distclean-expect
 
 distclean-expect: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27227,7 +29298,7 @@
 maybe-maintainer-clean-expect: maintainer-clean-expect
 
 maintainer-clean-expect: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./expect/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27253,11 +29324,11 @@
 @if guile
 maybe-configure-guile: configure-guile
 configure-guile: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -27283,7 +29354,7 @@
 TARGET-guile=all
 maybe-all-guile: all-guile
 all-guile: configure-guile
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27300,7 +29371,7 @@
 maybe-check-guile: check-guile
 
 check-guile:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27315,7 +29386,7 @@
 maybe-install-guile: install-guile
 
 install-guile: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27333,7 +29404,7 @@
 
 info-guile: \
     configure-guile 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27359,7 +29430,7 @@
 
 dvi-guile: \
     configure-guile 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27385,7 +29456,7 @@
 
 html-guile: \
     configure-guile 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27411,7 +29482,7 @@
 
 TAGS-guile: \
     configure-guile 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27438,7 +29509,7 @@
 install-info-guile: \
     configure-guile \
     info-guile 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27457,6 +29528,33 @@
 
 @endif guile
 
+.PHONY: maybe-install-html-guile install-html-guile
+maybe-install-html-guile:
+ at if guile
+maybe-install-html-guile: install-html-guile
+
+install-html-guile: \
+    configure-guile \
+    html-guile 
+	@: $(MAKE); $(unstage)
+	@[ -f ./guile/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in guile" ; \
+	(cd $(HOST_SUBDIR)/guile && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif guile
+
 .PHONY: maybe-installcheck-guile installcheck-guile
 maybe-installcheck-guile:
 @if guile
@@ -27464,7 +29562,7 @@
 
 installcheck-guile: \
     configure-guile 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27489,7 +29587,7 @@
 maybe-mostlyclean-guile: mostlyclean-guile
 
 mostlyclean-guile: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27514,7 +29612,7 @@
 maybe-clean-guile: clean-guile
 
 clean-guile: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27539,7 +29637,7 @@
 maybe-distclean-guile: distclean-guile
 
 distclean-guile: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27564,7 +29662,7 @@
 maybe-maintainer-clean-guile: maintainer-clean-guile
 
 maintainer-clean-guile: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./guile/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27590,11 +29688,11 @@
 @if tk
 maybe-configure-tk: configure-tk
 configure-tk: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -27620,7 +29718,7 @@
 TARGET-tk=all
 maybe-all-tk: all-tk
 all-tk: configure-tk
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27637,7 +29735,7 @@
 maybe-check-tk: check-tk
 
 check-tk:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27652,7 +29750,7 @@
 maybe-install-tk: install-tk
 
 install-tk: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27670,7 +29768,7 @@
 
 info-tk: \
     configure-tk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27696,7 +29794,7 @@
 
 dvi-tk: \
     configure-tk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27722,7 +29820,7 @@
 
 html-tk: \
     configure-tk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27748,7 +29846,7 @@
 
 TAGS-tk: \
     configure-tk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27775,7 +29873,7 @@
 install-info-tk: \
     configure-tk \
     info-tk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27794,6 +29892,33 @@
 
 @endif tk
 
+.PHONY: maybe-install-html-tk install-html-tk
+maybe-install-html-tk:
+ at if tk
+maybe-install-html-tk: install-html-tk
+
+install-html-tk: \
+    configure-tk \
+    html-tk 
+	@: $(MAKE); $(unstage)
+	@[ -f ./tk/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(HOST_EXPORTS) \
+	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	echo "Doing install-html in tk" ; \
+	(cd $(HOST_SUBDIR)/tk && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif tk
+
 .PHONY: maybe-installcheck-tk installcheck-tk
 maybe-installcheck-tk:
 @if tk
@@ -27801,7 +29926,7 @@
 
 installcheck-tk: \
     configure-tk 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27826,7 +29951,7 @@
 maybe-mostlyclean-tk: mostlyclean-tk
 
 mostlyclean-tk: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27851,7 +29976,7 @@
 maybe-clean-tk: clean-tk
 
 clean-tk: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27876,7 +30001,7 @@
 maybe-distclean-tk: distclean-tk
 
 distclean-tk: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27901,7 +30026,7 @@
 maybe-maintainer-clean-tk: maintainer-clean-tk
 
 maintainer-clean-tk: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./tk/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -27927,11 +30052,11 @@
 @if libtermcap
 maybe-configure-libtermcap: configure-libtermcap
 configure-libtermcap: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -27957,7 +30082,7 @@
 TARGET-libtermcap=all
 maybe-all-libtermcap: all-libtermcap
 all-libtermcap: configure-libtermcap
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -27983,7 +30108,7 @@
 maybe-install-libtermcap: install-libtermcap
 
 install-libtermcap: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28001,7 +30126,7 @@
 
 info-libtermcap: \
     configure-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28027,7 +30152,7 @@
 
 dvi-libtermcap: \
     configure-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28053,7 +30178,7 @@
 
 html-libtermcap: \
     configure-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28079,7 +30204,7 @@
 
 TAGS-libtermcap: \
     configure-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28106,7 +30231,7 @@
 install-info-libtermcap: \
     configure-libtermcap \
     info-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28125,6 +30250,33 @@
 
 @endif libtermcap
 
+.PHONY: maybe-install-html-libtermcap install-html-libtermcap
+maybe-install-html-libtermcap:
+ at if libtermcap
+maybe-install-html-libtermcap: install-html-libtermcap
+
+install-html-libtermcap: \
+    configure-libtermcap \
+    html-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f ./libtermcap/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-html in libtermcap" ; \
+	(cd $(HOST_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif libtermcap
+
 .PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
 maybe-installcheck-libtermcap:
 @if libtermcap
@@ -28132,7 +30284,7 @@
 
 installcheck-libtermcap: \
     configure-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./libtermcap/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28198,11 +30350,11 @@
 @if utils
 maybe-configure-utils: configure-utils
 configure-utils: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -28228,7 +30380,7 @@
 TARGET-utils=all
 maybe-all-utils: all-utils
 all-utils: configure-utils
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28254,7 +30406,7 @@
 maybe-install-utils: install-utils
 
 install-utils: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28272,7 +30424,7 @@
 
 info-utils: \
     configure-utils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28298,7 +30450,7 @@
 
 dvi-utils: \
     configure-utils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28324,7 +30476,7 @@
 
 html-utils: \
     configure-utils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28350,7 +30502,7 @@
 
 TAGS-utils: \
     configure-utils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28377,7 +30529,7 @@
 install-info-utils: \
     configure-utils \
     info-utils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28396,6 +30548,33 @@
 
 @endif utils
 
+.PHONY: maybe-install-html-utils install-html-utils
+maybe-install-html-utils:
+ at if utils
+maybe-install-html-utils: install-html-utils
+
+install-html-utils: \
+    configure-utils \
+    html-utils 
+	@: $(MAKE); $(unstage)
+	@[ -f ./utils/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-html in utils" ; \
+	(cd $(HOST_SUBDIR)/utils && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif utils
+
 .PHONY: maybe-installcheck-utils installcheck-utils
 maybe-installcheck-utils:
 @if utils
@@ -28403,7 +30582,7 @@
 
 installcheck-utils: \
     configure-utils 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28428,7 +30607,7 @@
 maybe-mostlyclean-utils: mostlyclean-utils
 
 mostlyclean-utils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28453,7 +30632,7 @@
 maybe-clean-utils: clean-utils
 
 clean-utils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28478,7 +30657,7 @@
 maybe-distclean-utils: distclean-utils
 
 distclean-utils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28503,7 +30682,7 @@
 maybe-maintainer-clean-utils: maintainer-clean-utils
 
 maintainer-clean-utils: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./utils/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28529,11 +30708,11 @@
 @if gnattools
 maybe-configure-gnattools: configure-gnattools
 configure-gnattools: 
-	@$(unstage)
-	@test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	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; \
@@ -28559,7 +30738,7 @@
 TARGET-gnattools=all
 maybe-all-gnattools: all-gnattools
 all-gnattools: configure-gnattools
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28576,7 +30755,7 @@
 maybe-check-gnattools: check-gnattools
 
 check-gnattools:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28591,7 +30770,7 @@
 maybe-install-gnattools: install-gnattools
 
 install-gnattools: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -28609,7 +30788,7 @@
 
 info-gnattools: \
     configure-gnattools 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28635,7 +30814,7 @@
 
 dvi-gnattools: \
     configure-gnattools 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28661,7 +30840,7 @@
 
 html-gnattools: \
     configure-gnattools 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28687,7 +30866,7 @@
 
 TAGS-gnattools: \
     configure-gnattools 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28714,7 +30893,7 @@
 install-info-gnattools: \
     configure-gnattools \
     info-gnattools 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28733,6 +30912,33 @@
 
 @endif gnattools
 
+.PHONY: maybe-install-html-gnattools install-html-gnattools
+maybe-install-html-gnattools:
+ at if gnattools
+maybe-install-html-gnattools: install-html-gnattools
+
+install-html-gnattools: \
+    configure-gnattools \
+    html-gnattools 
+	@: $(MAKE); $(unstage)
+	@[ -f ./gnattools/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-html in gnattools" ; \
+	(cd $(HOST_SUBDIR)/gnattools && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	          install-html) \
+	  || exit 1
+
+ at endif gnattools
+
 .PHONY: maybe-installcheck-gnattools installcheck-gnattools
 maybe-installcheck-gnattools:
 @if gnattools
@@ -28740,7 +30946,7 @@
 
 installcheck-gnattools: \
     configure-gnattools 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28765,7 +30971,7 @@
 maybe-mostlyclean-gnattools: mostlyclean-gnattools
 
 mostlyclean-gnattools: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28790,7 +30996,7 @@
 maybe-clean-gnattools: clean-gnattools
 
 clean-gnattools: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28815,7 +31021,7 @@
 maybe-distclean-gnattools: distclean-gnattools
 
 distclean-gnattools: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28840,7 +31046,7 @@
 maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
 
 maintainer-clean-gnattools: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f ./gnattools/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28866,26 +31072,31 @@
 # ---------------------------------------
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libstdc++-v3
-$(TARGET_SUBDIR)/libstdc++-v3/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-	rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
- at endif target-libstdc++-v3
 
 
-
 .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: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
+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..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
 	$(RAW_CXX_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
 	cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
@@ -28912,7 +31123,7 @@
 TARGET-target-libstdc++-v3=all
 maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
 all-target-libstdc++-v3: configure-target-libstdc++-v3
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -28930,7 +31141,7 @@
 maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
 
 check-target-libstdc++-v3:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -28945,7 +31156,7 @@
 maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
 
 install-target-libstdc++-v3: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -28963,7 +31174,7 @@
 
 info-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -28989,7 +31200,7 @@
 
 dvi-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29015,7 +31226,7 @@
 
 html-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29041,7 +31252,7 @@
 
 TAGS-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29068,7 +31279,7 @@
 install-info-target-libstdc++-v3: \
     configure-target-libstdc++-v3 \
     info-target-libstdc++-v3 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29087,6 +31298,33 @@
 
 @endif target-libstdc++-v3
 
+.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3
+maybe-install-html-target-libstdc++-v3:
+ at if target-libstdc++-v3
+maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3
+
+install-html-target-libstdc++-v3: \
+    configure-target-libstdc++-v3 \
+    html-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; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libstdc++-v3
+
 .PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
 maybe-installcheck-target-libstdc++-v3:
 @if target-libstdc++-v3
@@ -29094,7 +31332,7 @@
 
 installcheck-target-libstdc++-v3: \
     configure-target-libstdc++-v3 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29119,7 +31357,7 @@
 maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
 
 mostlyclean-target-libstdc++-v3: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29144,7 +31382,7 @@
 maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
 
 clean-target-libstdc++-v3: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29169,7 +31407,7 @@
 maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
 
 distclean-target-libstdc++-v3: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29194,7 +31432,7 @@
 maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
 
 maintainer-clean-target-libstdc++-v3: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29215,26 +31453,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libmudflap
-$(TARGET_SUBDIR)/libmudflap/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-	rm -f $(TARGET_SUBDIR)/libmudflap/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libmudflap/multilib.out
- at endif target-libmudflap
 
 
-
 .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: $(TARGET_SUBDIR)/libmudflap/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
+configure-target-libmudflap: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libmudflap..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
 	cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
@@ -29261,7 +31504,7 @@
 TARGET-target-libmudflap=all
 maybe-all-target-libmudflap: all-target-libmudflap
 all-target-libmudflap: configure-target-libmudflap
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29279,7 +31522,7 @@
 maybe-check-target-libmudflap: check-target-libmudflap
 
 check-target-libmudflap:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29294,7 +31537,7 @@
 maybe-install-target-libmudflap: install-target-libmudflap
 
 install-target-libmudflap: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29312,7 +31555,7 @@
 
 info-target-libmudflap: \
     configure-target-libmudflap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29338,7 +31581,7 @@
 
 dvi-target-libmudflap: \
     configure-target-libmudflap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29364,7 +31607,7 @@
 
 html-target-libmudflap: \
     configure-target-libmudflap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29390,7 +31633,7 @@
 
 TAGS-target-libmudflap: \
     configure-target-libmudflap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29417,7 +31660,7 @@
 install-info-target-libmudflap: \
     configure-target-libmudflap \
     info-target-libmudflap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29436,6 +31679,33 @@
 
 @endif target-libmudflap
 
+.PHONY: maybe-install-html-target-libmudflap install-html-target-libmudflap
+maybe-install-html-target-libmudflap:
+ at if target-libmudflap
+maybe-install-html-target-libmudflap: install-html-target-libmudflap
+
+install-html-target-libmudflap: \
+    configure-target-libmudflap \
+    html-target-libmudflap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libmudflap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libmudflap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libmudflap
+
 .PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
 maybe-installcheck-target-libmudflap:
 @if target-libmudflap
@@ -29443,7 +31713,7 @@
 
 installcheck-target-libmudflap: \
     configure-target-libmudflap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29468,7 +31738,7 @@
 maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
 
 mostlyclean-target-libmudflap: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29493,7 +31763,7 @@
 maybe-clean-target-libmudflap: clean-target-libmudflap
 
 clean-target-libmudflap: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29518,7 +31788,7 @@
 maybe-distclean-target-libmudflap: distclean-target-libmudflap
 
 distclean-target-libmudflap: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29543,7 +31813,7 @@
 maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
 
 maintainer-clean-target-libmudflap: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29564,26 +31834,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libssp
-$(TARGET_SUBDIR)/libssp/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-	rm -f $(TARGET_SUBDIR)/libssp/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libssp/multilib.out
- at endif target-libssp
 
 
-
 .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: $(TARGET_SUBDIR)/libssp/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
+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 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
@@ -29610,7 +31885,7 @@
 TARGET-target-libssp=all
 maybe-all-target-libssp: all-target-libssp
 all-target-libssp: configure-target-libssp
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29628,7 +31903,7 @@
 maybe-check-target-libssp: check-target-libssp
 
 check-target-libssp:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29643,7 +31918,7 @@
 maybe-install-target-libssp: install-target-libssp
 
 install-target-libssp: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29661,7 +31936,7 @@
 
 info-target-libssp: \
     configure-target-libssp 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29687,7 +31962,7 @@
 
 dvi-target-libssp: \
     configure-target-libssp 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29713,7 +31988,7 @@
 
 html-target-libssp: \
     configure-target-libssp 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29739,7 +32014,7 @@
 
 TAGS-target-libssp: \
     configure-target-libssp 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29766,7 +32041,7 @@
 install-info-target-libssp: \
     configure-target-libssp \
     info-target-libssp 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29785,6 +32060,33 @@
 
 @endif target-libssp
 
+.PHONY: maybe-install-html-target-libssp install-html-target-libssp
+maybe-install-html-target-libssp:
+ at if target-libssp
+maybe-install-html-target-libssp: install-html-target-libssp
+
+install-html-target-libssp: \
+    configure-target-libssp \
+    html-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-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}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libssp
+
 .PHONY: maybe-installcheck-target-libssp installcheck-target-libssp
 maybe-installcheck-target-libssp:
 @if target-libssp
@@ -29792,7 +32094,7 @@
 
 installcheck-target-libssp: \
     configure-target-libssp 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29817,7 +32119,7 @@
 maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
 
 mostlyclean-target-libssp: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29842,7 +32144,7 @@
 maybe-clean-target-libssp: clean-target-libssp
 
 clean-target-libssp: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29867,7 +32169,7 @@
 maybe-distclean-target-libssp: distclean-target-libssp
 
 distclean-target-libssp: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29892,7 +32194,7 @@
 maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
 
 maintainer-clean-target-libssp: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -29913,26 +32215,412 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-newlib
-$(TARGET_SUBDIR)/newlib/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-	rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out
- at endif target-newlib
 
 
+.PHONY: configure-target-libgcc-math maybe-configure-target-libgcc-math
+maybe-configure-target-libgcc-math:
+ at 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
+ at endif target-libgcc-math
 
+
+
+
+
+.PHONY: all-target-libgcc-math maybe-all-target-libgcc-math
+maybe-all-target-libgcc-math:
+ at 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))
+ at endif target-libgcc-math
+
+
+
+
+
+.PHONY: check-target-libgcc-math maybe-check-target-libgcc-math
+maybe-check-target-libgcc-math:
+ at 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)
+
+ at endif target-libgcc-math
+
+.PHONY: install-target-libgcc-math maybe-install-target-libgcc-math
+maybe-install-target-libgcc-math:
+ at 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)
+
+ at endif target-libgcc-math
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-target-libgcc-math info-target-libgcc-math
+maybe-info-target-libgcc-math:
+ at 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
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-dvi-target-libgcc-math dvi-target-libgcc-math
+maybe-dvi-target-libgcc-math:
+ at 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
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-html-target-libgcc-math html-target-libgcc-math
+maybe-html-target-libgcc-math:
+ at 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
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-TAGS-target-libgcc-math TAGS-target-libgcc-math
+maybe-TAGS-target-libgcc-math:
+ at 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
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-install-info-target-libgcc-math install-info-target-libgcc-math
+maybe-install-info-target-libgcc-math:
+ at 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
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-install-html-target-libgcc-math install-html-target-libgcc-math
+maybe-install-html-target-libgcc-math:
+ at if target-libgcc-math
+maybe-install-html-target-libgcc-math: install-html-target-libgcc-math
+
+install-html-target-libgcc-math: \
+    configure-target-libgcc-math \
+    html-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-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}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-installcheck-target-libgcc-math installcheck-target-libgcc-math
+maybe-installcheck-target-libgcc-math:
+ at 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
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-mostlyclean-target-libgcc-math mostlyclean-target-libgcc-math
+maybe-mostlyclean-target-libgcc-math:
+ at 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
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-clean-target-libgcc-math clean-target-libgcc-math
+maybe-clean-target-libgcc-math:
+ at 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
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-distclean-target-libgcc-math distclean-target-libgcc-math
+maybe-distclean-target-libgcc-math:
+ at 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
+
+ at endif target-libgcc-math
+
+.PHONY: maybe-maintainer-clean-target-libgcc-math maintainer-clean-target-libgcc-math
+maybe-maintainer-clean-target-libgcc-math:
+ at 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
+
+ at 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: $(TARGET_SUBDIR)/newlib/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
+configure-target-newlib: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for newlib..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/newlib; \
 	cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
@@ -29959,7 +32647,7 @@
 TARGET-target-newlib=all
 maybe-all-target-newlib: all-target-newlib
 all-target-newlib: configure-target-newlib
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29977,7 +32665,7 @@
 maybe-check-target-newlib: check-target-newlib
 
 check-target-newlib:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -29992,7 +32680,7 @@
 maybe-install-target-newlib: install-target-newlib
 
 install-target-newlib: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30010,7 +32698,7 @@
 
 info-target-newlib: \
     configure-target-newlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30036,7 +32724,7 @@
 
 dvi-target-newlib: \
     configure-target-newlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30062,7 +32750,7 @@
 
 html-target-newlib: \
     configure-target-newlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30088,7 +32776,7 @@
 
 TAGS-target-newlib: \
     configure-target-newlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30115,7 +32803,7 @@
 install-info-target-newlib: \
     configure-target-newlib \
     info-target-newlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30134,6 +32822,33 @@
 
 @endif target-newlib
 
+.PHONY: maybe-install-html-target-newlib install-html-target-newlib
+maybe-install-html-target-newlib:
+ at if target-newlib
+maybe-install-html-target-newlib: install-html-target-newlib
+
+install-html-target-newlib: \
+    configure-target-newlib \
+    html-target-newlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/newlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/newlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-newlib
+
 .PHONY: maybe-installcheck-target-newlib installcheck-target-newlib
 maybe-installcheck-target-newlib:
 @if target-newlib
@@ -30141,7 +32856,7 @@
 
 installcheck-target-newlib: \
     configure-target-newlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30166,7 +32881,7 @@
 maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
 
 mostlyclean-target-newlib: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30191,7 +32906,7 @@
 maybe-clean-target-newlib: clean-target-newlib
 
 clean-target-newlib: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30216,7 +32931,7 @@
 maybe-distclean-target-newlib: distclean-target-newlib
 
 distclean-target-newlib: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30241,7 +32956,7 @@
 maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
 
 maintainer-clean-target-newlib: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30262,26 +32977,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libgfortran
-$(TARGET_SUBDIR)/libgfortran/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
-	rm -f $(TARGET_SUBDIR)/libgfortran/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libgfortran/multilib.out
- at endif target-libgfortran
 
 
-
 .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: $(TARGET_SUBDIR)/libgfortran/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
+configure-target-libgfortran: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libgfortran..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
 	cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
@@ -30308,7 +33028,7 @@
 TARGET-target-libgfortran=all
 maybe-all-target-libgfortran: all-target-libgfortran
 all-target-libgfortran: configure-target-libgfortran
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30326,7 +33046,7 @@
 maybe-check-target-libgfortran: check-target-libgfortran
 
 check-target-libgfortran:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30341,7 +33061,7 @@
 maybe-install-target-libgfortran: install-target-libgfortran
 
 install-target-libgfortran: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30359,7 +33079,7 @@
 
 info-target-libgfortran: \
     configure-target-libgfortran 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30385,7 +33105,7 @@
 
 dvi-target-libgfortran: \
     configure-target-libgfortran 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30411,7 +33131,7 @@
 
 html-target-libgfortran: \
     configure-target-libgfortran 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30437,7 +33157,7 @@
 
 TAGS-target-libgfortran: \
     configure-target-libgfortran 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30464,7 +33184,7 @@
 install-info-target-libgfortran: \
     configure-target-libgfortran \
     info-target-libgfortran 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30483,6 +33203,33 @@
 
 @endif target-libgfortran
 
+.PHONY: maybe-install-html-target-libgfortran install-html-target-libgfortran
+maybe-install-html-target-libgfortran:
+ at if target-libgfortran
+maybe-install-html-target-libgfortran: install-html-target-libgfortran
+
+install-html-target-libgfortran: \
+    configure-target-libgfortran \
+    html-target-libgfortran 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libgfortran" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgfortran && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libgfortran
+
 .PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran
 maybe-installcheck-target-libgfortran:
 @if target-libgfortran
@@ -30490,7 +33237,7 @@
 
 installcheck-target-libgfortran: \
     configure-target-libgfortran 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30515,7 +33262,7 @@
 maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
 
 mostlyclean-target-libgfortran: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30540,7 +33287,7 @@
 maybe-clean-target-libgfortran: clean-target-libgfortran
 
 clean-target-libgfortran: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30565,7 +33312,7 @@
 maybe-distclean-target-libgfortran: distclean-target-libgfortran
 
 distclean-target-libgfortran: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30590,7 +33337,7 @@
 maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
 
 maintainer-clean-target-libgfortran: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30611,26 +33358,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libobjc
-$(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-	rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out
- at endif target-libobjc
 
 
-
 .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: $(TARGET_SUBDIR)/libobjc/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
+configure-target-libobjc: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libobjc..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libobjc; \
 	cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
@@ -30657,7 +33409,7 @@
 TARGET-target-libobjc=all
 maybe-all-target-libobjc: all-target-libobjc
 all-target-libobjc: configure-target-libobjc
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30675,7 +33427,7 @@
 maybe-check-target-libobjc: check-target-libobjc
 
 check-target-libobjc:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30690,7 +33442,7 @@
 maybe-install-target-libobjc: install-target-libobjc
 
 install-target-libobjc: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -30708,7 +33460,7 @@
 
 info-target-libobjc: \
     configure-target-libobjc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30734,7 +33486,7 @@
 
 dvi-target-libobjc: \
     configure-target-libobjc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30760,7 +33512,7 @@
 
 html-target-libobjc: \
     configure-target-libobjc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30786,7 +33538,7 @@
 
 TAGS-target-libobjc: \
     configure-target-libobjc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30813,7 +33565,7 @@
 install-info-target-libobjc: \
     configure-target-libobjc \
     info-target-libobjc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30832,6 +33584,33 @@
 
 @endif target-libobjc
 
+.PHONY: maybe-install-html-target-libobjc install-html-target-libobjc
+maybe-install-html-target-libobjc:
+ at if target-libobjc
+maybe-install-html-target-libobjc: install-html-target-libobjc
+
+install-html-target-libobjc: \
+    configure-target-libobjc \
+    html-target-libobjc 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libobjc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libobjc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libobjc
+
 .PHONY: maybe-installcheck-target-libobjc installcheck-target-libobjc
 maybe-installcheck-target-libobjc:
 @if target-libobjc
@@ -30839,7 +33618,7 @@
 
 installcheck-target-libobjc: \
     configure-target-libobjc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30864,7 +33643,7 @@
 maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
 
 mostlyclean-target-libobjc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30889,7 +33668,7 @@
 maybe-clean-target-libobjc: clean-target-libobjc
 
 clean-target-libobjc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30914,7 +33693,7 @@
 maybe-distclean-target-libobjc: distclean-target-libobjc
 
 distclean-target-libobjc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30939,7 +33718,7 @@
 maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
 
 maintainer-clean-target-libobjc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -30960,26 +33739,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libtermcap
-$(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-	rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out
- at endif target-libtermcap
 
 
-
 .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: $(TARGET_SUBDIR)/libtermcap/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
+configure-target-libtermcap: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libtermcap..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
 	cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
@@ -31006,7 +33790,7 @@
 TARGET-target-libtermcap=all
 maybe-all-target-libtermcap: all-target-libtermcap
 all-target-libtermcap: configure-target-libtermcap
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31034,7 +33818,7 @@
 maybe-install-target-libtermcap: install-target-libtermcap
 
 install-target-libtermcap: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31052,7 +33836,7 @@
 
 info-target-libtermcap: \
     configure-target-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31078,7 +33862,7 @@
 
 dvi-target-libtermcap: \
     configure-target-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31104,7 +33888,7 @@
 
 html-target-libtermcap: \
     configure-target-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31130,7 +33914,7 @@
 
 TAGS-target-libtermcap: \
     configure-target-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31157,7 +33941,7 @@
 install-info-target-libtermcap: \
     configure-target-libtermcap \
     info-target-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31176,6 +33960,33 @@
 
 @endif target-libtermcap
 
+.PHONY: maybe-install-html-target-libtermcap install-html-target-libtermcap
+maybe-install-html-target-libtermcap:
+ at if target-libtermcap
+maybe-install-html-target-libtermcap: install-html-target-libtermcap
+
+install-html-target-libtermcap: \
+    configure-target-libtermcap \
+    html-target-libtermcap 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libtermcap" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libtermcap && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libtermcap
+
 .PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
 maybe-installcheck-target-libtermcap:
 @if target-libtermcap
@@ -31183,7 +33994,7 @@
 
 installcheck-target-libtermcap: \
     configure-target-libtermcap 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31244,26 +34055,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-winsup
-$(TARGET_SUBDIR)/winsup/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-	rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out
- at endif target-winsup
 
 
-
 .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: $(TARGET_SUBDIR)/winsup/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
+configure-target-winsup: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for winsup..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/winsup; \
 	cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
@@ -31290,7 +34106,7 @@
 TARGET-target-winsup=all
 maybe-all-target-winsup: all-target-winsup
 all-target-winsup: configure-target-winsup
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31308,7 +34124,7 @@
 maybe-check-target-winsup: check-target-winsup
 
 check-target-winsup:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31323,7 +34139,7 @@
 maybe-install-target-winsup: install-target-winsup
 
 install-target-winsup: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31341,7 +34157,7 @@
 
 info-target-winsup: \
     configure-target-winsup 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31367,7 +34183,7 @@
 
 dvi-target-winsup: \
     configure-target-winsup 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31393,7 +34209,7 @@
 
 html-target-winsup: \
     configure-target-winsup 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31419,7 +34235,7 @@
 
 TAGS-target-winsup: \
     configure-target-winsup 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31446,7 +34262,7 @@
 install-info-target-winsup: \
     configure-target-winsup \
     info-target-winsup 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31465,6 +34281,33 @@
 
 @endif target-winsup
 
+.PHONY: maybe-install-html-target-winsup install-html-target-winsup
+maybe-install-html-target-winsup:
+ at if target-winsup
+maybe-install-html-target-winsup: install-html-target-winsup
+
+install-html-target-winsup: \
+    configure-target-winsup \
+    html-target-winsup 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/winsup" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/winsup && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-winsup
+
 .PHONY: maybe-installcheck-target-winsup installcheck-target-winsup
 maybe-installcheck-target-winsup:
 @if target-winsup
@@ -31472,7 +34315,7 @@
 
 installcheck-target-winsup: \
     configure-target-winsup 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31497,7 +34340,7 @@
 maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
 
 mostlyclean-target-winsup: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31522,7 +34365,7 @@
 maybe-clean-target-winsup: clean-target-winsup
 
 clean-target-winsup: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31547,7 +34390,7 @@
 maybe-distclean-target-winsup: distclean-target-winsup
 
 distclean-target-winsup: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31572,7 +34415,7 @@
 maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
 
 maintainer-clean-target-winsup: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31593,26 +34436,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libgloss
-$(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
-	rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out
- at endif target-libgloss
 
 
-
 .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: $(TARGET_SUBDIR)/libgloss/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
+configure-target-libgloss: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libgloss..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libgloss; \
 	cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
@@ -31639,7 +34487,7 @@
 TARGET-target-libgloss=all
 maybe-all-target-libgloss: all-target-libgloss
 all-target-libgloss: configure-target-libgloss
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31667,7 +34515,7 @@
 maybe-install-target-libgloss: install-target-libgloss
 
 install-target-libgloss: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -31685,7 +34533,7 @@
 
 info-target-libgloss: \
     configure-target-libgloss 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31711,7 +34559,7 @@
 
 dvi-target-libgloss: \
     configure-target-libgloss 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31737,7 +34585,7 @@
 
 html-target-libgloss: \
     configure-target-libgloss 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31763,7 +34611,7 @@
 
 TAGS-target-libgloss: \
     configure-target-libgloss 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31790,7 +34638,7 @@
 install-info-target-libgloss: \
     configure-target-libgloss \
     info-target-libgloss 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31809,6 +34657,33 @@
 
 @endif target-libgloss
 
+.PHONY: maybe-install-html-target-libgloss install-html-target-libgloss
+maybe-install-html-target-libgloss:
+ at if target-libgloss
+maybe-install-html-target-libgloss: install-html-target-libgloss
+
+install-html-target-libgloss: \
+    configure-target-libgloss \
+    html-target-libgloss 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libgloss" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libgloss && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libgloss
+
 .PHONY: maybe-installcheck-target-libgloss installcheck-target-libgloss
 maybe-installcheck-target-libgloss:
 @if target-libgloss
@@ -31816,7 +34691,7 @@
 
 installcheck-target-libgloss: \
     configure-target-libgloss 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31841,7 +34716,7 @@
 maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
 
 mostlyclean-target-libgloss: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31866,7 +34741,7 @@
 maybe-clean-target-libgloss: clean-target-libgloss
 
 clean-target-libgloss: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31891,7 +34766,7 @@
 maybe-distclean-target-libgloss: distclean-target-libgloss
 
 distclean-target-libgloss: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31916,7 +34791,7 @@
 maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
 
 maintainer-clean-target-libgloss: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -31937,26 +34812,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libiberty
-$(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
-	rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out
- at endif target-libiberty
 
 
-
 .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: $(TARGET_SUBDIR)/libiberty/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
+configure-target-libiberty: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libiberty..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libiberty; \
 	cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
@@ -31983,7 +34863,7 @@
 TARGET-target-libiberty=all
 maybe-all-target-libiberty: all-target-libiberty
 all-target-libiberty: configure-target-libiberty
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32001,7 +34881,7 @@
 maybe-check-target-libiberty: check-target-libiberty
 
 check-target-libiberty:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32016,7 +34896,7 @@
 maybe-install-target-libiberty: install-target-libiberty
 
 install-target-libiberty: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32034,7 +34914,7 @@
 
 info-target-libiberty: \
     configure-target-libiberty 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32060,7 +34940,7 @@
 
 dvi-target-libiberty: \
     configure-target-libiberty 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32086,7 +34966,7 @@
 
 html-target-libiberty: \
     configure-target-libiberty 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32112,7 +34992,7 @@
 
 TAGS-target-libiberty: \
     configure-target-libiberty 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32139,7 +35019,7 @@
 install-info-target-libiberty: \
     configure-target-libiberty \
     info-target-libiberty 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32158,6 +35038,33 @@
 
 @endif target-libiberty
 
+.PHONY: maybe-install-html-target-libiberty install-html-target-libiberty
+maybe-install-html-target-libiberty:
+ at if target-libiberty
+maybe-install-html-target-libiberty: install-html-target-libiberty
+
+install-html-target-libiberty: \
+    configure-target-libiberty \
+    html-target-libiberty 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libiberty" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libiberty && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libiberty
+
 .PHONY: maybe-installcheck-target-libiberty installcheck-target-libiberty
 maybe-installcheck-target-libiberty:
 @if target-libiberty
@@ -32165,7 +35072,7 @@
 
 installcheck-target-libiberty: \
     configure-target-libiberty 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32190,7 +35097,7 @@
 maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty
 
 mostlyclean-target-libiberty: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32215,7 +35122,7 @@
 maybe-clean-target-libiberty: clean-target-libiberty
 
 clean-target-libiberty: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32240,7 +35147,7 @@
 maybe-distclean-target-libiberty: distclean-target-libiberty
 
 distclean-target-libiberty: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32265,7 +35172,7 @@
 maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty
 
 maintainer-clean-target-libiberty: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32286,26 +35193,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-gperf
-$(TARGET_SUBDIR)/gperf/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
-	rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out
- at endif target-gperf
 
 
-
 .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: $(TARGET_SUBDIR)/gperf/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
+configure-target-gperf: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for gperf..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/gperf; \
 	cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
@@ -32332,7 +35244,7 @@
 TARGET-target-gperf=all
 maybe-all-target-gperf: all-target-gperf
 all-target-gperf: configure-target-gperf
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32350,7 +35262,7 @@
 maybe-check-target-gperf: check-target-gperf
 
 check-target-gperf:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32365,7 +35277,7 @@
 maybe-install-target-gperf: install-target-gperf
 
 install-target-gperf: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32383,7 +35295,7 @@
 
 info-target-gperf: \
     configure-target-gperf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32409,7 +35321,7 @@
 
 dvi-target-gperf: \
     configure-target-gperf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32435,7 +35347,7 @@
 
 html-target-gperf: \
     configure-target-gperf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32461,7 +35373,7 @@
 
 TAGS-target-gperf: \
     configure-target-gperf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32488,7 +35400,7 @@
 install-info-target-gperf: \
     configure-target-gperf \
     info-target-gperf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32507,6 +35419,33 @@
 
 @endif target-gperf
 
+.PHONY: maybe-install-html-target-gperf install-html-target-gperf
+maybe-install-html-target-gperf:
+ at if target-gperf
+maybe-install-html-target-gperf: install-html-target-gperf
+
+install-html-target-gperf: \
+    configure-target-gperf \
+    html-target-gperf 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/gperf" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/gperf && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-gperf
+
 .PHONY: maybe-installcheck-target-gperf installcheck-target-gperf
 maybe-installcheck-target-gperf:
 @if target-gperf
@@ -32514,7 +35453,7 @@
 
 installcheck-target-gperf: \
     configure-target-gperf 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32539,7 +35478,7 @@
 maybe-mostlyclean-target-gperf: mostlyclean-target-gperf
 
 mostlyclean-target-gperf: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32564,7 +35503,7 @@
 maybe-clean-target-gperf: clean-target-gperf
 
 clean-target-gperf: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32589,7 +35528,7 @@
 maybe-distclean-target-gperf: distclean-target-gperf
 
 distclean-target-gperf: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32614,7 +35553,7 @@
 maybe-maintainer-clean-target-gperf: maintainer-clean-target-gperf
 
 maintainer-clean-target-gperf: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32635,26 +35574,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-examples
-$(TARGET_SUBDIR)/examples/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
-	rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out
- at endif target-examples
 
 
-
 .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: $(TARGET_SUBDIR)/examples/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
+configure-target-examples: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for examples..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/examples; \
 	cd "$(TARGET_SUBDIR)/examples" || exit 1; \
@@ -32681,7 +35625,7 @@
 TARGET-target-examples=all
 maybe-all-target-examples: all-target-examples
 all-target-examples: configure-target-examples
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -32722,7 +35666,7 @@
 
 info-target-examples: \
     configure-target-examples 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32748,7 +35692,7 @@
 
 dvi-target-examples: \
     configure-target-examples 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32774,7 +35718,7 @@
 
 html-target-examples: \
     configure-target-examples 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32800,7 +35744,7 @@
 
 TAGS-target-examples: \
     configure-target-examples 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32827,7 +35771,7 @@
 install-info-target-examples: \
     configure-target-examples \
     info-target-examples 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32846,6 +35790,33 @@
 
 @endif target-examples
 
+.PHONY: maybe-install-html-target-examples install-html-target-examples
+maybe-install-html-target-examples:
+ at if target-examples
+maybe-install-html-target-examples: install-html-target-examples
+
+install-html-target-examples: \
+    configure-target-examples \
+    html-target-examples 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/examples" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/examples && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-examples
+
 .PHONY: maybe-installcheck-target-examples installcheck-target-examples
 maybe-installcheck-target-examples:
 @if target-examples
@@ -32853,7 +35824,7 @@
 
 installcheck-target-examples: \
     configure-target-examples 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32878,7 +35849,7 @@
 maybe-mostlyclean-target-examples: mostlyclean-target-examples
 
 mostlyclean-target-examples: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32903,7 +35874,7 @@
 maybe-clean-target-examples: clean-target-examples
 
 clean-target-examples: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32928,7 +35899,7 @@
 maybe-distclean-target-examples: distclean-target-examples
 
 distclean-target-examples: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32953,7 +35924,7 @@
 maybe-maintainer-clean-target-examples: maintainer-clean-target-examples
 
 maintainer-clean-target-examples: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -32974,26 +35945,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libffi
-$(TARGET_SUBDIR)/libffi/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-	rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out
- at endif target-libffi
 
 
-
 .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: $(TARGET_SUBDIR)/libffi/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
+configure-target-libffi: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libffi..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libffi; \
 	cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
@@ -33020,7 +35996,7 @@
 TARGET-target-libffi=all
 maybe-all-target-libffi: all-target-libffi
 all-target-libffi: configure-target-libffi
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33038,7 +36014,7 @@
 maybe-check-target-libffi: check-target-libffi
 
 check-target-libffi:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33053,7 +36029,7 @@
 maybe-install-target-libffi: install-target-libffi
 
 install-target-libffi: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33071,7 +36047,7 @@
 
 info-target-libffi: \
     configure-target-libffi 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33097,7 +36073,7 @@
 
 dvi-target-libffi: \
     configure-target-libffi 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33123,7 +36099,7 @@
 
 html-target-libffi: \
     configure-target-libffi 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33149,7 +36125,7 @@
 
 TAGS-target-libffi: \
     configure-target-libffi 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33176,7 +36152,7 @@
 install-info-target-libffi: \
     configure-target-libffi \
     info-target-libffi 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33195,6 +36171,33 @@
 
 @endif target-libffi
 
+.PHONY: maybe-install-html-target-libffi install-html-target-libffi
+maybe-install-html-target-libffi:
+ at if target-libffi
+maybe-install-html-target-libffi: install-html-target-libffi
+
+install-html-target-libffi: \
+    configure-target-libffi \
+    html-target-libffi 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libffi" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libffi && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libffi
+
 .PHONY: maybe-installcheck-target-libffi installcheck-target-libffi
 maybe-installcheck-target-libffi:
 @if target-libffi
@@ -33202,7 +36205,7 @@
 
 installcheck-target-libffi: \
     configure-target-libffi 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33227,7 +36230,7 @@
 maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
 
 mostlyclean-target-libffi: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33252,7 +36255,7 @@
 maybe-clean-target-libffi: clean-target-libffi
 
 clean-target-libffi: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33277,7 +36280,7 @@
 maybe-distclean-target-libffi: distclean-target-libffi
 
 distclean-target-libffi: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33302,7 +36305,7 @@
 maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
 
 maintainer-clean-target-libffi: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33323,26 +36326,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libjava
-$(TARGET_SUBDIR)/libjava/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
-	rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out
- at endif target-libjava
 
 
-
 .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: $(TARGET_SUBDIR)/libjava/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
+configure-target-libjava: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libjava..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
 	$(RAW_CXX_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libjava; \
 	cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
@@ -33369,7 +36377,7 @@
 TARGET-target-libjava=all
 maybe-all-target-libjava: all-target-libjava
 all-target-libjava: configure-target-libjava
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -33387,7 +36395,7 @@
 maybe-check-target-libjava: check-target-libjava
 
 check-target-libjava:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -33402,7 +36410,7 @@
 maybe-install-target-libjava: install-target-libjava
 
 install-target-libjava: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(RAW_CXX_TARGET_EXPORTS) \
@@ -33420,7 +36428,7 @@
 
 info-target-libjava: \
     configure-target-libjava 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33446,7 +36454,7 @@
 
 dvi-target-libjava: \
     configure-target-libjava 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33472,7 +36480,7 @@
 
 html-target-libjava: \
     configure-target-libjava 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33498,7 +36506,7 @@
 
 TAGS-target-libjava: \
     configure-target-libjava 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33525,7 +36533,7 @@
 install-info-target-libjava: \
     configure-target-libjava \
     info-target-libjava 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33544,6 +36552,33 @@
 
 @endif target-libjava
 
+.PHONY: maybe-install-html-target-libjava install-html-target-libjava
+maybe-install-html-target-libjava:
+ at if target-libjava
+maybe-install-html-target-libjava: install-html-target-libjava
+
+install-html-target-libjava: \
+    configure-target-libjava \
+    html-target-libjava 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(RAW_CXX_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libjava" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libjava && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libjava
+
 .PHONY: maybe-installcheck-target-libjava installcheck-target-libjava
 maybe-installcheck-target-libjava:
 @if target-libjava
@@ -33551,7 +36586,7 @@
 
 installcheck-target-libjava: \
     configure-target-libjava 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33576,7 +36611,7 @@
 maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
 
 mostlyclean-target-libjava: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33601,7 +36636,7 @@
 maybe-clean-target-libjava: clean-target-libjava
 
 clean-target-libjava: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33626,7 +36661,7 @@
 maybe-distclean-target-libjava: distclean-target-libjava
 
 distclean-target-libjava: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33651,7 +36686,7 @@
 maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
 
 maintainer-clean-target-libjava: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33672,26 +36707,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-zlib
-$(TARGET_SUBDIR)/zlib/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
-	rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out
- at endif target-zlib
 
 
-
 .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: $(TARGET_SUBDIR)/zlib/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
+configure-target-zlib: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for zlib..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/zlib; \
 	cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
@@ -33718,7 +36758,7 @@
 TARGET-target-zlib=all
 maybe-all-target-zlib: all-target-zlib
 all-target-zlib: configure-target-zlib
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33736,7 +36776,7 @@
 maybe-check-target-zlib: check-target-zlib
 
 check-target-zlib:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33751,7 +36791,7 @@
 maybe-install-target-zlib: install-target-zlib
 
 install-target-zlib: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -33769,7 +36809,7 @@
 
 info-target-zlib: \
     configure-target-zlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33795,7 +36835,7 @@
 
 dvi-target-zlib: \
     configure-target-zlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33821,7 +36861,7 @@
 
 html-target-zlib: \
     configure-target-zlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33847,7 +36887,7 @@
 
 TAGS-target-zlib: \
     configure-target-zlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33874,7 +36914,7 @@
 install-info-target-zlib: \
     configure-target-zlib \
     info-target-zlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33893,6 +36933,33 @@
 
 @endif target-zlib
 
+.PHONY: maybe-install-html-target-zlib install-html-target-zlib
+maybe-install-html-target-zlib:
+ at if target-zlib
+maybe-install-html-target-zlib: install-html-target-zlib
+
+install-html-target-zlib: \
+    configure-target-zlib \
+    html-target-zlib 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/zlib" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/zlib && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-zlib
+
 .PHONY: maybe-installcheck-target-zlib installcheck-target-zlib
 maybe-installcheck-target-zlib:
 @if target-zlib
@@ -33900,7 +36967,7 @@
 
 installcheck-target-zlib: \
     configure-target-zlib 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33925,7 +36992,7 @@
 maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
 
 mostlyclean-target-zlib: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33950,7 +37017,7 @@
 maybe-clean-target-zlib: clean-target-zlib
 
 clean-target-zlib: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -33975,7 +37042,7 @@
 maybe-distclean-target-zlib: distclean-target-zlib
 
 distclean-target-zlib: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34000,7 +37067,7 @@
 maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
 
 maintainer-clean-target-zlib: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34021,26 +37088,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-boehm-gc
-$(TARGET_SUBDIR)/boehm-gc/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
-	rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out
- at endif target-boehm-gc
 
 
-
 .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: $(TARGET_SUBDIR)/boehm-gc/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
+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..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
 	cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
@@ -34067,7 +37139,7 @@
 TARGET-target-boehm-gc=all
 maybe-all-target-boehm-gc: all-target-boehm-gc
 all-target-boehm-gc: configure-target-boehm-gc
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34085,7 +37157,7 @@
 maybe-check-target-boehm-gc: check-target-boehm-gc
 
 check-target-boehm-gc:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34100,7 +37172,7 @@
 maybe-install-target-boehm-gc: install-target-boehm-gc
 
 install-target-boehm-gc: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34118,7 +37190,7 @@
 
 info-target-boehm-gc: \
     configure-target-boehm-gc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34144,7 +37216,7 @@
 
 dvi-target-boehm-gc: \
     configure-target-boehm-gc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34170,7 +37242,7 @@
 
 html-target-boehm-gc: \
     configure-target-boehm-gc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34196,7 +37268,7 @@
 
 TAGS-target-boehm-gc: \
     configure-target-boehm-gc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34223,7 +37295,7 @@
 install-info-target-boehm-gc: \
     configure-target-boehm-gc \
     info-target-boehm-gc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34242,6 +37314,33 @@
 
 @endif target-boehm-gc
 
+.PHONY: maybe-install-html-target-boehm-gc install-html-target-boehm-gc
+maybe-install-html-target-boehm-gc:
+ at if target-boehm-gc
+maybe-install-html-target-boehm-gc: install-html-target-boehm-gc
+
+install-html-target-boehm-gc: \
+    configure-target-boehm-gc \
+    html-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; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/boehm-gc" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/boehm-gc && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-boehm-gc
+
 .PHONY: maybe-installcheck-target-boehm-gc installcheck-target-boehm-gc
 maybe-installcheck-target-boehm-gc:
 @if target-boehm-gc
@@ -34249,7 +37348,7 @@
 
 installcheck-target-boehm-gc: \
     configure-target-boehm-gc 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34274,7 +37373,7 @@
 maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
 
 mostlyclean-target-boehm-gc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34299,7 +37398,7 @@
 maybe-clean-target-boehm-gc: clean-target-boehm-gc
 
 clean-target-boehm-gc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34324,7 +37423,7 @@
 maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
 
 distclean-target-boehm-gc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34349,7 +37448,7 @@
 maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
 
 maintainer-clean-target-boehm-gc: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34370,26 +37469,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-qthreads
-$(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
-	rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out
- at endif target-qthreads
 
 
-
 .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: $(TARGET_SUBDIR)/qthreads/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
+configure-target-qthreads: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for qthreads..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/qthreads; \
 	cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
@@ -34416,7 +37520,7 @@
 TARGET-target-qthreads=all
 maybe-all-target-qthreads: all-target-qthreads
 all-target-qthreads: configure-target-qthreads
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34434,7 +37538,7 @@
 maybe-check-target-qthreads: check-target-qthreads
 
 check-target-qthreads:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34449,7 +37553,7 @@
 maybe-install-target-qthreads: install-target-qthreads
 
 install-target-qthreads: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34467,7 +37571,7 @@
 
 info-target-qthreads: \
     configure-target-qthreads 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34493,7 +37597,7 @@
 
 dvi-target-qthreads: \
     configure-target-qthreads 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34519,7 +37623,7 @@
 
 html-target-qthreads: \
     configure-target-qthreads 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34545,7 +37649,7 @@
 
 TAGS-target-qthreads: \
     configure-target-qthreads 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34572,7 +37676,7 @@
 install-info-target-qthreads: \
     configure-target-qthreads \
     info-target-qthreads 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34591,6 +37695,33 @@
 
 @endif target-qthreads
 
+.PHONY: maybe-install-html-target-qthreads install-html-target-qthreads
+maybe-install-html-target-qthreads:
+ at if target-qthreads
+maybe-install-html-target-qthreads: install-html-target-qthreads
+
+install-html-target-qthreads: \
+    configure-target-qthreads \
+    html-target-qthreads 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/qthreads" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/qthreads && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-qthreads
+
 .PHONY: maybe-installcheck-target-qthreads installcheck-target-qthreads
 maybe-installcheck-target-qthreads:
 @if target-qthreads
@@ -34598,7 +37729,7 @@
 
 installcheck-target-qthreads: \
     configure-target-qthreads 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34623,7 +37754,7 @@
 maybe-mostlyclean-target-qthreads: mostlyclean-target-qthreads
 
 mostlyclean-target-qthreads: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34648,7 +37779,7 @@
 maybe-clean-target-qthreads: clean-target-qthreads
 
 clean-target-qthreads: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34673,7 +37804,7 @@
 maybe-distclean-target-qthreads: distclean-target-qthreads
 
 distclean-target-qthreads: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34698,7 +37829,7 @@
 maybe-maintainer-clean-target-qthreads: maintainer-clean-target-qthreads
 
 maintainer-clean-target-qthreads: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34719,26 +37850,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-rda
-$(TARGET_SUBDIR)/rda/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
-	rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out
- at endif target-rda
 
 
-
 .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: $(TARGET_SUBDIR)/rda/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
+configure-target-rda: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for rda..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/rda; \
 	cd "$(TARGET_SUBDIR)/rda" || exit 1; \
@@ -34765,7 +37901,7 @@
 TARGET-target-rda=all
 maybe-all-target-rda: all-target-rda
 all-target-rda: configure-target-rda
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34783,7 +37919,7 @@
 maybe-check-target-rda: check-target-rda
 
 check-target-rda:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34798,7 +37934,7 @@
 maybe-install-target-rda: install-target-rda
 
 install-target-rda: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -34816,7 +37952,7 @@
 
 info-target-rda: \
     configure-target-rda 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34842,7 +37978,7 @@
 
 dvi-target-rda: \
     configure-target-rda 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34868,7 +38004,7 @@
 
 html-target-rda: \
     configure-target-rda 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34894,7 +38030,7 @@
 
 TAGS-target-rda: \
     configure-target-rda 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34921,7 +38057,7 @@
 install-info-target-rda: \
     configure-target-rda \
     info-target-rda 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34940,6 +38076,33 @@
 
 @endif target-rda
 
+.PHONY: maybe-install-html-target-rda install-html-target-rda
+maybe-install-html-target-rda:
+ at if target-rda
+maybe-install-html-target-rda: install-html-target-rda
+
+install-html-target-rda: \
+    configure-target-rda \
+    html-target-rda 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/rda" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/rda && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-rda
+
 .PHONY: maybe-installcheck-target-rda installcheck-target-rda
 maybe-installcheck-target-rda:
 @if target-rda
@@ -34947,7 +38110,7 @@
 
 installcheck-target-rda: \
     configure-target-rda 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34972,7 +38135,7 @@
 maybe-mostlyclean-target-rda: mostlyclean-target-rda
 
 mostlyclean-target-rda: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -34997,7 +38160,7 @@
 maybe-clean-target-rda: clean-target-rda
 
 clean-target-rda: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35022,7 +38185,7 @@
 maybe-distclean-target-rda: distclean-target-rda
 
 distclean-target-rda: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35047,7 +38210,7 @@
 maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
 
 maintainer-clean-target-rda: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35068,26 +38231,31 @@
 
 
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-libada
-$(TARGET_SUBDIR)/libada/multilib.out: multilib.out
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
-	rm -f $(TARGET_SUBDIR)/libada/Makefile || : ; \
-	cp multilib.out $(TARGET_SUBDIR)/libada/multilib.out
- at endif target-libada
 
 
-
 .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: $(TARGET_SUBDIR)/libada/multilib.out
-	@$(unstage)
-	@test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
+configure-target-libada: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libada..."; \
 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
 	$(NORMAL_TARGET_EXPORTS) \
 	echo Configuring in $(TARGET_SUBDIR)/libada; \
 	cd "$(TARGET_SUBDIR)/libada" || exit 1; \
@@ -35114,7 +38282,7 @@
 TARGET-target-libada=all
 maybe-all-target-libada: all-target-libada
 all-target-libada: configure-target-libada
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -35132,7 +38300,7 @@
 maybe-check-target-libada: check-target-libada
 
 check-target-libada:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -35147,7 +38315,7 @@
 maybe-install-target-libada: install-target-libada
 
 install-target-libada: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(NORMAL_TARGET_EXPORTS) \
@@ -35165,7 +38333,7 @@
 
 info-target-libada: \
     configure-target-libada 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35191,7 +38359,7 @@
 
 dvi-target-libada: \
     configure-target-libada 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35217,7 +38385,7 @@
 
 html-target-libada: \
     configure-target-libada 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35243,7 +38411,7 @@
 
 TAGS-target-libada: \
     configure-target-libada 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35270,7 +38438,7 @@
 install-info-target-libada: \
     configure-target-libada \
     info-target-libada 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35289,6 +38457,33 @@
 
 @endif target-libada
 
+.PHONY: maybe-install-html-target-libada install-html-target-libada
+maybe-install-html-target-libada:
+ at if target-libada
+maybe-install-html-target-libada: install-html-target-libada
+
+install-html-target-libada: \
+    configure-target-libada \
+    html-target-libada 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libada" ; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libada && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libada
+
 .PHONY: maybe-installcheck-target-libada installcheck-target-libada
 maybe-installcheck-target-libada:
 @if target-libada
@@ -35296,7 +38491,7 @@
 
 installcheck-target-libada: \
     configure-target-libada 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35321,7 +38516,7 @@
 maybe-mostlyclean-target-libada: mostlyclean-target-libada
 
 mostlyclean-target-libada: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35346,7 +38541,7 @@
 maybe-clean-target-libada: clean-target-libada
 
 clean-target-libada: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35371,7 +38566,7 @@
 maybe-distclean-target-libada: distclean-target-libada
 
 distclean-target-libada: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35396,7 +38591,7 @@
 maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
 
 maintainer-clean-target-libada: 
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -35417,6 +38612,387 @@
 
 
 
+
+
+.PHONY: configure-target-libgomp maybe-configure-target-libgomp
+maybe-configure-target-libgomp:
+ at 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
+ at endif target-libgomp
+
+
+
+
+
+.PHONY: all-target-libgomp maybe-all-target-libgomp
+maybe-all-target-libgomp:
+ at 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))
+ at endif target-libgomp
+
+
+
+
+
+.PHONY: check-target-libgomp maybe-check-target-libgomp
+maybe-check-target-libgomp:
+ at 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)
+
+ at endif target-libgomp
+
+.PHONY: install-target-libgomp maybe-install-target-libgomp
+maybe-install-target-libgomp:
+ at 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)
+
+ at endif target-libgomp
+
+# Other targets (info, dvi, etc.)
+
+.PHONY: maybe-info-target-libgomp info-target-libgomp
+maybe-info-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+.PHONY: maybe-dvi-target-libgomp dvi-target-libgomp
+maybe-dvi-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+.PHONY: maybe-html-target-libgomp html-target-libgomp
+maybe-html-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+.PHONY: maybe-TAGS-target-libgomp TAGS-target-libgomp
+maybe-TAGS-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+.PHONY: maybe-install-info-target-libgomp install-info-target-libgomp
+maybe-install-info-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+.PHONY: maybe-install-html-target-libgomp install-html-target-libgomp
+maybe-install-html-target-libgomp:
+ at if target-libgomp
+maybe-install-html-target-libgomp: install-html-target-libgomp
+
+install-html-target-libgomp: \
+    configure-target-libgomp \
+    html-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-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}" \
+	           install-html) \
+	  || exit 1
+
+ at endif target-libgomp
+
+.PHONY: maybe-installcheck-target-libgomp installcheck-target-libgomp
+maybe-installcheck-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+.PHONY: maybe-mostlyclean-target-libgomp mostlyclean-target-libgomp
+maybe-mostlyclean-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+.PHONY: maybe-clean-target-libgomp clean-target-libgomp
+maybe-clean-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+.PHONY: maybe-distclean-target-libgomp distclean-target-libgomp
+maybe-distclean-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+.PHONY: maybe-maintainer-clean-target-libgomp maintainer-clean-target-libgomp
+maybe-maintainer-clean-target-libgomp:
+ at 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
+
+ at endif target-libgomp
+
+
+
 # ----------
 # GCC module
 # ----------
@@ -35535,29 +39111,36 @@
 # are dummy when toplevel bootstrap is not active.
 
 # While making host and target tools, symlinks to the final stage must be
-# there, so $(MAKE) $(unstage) should be run at various points.  To avoid
-# excessive recursive invocations of make, we "inline" them using a variable.
+# 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 = ""
 
 @if gcc-bootstrap
 unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
-stage = [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
+current_stage = "`cat stage_current 2> /dev/null`"
 @endif gcc-bootstrap
 
 .PHONY: unstage stage
 unstage:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 stage:
-	@$(stage)
+	@: $(MAKE); $(stage)
 
+# Disable commands for lean bootstrap.
+LEAN = false
+
 # 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 ('gcc-prev'), and to make the name of
+# the previous stage to a constant name ('prev-gcc'), 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
@@ -35583,6 +39166,8 @@
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
 	STAGE_PREFIX=$$r/prev-gcc/ \
 	CFLAGS="$(BOOT_CFLAGS)" \
+	LIBCFLAGS="$(BOOT_CFLAGS)" \
+	LDFLAGS="$(BOOT_LDFLAGS)" \
 	ADAC="\$$(CC)"
 
 # For stage 1:
@@ -35598,127 +39183,133 @@
 .PHONY: stage1-start stage1-end
 
 stage1-start::
-	@$(stage); \
+	@: $(MAKE); $(stage); \
 	echo stage1 > stage_current ; \
 	echo stage1 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \
 	  mkdir stage1-bfd; \
-	set stage1-bfd bfd ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-bfd bfd 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \
 	  mkdir stage1-opcodes; \
-	set stage1-opcodes opcodes ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-opcodes opcodes 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \
 	  mkdir stage1-binutils; \
-	set stage1-binutils binutils ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-binutils binutils 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage1-gas ] || \
 	  mkdir stage1-gas; \
-	set stage1-gas gas ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-gas gas 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \
 	  mkdir stage1-gcc; \
-	set stage1-gcc gcc ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-gcc gcc 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage1-intl ] || \
 	  mkdir stage1-intl; \
-	set stage1-intl intl ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-intl intl 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage1-ld ] || \
 	  mkdir stage1-ld; \
-	set stage1-ld ld ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-ld ld 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \
 	  mkdir stage1-libcpp; \
-	set stage1-libcpp libcpp ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-libcpp libcpp 
 @endif libcpp
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \
 	  mkdir stage1-libdecnumber; \
-	set stage1-libdecnumber libdecnumber ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-libdecnumber libdecnumber 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \
 	  mkdir stage1-libiberty; \
-	set stage1-libiberty libiberty ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-libiberty libiberty 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \
 	  mkdir stage1-zlib; \
-	set stage1-zlib zlib ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage1-zlib zlib 
 @endif zlib
+	@[ -d stage1-$(TARGET_SUBDIR) ] || \
+	  mkdir stage1-$(TARGET_SUBDIR); \
+	mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) 
 
-stage1-end::
-	@rm -f stage_current
+stage1-end:: 
 @if bfd
-	@cd $(HOST_SUBDIR); set bfd stage1-bfd ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stage1-bfd  ; \
+	fi
 @endif bfd
 @if opcodes
-	@cd $(HOST_SUBDIR); set opcodes stage1-opcodes ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stage1-opcodes  ; \
+	fi
 @endif opcodes
 @if binutils
-	@cd $(HOST_SUBDIR); set binutils stage1-binutils ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stage1-binutils  ; \
+	fi
 @endif binutils
 @if gas
-	@cd $(HOST_SUBDIR); set gas stage1-gas ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stage1-gas  ; \
+	fi
 @endif gas
 @if gcc
-	@cd $(HOST_SUBDIR); set gcc stage1-gcc ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stage1-gcc  ; \
+	fi
 @endif gcc
 @if intl
-	@cd $(HOST_SUBDIR); set intl stage1-intl ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stage1-intl  ; \
+	fi
 @endif intl
 @if ld
-	@cd $(HOST_SUBDIR); set ld stage1-ld ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stage1-ld  ; \
+	fi
 @endif ld
 @if libcpp
-	@cd $(HOST_SUBDIR); set libcpp stage1-libcpp ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stage1-libcpp  ; \
+	fi
 @endif libcpp
 @if libdecnumber
-	@cd $(HOST_SUBDIR); set libdecnumber stage1-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber  ; \
+	fi
 @endif libdecnumber
 @if libiberty
-	@cd $(HOST_SUBDIR); set libiberty stage1-libiberty ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stage1-libiberty  ; \
+	fi
 @endif libiberty
 @if zlib
-	@cd $(HOST_SUBDIR); set zlib stage1-zlib ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stage1-zlib  ; \
+	fi
 @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; \
@@ -35744,7 +39335,7 @@
 
 .PHONY: distclean-stage1
 distclean-stage1::
-	@$(stage)
+	@: $(MAKE); $(stage)
 	rm -rf stage1-* 
 
 
@@ -35754,171 +39345,157 @@
 .PHONY: stage2-start stage2-end
 
 stage2-start::
-	@$(stage); \
+	@: $(MAKE); $(stage); \
 	echo stage2 > stage_current ; \
 	echo stage2 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
 	  mkdir stage2-bfd; \
-	set stage2-bfd bfd ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-bfd prev-bfd ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-bfd bfd  ; \
+	mv stage1-bfd prev-bfd || test -f stage1-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
 	  mkdir stage2-opcodes; \
-	set stage2-opcodes opcodes ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-opcodes prev-opcodes ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-opcodes opcodes  ; \
+	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
 	  mkdir stage2-binutils; \
-	set stage2-binutils binutils ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-binutils prev-binutils ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-binutils binutils  ; \
+	mv stage1-binutils prev-binutils || test -f stage1-lean 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
 	  mkdir stage2-gas; \
-	set stage2-gas gas ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-gas prev-gas ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-gas gas  ; \
+	mv stage1-gas prev-gas || test -f stage1-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
 	  mkdir stage2-gcc; \
-	set stage2-gcc gcc ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-gcc prev-gcc ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-gcc gcc  ; \
+	mv stage1-gcc prev-gcc || test -f stage1-lean 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
 	  mkdir stage2-intl; \
-	set stage2-intl intl ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-intl prev-intl ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-intl intl  ; \
+	mv stage1-intl prev-intl || test -f stage1-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
 	  mkdir stage2-ld; \
-	set stage2-ld ld ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-ld prev-ld ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-ld ld  ; \
+	mv stage1-ld prev-ld || test -f stage1-lean 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
 	  mkdir stage2-libcpp; \
-	set stage2-libcpp libcpp ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-libcpp prev-libcpp ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-libcpp libcpp  ; \
+	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
 @endif libcpp
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
 	  mkdir stage2-libdecnumber; \
-	set stage2-libdecnumber libdecnumber ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-libdecnumber prev-libdecnumber ; \
-	@CREATE_LINK_TO_DIR@ 
+	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; \
-	set stage2-libiberty libiberty ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-libiberty prev-libiberty ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-libiberty libiberty  ; \
+	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
 	  mkdir stage2-zlib; \
-	set stage2-zlib zlib ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-zlib prev-zlib ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage2-zlib zlib  ; \
+	mv stage1-zlib prev-zlib || test -f stage1-lean 
 @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::
-	@rm -f stage_current
+stage2-end:: 
 @if bfd
-	@cd $(HOST_SUBDIR); set bfd stage2-bfd ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-bfd stage1-bfd ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \
+	  mv prev-bfd stage1-bfd ; :  ; \
+	fi
 @endif bfd
 @if opcodes
-	@cd $(HOST_SUBDIR); set opcodes stage2-opcodes ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-opcodes stage1-opcodes ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \
+	  mv prev-opcodes stage1-opcodes ; :  ; \
+	fi
 @endif opcodes
 @if binutils
-	@cd $(HOST_SUBDIR); set binutils stage2-binutils ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-binutils stage1-binutils ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \
+	  mv prev-binutils stage1-binutils ; :  ; \
+	fi
 @endif binutils
 @if gas
-	@cd $(HOST_SUBDIR); set gas stage2-gas ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gas stage1-gas ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stage2-gas ; \
+	  mv prev-gas stage1-gas ; :  ; \
+	fi
 @endif gas
 @if gcc
-	@cd $(HOST_SUBDIR); set gcc stage2-gcc ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gcc stage1-gcc ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \
+	  mv prev-gcc stage1-gcc ; :  ; \
+	fi
 @endif gcc
 @if intl
-	@cd $(HOST_SUBDIR); set intl stage2-intl ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-intl stage1-intl ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stage2-intl ; \
+	  mv prev-intl stage1-intl ; :  ; \
+	fi
 @endif intl
 @if ld
-	@cd $(HOST_SUBDIR); set ld stage2-ld ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-ld stage1-ld ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stage2-ld ; \
+	  mv prev-ld stage1-ld ; :  ; \
+	fi
 @endif ld
 @if libcpp
-	@cd $(HOST_SUBDIR); set libcpp stage2-libcpp ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libcpp stage1-libcpp ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stage2-libcpp ; \
+	  mv prev-libcpp stage1-libcpp ; :  ; \
+	fi
 @endif libcpp
 @if libdecnumber
-	@cd $(HOST_SUBDIR); set libdecnumber stage2-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libdecnumber stage1-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber ; \
+	  mv prev-libdecnumber stage1-libdecnumber ; :  ; \
+	fi
 @endif libdecnumber
 @if libiberty
-	@cd $(HOST_SUBDIR); set libiberty stage2-libiberty ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libiberty stage1-libiberty ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stage2-libiberty ; \
+	  mv prev-libiberty stage1-libiberty ; :  ; \
+	fi
 @endif libiberty
 @if zlib
-	@cd $(HOST_SUBDIR); set zlib stage2-zlib ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-zlib stage1-zlib ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \
+	  mv prev-zlib stage1-zlib ; :  ; \
+	fi
 @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; \
@@ -35939,24 +39516,33 @@
 
 
 
-.PHONY: bootstrap2
+.PHONY: bootstrap2 bootstrap2-lean
 bootstrap2:
 	echo stage2 > stage_final
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-	@$(stage)
 
+bootstrap2-lean:
+	echo stage2 > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
+
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage1:: distclean-stage2 
 .PHONY: distclean-stage2
 distclean-stage2::
-	@$(stage)
+	@: $(MAKE); $(stage)
 	rm -rf stage2-* 
 
 
@@ -35966,183 +39552,172 @@
 .PHONY: stage3-start stage3-end
 
 stage3-start::
-	@$(stage); \
+	@: $(MAKE); $(stage); \
 	echo stage3 > stage_current ; \
 	echo stage3 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
 	  mkdir stage3-bfd; \
-	set stage3-bfd bfd ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-bfd prev-bfd ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-bfd bfd  ; \
+	mv stage2-bfd prev-bfd || test -f stage2-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \
 	  mkdir stage3-opcodes; \
-	set stage3-opcodes opcodes ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-opcodes prev-opcodes ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-opcodes opcodes  ; \
+	mv stage2-opcodes prev-opcodes || test -f stage2-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \
 	  mkdir stage3-binutils; \
-	set stage3-binutils binutils ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-binutils prev-binutils ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-binutils binutils  ; \
+	mv stage2-binutils prev-binutils || test -f stage2-lean 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
 	  mkdir stage3-gas; \
-	set stage3-gas gas ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-gas prev-gas ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-gas gas  ; \
+	mv stage2-gas prev-gas || test -f stage2-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \
 	  mkdir stage3-gcc; \
-	set stage3-gcc gcc ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-gcc prev-gcc ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-gcc gcc  ; \
+	mv stage2-gcc prev-gcc || test -f stage2-lean 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage3-intl ] || \
 	  mkdir stage3-intl; \
-	set stage3-intl intl ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-intl prev-intl ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-intl intl  ; \
+	mv stage2-intl prev-intl || test -f stage2-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage3-ld ] || \
 	  mkdir stage3-ld; \
-	set stage3-ld ld ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-ld prev-ld ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-ld ld  ; \
+	mv stage2-ld prev-ld || test -f stage2-lean 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
 	  mkdir stage3-libcpp; \
-	set stage3-libcpp libcpp ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-libcpp prev-libcpp ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-libcpp libcpp  ; \
+	mv stage2-libcpp prev-libcpp || test -f stage2-lean 
 @endif libcpp
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \
 	  mkdir stage3-libdecnumber; \
-	set stage3-libdecnumber libdecnumber ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-libdecnumber prev-libdecnumber ; \
-	@CREATE_LINK_TO_DIR@ 
+	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; \
-	set stage3-libiberty libiberty ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-libiberty prev-libiberty ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-libiberty libiberty  ; \
+	mv stage2-libiberty prev-libiberty || test -f stage2-lean 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \
 	  mkdir stage3-zlib; \
-	set stage3-zlib zlib ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage2-zlib prev-zlib ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage3-zlib zlib  ; \
+	mv stage2-zlib prev-zlib || test -f stage2-lean 
 @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::
-	@rm -f stage_current
+stage3-end:: 
 @if bfd
-	@cd $(HOST_SUBDIR); set bfd stage3-bfd ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-bfd stage2-bfd ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stage3-bfd ; \
+	  mv prev-bfd stage2-bfd ; :  ; \
+	fi
 @endif bfd
 @if opcodes
-	@cd $(HOST_SUBDIR); set opcodes stage3-opcodes ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-opcodes stage2-opcodes ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stage3-opcodes ; \
+	  mv prev-opcodes stage2-opcodes ; :  ; \
+	fi
 @endif opcodes
 @if binutils
-	@cd $(HOST_SUBDIR); set binutils stage3-binutils ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-binutils stage2-binutils ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stage3-binutils ; \
+	  mv prev-binutils stage2-binutils ; :  ; \
+	fi
 @endif binutils
 @if gas
-	@cd $(HOST_SUBDIR); set gas stage3-gas ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gas stage2-gas ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stage3-gas ; \
+	  mv prev-gas stage2-gas ; :  ; \
+	fi
 @endif gas
 @if gcc
-	@cd $(HOST_SUBDIR); set gcc stage3-gcc ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gcc stage2-gcc ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stage3-gcc ; \
+	  mv prev-gcc stage2-gcc ; :  ; \
+	fi
 @endif gcc
 @if intl
-	@cd $(HOST_SUBDIR); set intl stage3-intl ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-intl stage2-intl ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stage3-intl ; \
+	  mv prev-intl stage2-intl ; :  ; \
+	fi
 @endif intl
 @if ld
-	@cd $(HOST_SUBDIR); set ld stage3-ld ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-ld stage2-ld ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stage3-ld ; \
+	  mv prev-ld stage2-ld ; :  ; \
+	fi
 @endif ld
 @if libcpp
-	@cd $(HOST_SUBDIR); set libcpp stage3-libcpp ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libcpp stage2-libcpp ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \
+	  mv prev-libcpp stage2-libcpp ; :  ; \
+	fi
 @endif libcpp
 @if libdecnumber
-	@cd $(HOST_SUBDIR); set libdecnumber stage3-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libdecnumber stage2-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber ; \
+	  mv prev-libdecnumber stage2-libdecnumber ; :  ; \
+	fi
 @endif libdecnumber
 @if libiberty
-	@cd $(HOST_SUBDIR); set libiberty stage3-libiberty ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libiberty stage2-libiberty ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stage3-libiberty ; \
+	  mv prev-libiberty stage2-libiberty ; :  ; \
+	fi
 @endif libiberty
 @if zlib
-	@cd $(HOST_SUBDIR); set zlib stage3-zlib ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-zlib stage2-zlib ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stage3-zlib ; \
+	  mv prev-zlib stage2-zlib ; :  ; \
+	fi
 @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
-	@bootstrap_lean at -rm -rf stage1-* ; $(STAMP) stage1-lean
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
 	fi
-	$(MAKE) compare
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) compare
 
 .PHONY: all-stage3 clean-stage3
 do-clean: clean-stage3
@@ -36158,8 +39733,9 @@
 	  echo Cannot compare object files as stage 2 was deleted. ; \
 	  exit 0 ; \
 	fi; \
-	$(stage); \
+	: $(MAKE); $(stage); \
 	rm -f .bad_compare ; \
+	echo Comparing stages 2 and 3 ; \
 	cd stage3-gcc; \
 	files=`find . -name "*$(objext)" -print` ; \
 	cd .. ; \
@@ -36180,31 +39756,43 @@
 	  cat .bad_compare; \
 	  exit 1; \
 	else \
-	  true; \
+	  echo Comparison successful.; \
 	fi ; \
 	$(STAMP) compare
-	@bootstrap_lean at -rm -rf stage2-* ; $(STAMP) stage2-lean
+	if $(LEAN); then \
+	  rm -rf stage2-*; \
+	  $(STAMP) stage2-lean; \
+	fi
 
 
 
-.PHONY: bootstrap
+.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
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-	@$(stage)
 
+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
 
+
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage2:: distclean-stage3 
 .PHONY: distclean-stage3
 distclean-stage3::
-	@$(stage)
+	@: $(MAKE); $(stage)
 	rm -rf stage3-* compare 
 
 
@@ -36217,183 +39805,172 @@
 .PHONY: stage4-start stage4-end
 
 stage4-start::
-	@$(stage); \
+	@: $(MAKE); $(stage); \
 	echo stage4 > stage_current ; \
 	echo stage4 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \
 	  mkdir stage4-bfd; \
-	set stage4-bfd bfd ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-bfd prev-bfd ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-bfd bfd  ; \
+	mv stage3-bfd prev-bfd || test -f stage3-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \
 	  mkdir stage4-opcodes; \
-	set stage4-opcodes opcodes ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-opcodes prev-opcodes ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-opcodes opcodes  ; \
+	mv stage3-opcodes prev-opcodes || test -f stage3-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \
 	  mkdir stage4-binutils; \
-	set stage4-binutils binutils ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-binutils prev-binutils ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-binutils binutils  ; \
+	mv stage3-binutils prev-binutils || test -f stage3-lean 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stage4-gas ] || \
 	  mkdir stage4-gas; \
-	set stage4-gas gas ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-gas prev-gas ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-gas gas  ; \
+	mv stage3-gas prev-gas || test -f stage3-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \
 	  mkdir stage4-gcc; \
-	set stage4-gcc gcc ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-gcc prev-gcc ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-gcc gcc  ; \
+	mv stage3-gcc prev-gcc || test -f stage3-lean 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stage4-intl ] || \
 	  mkdir stage4-intl; \
-	set stage4-intl intl ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-intl prev-intl ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-intl intl  ; \
+	mv stage3-intl prev-intl || test -f stage3-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stage4-ld ] || \
 	  mkdir stage4-ld; \
-	set stage4-ld ld ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-ld prev-ld ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-ld ld  ; \
+	mv stage3-ld prev-ld || test -f stage3-lean 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \
 	  mkdir stage4-libcpp; \
-	set stage4-libcpp libcpp ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-libcpp prev-libcpp ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-libcpp libcpp  ; \
+	mv stage3-libcpp prev-libcpp || test -f stage3-lean 
 @endif libcpp
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \
 	  mkdir stage4-libdecnumber; \
-	set stage4-libdecnumber libdecnumber ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-libdecnumber prev-libdecnumber ; \
-	@CREATE_LINK_TO_DIR@ 
+	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; \
-	set stage4-libiberty libiberty ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-libiberty prev-libiberty ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-libiberty libiberty  ; \
+	mv stage3-libiberty prev-libiberty || test -f stage3-lean 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \
 	  mkdir stage4-zlib; \
-	set stage4-zlib zlib ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage3-zlib prev-zlib ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stage4-zlib zlib  ; \
+	mv stage3-zlib prev-zlib || test -f stage3-lean 
 @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::
-	@rm -f stage_current
+stage4-end:: 
 @if bfd
-	@cd $(HOST_SUBDIR); set bfd stage4-bfd ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-bfd stage3-bfd ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stage4-bfd ; \
+	  mv prev-bfd stage3-bfd ; :  ; \
+	fi
 @endif bfd
 @if opcodes
-	@cd $(HOST_SUBDIR); set opcodes stage4-opcodes ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-opcodes stage3-opcodes ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stage4-opcodes ; \
+	  mv prev-opcodes stage3-opcodes ; :  ; \
+	fi
 @endif opcodes
 @if binutils
-	@cd $(HOST_SUBDIR); set binutils stage4-binutils ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-binutils stage3-binutils ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stage4-binutils ; \
+	  mv prev-binutils stage3-binutils ; :  ; \
+	fi
 @endif binutils
 @if gas
-	@cd $(HOST_SUBDIR); set gas stage4-gas ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gas stage3-gas ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stage4-gas ; \
+	  mv prev-gas stage3-gas ; :  ; \
+	fi
 @endif gas
 @if gcc
-	@cd $(HOST_SUBDIR); set gcc stage4-gcc ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gcc stage3-gcc ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stage4-gcc ; \
+	  mv prev-gcc stage3-gcc ; :  ; \
+	fi
 @endif gcc
 @if intl
-	@cd $(HOST_SUBDIR); set intl stage4-intl ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-intl stage3-intl ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stage4-intl ; \
+	  mv prev-intl stage3-intl ; :  ; \
+	fi
 @endif intl
 @if ld
-	@cd $(HOST_SUBDIR); set ld stage4-ld ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-ld stage3-ld ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stage4-ld ; \
+	  mv prev-ld stage3-ld ; :  ; \
+	fi
 @endif ld
 @if libcpp
-	@cd $(HOST_SUBDIR); set libcpp stage4-libcpp ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libcpp stage3-libcpp ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stage4-libcpp ; \
+	  mv prev-libcpp stage3-libcpp ; :  ; \
+	fi
 @endif libcpp
 @if libdecnumber
-	@cd $(HOST_SUBDIR); set libdecnumber stage4-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libdecnumber stage3-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber ; \
+	  mv prev-libdecnumber stage3-libdecnumber ; :  ; \
+	fi
 @endif libdecnumber
 @if libiberty
-	@cd $(HOST_SUBDIR); set libiberty stage4-libiberty ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libiberty stage3-libiberty ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stage4-libiberty ; \
+	  mv prev-libiberty stage3-libiberty ; :  ; \
+	fi
 @endif libiberty
 @if zlib
-	@cd $(HOST_SUBDIR); set zlib stage4-zlib ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-zlib stage3-zlib ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stage4-zlib ; \
+	  mv prev-zlib stage3-zlib ; :  ; \
+	fi
 @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
-	@bootstrap_lean at -rm -rf stage2-* ; $(STAMP) stage2-lean
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	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; \
 	fi
-	$(MAKE) compare3
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
 
 .PHONY: all-stage4 clean-stage4
 do-clean: clean-stage4
@@ -36409,8 +39986,9 @@
 	  echo Cannot compare object files as stage 3 was deleted. ; \
 	  exit 0 ; \
 	fi; \
-	$(stage); \
+	: $(MAKE); $(stage); \
 	rm -f .bad_compare ; \
+	echo Comparing stages 3 and 4 ; \
 	cd stage4-gcc; \
 	files=`find . -name "*$(objext)" -print` ; \
 	cd .. ; \
@@ -36431,31 +40009,43 @@
 	  cat .bad_compare; \
 	  exit 1; \
 	else \
-	  true; \
+	  echo Comparison successful.; \
 	fi ; \
 	$(STAMP) compare3
-	@bootstrap_lean at -rm -rf stage3-* ; $(STAMP) stage3-lean
+	if $(LEAN); then \
+	  rm -rf stage3-*; \
+	  $(STAMP) stage3-lean; \
+	fi
 
 
 
-.PHONY: bootstrap4
+.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
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-	@$(stage)
 
+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
 
+
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage3:: distclean-stage4 
 .PHONY: distclean-stage4
 distclean-stage4::
-	@$(stage)
+	@: $(MAKE); $(stage)
 	rm -rf stage4-* compare3 
 
 
@@ -36465,171 +40055,157 @@
 .PHONY: stageprofile-start stageprofile-end
 
 stageprofile-start::
-	@$(stage); \
+	@: $(MAKE); $(stage); \
 	echo stageprofile > stage_current ; \
 	echo stageprofile > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
 	  mkdir stageprofile-bfd; \
-	set stageprofile-bfd bfd ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-bfd prev-bfd ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-bfd bfd  ; \
+	mv stage1-bfd prev-bfd || test -f stage1-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \
 	  mkdir stageprofile-opcodes; \
-	set stageprofile-opcodes opcodes ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-opcodes prev-opcodes ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-opcodes opcodes  ; \
+	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \
 	  mkdir stageprofile-binutils; \
-	set stageprofile-binutils binutils ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-binutils prev-binutils ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-binutils binutils  ; \
+	mv stage1-binutils prev-binutils || test -f stage1-lean 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \
 	  mkdir stageprofile-gas; \
-	set stageprofile-gas gas ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-gas prev-gas ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-gas gas  ; \
+	mv stage1-gas prev-gas || test -f stage1-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \
 	  mkdir stageprofile-gcc; \
-	set stageprofile-gcc gcc ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-gcc prev-gcc ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-gcc gcc  ; \
+	mv stage1-gcc prev-gcc || test -f stage1-lean 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \
 	  mkdir stageprofile-intl; \
-	set stageprofile-intl intl ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-intl prev-intl ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-intl intl  ; \
+	mv stage1-intl prev-intl || test -f stage1-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \
 	  mkdir stageprofile-ld; \
-	set stageprofile-ld ld ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-ld prev-ld ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-ld ld  ; \
+	mv stage1-ld prev-ld || test -f stage1-lean 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \
 	  mkdir stageprofile-libcpp; \
-	set stageprofile-libcpp libcpp ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-libcpp prev-libcpp ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-libcpp libcpp  ; \
+	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
 @endif libcpp
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \
 	  mkdir stageprofile-libdecnumber; \
-	set stageprofile-libdecnumber libdecnumber ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-libdecnumber prev-libdecnumber ; \
-	@CREATE_LINK_TO_DIR@ 
+	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; \
-	set stageprofile-libiberty libiberty ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-libiberty prev-libiberty ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-libiberty libiberty  ; \
+	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
 	  mkdir stageprofile-zlib; \
-	set stageprofile-zlib zlib ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stage1-zlib prev-zlib ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stageprofile-zlib zlib  ; \
+	mv stage1-zlib prev-zlib || test -f stage1-lean 
 @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::
-	@rm -f stage_current
+stageprofile-end:: 
 @if bfd
-	@cd $(HOST_SUBDIR); set bfd stageprofile-bfd ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-bfd stage1-bfd ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stageprofile-bfd ; \
+	  mv prev-bfd stage1-bfd ; :  ; \
+	fi
 @endif bfd
 @if opcodes
-	@cd $(HOST_SUBDIR); set opcodes stageprofile-opcodes ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-opcodes stage1-opcodes ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes ; \
+	  mv prev-opcodes stage1-opcodes ; :  ; \
+	fi
 @endif opcodes
 @if binutils
-	@cd $(HOST_SUBDIR); set binutils stageprofile-binutils ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-binutils stage1-binutils ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stageprofile-binutils ; \
+	  mv prev-binutils stage1-binutils ; :  ; \
+	fi
 @endif binutils
 @if gas
-	@cd $(HOST_SUBDIR); set gas stageprofile-gas ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gas stage1-gas ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stageprofile-gas ; \
+	  mv prev-gas stage1-gas ; :  ; \
+	fi
 @endif gas
 @if gcc
-	@cd $(HOST_SUBDIR); set gcc stageprofile-gcc ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gcc stage1-gcc ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stageprofile-gcc ; \
+	  mv prev-gcc stage1-gcc ; :  ; \
+	fi
 @endif gcc
 @if intl
-	@cd $(HOST_SUBDIR); set intl stageprofile-intl ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-intl stage1-intl ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stageprofile-intl ; \
+	  mv prev-intl stage1-intl ; :  ; \
+	fi
 @endif intl
 @if ld
-	@cd $(HOST_SUBDIR); set ld stageprofile-ld ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-ld stage1-ld ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stageprofile-ld ; \
+	  mv prev-ld stage1-ld ; :  ; \
+	fi
 @endif ld
 @if libcpp
-	@cd $(HOST_SUBDIR); set libcpp stageprofile-libcpp ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libcpp stage1-libcpp ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp ; \
+	  mv prev-libcpp stage1-libcpp ; :  ; \
+	fi
 @endif libcpp
 @if libdecnumber
-	@cd $(HOST_SUBDIR); set libdecnumber stageprofile-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libdecnumber stage1-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber ; \
+	  mv prev-libdecnumber stage1-libdecnumber ; :  ; \
+	fi
 @endif libdecnumber
 @if libiberty
-	@cd $(HOST_SUBDIR); set libiberty stageprofile-libiberty ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libiberty stage1-libiberty ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty ; \
+	  mv prev-libiberty stage1-libiberty ; :  ; \
+	fi
 @endif libiberty
 @if zlib
-	@cd $(HOST_SUBDIR); set zlib stageprofile-zlib ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-zlib stage1-zlib ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stageprofile-zlib ; \
+	  mv prev-zlib stage1-zlib ; :  ; \
+	fi
 @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; \
@@ -36655,7 +40231,7 @@
 distclean-stage1:: distclean-stageprofile 
 .PHONY: distclean-stageprofile
 distclean-stageprofile::
-	@$(stage)
+	@: $(MAKE); $(stage)
 	rm -rf stageprofile-* 
 
 
@@ -36665,171 +40241,157 @@
 .PHONY: stagefeedback-start stagefeedback-end
 
 stagefeedback-start::
-	@$(stage); \
+	@: $(MAKE); $(stage); \
 	echo stagefeedback > stage_current ; \
 	echo stagefeedback > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
 @if bfd
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
 	  mkdir stagefeedback-bfd; \
-	set stagefeedback-bfd bfd ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-bfd prev-bfd ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-bfd bfd  ; \
+	mv stageprofile-bfd prev-bfd || test -f stageprofile-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \
 	  mkdir stagefeedback-opcodes; \
-	set stagefeedback-opcodes opcodes ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-opcodes prev-opcodes ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-opcodes opcodes  ; \
+	mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \
 	  mkdir stagefeedback-binutils; \
-	set stagefeedback-binutils binutils ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-binutils prev-binutils ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-binutils binutils  ; \
+	mv stageprofile-binutils prev-binutils || test -f stageprofile-lean 
 @endif binutils
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \
 	  mkdir stagefeedback-gas; \
-	set stagefeedback-gas gas ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-gas prev-gas ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-gas gas  ; \
+	mv stageprofile-gas prev-gas || test -f stageprofile-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \
 	  mkdir stagefeedback-gcc; \
-	set stagefeedback-gcc gcc ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-gcc prev-gcc ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-gcc gcc  ; \
+	mv stageprofile-gcc prev-gcc || test -f stageprofile-lean 
 @endif gcc
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \
 	  mkdir stagefeedback-intl; \
-	set stagefeedback-intl intl ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-intl prev-intl ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-intl intl  ; \
+	mv stageprofile-intl prev-intl || test -f stageprofile-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \
 	  mkdir stagefeedback-ld; \
-	set stagefeedback-ld ld ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-ld prev-ld ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-ld ld  ; \
+	mv stageprofile-ld prev-ld || test -f stageprofile-lean 
 @endif ld
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \
 	  mkdir stagefeedback-libcpp; \
-	set stagefeedback-libcpp libcpp ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-libcpp prev-libcpp ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-libcpp libcpp  ; \
+	mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean 
 @endif libcpp
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \
 	  mkdir stagefeedback-libdecnumber; \
-	set stagefeedback-libdecnumber libdecnumber ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-libdecnumber prev-libdecnumber ; \
-	@CREATE_LINK_TO_DIR@ 
+	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; \
-	set stagefeedback-libiberty libiberty ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-libiberty prev-libiberty ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-libiberty libiberty  ; \
+	mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean 
 @endif libiberty
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \
 	  mkdir stagefeedback-zlib; \
-	set stagefeedback-zlib zlib ; \
-	@CREATE_LINK_TO_DIR@  ; \
-	set stageprofile-zlib prev-zlib ; \
-	@CREATE_LINK_TO_DIR@ 
+	mv stagefeedback-zlib zlib  ; \
+	mv stageprofile-zlib prev-zlib || test -f stageprofile-lean 
 @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::
-	@rm -f stage_current
+stagefeedback-end:: 
 @if bfd
-	@cd $(HOST_SUBDIR); set bfd stagefeedback-bfd ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-bfd stageprofile-bfd ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/bfd ; then \
+	  cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd ; \
+	  mv prev-bfd stageprofile-bfd ; :  ; \
+	fi
 @endif bfd
 @if opcodes
-	@cd $(HOST_SUBDIR); set opcodes stagefeedback-opcodes ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-opcodes stageprofile-opcodes ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/opcodes ; then \
+	  cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes ; \
+	  mv prev-opcodes stageprofile-opcodes ; :  ; \
+	fi
 @endif opcodes
 @if binutils
-	@cd $(HOST_SUBDIR); set binutils stagefeedback-binutils ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-binutils stageprofile-binutils ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/binutils ; then \
+	  cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils ; \
+	  mv prev-binutils stageprofile-binutils ; :  ; \
+	fi
 @endif binutils
 @if gas
-	@cd $(HOST_SUBDIR); set gas stagefeedback-gas ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gas stageprofile-gas ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gas ; then \
+	  cd $(HOST_SUBDIR); mv gas stagefeedback-gas ; \
+	  mv prev-gas stageprofile-gas ; :  ; \
+	fi
 @endif gas
 @if gcc
-	@cd $(HOST_SUBDIR); set gcc stagefeedback-gcc ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-gcc stageprofile-gcc ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/gcc ; then \
+	  cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc ; \
+	  mv prev-gcc stageprofile-gcc ; :  ; \
+	fi
 @endif gcc
 @if intl
-	@cd $(HOST_SUBDIR); set intl stagefeedback-intl ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-intl stageprofile-intl ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/intl ; then \
+	  cd $(HOST_SUBDIR); mv intl stagefeedback-intl ; \
+	  mv prev-intl stageprofile-intl ; :  ; \
+	fi
 @endif intl
 @if ld
-	@cd $(HOST_SUBDIR); set ld stagefeedback-ld ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-ld stageprofile-ld ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/ld ; then \
+	  cd $(HOST_SUBDIR); mv ld stagefeedback-ld ; \
+	  mv prev-ld stageprofile-ld ; :  ; \
+	fi
 @endif ld
 @if libcpp
-	@cd $(HOST_SUBDIR); set libcpp stagefeedback-libcpp ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libcpp stageprofile-libcpp ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libcpp ; then \
+	  cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp ; \
+	  mv prev-libcpp stageprofile-libcpp ; :  ; \
+	fi
 @endif libcpp
 @if libdecnumber
-	@cd $(HOST_SUBDIR); set libdecnumber stagefeedback-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libdecnumber stageprofile-libdecnumber ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
+	  cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber ; \
+	  mv prev-libdecnumber stageprofile-libdecnumber ; :  ; \
+	fi
 @endif libdecnumber
 @if libiberty
-	@cd $(HOST_SUBDIR); set libiberty stagefeedback-libiberty ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-libiberty stageprofile-libiberty ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/libiberty ; then \
+	  cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty ; \
+	  mv prev-libiberty stageprofile-libiberty ; :  ; \
+	fi
 @endif libiberty
 @if zlib
-	@cd $(HOST_SUBDIR); set zlib stagefeedback-zlib ; \
-	@UNDO_LINK_TO_DIR@  ; \
-	set prev-zlib stageprofile-zlib ; \
-	@UNDO_LINK_TO_DIR@ 
+	@if test -d $(HOST_SUBDIR)/zlib ; then \
+	  cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib ; \
+	  mv prev-zlib stageprofile-zlib ; :  ; \
+	fi
 @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; \
@@ -36850,24 +40412,33 @@
 
 
 
-.PHONY: profiledbootstrap
+.PHONY: profiledbootstrap profiledbootstrap-lean
 profiledbootstrap:
 	echo stagefeedback > stage_final
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stagefeedback-bubble
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-	@$(stage)
 
+profiledbootstrap-lean:
+	echo stagefeedback > stage_final
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stagefeedback-bubble
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
 
+
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stageprofile:: distclean-stagefeedback 
 .PHONY: distclean-stagefeedback
 distclean-stagefeedback::
-	@$(stage)
+	@: $(MAKE); $(stage)
 	rm -rf stagefeedback-* 
 
 
@@ -36890,51 +40461,71 @@
 
 @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
 @endif gcc-bootstrap
 
+.PHONY: restrap
+restrap:
+	@: $(MAKE); $(stage)
+	rm -rf stage1-$(TARGET_SUBDIR) stage2 stage3 stage4 stageprofile stagefeedback 
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+
 # --------------------------------------
 # Dependencies between different modules
 # --------------------------------------
 
 # Generic dependencies for target modules on host stuff, especially gcc
+ at 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
+ at endif gcc-bootstrap
 
+ at 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
+ at endif gcc-no-bootstrap
 
 
 
@@ -37492,17 +41083,6 @@
 # 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

Modified: trunk/binutils/Makefile.tpl
===================================================================
--- trunk/binutils/Makefile.tpl	2006-04-23 11:09:39 UTC (rev 13)
+++ trunk/binutils/Makefile.tpl	2006-04-23 11:31:49 UTC (rev 14)
@@ -6,7 +6,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 Free Software Foundation
+#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 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
@@ -53,6 +53,9 @@
 includedir = @includedir@
 oldincludedir = @oldincludedir@
 infodir = @infodir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+htmldir = @htmldir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
@@ -87,8 +90,6 @@
 # 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
@@ -181,9 +182,6 @@
 	  -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
@@ -255,6 +253,7 @@
 # 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@
@@ -284,6 +283,7 @@
 LD = @LD@
 LIPO = @LIPO@
 NM = @NM@
+OBJDUMP = @OBJDUMP@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 WINDRES = @WINDRES@
@@ -387,8 +387,9 @@
 [+ ENDIF lib_path +][+ ENDFOR host_modules +]
 
 # Flags to pass down to all sub-makes.
-BASE_FLAGS_TO_PASS = [+ FOR flags_to_pass +]\
-	"[+flag+]=$([+flag+])" [+ ENDFOR flags_to_pass +]\
+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 +] \
 	"CONFIG_SHELL=$(SHELL)" \
 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
 
@@ -406,6 +407,7 @@
 	'LD=$(LD)' \
 	'LIPO=$(LIPO)' \
 	'NM=$(NM)' \
+	'OBJDUMP=$(OBJDUMP)' \
 	'RANLIB=$(RANLIB)' \
 	'STRIP=$(STRIP)' \
 	'WINDRES=$(WINDRES)'
@@ -425,21 +427,22 @@
 	'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; the variables
-# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.
+# 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.
 EXTRA_TARGET_FLAGS = \
 	'AR=$$(AR_FOR_TARGET)' \
-	'AS=$$(COMPILER_AS_FOR_TARGET)' \
+	'AS=$(COMPILER_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)' \
+	'LD=$(COMPILER_LD_FOR_TARGET)' \
 	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
 	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-	'NM=$$(COMPILER_NM_FOR_TARGET)' \
+	'NM=$(COMPILER_NM_FOR_TARGET)' \
 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)'
@@ -453,18 +456,12 @@
 # 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)" \
-	"`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 '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=/'`"
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
 GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
 
@@ -486,9 +483,9 @@
 	[ -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; \
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble
 @endif gcc-bootstrap
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	if [ -f stage_last ]; then \
@@ -496,23 +493,22 @@
 	else \
 	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
 	fi
-	@$(stage)
 
 .PHONY: all-build
-all-build: [+
-  FOR build_modules +] \
-    maybe-all-build-[+module+][+
-  ENDFOR build_modules +]
+[+ FOR build_modules +]
+all-build: maybe-all-build-[+module+][+ ENDFOR build_modules +]
+
 .PHONY: all-host
-all-host: [+
-  FOR host_modules +] \
-    maybe-all-[+module+][+
-  ENDFOR host_modules +]
+[+ FOR host_modules +][+ IF bootstrap +]
+ at if [+module+]-no-bootstrap[+ ENDIF bootstrap +]
+all-host: maybe-all-[+module+][+ IF bootstrap +]
+ at endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
+
 .PHONY: all-target
-all-target: [+
-  FOR target_modules +] \
-    maybe-all-target-[+module+][+
-  ENDFOR target_modules +]
+[+ FOR target_modules +][+ IF bootstrap +]
+ at if [+module+]-no-bootstrap[+ ENDIF bootstrap +]
+all-target: maybe-all-target-[+module+][+ IF bootstrap +]
+ at endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ 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
@@ -521,30 +517,25 @@
 [+ FOR recursive_targets +]
 .PHONY: do-[+make_target+]
 do-[+make_target+]:
-	@$(unstage)
+	@: $(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
-	@$(stage)
 
 
 .PHONY: [+make_target+]-host
-[+make_target+]-host: [+
-  FOR host_modules +] \
-    maybe-[+make_target+]-[+module+][+
-  ENDFOR host_modules +]
+[+ FOR host_modules +]
+[+make_target+]-host: maybe-[+make_target+]-[+module+][+ ENDFOR host_modules +]
 
 .PHONY: [+make_target+]-target
-[+make_target+]-target: [+
-  FOR target_modules +] \
-    maybe-[+make_target+]-target-[+module+][+
-  ENDFOR target_modules +]
+[+ FOR target_modules +]
+[+make_target+]-target: maybe-[+make_target+]-target-[+module+][+ ENDFOR target_modules +]
 [+ ENDFOR recursive_targets +]
 
 # Here are the targets which correspond to the do-X targets.
 
-.PHONY: info installcheck dvi html install-info
+.PHONY: info installcheck dvi html install-info install-html
 .PHONY: clean distclean mostlyclean maintainer-clean realclean
 .PHONY: local-clean local-distclean local-maintainer-clean
 info: do-info
@@ -562,12 +553,14 @@
 	  $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
 	else true ; fi
 
+install-html: do-install-html
+
 local-clean:
 	-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E *.log
 
 local-distclean:
 	-rm -f Makefile config.status config.cache mh-frag mt-frag
-	-rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
+	-rm -f maybedep.tmp serdep.tmp
 	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
 	  rm -rf $(TARGET_SUBDIR); \
 	else true; fi
@@ -616,11 +609,10 @@
   ENDFOR target_modules +]
 
 do-check:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
-	@$(stage)
 
 # Automated reporting of test results.
 
@@ -647,11 +639,10 @@
 
 .PHONY: install uninstall
 install:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
-	@$(stage)
 
 .PHONY: install-host-nogcc
 install-host-nogcc: [+
@@ -678,6 +669,7 @@
 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) ; \
@@ -730,13 +722,31 @@
 maybe-configure-[+prefix+][+module+]:
 @if [+prefix+][+module+]
 maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+]
-configure-[+prefix+][+module+]: [+deps+]
-	@[+ IF bootstrap +]test -f stage_last && exit 0; \
-	[+ ELSE bootstrap +]$(unstage)
-	@[+ ENDIF bootstrap +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
+configure-[+prefix+][+module+]: [+ IF bootstrap +]
+ at endif [+prefix+][+module+]
+ at if [+prefix+][+module+]-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif [+prefix+][+module+]-bootstrap
+ at if [+prefix+][+module+][+ ELSE bootstrap +]
+	@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
+	@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+] ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(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; \
@@ -757,16 +767,31 @@
 [+ FOR bootstrap_stage +]
 .PHONY: configure-stage[+id+]-[+prefix+][+module+] maybe-configure-stage[+id+]-[+prefix+][+module+]
 maybe-configure-stage[+id+]-[+prefix+][+module+]:
- at if [+module+]-bootstrap
+ at if [+prefix+][+module+]-bootstrap
 maybe-configure-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
-configure-stage[+id+]-[+prefix+][+module+]: [+deps+]
-	@[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start
-	@[ -f [+subdir+]/[+module+]/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
+configure-stage[+id+]-[+prefix+][+module+]:
+	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
+	@$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+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; \
 	case $(srcdir) in \
 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -778,7 +803,7 @@
 	$(SHELL) $${libsrcdir}/configure \
 	  [+args+] $${srcdiroption} \
 	  [+stage_configure_flags+] [+extra_configure_flags+]
- at endif [+module+]-bootstrap
+ at endif [+prefix+][+module+]-bootstrap
 [+ ENDFOR bootstrap_stage +]
 [+ ENDIF bootstrap +]
 [+ ENDDEF +]
@@ -790,10 +815,14 @@
 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 +]test -f stage_last && exit 0; \
-	[+ ELSE bootstrap +]$(unstage)
-	@[+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
+all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +]
+ at endif [+prefix+][+module+]
+ at if [+prefix+][+module+]-bootstrap
+	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+ at endif [+prefix+][+module+]-bootstrap
+ at 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+] && \
@@ -806,12 +835,12 @@
 .PHONY: clean-stage[+id+]-[+prefix+][+module+] maybe-clean-stage[+id+]-[+prefix+][+module+]
 maybe-all-stage[+id+]-[+prefix+][+module+]:
 maybe-clean-stage[+id+]-[+prefix+][+module+]:
- at if [+module+]-bootstrap
+ at 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+]
-	@[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start
+	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	[+exports+][+ IF prev +] \
@@ -827,12 +856,12 @@
 clean-stage[+id+]-[+prefix+][+module+]:
 	@[ -f [+subdir+]/[+module+]/Makefile ] || [ -f [+subdir+]/stage[+id+]-[+module+]/Makefile ] \
 	  || exit 0 ; \
-	@[ `cat stage_current` = stage[+id+] ] || $(MAKE) stage[+id+]-start
+	[ $(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
- at endif [+module+]-bootstrap
+ at endif [+prefix+][+module+]-bootstrap
 
 [+ ENDFOR bootstrap_stage +]
 [+ ENDIF bootstrap +]
@@ -872,7 +901,7 @@
 [+ ELIF no_check_cross +]
 # This module is only tested in a native toolchain.
 check-[+module+]:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@if [ '$(host)' = '$(target)' ] ; then \
 	  r=`${PWD_COMMAND}`; export r; \
 	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -882,7 +911,7 @@
 	fi
 [+ ELSE check +]
 check-[+module+]:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -899,7 +928,7 @@
 install-[+module+]:
 [+ ELSE install +]
 install-[+module+]: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
@@ -922,7 +951,7 @@
   FOR depend +]\
     [+depend+]-[+module+] [+
   ENDFOR depend +]
-	@[+ IF bootstrap +][+ ELSE +]$(unstage)
+	@[+ IF bootstrap +][+ ELSE +]: $(MAKE); $(unstage)
 	@[+ ENDIF bootstrap +][ -f ./[+module+]/Makefile ] || exit 0; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
@@ -948,17 +977,9 @@
 # ---------------------------------------
 [+ FOR target_modules +]
 
-# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- at if target-[+module+]
-$(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
- at endif target-[+module+]
-
 [+ IF raw_cxx +]
 [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
-	     deps=(string-append "$(TARGET_SUBDIR)/" (get "module") "/multilib.out")
+	     check_multilibs=true
 	     exports="$(RAW_CXX_TARGET_EXPORTS)"
 	     args="$(TARGET_CONFIGARGS)" no-config-site=true +]
 
@@ -967,7 +988,7 @@
        args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
 [+ ELSE +]
 [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
-	     deps=(string-append "$(TARGET_SUBDIR)/" (get "module") "/multilib.out")
+	     check_multilibs=true
 	     exports="$(NORMAL_TARGET_EXPORTS)"
 	     args="$(TARGET_CONFIGARGS)" no-config-site=true +]
 
@@ -985,7 +1006,7 @@
 check-target-[+module+]:
 [+ ELSE check +]
 check-target-[+module+]:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
 IF raw_cxx +]
@@ -1011,7 +1032,7 @@
 install-target-[+module+]:
 [+ ELSE install +]
 install-target-[+module+]: installdirs
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
 IF raw_cxx +]
@@ -1038,7 +1059,7 @@
   FOR depend +]\
     [+depend+]-target-[+module+] [+
   ENDFOR depend +]
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
@@ -1181,29 +1202,36 @@
 # are dummy when toplevel bootstrap is not active.
 
 # While making host and target tools, symlinks to the final stage must be
-# there, so $(MAKE) $(unstage) should be run at various points.  To avoid
-# excessive recursive invocations of make, we "inline" them using a variable.
+# 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 = ""
 
 @if gcc-bootstrap
 unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
-stage = [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
+current_stage = "`cat stage_current 2> /dev/null`"
 @endif gcc-bootstrap
 
 .PHONY: unstage stage
 unstage:
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 stage:
-	@$(stage)
+	@: $(MAKE); $(stage)
 
+# Disable commands for lean bootstrap.
+LEAN = false
+
 # 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 ('gcc-prev'), and to make the name of
+# the previous stage to a constant name ('prev-gcc'), 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
@@ -1229,6 +1257,8 @@
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
 	STAGE_PREFIX=$$r/prev-gcc/ \
 	CFLAGS="$(BOOT_CFLAGS)" \
+	LIBCFLAGS="$(BOOT_CFLAGS)" \
+	LDFLAGS="$(BOOT_LDFLAGS)" \
 	ADAC="\$$(CC)"
 
 # For stage 1:
@@ -1244,61 +1274,54 @@
 .PHONY: stage[+id+]-start stage[+id+]-end
 
 stage[+id+]-start::
-	@$(stage); \
+	@: $(MAKE); $(stage); \
 	echo stage[+id+] > stage_current ; \
 	echo stage[+id+] > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR)[+
+	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)[+
    FOR host_modules +][+ IF bootstrap +]
 @if [+ module +]
 	@cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \
 	  mkdir stage[+id+]-[+module+]; \
-	set stage[+id+]-[+module+] [+module+] ; \
-	@CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
-	set stage[+prev+]-[+module+] prev-[+module+] ; \
-	@CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
- at endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +][+
-   FOR target_modules +][+ IF bootstrap +]
- at if target-[+ module +]
-	@cd $(TARGET_SUBDIR); [ -d stage[+id+]-[+module+] ] || \
-	  mkdir stage[+id+]-[+module+]; \
-	set stage[+id+]-[+module+] [+module+] ; \
-	@CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
-	set stage[+prev+]-[+module+] prev-[+module+] ; \
-	@CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
- at endif target-[+ module +][+ ENDIF bootstrap +][+ ENDFOR target_modules +]
+	mv stage[+id+]-[+module+] [+module+] [+ IF prev +] ; \
+	mv stage[+prev+]-[+module+] prev-[+module+] || test -f stage[+prev+]-lean [+ ENDIF prev +]
+ at 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::
-	@rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +]
+stage[+id+]-end:: [+ FOR host_modules +][+ IF bootstrap +]
 @if [+ module +]
-	@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 +]
- at endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +][+
-   FOR target_modules +][+ IF bootstrap +]
- at if target-[+ module +]
-	@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 +]
- at endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR target_modules +]
+	@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
+ at 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 +][+IF lean +]
-	@bootstrap_lean at -rm -rf stage[+lean+]-* ; $(STAMP) stage[+lean+]-lean[+ ENDIF lean +]
+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 [+
 	  IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \
 	  echo Skipping rebuild of stage[+id+] ; \
 	else \
-	  $(MAKE) stage[+id+]-start; \
+	  $(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) [+compare-target+][+ ENDIF compare-target +]
+	$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+compare-target+][+ ENDIF compare-target +]
 
 .PHONY: all-stage[+id+] clean-stage[+id+]
 do-clean: clean-stage[+id+]
@@ -1314,8 +1337,9 @@
 	  echo Cannot compare object files as stage [+prev+] was deleted. ; \
 	  exit 0 ; \
 	fi; \
-	$(stage); \
+	: $(MAKE); $(stage); \
 	rm -f .bad_compare ; \
+	echo Comparing stages [+prev+] and [+id+] ; \
 	cd stage[+id+]-gcc; \
 	files=`find . -name "*$(objext)" -print` ; \
 	cd .. ; \
@@ -1336,31 +1360,43 @@
 	  cat .bad_compare; \
 	  exit 1; \
 	else \
-	  true; \
+	  echo Comparison successful.; \
 	fi ; \
 	$(STAMP) [+compare-target+][+ IF prev +]
-	@bootstrap_lean at -rm -rf stage[+prev+]-* ; $(STAMP) stage[+prev+]-lean[+ ENDIF prev +]
+	if $(LEAN); then \
+	  rm -rf stage[+prev+]-*; \
+	  $(STAMP) stage[+prev+]-lean; \
+	fi[+ ENDIF prev +]
 [+ ENDIF compare-target +]
 
 [+ IF bootstrap-target +]
-.PHONY: [+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
-	@$(unstage)
+	@: $(MAKE); $(unstage)
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-	@$(stage)
+
+[+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
 [+ 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+]::
-	@$(stage)
+	@: $(MAKE); $(stage)
 	rm -rf stage[+id+]-* [+
 	  IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
 
@@ -1387,20 +1423,40 @@
 
 @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
 @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
+
 # --------------------------------------
 # Dependencies between different modules
 # --------------------------------------
 
 # Generic dependencies for target modules on host stuff, especially gcc
-[+ FOR target_modules +][+ IF bootstrap +]
- at if gcc-bootstrap[+ FOR bootstrap_stage +]
-configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-gcc[+ ENDFOR +]
- at endif gcc-bootstrap[+ ENDIF bootstrap +]
-configure-target-[+module+]: maybe-all-gcc
-[+ ENDFOR target_modules +]
+ at 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 +]
+ at endif gcc-bootstrap
 
+ at if gcc-no-bootstrap[+ FOR target_modules +][+ IF bootstrap
+  +][+ ELSE +]
+configure-target-[+module+]: maybe-all-gcc[+
+  ENDIF bootstrap +][+ ENDFOR target_modules +]
+ at endif gcc-no-bootstrap
+
+
 [+ FOR lang_env_dependencies +]
 configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
 [+ IF cxx +]configure-target-[+module+]: maybe-all-target-libstdc++-v3
@@ -1529,17 +1585,6 @@
 # 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

Modified: trunk/binutils/bfd/ChangeLog
===================================================================
--- trunk/binutils/bfd/ChangeLog	2006-04-23 11:09:39 UTC (rev 13)
+++ trunk/binutils/bfd/ChangeLog	2006-04-23 11:31:49 UTC (rev 14)
@@ -1,2959 +1,477 @@
-2005-12-13  H.J. Lu  <hongjiu.lu at intel.com>
+2006-04-08  H.J. Lu  <hongjiu.lu at intel.com>
 
-	PR ld/2008
-	* elf.c (_bfd_elf_setup_sections): Return FALSE if
-	elf_linked_to_section will be set to NULL.
+	PR ld/2513
+	* elf32-i386.c (GOT_TLS_MASK): New macro for tls_type.
+	(GOT_TLS_IE_IE): Likewise.
+	(GOT_TLS_IE_GD): Likewise.
+	(GOT_TLS_IE_MASK): Likewise.
+	(elf_i386_check_relocs): For global symbols, set GOT_TLS_IE_GD
+	and GOT_TLS_IE_IE for R_386_TLS_GD and R_386_TLS_IE
+	respectively.
+	(allocate_dynrelocs): If both GOT_TLS_IE_IE and GOT_TLS_IE_GD
+	are set, treat tls_type as GOT_TLS_IE_BOTH.
+	(elf_i386_relocate_section): Likewise.
 
-	* format.c (bfd_check_format_matches): Don't check the default
-	target twice.
+2006-04-07  Randolph Chung  <tausq at debian.org>
 
-2005-12-13  Alan Modra  <amodra at bigpond.net.au>
+	* elf64-hppa.c (elf64_hppa_grok_prstatus): New function.
+	(elf64_hppa_grok_psinfo): Likewise.
+	(elf_backend_grok_pstatus, elf_backend_grok_psinfo): Define.
 
-	* elf64-ppc.c (ppc64_elf_relocate_section): Force tail calls in
-	shared libs to resolve locally.
+2006-04-06  DJ Delorie  <dj at redhat.com>
 
-2005-12-12  Paul Brook  <paul at codesourcery.com>
+	* elf32-m32c.c (m32c_elf_relocate_section): Generate a symbol for
+	each plt entry we create.
 
-	* bfd-in2.h: Regenerate.
-	* elf32-arm.c (elf32_arm_reloc_map): Add BFD_RELOC_ARM_PCREL_CALL and
-	BFD_RELOC_ARM_PCREL_JUMP.
-	(check_use_blx): New function.
-	(bfd_elf32_arm_process_before_allocation): Don't allocate glue if
-	using BLX.
-	(elf32_arm_final_link_relocate): Perform bl<->blx conversion for
-	R_ARM_CALL and R_ARM_THM.
-	(elf32_arm_get_eabi_attr_int): New function.
-	(elf32_arm_size_dynamic_sections): Call check_use_blx.
-	* libbfd.h: Regenerate.
-	* reloc.c: Add BFD_RELOC_ARM_PCREL_CALL and BFD_RELOC_ARM_PCREL_JUMP.
+2006-04-06  Carlos O'Donell  <carlos at codesourcery.com>
 
-2005-12-12  Nathan Sidwell  <nathan at codesourcery.com>
-
-	* Makefile.am (ALL_MACHINES, ALL_MACHINES_CFILES,
-	BFD32_BACKENDS, BFD32_BACKENDS_CFILES): Replace ms1 with mt.
-	(cpu_mt.lo, elf32-mt.lo): Update target and dependency names.
-	* Makefile.in: Rebuilt.
-	* config.bfd: Replace ms1 arch with mt.
-	* configure.in: Replace ms1 files with mt files.
-	* configure: Rebuilt.
-	* elf32-mt.c: Renamed from elf32-ms1.c.  Update include files.
-	* cpu-mt.c: Renamed from cpu-ms1.c.
-
-2005-12-12  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (ppc64_elf_size_stubs): Don't consider non-ppc64 input.
-
-2005-12-10  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (elf_gc_mark_dynamic_ref_symbol):  Use !info-executable
-	to test for linking shared libs, not info->shared.
-
-2005-12-08  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (struct ppc_elf_link_hash_table): Add emit_stub_syms.
-	(ppc_elf_select_plt_layout): Add emit_stub_syms param, save to htab.
-	(add_stub_sym): New function.
-	(allocate_dynrelocs): Call add_stub_sym.
-	(ppc_elf_size_dynamic_sections): Emit __glink and __glink_PLTresolve
-	when emit_stub_syms.
-	* elf32-ppc.h (ppc_elf_select_plt_layout): Update prototype.
-
-2005-12-08  Alan Modra  <amodra at bigpond.net.au>
-
-	* reloc.c (enum complain_overflow): Correct comments.
-	(bfd_check_overflow): Combine complain_overflow_bitfield and
-	complain_overflow_signed code.
-	(_bfd_relocate_contents): Likewise.
-	(bfd_howto_32): Use complain_overflow_dont.
-	* elf32-d10v.c (elf_d10v_howto_table): Revert 2002-06-17 change.
-	* bfd-in2.h: Regenerate.
-
-2005-12-07  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf.c (assign_section_numbers): Remove extra code in the last
-	change.
-
-2005-12-07  H.J. Lu  <hongjiu.lu at intel.com>
-	    Andreas Schwab  <schwab at suse.de>
-
-	PR binutils/1991
-	* elf.c (assign_section_numbers): Always use the output section
-	when setting up sh_link for SHF_LINK_ORDER.
-
-2005-12-07  Thiemo Seufer  <ths at networkno.de>
-	    H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR ld/1932
-	* bfd-in.h (bfd_elf_record_link_assignment): Add output_bfd
-	and hidden arguments.
-
-	* bfd.c (bfd_hide_symbol): Removed.
-
-	* bfd-in2.h: Regenerated.
-
-	* elflink.c (bfd_elf_record_link_assignment): Handle hidden
-	symbols which were provided by a linker script.
-
-2005-12-06  Paul Gilliam  <pgilliam at us.ibm.com>
-
-	* cpu-powerpc.c (bfd_powerpc_archs): Add ppc 750.
-
-2005-11-18  Mark Kettenis  <kettenis at gnu.org>
-
-	* elf64-hppa.c (elf64_hppa_section_from_phdr): Create .kernel
-	pseudo-section.  Make sure .reg section comes after the proc
-	section it's generated from.
-
-2005-12-01  Kazuhiro Inaoka <inaoka.kazuhiro at renesas.com>
-
-	* elf32-m32r.c (m32r_elf_sweep_hook): Fix an illegal duplicate check.
-	(m32r_elf_relocate_section): Fix R_M32R_10_PCREL_RELA linkage bug.
-	(m32r_elf_gc_sweep_hook): Likewise.
-	(m32r_elf_check_relocs): Likewise.
-
-2005-11-24  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf-bfd.h (_bfd_generic_match_sections_by_type): Don't define.
-	* libbfd-in.h (_bfd_generic_match_sections_by_type): Delete.
-	* libbfd.c (_bfd_generic_match_sections_by_type): Delete.
-	* targets.c (bfd_match_sections_by_type): Don't define.
-	(BFD_JUMP_TABLE_LINK): Remove _bfd_generic_match_sections_by_type.
-	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Likewise.
-	* coff64-rs6000.c (rs6000coff64_vec, aix5coff64_vec): Likewise.
-	* bfd-in2.h: Regenerate.
-	* libbfd.h: Regenerate.
-
-2005-11-23  Daniel Jacobowitz  <dan at codesourcery.com>
-	    Thiemo Seufer <ths at networkno.de>
-
-	* elf32-mips.c (elf_mips_howto_table_rel): Use rightshift 2 for
-	R_MIPS_PC16.
-	(mips_reloc_map): Map BFD_RELOC_16_PCREL_S2 to R_MIPS_PC16.
-	(bfd_elf32_bfd_reloc_type_lookup): Don't handle
-	BFD_RELOC_16_PCREL_S2.
-	* elf64-mips.c (mips_elf64_howto_table_rel): Use rightshift 2 for
-	R_MIPS_PC16.
-	(mips_elf64_howto_table_rela): Likewise.
-	(mips_reloc_map): Map BFD_RELOC_16_PCREL_S2 to R_MIPS_PC16.
-	(bfd_elf64_bfd_reloc_type_lookup): Don't handle
-	BFD_RELOC_16_PCREL_S2.
-	* elfn32-mips.c (elf_mips_howto_table_rel): Use rightshift 2 for
-	R_MIPS_PC16.
-	(elf_mips_howto_table_rela): Likewise.
-	(mips_reloc_map): Map BFD_RELOC_16_PCREL_S2 to R_MIPS_PC16.
-	(bfd_elf32_bfd_reloc_type_lookup): Don't handle
-	BFD_RELOC_16_PCREL_S2.
-	* elfxx-mips.c: Formatting fixes.
-	(mips_elf_calculate_relocation): Handle R_MIPS_GNU_REL16_S2
-	and R_MIPS_PC16 identically.
-
-2005-11-23  Frederic Riss  <frederic.riss at st.com>
-
-	* elfcode.h (elf_object_p): Delay the setting of start_address
-	until we're sure the backend matches the binary.
-
-2005-11-20  John David Anglin  <dave.anglin at nrc-cnrc.gc.ca>
-
-	* som.c (som_decode_symclass): Decode BSF_WEAK symbols in the same
-	manner as bfd_decode_symclass.
-
-2005-11-18  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (ppc64_elf_check_relocs): Don't set has_14bit_branch
-	on branches to same section.
-
-2005-11-17  Randolph Chung  <tausq at debian.org>
-
-	* elf64-hppa.c (elf64_hppa_object_p): Recognize corefiles under
-	hppa64-hp-hpux11.11.
-	(elf64_hppa_section_from_phdr): New function.
-	(elf_backend_section_from_phdr): Define.
-
-2005-11-11  Nick Clifton  <nickc at redhat.com>
-
-	PR 1150
-	* elfxx-mips.c (mips_elf_calculate_relocation): Ignore an
-	undefined symbol if it is optional.
-	(_bfd_mips_elf_merge_symbol_attribute): Make sure that the
-	optional flag is merged as well as the visibility.
-	* elfxx-mips.h (_bfd_mips_elf_merge_symbol_attribute): Prototype.
-	(elf_backend_merge_symbol_attribute): Define.
-
-2005-11-08  Nathan Sidwell  <nathan at codesourcery.com>
-
-	Add ms2 support
-	* archures.c (bfd_mach_ms2): Define.
-	* cpu-ms1.c (arch_info_struct): Add ms2 stanza.
-	* elf32-ms1.c (elf32_ms1_machine): Add ms2 case.
-	(ms1_elf_merge_private_bfd_data): Remove unused variables.  Add
-	correct merging logic, with workaround.
-	(ms1_elf_print_private_bfd_data): Add ms2 case.
-	* reloc.c (BFD_RELOC_MS1_PCINSN8): Add ms2 specific reloc.
-	* libbfd.h: Regenerated.
-	* bfd-in2.h: Regenerated.
-
-2005-11-07  Steve Ellcey  <sje at cup.hp.com>
-
-	* warning.m4 (AM_BINUTILS_WARNINGS): Default to empty string
-	if compiler is not GCC.
-	* configure: Regenerate
-
-2005-11-07  Steve Ellcey  <sje at cup.hp.com>
-
-	* configure: Regenerate after modifying bfd/warning.m4.
-
-2005-11-07  Steve Ellcey  <sje at cup.hp.com>
-
-	* configure.host (ia64-*-hpux*): Set _LARGEFILE64_SOURCE.
-
-2005-11-03  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* configure.in: Check for fopen64.
-	* libbfd-in.h (real_fopen): New prototype.
-	* configure, config.in, libbfd.h: Regenerated.
-	* bfdio.c (real_fopen): New function.
-	* opncls.c (bfd_fopen, bfd_fill_in_gnu_debuglink_section): Use it.
-	* cache.c (bfd_open_file): Likewise.
-
-2005-11-03  Thiemo Seufer  <ths at networkno.de>
-
-	* elfxx-mips.c (mips_elf_calculate_relocation): Handle only
-	forced local symbols here.
-	(mips_elf_create_dynamic_relocation): Likewise.
-	(_bfd_mips_elf_finish_dynamic_symbol): Fix typo in comment.
-
-2005-11-03  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf.c (elf_fake_sections): When calculating tbss size, just use
-	the last link_order.
-	(assign_file_positions_for_segments): Likewise.
-	* elflink.c (bfd_elf_final_link): Likewise.
-	(elf_reloc_link_order): Correct comment.
-
-2005-11-02  Alan Modra  <amodra at bigpond.net.au>
-
-	PR ld/1775
-	* elf32-m68k.c (elf_m68k_finish_dynamic_symbol): Add required
-	parentheses.
-
-2005-10-29  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* Makefile.am: Run "make dep-am".
-	* Makefile.in: Regenerated.
-
-	* dep-in.sed: Replace " ./" with " ".
-
-2005-10-29  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* hpux-core.c: Include <machine/reg.h> only if HPUX_CORE is
-	define.
-	* osf-core.c: Include <sys/core.h> only if OSF_CORE is defined.
-	* sco5-core.c: Include <sys/paccess.h> and <sys/region.h> only
-	if SCO5_CORE is defined.
-
-2005-10-29  Mark Kettenis  <kettenis at gnu.org>
-
-	* Makefile.am: Run "make dep-am".
+	* po/Make-in: Add install-html target.
+	* Makefile.am: Rename docdir to bfddocdir. Add datarootdir, docdir
+	htmldir. Add install-html and install-html-recursive targets.
 	* Makefile.in: Regenerate.
+	* configure.in: AC_SUBST for datarootdir, docdir and htmldir.
+	* configure: Regenerate.
 
-2005-10-28  Joel Brobecker  <brobecker at adacore.com>
+2006-04-06  H.J. Lu  <hongjiu.lu at intel.com>
 
-	From Eric Botcazou  <botcazou at adacore.com>
-	* coffcode.h (coff_compute_section_file_positions): Fix small
-	error in preprocessor directives.
+	* elfxx-ia64.c (elfNN_ia64_relax_section): Skip unneeded passes
+	with the skip_relax_pass_0 and skip_relax_pass_1 bits in the
+	section structure.
 
-2005-10-28  Joel Brobecker  <brobecker at adacore.com>
+2006-04-05  Bernd Schmidt  <bernd.schmidt at analog.com>
 
-	Mostly from Eric Botcazou <botcazou at adacore.com>
-	* rs6000-core.c: ANSIfy all function definitions.
-	Add missing function prototypes.
-	(ptr_to_uint): New type.
-	(rs6000coff_core_p): Use it as intermediate step in casts.
-	(rs6000coff_core_file_matches_executable_p): Likewise.
-	* xcoff-target.h (rs6000coff_core_p): Fix prototype.
-	(rs6000coff_core_file_matches_executable_p): Likewise.
+	* elf32-bfin.c (bfinfdpic_relocs_info_hash): Sprinkle casts to
+	eliminate warnings.
 
-2005-10-28  H.J. Lu  <hongjiu.lu at intel.com>
+2006-04-05  H.J. Lu  <hongjiu.lu at intel.com>
+	    James E Wilson  <wilson at specifixinc.com>
 
-	PR binutils/1472
-	* aoutx.h (NAME (aout, machine_type)): Handle
-	bfd_mach_sparc_v8plus, bfd_mach_sparc_v8plusa,
-	bfd_mach_sparc_v8plusb, bfd_mach_sparc_v9, bfd_mach_sparc_v9a
-	and bfd_mach_sparc_v9b.
+	PR ld/2442
+	* elfxx-ia64.c (elfNN_ia64_dyn_sym_info): Remove next.
+	(elfNN_ia64_local_hash_entry): Add count, sorted_count and
+	size.
+	(elfNN_ia64_link_hash_entry): Likewise.
+	(elfNN_ia64_new_elf_hash_entry): Initialize count, sorted_count
+	and size.
+	(elfNN_ia64_hash_copy_indirect): Updated elfNN_ia64_dyn_sym_info
+	processing.
+	(elfNN_ia64_hash_hide_symbol): Likewise.
+	(elfNN_ia64_global_dyn_sym_thunk): Likewise.
+	(elfNN_ia64_local_dyn_sym_thunk): Likewise.
+	(elfNN_ia64_global_dyn_info_free): New function.
+	(elfNN_ia64_local_dyn_info_free): Likewise.
+	(elfNN_ia64_hash_table_free): Free local and global
+	elfNN_ia64_dyn_sym_info.
+	(addend_compare): New function.
+	(sort_dyn_sym_info): Likewise.
+	(get_dyn_sym_info): Updated to use binary search for addend.
+	(elfNN_ia64_check_relocs): Scan relocations to create dynamic
+	relocation arrays first.
 
-2005-10-28  Hans-Peter Nilsson  <hp at axis.com>
+2006-04-05  Bernd Schmidt  <bernd.schmidt at analog.com>
 
-	PR ld/1567
-	* elf32-cris.c (cris_elf_howto_table) <R_CRIS_32>: Set
-	complain_on_overflow field to complain_overflow_dont.
+	* elf32-bfin.c (_bfin_create_got_section): Don't generate a _gp
+	symbol.
 
-2005-10-27  Alan Modra  <amodra at bigpond.net.au>
+2006-04-05  H.J. Lu  <hongjiu.lu at intel.com>
 
-	PR 973
-	* cache.c (enum cache_flag): New.
-	(close_one): Save file mtime.
-	(bfd_cache_lookup): Add flag arg, adjust all users.
-	(bfd_cache_lookup_worker): Likewise.
-	(cache_btell): Use CACHE_NO_OPEN and return abfd->where if file
-	not open.
-	(cache_bflush): Similarly, and return success of file not open.
-	(cache_bseek): Use CACHE_NO_SEEK if SEEK_SET or SEEK_END.
-	(cache_bstat): Use CACHE_NO_SEEK_ERROR.
+	PR ld/2411
+	* elflink.c (check_dynsym): New.
+	(elf_link_output_extsym): Use it.
+	(bfd_elf_final_link): Likewise.
 
-	* bfdwin.c (bfd_get_file_window): Seek into file in place of
-	using bfd_cache_lookup.
+2006-04-05  H.J. Lu  <hongjiu.lu at intel.com>
 
-	* cache.c (BFD_CACHE_MAX_OPEN): Make private to this file.
-	(bfd_last_cache, bfd_cache_lookup, bfd_cache_lookup_worker): Likewise.
-	* libbfd-in.h (bfd_cache_lookup_worker, bfd_last_cache): Delete.
-	* libbfd.h: Regenerate.
+	PR ld/2404
+	* elflink.c (_bfd_elf_merge_symbol): Skip the default indirect
+	symbol from the dynamic definition with the default version if
+	its type and the type of existing regular definition mismatch.
 
-	* hppabsd-core.c (hppabsd_core_core_file_p): Use bfd_stat, not fstat.
-	* sco5-core.c (sco5_core_file_p): Likewise.
-	* trad-core.c (trad_unix_core_file_p): Likewise.
+2006-04-05  Richard Sandiford  <richard at codesourcery.com>
+	    Daniel Jacobowitz  <dan at codesourcery.com>
 
-	* cache.c: Reorganize file to avoid forward reference.
-
-2005-10-26  Alan Modra  <amodra at bigpond.net.au>
-
-	* cache.c (bfd_cache_lookup_worker): Don't abort on failing to
-	reopen file.
-	(cache_btell, cache_bseek, cache_bflush, cache_bstat): Return -1 on
-	bfd_cache_lookup failure.
-	(cache_bread, cache_bwrite): Return 0 on the same.
-	* bfdwin.c (bfd_get_file_window): Likewise.
-	* hppabsd-core.c (hppabsd_core_core_file_p): Likewise.
-	* sco5-core.c (sco5_core_file_p): Likewise.
-	* trad-core.c (trad_unix_core_file_p): Likewise.
-
-2005-10-26  Alan Modra  <amodra at bigpond.net.au>
-
-	* cache.c (bfd_cache_lookup_worker): Use bfd_error_handler
-	rather than bfd_perror.  Print file name.  Internationalise.
-
-2005-10-26  Alan Modra  <amodra at bigpond.net.au>
-
-	* cache.c (bfd_open_file): Set bfd_error_system_call on failure
-	to open file.
-	(bfd_cache_lookup_worker): Remove check that file pos is in
-	unsigned long range.  Print system error before aborting.
-
-2005-10-25  Arnold Metselaar  <arnold.metselaar at planet.nl>
-
-	* Makefile.am: Add rules for coff-z80 and cpu-z80.
-	* Makefile.in: Regenerated.
-	* archures.c: Add bfd_arch_z80 and support for it.
-	* coffcode.h(coff_set_arch_mach_hook): Add case Z80MAGIC.
-	(coff_set_flags): Add case bfd_arch_z80.
-	* config.bfd: Add z80coff_vec.
-	* configure.in: Add z80coff_vec.
-	* reloc.c: Add BFD_RELOC_Z80_DISP8
-	* targets.c: Add z80coff_vec.
-	* coff-z80.c: New file
-	* cpu-z80.c: New file
-	* configure: Regenerated.
-	* libbfd.h: Regenerated.
-	* bfd-in2.h: Regenerated.
-
-2005-10-26  Alan Modra  <amodra at bigpond.net.au>
-
-	PR ld/1540
-	* elf-bfd.h (elf_backend_copy_indirect_symbol): Replace pointer to
-	elf_backend_data with pointer to bfd_link_info.
-	(_bfd_elf_link_hash_copy_indirect): Likewise.
-	* elf.c (_bfd_elf_link_hash_copy_indirect): Likewise.  Handle
-	direct and indirect symbols both having dynamic link info.
-	* elf32-arm.c (elf32_arm_copy_indirect_symbol): Likewise.
-	* elf32-hppa.c (elf32_hppa_copy_indirect_symbol): Likewise.
-	* elf32-i386.c (elf_i386_copy_indirect_symbol): Likewise.
-	* elf32-m32r.c (m32r_elf_copy_indirect_symbol): Likewise.
-	* elf32-ppc.c (ppc_elf_copy_indirect_symbol): Likewise.
-	* elf32-s390.c (elf_s390_copy_indirect_symbol): Likewise.
-	* elf32-sh.c (sh_elf_copy_indirect_symbol): Likewise.
-	* elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
-	* elf64-s390.c (elf_s390_copy_indirect_symbol): Likewise.
-	* elf64-x86-64.c (elf64_x86_64_copy_indirect_symbol): Likewise.
-	* elfxx-ia64.c (elfNN_ia64_hash_copy_indirect): Likewise.
-	* elfxx-mips.c (_bfd_mips_elf_copy_indirect_symbol): Likewise.
-	* elfxx-sparc.c (_bfd_sparc_elf_copy_indirect_symbol): Likewise.
-	* elflink.c: Adjust all calls to bed->elf_backend_copy_indirect_symbol.
-	* elfxx-mips.h (_bfd_mips_elf_copy_indirect_symbol): Update prototype.
-	* elfxx-sparc.h (_bfd_sparc_elf_copy_indirect_symbol): Likewise.
-
-2005-10-25  Alan Modra  <amodra at bigpond.net.au>
-
-	* po/SRC-POTFILES.in: Regenerate.
-	* po/bfd.pot: Regenerate.
-
-2005-10-24  Jie Zhang <jie.zhang at analog.com>
-
-	* elf32-bfin.c (bfd_bfin_elf32_create_embedded_relocs): Fix signedness
-	warning.
-
-2005-10-24  Bernd Schmidt  <bernd.schmidt at analog.com>
-
-	* elf32-bfin.c (bfin_howto_table): Set src_mask to 0 for all relocs.
-	(bfin_imm16_reloc): Always add in the addend.  Don't fetch existing
-	contents from section.
-	(bfin_relocate_section): Rework so as to not call special_functions.
-	Handle the relocation stack here.  Treat pcrel24 relocs specially.
-
-2005-10-24  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (elf_link_input_bfd): Don't use linker_mark and
-	SEC_EXCLUDE to test for sections dropped from output.  Instead,
-	use bfd_section_removed_from_list on normal sections.  Don't
-	attempt to handle symbols with unknown reserved section indices.
-	* linker.c (_bfd_generic_link_output_symbols): Don't use
-	linker_mark to test for symbols belonging to dropped sections.
-	Do allow absolute symbols.
-
-2005-10-24  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-i370.c (i370_elf_fake_sections): Don't set SHF_EXCLUDE on
-	group sections.
-
-2005-10-24  Jan Beulich  <jbeulich at novell.com>
-
-	* cpu-ia64-opc.c (elf64_ia64_operands): Move memory operand out of
-	set of indirect operands.
-
-2005-10-24  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_fake_sections): Don't set SHF_EXCLUDE on
-	group sections.
-
-2005-10-23  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* coff-rs6000.c (rs6000coff_vec): Initialize
-	_bfd_init_private_section_data with
-	_bfd_generic_init_private_section_data.
-	(pmac_xcoff_vec): Likewise.
-	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
-	(aix5coff64_vec): Likewise.
-
-2005-10-23  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR ld/1487
-	* elf-bfd.h (_bfd_generic_init_private_section_data): New.
-	(_bfd_elf_init_private_section_data): New.
-
-	* elf.c (elf_fake_sections): Don't set SHF_GROUP for
-	relocatable link.
-	(bfd_elf_set_group_contents): Don't handle relocatable link
-	specially.
-	(assign_section_numbers): If it isn't called by assembler,
-	use the output section of elf_linked_to_section for
-	SHF_LINK_ORDER.
-	(_bfd_elf_init_private_section_data): New.
-	(_bfd_elf_copy_private_section_data): Call it.
-
-	* libbfd-in.h (_bfd_generic_init_private_section_data): New.
-
-	* libbfd.c (_bfd_generic_init_private_section_data): New.
-
-	* targets.c (BFD_JUMP_TABLE_COPY): Add
-	_bfd_generic_init_private_section_data.
-	(bfd_init_private_section_data): Likewise.
-
-	* bfd-in2.h: Regenerated.
-	* libbfd.h: Likewise.
-
-2005-10-23  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (dec_dynrel_count): Don't report errors for local
-	syms in gc'd sections.
-	(ppc64_elf_edit_opd): Don't adjust reloc counts when NO_OPD_RELOCS.
-	(elf_backend_action_discarded): Define.
-	(ppc64_elf_action_discarded): New function.
-
-2005-10-19  Paul Brook  <paul at codesourcery.com>
-
-	* elf32-arm.c (find_arm_elf_section_entry): New function.
-	(get_arm_elf_section_data): Use it.
-	(unrecord_section_with_arm_elf_section_data): Use it.
-
-2005-10-15  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* coff-rs6000.c (rs6000coff_vec): Initialize
-	_bfd_match_sections_by_type with
-	_bfd_generic_match_sections_by_type.
-	(pmac_xcoff_vec): Likewise.
-	* coff64-rs6000.c (rs6000coff64_vec): Likewise.
-	(aix5coff64_vec): Likewise.
-
-2005-10-15  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR ld/1467
-	* elf-bfd.h (_bfd_elf_match_sections_by_type): New.
-	(_bfd_generic_match_sections_by_type): New. Defined.
-
-	* elf.c (_bfd_elf_match_sections_by_type): New.
-
-	* libbfd-in.h (_bfd_generic_match_sections_by_type): New.
-
-	* bfd-in2.h: Regenerated.
-	* libbfd.h: Likewise.
-
-	* libbfd.c (_bfd_generic_match_sections_by_type): New.
-
-	* targets.c (BFD_JUMP_TABLE_LINK): Initialize
-	_bfd_match_sections_by_type with
-	_bfd_generic_match_sections_by_type.
-	(bfd_target): Add _bfd_match_sections_by_type.
-
-2005-10-08  Paul Brook  <paul at codesourcery.com>
-
-	* elf32-arm.c: Move #include "elf/arm.h" after libbfd.h.
-	(NUM_KNOWN_ATTRIBUTES): Define.
-	(aeabi_attribute, aeabi_attribute_list): Define.
-	(elf32_arm_obj_tdata): Add known_eabi_attributes and
-	other_eabi_attributes.
-	(uleb128_size, is_default_attr, eabi_attr_size,
-	elf32_arm_eabi_attr_size, write_uleb128, write_eabi_attribute,
-	elf32_arm_set_eabi_attr_contents, elf32_arm_bfd_final_link,
-	elf32_arm_new_eabi_attr, attr_strdup, elf32_arm_add_eabi_attr_int,
-	elf32_arm_add_eabi_attr_compat, copy_eabi_attributes,
-	elf32_arm_merge_eabi_attributes): New functions.
-	(elf32_arm_copy_private_bfd_data): Copy EABI object attributes.
-	(elf32_arm_fake_sections): Handle .ARM.attributes.
-	(elf32_arm_parse_attributes): New function.
-	(elf32_arm_section_from_shdr): Use it.
-	(bfd_elf32_bfd_final_link): Define.
-
-2005-10-06  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* elf32-arm.c (elf32_arm_check_relocs): Avoid aliasing warnings from
-	GCC.
-	(elf32_arm_size_dynamic_sections): Likewise.
-	* ecofflink.c (bfd_ecoff_debug_one_external): Likewise.
-	* elf32-hppa.c (elf32_hppa_check_relocs): Likewise.
-	* elf32-m32r.c (m32r_elf_check_relocs): Likewise.
-	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
-	* elf32-ppc.c (ppc_elf_check_relocs): Likewise.
-	* elf32-s390.c (elf_s390_check_relocs): Likewise.
-	(elf_s390_size_dynamic_sections): Likewise.
-	* elf32-sh.c (sh_elf_check_relocs): Likewise.
-	* elf64-ppc.c (ppc64_elf_check_relocs, dec_dynrel_count)
-	(ppc64_elf_size_dynamic_sections): Likewise.
-	* elf64-s390.c (elf_s390_check_relocs): Likewise.
-	(elf_s390_size_dynamic_sections): Likewise.
-	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_sections): Likewise.
-	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Likewise.
-	(_bfd_sparc_elf_size_dynamic_sections): Likewise.
-	* ieee.c (ieee_slurp_section_data): Likewise.
-	* oasys.c (oasys_slurp_section_data): Likewise.
-
-2005-10-04  Bob Wilson  <bob.wilson at acm.org>
-
-	* archive.c: Add missing SUBSECTION for documentation.
-	* bfd.c: Likewise.
-	* cache.c: Likewise.
-	* corefile.c: Likewise.
-	* format.c: Likewise.
-	* init.c: Likewise.
-	* libbfd.c: Likewise.
-	* opncls.c: Likewise.
-	* elf.c: Remove blank line after SECTION heading.
-	* reloc.c: Change "howto manager" SECTION to a SUBSECTION.
-
-2005-10-04  Nick Clifton  <nickc at redhat.com>
-
-	* elf32-arm.c (get_arm_elf_section_data): Cache the last pointer
-	matched so that the typical case of scanning for the previous
-	section to last one can be handled quickly.
-
-2005-10-03  David Heine  <dlheine at tensilica.com>
-
-	* elf32-xtensa.c (relocations_reach): Skip range check for
-	absolute literals.
-
-2005-10-03  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf.c (_bfd_elf_get_synthetic_symtab): Set BSF_GLOBAL on
-	synthetic syms.
-
-2005-09-30  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* Makefile.am: Run "make dep-am".
-	* Makefile.in: Regenerated.
-	* aclocal.m4: Likewise.
-
-2005-09-30  Catherine Moore  <clm at cm00re.com>
-
-	* Makefile.am: Bfin support.
-	* Makefile.in: Regenerated.
-	* aclocal.m4: Regenerated.
-	* archures.c (bfd_mach_bfin): New.
-	(bfd_arch_bfin): New.
-	bfd-in.h (bfd_bfin_elf32_create_embedded_relocs): New.
-	* bfd-in2.h: Regenerated.
-	* config.bfd: Bfin support.
-	* configure: Regenerated.
-	* configure.in: Bfin support.
-	* libbfd.h: Regenerated.
-	* reloc.c: Add BFD relocations for Bfin.
-	* targets.c (bfd_elf32_bfin_vec): New.
-	* cpu-bfin.c: New file.
-	* elf32-bfin.c: New file.
-
-2005-09-30  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (ppc_type_of_stub): Check both func desc and func
-	entry sym before deciding no stub is needed.
-	(ppc64_elf_size_stubs): When calculating branch destination,
-	don't use func desc sym for old ABI objects unless func entry
-	is undefined.
-
-2005-09-28  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR binutils/1321
-	* elf-bfd.h (_bfd_elf_setup_group_pointers): Renamed to ...
-	(_bfd_elf_setup_sections): This.
-	* elf.c: Likewise.
-	* elfcode.h (elf_object_p): Likewise.
-
-	* elf.c (_bfd_elf_setup_sections): Process SHF_LINK_ORDER.
-	(_bfd_elf_copy_private_section_data): Likewise.
-
-2005-09-28  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elflink.c (elf_fixup_link_order): Report locations for mixed
-	ordered and unordered input sections.
-
-2005-09-22  James E. Wilson  <wilson at specifix.com>
-
-	* dwarf2.c (struct funcinfo): Delete nesting_level field.
-	(lookup_address_in_function_table): Delete code to set funcinfo
-	caller_func field.  Delete local curr_func.
-	(scan_unit_for_symbols): New locals nested_funcs, nested_funcs_size.
-	Delete code setting funcinfo nesting_level field.  Add code to set
-	funcinfo caller_func field.
-
-2005-09-20  James E. Wilson  <wilson at specifix.com>
-
-	* dwarf2.c (find_abstract_instance_name): Don't early exit when name
-	set.  For DW_AT_name case, only set name if not already set.  Handle
-	DW_AT_MIPS_linkage_name.
-
-2005-09-20  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (_bfd_elf_merge_symbol): Simplify.
-
-2005-09-19  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (ppc_build_one_stub): Replace assertion that long
-	branch offset is in range with an error.  Print full stub name on
-	errors.
-	(ppc_size_one_stub): Print full stub name on errors.
-	(group_sections): Warn if section size exceeds group size.
-	(ppc64_elf_size_stubs): Continue relaxing when stub types change.
-
-2005-09-09  Kevin Buettner  <kevinb at redhat.com>
-
-	* elf32-am33lin.c (bfd.h, sysdep.h, elf-bfd.h, elf/mn10300.h):
-	Include.
-	(elf32_am33lin_grok_prstatus, elf32_am33lin_grok_psinfo): New
-	functions.
-	(elf_backend_grok_prstatus, elf_backend_grok_psinfo): Define.
-
-2005-09-09  Richard Earnshaw  <richard.earnshaw at arm.com>
-
-	* elf32-arm.c (elf32_arm_section_from_shdr): Accept SHT_ARM_PREEMPTMAP
-	and SHT_ARM_ATTRIBUTES.
-
-2005-09-08  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elflink.c (elf_get_linked_section_vma): Fix a typo in comment.
-	* elfxx-ia64.c (elf_backend_link_order_error_handler): Likewise.
-
-2005-09-08  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR ld/1263
-	* elflink.c (elf_link_add_object_symbols): Abort for
-	--just-symbols on DSO.
-
-2005-09-08  Paul Brook  <paul at codesourcery.com>
-
-	* reloc.c: Rename BFD_RELOC_ARM_SMI to BFD_RELOC_ARM_SMC.
-	* bfd-in2.h: Regenerate.
-	* libbfd.h: Regenerate.
-
-2005-09-06  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR ld/1301
-	* elflink.c (_bfd_elf_merge_symbol): Don't check undefined
-	symbol introduced by "ld -u" for TLS.
-
-2005-09-02  Paul Brook  <paul at codesourcery.com>
-
-	* libbdf.h: Regenerate.
-	* bfd-in2.h: Regenerate.
-	* reloc.c: Add BFD_RELOC_ARM_T32_CP_OFF_IMM and
-	BFD_RELOC_ARM_T32_CP_OFF_IMM_S2.
-
-2005-09-01  Dmitry Diky <diwil at spec.ru>
-
-	* elf32-msp430.c (msp430_elf_relax_delete_bytes): Do not adjust
-	local symbols and move it to
-	(msp430_elf_relax_adjust_locals): New function - walk over the
-	sections in the bfd and adjust relocations as necessary.
-
-2005-08-31  DJ Delorie  <dj at redhat.com>
-
-	* elf32-i386.c (elf_i386_check_relocs): Don't cast a unary &
-	address operator, as that breaks GCC's strict aliasing rules.
-	(elf_i386_size_dynamic_sections): Avoid the need for type
-	punning.
-	* elf64-x86-64.c (elf_x86_64_check_relocs): Don't cast a unary
-	& address operator, as that breaks GCC's strict aliasing
-	rules.
-	(elf_x86_64_size_dynamic_sections): Avoid the need for type
-	punning.
-
-2005-08-30  Phil Edwards  <phil at codesourcery.com>
-
-	* config.bfd (i[3-7]86-*-vxworks):  Match vxworks* instead.
-
-2005-08-29  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR ld/1247
-	* elfxx-ia64.c (allocate_fptr): Check undefined symbol.
-
-2005-08-29  Steven J. Hill <sjhill at realitydiluted.com>
-
-	* elfxx-mips.c (_bfd_mips_elf_relocate_section): Initialise
-	'value' to avoid compile time warning message.
-
-2005-08-26  Christian Groessler  <chris at groessler.org>
-
-	* coff-z8k.c: (r_jr, r_disp7, r_callr): Fix src_mask and dst_mask
-	of HOWTO.
-	(coff_z8k_select_reloc): Remove.
-	(SELECT_RELOC): Remove.
-	(coff_z8k_reloc_type_lookup): New function.
-	(coff_bfd_reloc_type_lookup): Define.
-	* configure.in: Add cofflink.lo to z8kcoff_vec.
+	* config.bfd (sparc-*-vxworks*): New stanza.
+	* configure.in (bfd_elf32_sparc_vxworks_vec): New stanza.
+	(bfd_elf32_sparc_vec, bfd_elf64_sparc_vec): Add elf-vxworks.lo.
 	* configure: Regenerate.
-	* reloc.c: (bfd_reloc_code_type): Add z8k relocations.
-	(bfd_install_relocation): Don't clear reloc_entry->addend for
-	coff-z8k target.
-	* bfd-in2.h: Regenerate.
-	* libbfd.h: Regenerate.
+	* elf32-sparc.c: Include elf-vxworks.h.
+	(elf32_sparc_vxworks_link_hash_table_create: New.
+	(elf32_sparc_vxworks_final_write_processing): New.
+	(TARGET_BIG_SYM): Override for VxWorks.
+	(TARGET_BIG_NAME, ELF_MINPAGESIZE): Likewise.
+	(bfd_elf32_bfd_link_hash_table_create): Likewise.
+	(elf_backend_want_got_plt, elf_backend_plt_readonly): Likewise.
+	(elf_backend_got_header_size, elf_backend_add_symbol_hook): Likewise.
+	(elf_backend_link_output_symbol_hook): Likewise.
+	(elf_backend_emit_relocs): Likewise.
+	(elf_backend_final_write_processing, elf32_bed): Likewise.
+	* elfxx-sparc.c: Include libiberty.h and elf-vxworks.h.
+	(sparc_vxworks_exec_plt0_entry, sparc_vxworks_exec_plt_entry): New.
+	(sparc_vxworks_shared_plt0_entry, sparc_vxworks_shared_plt_entry): New.
+	(_bfd_sparc_elf_link_hash_table_create): Don't initialize
+	build_plt_entry here.
+	(create_got_section): Initialize sgotplt for VxWorks.
+	(_bfd_sparc_elf_create_dynamic_sections): Initialize build_plt_entry,
+	plt_header_size and plt_entry_size, with new VxWorks-specific settings.
+	Call elf_vxworks_create_dynamic_sections for VxWorks.
+	(allocate_dynrelocs): Use plt_header_size and plt_entry_size.
+	Allocate room for .got.plt and .rela.plt.unloaded entries on VxWorks.
+	(_bfd_sparc_elf_size_dynamic_sections): Don't allocate a nop in .plt
+	for VxWorks.  Check for the .got.plt section.
+	(sparc_vxworks_build_plt_entry): New function.
+	(_bfd_sparc_elf_finish_dynamic_symbol): Add handling of VxWorks PLTs.
+	Don't make _GLOBAL_OFFSET_TABLE_ and _PROCEDURE_LINKAGE_TABLE_
+	absolute on VxWorks.
+	(sparc32_finish_dyn): Add special handling for DT_RELASZ
+	and DT_PLTGOT on VxWorks.
+	(sparc_vxworks_finish_exec_plt): New.
+	(sparc_vxworks_finish_shared_plt): New.
+	(_bfd_sparc_elf_finish_dynamic_sections): Call them.
+	Use plt_header_size and plt_entry_size.
+	* elfxx-sparc.h (_bfd_sparc_elf_link_hash_table): Add is_vxworks,
+	srelplt2, sgotplt, plt_header_size and plt_entry_size fields.
+	* Makefile.am (elfxx-sparc.lo): Depend on elf-vxworks.h.
+	(elf32-sparc.lo): Likewise.
+	* Makefile.in: Regenerate.
+	* targets.c (bfd_elf32_sparc_vxworks_vec): Declare.
+	(_bfd_target_vector): Add a pointer to it.
 
-2005-08-25  Kaz Kojima  <kkojima at rr.iij4u.or.jp>
+2006-03-30  Ben Elliston  <bje at au.ibm.com>
 
-	* elf32-sh.c (sh_elf_get_flags_from_mach): Fix off-by-one error.
+	PR ld/2267
+	* elflink.c (elf_fixup_link_order): Ensure `elfsec' is not a
+	special section number that exceeds the number of ELF sections
+	(eg. SHN_MIPS_SCOMMON).
 
-2005-08-24  H.J. Lu  <hongjiu.lu at intel.com>
+2006-03-27  Richard Sandiford  <richard at codesourcery.com>
 
-	PR ld/1208
-	* elf-hppa.h (elf_hppa_relocate_section): Print out the name
-	of unresolvable relocation.
-	* elf-m10300.c (mn10300_elf_relocate_section): Likewise.
-	* elf32-arm.c (elf32_arm_relocate_section): Likewise.
-	* elf32-i386.c (elf_i386_relocate_section): Likewise.
-	* elf32-m32r.c (m32r_elf_relocate_section): Likewise.
-	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
-	* elf32-s390.c (elf_s390_relocate_section): Likewise.
-	* elf32-sh.c (sh_elf_relocate_section): Likewise.
-	* elf32-xtensa.c (elf_xtensa_relocate_section): Likewise.
-	* elf64-s390.c (elf_s390_relocate_section): Likewise.
-	* elf64-sh64.c (sh_elf64_relocate_section): Likewise.
-	* elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise.
-	* elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Likewise.
+	* elfxx-mips.c (mips_got_entry): Add more commentary.
+	(mips_elf_local_got_index): Use the hash table entry to record
+	the GOT index of forced-local symbols.
+	(mips_elf_initialize_tls_index): Rearrange code.  Store the index
+	in either the hash table entry or the mips_got_entry, not both.
+	Add more commentary.
+	(mips_elf_multi_got): Make sure the g->next is nonnull when calling
+	mips_elf_initialize_tls_index.
 
-2005-08-18  Kaz Kojima  <kkojima at rr.iij4u.or.jp>
+2006-03-25  Bernd Schmidt  <bernd.schmidt at analog.com>
 
-	* config.bfd: Add bfd_elf32_shnbsd_vec and bfd_elf32_shlnbsd_vec
-	to targ_selvecs for sh5*-*-netbsd* and sh64*-*-netbsd*.
+	* elf32-bfin.c (bfd_const_reloc, bfd_oper_reloc, bfin_push_reloc,
+	RELOC_STACK_SIZE, reloc_stack, reloc_stack_tos, is_reloc_stack_empty,
+	reloc_stack_push, reloc_stack_pop, reloc_stack_operate,
+	bfin_areloc_howto_table): Delete.  All
+	uses deleted as well.
+	(bfin_reloc_map): Delete all stack relocs.
+	(bfin_info_to_howto, bfin_bfd_reloc_type_lookup,
+	bfin_reloc_type_lookup): Don't support them.
+	(bfin_relocate_section): Don't try to handle them.
 
-2005-08-18  Alan Modra  <amodra at bigpond.net.au>
-
-	* coff-a29k.c: Delete.
-	* cpu-a29k.c: Delete.
-	* Makefile.am: Remove mention of a29k files.
-	* aoutf1.h: Remove a29k support.
-	* aoutx.h: Likewise.
-	* archures.c: Likewise.
-	* coffcode.h: Likewise.
-	* config.bfd: Likewise.
+	* config.bfd (bfin-*-*): Add bfd_elf32_bfinfdpic_vec.
 	* configure.in: Likewise.
-	* ieee.c: Likewise.
-	* mipsbsd.c: Likewise.
-	* pdp11.c: Likewise.
-	* sparclynx.c: Likewise.
-	* targets.c: Likewise.
-	* Makefile.in: Regenerate.
 	* configure: Regenerate.
+	* elf32-bfin.c: Include "elf/dwarf2.h" and "hashtab.h".
+	(BFIN_RELOC_MAX): Now 0x21.
+	(bfin_howto_table, bfin_reloc_map): Add FD-PIC relocs.
+	(bfd_elf32_bfinfdpic_vec): Declare.
+	(IS_FDPIC): New macro.
+	(struct bfinfdpic_elf_link_hash_table): New struct.
+	(bfinfdpic_hash_table, bfinfdpic_got_section,
+	bfinfdpic_gotrel_section, bfinfdpic_gotfixup_section,
+	bfinfdpic_plt_setion, bfinfdpic_pltrel_section,
+	bfinfdpic_relocs_info, bfinfdpic_got_initial_offset,
+	bfinfdpic_plt_initial_offset): Accessor macros for it.
+	(BFINFDPIC_SYM_LOCAL, BFINFDPIC_FUNCDESC_LOCAL): New macros.
+	(struct bfinfdpic_relocs_info): New struct.
+	(LZPLT_RESOLVER_EXTRA, LZPLT_NORMAL_SIZE, LZPLT_ENTRIES,
+	BFINFDPIC_LZPLT_BLOCK_SIZE, BFINFDPIC_LZPLT_RESOLV_LOC,
+	DEFAULT_STACK_SIZE): New macros.
+	(bfinfdpic_elf_link_hash_table_create, bfinfdpic_relocs_info_hash,
+	bfinfdpic_relocs_info_eq, bfinfdpics_relocs_info_find,
+	bfinfdpic_relocs_info_for_global, bfinfdpic_relocs_info_for_local,
+	bfinfdpic_pic_merge_early_relocs_info, _bfinfdpic_add_dyn_reloc,
+	_bfinfdpic_add_rofixup, _bfinfdpic_osec_to_segment,
+	_bfinfdpic_osec_readonly_p, bfinfdpic_relocate_section,
+	bfinfdpic_check_relocs, bfinfdpic_gc_sweep_hook,
+	_bfinfdpic_link_omit_section_dynsym, _bfin_create_got_section,
+	elf32_bfinfdpic_create_dynamic_sections, _bfinfdpic_get_fd_entry,
+	_bfinfdpic_compute_got_alloc_data, _bfinfdpic_get_got_entry,
+	_bfinfdpic_assign_got_entries, _bfinfdpic_assign_plt_entries,
+	_bfinfdpic_resolve_final_relocs_info,
+	elf32_bfinfdpic_size_dynamic_sections,
+	elf32_bfinfdpic_always_size_sections,
+	elf32_bfinfdpic_modify_segment_map,
+	_bfinfdpic_count_got_plt_entries,
+	elf32_bfinfdpic_finish_dynamic_sections,
+	elf32_bfinfdpic_adjust_dynamic_symbol,
+	elf32_bfinfdpic_finish_dynamic_symbol,
+	elf32_bfinfdpic_elf_use_relative_eh_frame,
+	elf32_bfinfdpic_elf_encode_eh_address,
+	elf32_bfin_object_p, bfin_elf_copy_private_bfd_data,
+	elf32_bfinfdpic_copy_private_bfd_data,
+	(struct _bfinfdpic_dynamic_got_info,
+	struct _bfinfdpic_dynamic_got_plt_info): New structs.
+	(elf32_bfin_print_private_bfd_data): Print PIC flags.
+	(elf32_bfin_merge_private_bfd_data): Extend to support FD-PIC.
+	(TARGET_LITTLE_SYM, TARGET_LITTLE_NAME, elf32_bed,
+	elf_backend_got_header_size, bfd_elf32_bfd_link_hash_table_create,
+	elf_backend_always_size_sectinos, elf_backend_modify_segment_map,
+	bfd_elf32_bfd_copy_private_bfd_data,
+	elf_backend_create_dynamic_sections, elf_backend_adjust_dynamic_symbol,
+	elf_backend_size_dynamic_sections, elf_backend_finish_dynamic_symbol,
+	elf_backend_finish_dynamic_sections, elf_backend_relocate_section,
+	elf_backend_can_make_relative_eh_frame, elf_backend_check_relocs,
+	elf_backend_can_make_ldsa_relative_eh_frame, elf_backend_may_use_rel_p,
+	elf_backend_may_use_rela_p, elf_backend_default_use_rela_p,
+	elf_backend_omit_section_dynsym): Redefine these macros and include
+	"elf32-target.h" again to create the elf32-bfinfdpic target.
+	* reloc.c (BFD_RELOC_BFIN_GOT17M4, BFD_RELOC_BFIN_GOTHI,
+	BFD_RELOC_BFIN_GOTLO, BFD_RELOC_BFIN_FUNCDESC,
+	BFD_RELOC_BFIN_FUNCDESC_GOT17M4, BFD_RELOC_BFIN_FUNCDESC_GOTHI,
+	BFD_RELOC_BFIN_FUNCDESC_GOTLO, BFD_RELOC_BFIN_FUNCDESC_VALUE,
+	BFD_RELOC_BFIN_FUNCDESC_GOTOFF17M4, BFD_RELOC_BFIN_FUNCDESC_GOTOFFHI,
+	BFD_RELOC_BFIN_FUNCDESC_GOTOFFLO, BFD_RELOC_BFIN_GOTOFFHI,
+	BFD_RELOC_BFIN_GOTOFFLO): New.
+	* targets.c (bfd_elf32_bfinfdpic_vec): New bfd_target.
+	(_bfd_target_vector): Add it.
 	* bfd-in2.h: Regenerate.
-	* po/SRC-POTFILES.in: Regenerate.
-
-2005-08-18  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf-m10300.c (_bfd_mn10300_elf_adjust_dynamic_symbol): Warn on
-	zero size dynamic variables.
-	* elf32-arm.c (elf32_arm_adjust_dynamic_symbol): Likewise.
-	* elf32-cris.c (elf_cris_adjust_dynamic_symbol): Likewise.
-	* elf32-hppa.c (elf32_hppa_adjust_dynamic_symbol): Likewise.
-	* elf32-i370.c (i370_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Likewise.
-	* elf32-m32r.c (m32r_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
-	* elf32-sh.c (sh_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-vax.c (elf_vax_adjust_dynamic_symbol): Likewise.
-	* elf64-ppc.c (ppc64_elf_adjust_dynamic_symbol): Likewise.
-	* elf64-s390.c (elf_s390_adjust_dynamic_symbol): Likewise.
-	* elf64-sh64.c (sh64_elf64_adjust_dynamic_symbol): Likewise.
-	* elf64-x86-64.c (elf64_x86_64_adjust_dynamic_symbol): Likewise.
-	* elfxx-sparc.c (_bfd_sparc_elf_adjust_dynamic_symbol): Likewise.
-
-2005-08-17  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR binutils/1179
-	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Use section lma
-	instead of vma.
-	(_bfd_dwarf2_find_line): Likewise.
-
-2005-08-17  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-mmix.c (mmix_elf_add_symbol_hook): Mark reg section
-	SEC_LINKER_CREATED.
-	(mmix_elf_final_link): Check that section hasn't already been
-	removed before removing.
-	* mmo.c (mmo_scan): Mark reg contents section SEC_LINKER_CREATED.
-	(mmo_canonicalize_symtab): Likewise for reg section.
-
-2005-08-17  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-cris.c (elf_cris_adjust_gotplt_to_got): Move assert later.
-	* elfxx-mips.c (_bfd_mips_elf_hide_symbol): Cope with being called
-	without any got section.
-
-2005-08-17  Danny Smith  <dannysmith at users.sourceforge.net>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section): Correct
-	comment.
-
-2005-08-17  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (_bfd_elf_define_linkage_sym): Don't call
-	bfd_elf_link_record_dynamic_symbol.  Call elf_backend_hide_symbol.
-	(_bfd_elf_link_renumber_dynsyms): Formatting.
-	(struct elf_gc_sweep_symbol_info): New.
-	(elf_gc_sweep_symbol): Rewrite.
-	(elf_gc_sweep): Adjust params and elf_gc_sweep_symbol call.
-	Call _bfd_elf_link_renumber_dynsyms.
-	(bfd_elf_gc_sections): Adjust elf_gc_sweep call.
-
-2005-08-16  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (ppc64_elf_edit_opd): Don't call dec_dynrel_count
-	when relocatable.
-
-2005-08-15  Bob Wilson  <bob.wilson at acm.org>
-
-	* elf32-xtensa.c (ELF_MACHINE_CODE, ELF_MACHINE_ALT1): Swap values
-	of EM_XTENSA and EM_XTENSA_OLD.
-
-2005-08-16  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf-bfd.h (_bfd_elf_define_linkage_sym): Declare.
-	* elflink.c (_bfd_elf_define_linkage_sym): New function, extracted
-	from..
-	(_bfd_elf_create_got_section): ..here.
-	(_bfd_elf_link_create_dynamic_sections): Call it for _DYNAMIC.
-	(_bfd_elf_create_dynamic_sections): ..and _PROCEDURE_LINKAGE_TABLE_.
-	* elf-m10300.c (_bfd_mn10300_elf_create_got_section): Use
-	_bfd_elf_define_linkage_sym.
-	* elf32-frv.c (_frv_create_got_section): Likewise.
-	* elf64-alpha.c (elf64_alpha_create_dynamic_sections): Likewise.
-
-2005-08-15  Paul Brook  <paul at codesourcery.com>
-
-	* elf32-arm.c (elf32_arm_howto_table_1): Make R_ARM_PLT32 the same as
-	R_ARM_PC24.
-
-2005-08-13  John David Anglin  <dave.anglin at nrc-cnrc.gc.ca>
-
-	PR ld/1135
-	* elf64-hppa.c (elf64_hppa_special_sections): Add flag definitions for
-	.plt, .dlt, .sdata, .sbss and .tbss.
-
-2005-08-12  Dmitry Diky  <diwil at spec.ru>
-
-	* elf32-msp430.c (msp430_elf_relax_delete_bytes): Adjust relocations
-	referenced by .section + DISPLACEMENT.
-
-2005-08-10  James E. Wilson  <wilson at specifix.com>
-
-	* dwarf2.c (scan_unit_for_symbols, case DT_AT_location): Verify that
-	DW_OP_addr is only opcode in location before using it.
-
-2005-08-09  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elfxx-ia64.c (elfNN_ia64_final_link): Reset gp.
-
-2005-08-09  Rodney Brown  <rbrown at bravurasolutions.com.au>
-	    Nick Clifton  <nickc at redhat.com>
-
-	* aix5ppc-core.c (xcoff64_core_p): Constify return_value
-	variable.  Also, do not use core_hdr macro as it evaluates to a
-	cast of an lvalue which is no longer supported by GCC 4.0.
-
-2005-08-08  Eric Dönges <Eric.Doenges at betty-tv.com>
-
-	* archures.c (bfd_mach_msp21): New MSP430 machine number.
-	* bfd-in2.h: Regenerate.
-	* cpu-msp430.c (arch_info_struct): Add support for msp430x21xx
-	variants.
-
-2005-08-07  Nick Clifton  <nickc at redhat.com>
-	    Paul Brook  <paul at codesourcery.com>
-
-	PR 1147
-	* elf32-arm.c (bfd_elf32_close_and_cleanup): Define.
-	(elf32_arm_close_and_cleanup): New function - walk over the
-	sections in the bfd that is being closed removing them from the
-	list of recorded sections.
-	(unrecord_section_via_map_over_sections): New helper function.
-	(record_section_with_arm_elf_section_data): Call bfd_malloc
-	instead of bfd_alloc.  Remove unneeded abfd parameter.
-	(elf32_arm_new_section_hook): Do not pass bfd to
-	record_section_with_arm_elf_section_data.
-
-	* elfxx-target.h (bfd_elfNN_close_and_cleanup): Only define if not
-	already defined by the target.
-
-2005-08-05  Fred Fish  <fnf at specifix.com>
-
-	* dwarf2.c (read_rangelist): Use addr_size instead of offset_size
-	to determine how many bytes to read from each rangelist entry.
-
-2005-08-05  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* bfd.c (bfd_hide_symbol): New.
-	* bfd-in2.h: Regenerated.
-
-2005-08-04  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf64-x86-64.c (elf64_x86_64_merge_symbol): When mixing a
-	large common symbol and a normal common symbol, always turn
-	the large common symbol into a normal one.
-
-2005-08-04  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (struct elf_linker_section): Replace sym_val field
-	with sym.
-	(ppc_elf_relocate_section): Adjust for above.
-	(create_sdata_sym): New function.
-	(ppc_elf_create_linker_section): Call it.
-	(ppc_elf_check_relocs): Correct has_sda_refs and non_got_refs.
-	Create sdata syms for all SDA relocs.
-	(ppc_elf_adjust_dynamic_symbol): Don't special case _SDA_BASE_
-	and _SDA2_BASE_.
-	(ppc_elf_set_sdata_syms): Delete.
-	* elflink.c (bfd_elf_size_dynamic_sections): Don't create DT_INIT
-	and DT_FINI tags unless associated section has input.
-	(bfd_elf_set_symbol, _bfd_elf_provide_symbol): Delete.
-	(_bfd_elf_provide_section_bound_symbols): Delete.
-	* bfd-in.h (_bfd_elf_provide_symbol): Delete.
-	(_bfd_elf_provide_section_bound_symbols): Delete.
-	* bfd-in2.h: Regenerate.
-
-2005-08-04  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (fix_syms, _bfd_elf_fix_excluded_sec_syms): Move to..
-	* linker.c (fix_syms, _bfd_fix_excluded_sec_syms): ..here.
-	* bfd-in.h (_bfd_fix_excluded_sec_syms): Rename.
-	* bfd-in2.h: Regenerate.
-
-2005-08-03  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elfxx-ia64.c (elfNN_ia64_relax_section): Resize .rela.got
-	only if it isn't NULL.
-
-2005-08-03  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf32-i386.c (elf_howto_table): Undo the overflow change for
-	R_386_PC16 made on 2005-07-18.
-
-	* elf64-x86-64.c (x86_64_elf_howto_table): Undo the overflow
-	change for R_X86_64_PC16 made on 2005-07-18.
-
-2005-08-03  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (struct ppc_elf_link_hash_table): Remove hgot.  Use
-	elf.hgot throughout file.
-
-2005-08-03  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Correct value of
-	_GLOBAL_OFFSET_TABLE_ for > 32k GOT.
-
-2005-08-02  Andreas Schwab  <schwab at suse.de>
-
-	* elfxx-ia64.c (struct elfNN_ia64_allocate_data): Add only_got.
-	(elfNN_ia64_relax_section): Reallocate .rela.got when .got has
-	changed.
-	(allocate_dynrel_entries): Look only at GOT relocations when
-	only_got is true.
-	(elfNN_ia64_size_dynamic_sections): Set only_got to false before
-	calling allocate_dynrel_entries.
-
-2005-08-02  Nick Clifton  <nickc at redhat.com>
-
-	PR 1147
-	* elf32-arm.c (struct _arm_elf_section_data): Turn into a typedef
-	and make the mapcount field unsigned.
-	(struct section_list): New: Used to keep track of which sections
-	have an _arm_elf_section_data structure.
-	(record_section_with_arm_elf_section_data): New function.
-	(get_arm_elf_section_data): New function.
-	(unrecord_section_with_arm_elf_section_data): New function.
-	(elf32_arm_output_symbol_hook): Use get_arm_elf_section_data.
-	(elf32_arm_new_section_hook): Call
-	record_section_with_arm_elf_section_data.
-	(elf32_arm_write_section): Use get_arm_elf_section_data and
-	unrecord_section_with_arm_elf_section_data.
-
-2005-08-01  Richard Sandiford  <richard at codesourcery.com>
-
-	* elfxx-mips.c (mips_mach_extends_p): Treat MIPS64 as an extension
-	of MIPS32 and MIPS64r2 as an extension of MIPS32r2.
-
-2005-07-30  David Daney  <ddaney at avtrex.com>
-
-	* elflink.c (elf_gc_sweep):  Set dynsymcount to correct value.
-
-2005-07-29  David Daney  <ddaney at avtrex.com>
-
-	* elfxx-mips.c (_bfd_mips_elf_add_symbol_hook):  Ignore _gp_disp
-	if it is in the *ABS* section.
-
-2005-07-29  Paul Brook  <paul at codesourcery.com>
-
-	* reloc.c: Add BFD_RELOC_ARM_T32_ADD_PC12.
-	* bfd-in2.h: Regenerate.
 	* libbfd.h: Regenerate.
 
-2005-07-29  Paul Brook  <paul at codesourcery.com>
+2006-03-25  Richard Sandiford  <richard at codesourcery.com>
 
-	* reloc.c (BFD_RELOC_ARM_T32_IMM12): Add.
-	* bfd-in2.h: Regeenrate.
-	* libbfd.h: Regenerate.
+	* cpu-m68k.c (bfd_m68k_compatible): Treat ISA A+ and ISA B code as
+	incompatible.  Likewise MAC and EMAC code.
+	* elf32-m68k.c (elf32_m68k_merge_private_bfd_data): Use
+	bfd_get_compatible to set the new bfd architecture.  Rely on it
+	to detect incompatibilities.
 
-2005-07-29  Pavel Kankovsky  <peak at argo.troja.mff.cuni.cz>
+2006-03-22  Bob Wilson  <bob.wilson at acm.org>
 
-	* peXXigen.c (pe_print_edata): Compute the size of the export
-	table from the size field in the DataDictionary and not the size
-	of the section.  Some linkers embed the export table inside a
-	larger section.
+	* elf32-xtensa.c (xtensa_read_table_entries): Remove assertion that
+	rel->r_addend is zero.
 
-2005-07-29  Alan Modra  <amodra at bigpond.net.au>
+2006-03-22  Richard Sandiford  <richard at codesourcery.com>
 
-	* elf-bfd.h (struct elf_backend_data): Add action_discarded.
-	(enum action_discarded): Move from..
-	* elflink.c (enum action_discarded): ..here.
-	(_bfd_elf_default_action_discarded): Rename from elf_action_discarded.
-	Remove target specific section checks.
-	(elf_link_input_bfd): Adjust.
-	* elfxx-target.h (elf_backend_action_discarded): Define.
-	(elfNN_bed): Init new field.
-	* bfd-in.h (_bfd_elf_default_action_discarded): Declare.
-	* bfd-in2.h: Regenerate.
-	* elf-hppa.h (elf_hppa_action_discarded): New function.
-	* elf32-hppa.c (elf_backend_action_discarded): Define.
-	* elf64-hppa.c (elf_backend_action_discarded): Define.
-	* elf32-ppc.c (ppc_elf_action_discarded): New function.
-	(elf_backend_action_discarded): Define.
+	* elfxx-mips.c (_bfd_mips_vxworks_finish_dynamic_symbol): Fix type
+	of "loc".
 
-2005-07-27  Alan Modra  <amodra at bigpond.net.au>
+2006-03-22  Richard Sandiford  <richard at codesourcery.com>
+	    Daniel Jacobowitz  <dan at codesourcery.com>
+	    Phil Edwards  <phil at codesourcery.com>
+	    Zack Weinberg  <zack at codesourcery.com>
+	    Mark Mitchell  <mark at codesourcery.com>
+	    Nathan Sidwell  <nathan at codesourcery.com>
 
-	* elflink.c (fix_syms): Handle symbols defined in input sections.
-
-2005-07-27  Jan Beulich  <jbeulich at novell.com>
-
-	* elf64-x86-64.c (R_X86_64_standard, R_X86_64_vt_offset): New.
-	(elf64_x86_64_info_to_howto): Use them.
-
-2005-07-27  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (_bfd_elf_merge_symbol): Skip weak redefinition
-	regardless of strength of previous definition.
-
-2005-07-26  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (elf_gc_mark_dynamic_ref_symbol): Handle -shared.
-	(bfd_elf_gc_sections): Allow -gc-sections when -shared.
-	* elf32-ppc.c (ppc_elf_gc_sweep_hook): Correct for -shared.
-
-2005-07-26  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (elf_gc_sweep): Move gcc_except_table code..
-	(bfd_elf_gc_sections): ..to here.
-
-2005-07-25  DJ Delorie  <dj at redhat.com>
-
-	* reloc.c: Remove unused M32C relocs, add BFD_RELOC_M32C_HI8.
-	* libbfd.h: Regenerate.
 	* bfd-in2.h: Regenerate.
-
-	* elf32-m32c.c (m32c_elf_howto_table): Add R_M32C_8, R_M32C_LO16,
-	R_M32C_HI8, R_M32C_HI16.
-	(m32c_reloc_map): Likewise.
-	(m32c_elf_relocate_section): Add R_M32C_HI8 and R_M32C_HI16.
-
-2005-07-25  Jan Hubicka  <jh at suse.cz>
-	    H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf-bfd.h (_bfd_elf_large_com_section): New.
-	* elf.c (_bfd_elf_large_com_section): New. Defined.
-
-	* elf64-x86-64.c (elf64_x86_64_add_symbol_hook): New.
-	(elf64_x86_64_elf_section_from_bfd_section): New.
-	(elf64_x86_64_symbol_processing): New.
-	(elf64_x86_64_common_definition): New.
-	(elf64_x86_64_common_section_index): New.
-	(elf64_x86_64_common_section): New.
-	(elf64_x86_64_merge_symbol): New.
-	(elf64_x86_64_additional_program_headers): New.
-	(elf64_x86_64_special_sections): New.
-	(elf_backend_section_from_bfd_section): New. Defined.
+	* config.bfd (mips*-*-vxworks*, mips*el-*-vxworks*): New stanzas.
+	* configure.in (bfd_elf32_bigmips_vxworks_vec): New stanza.
+	(bfd_elf32_littlemips_vxworks_vec): Likewise.
+	(bfd_elf32_bigmips_vec): Add elf-vxworks.lo.
+	(bfd_elf32_littlemips_vec): Likewise.
+	(bfd_elf32_nbigmips_vec): Likewise.
+	(bfd_elf32_nlittlemips_vec): Likewise.
+	(bfd_elf32_ntradbigmips_vec): Likewise.
+	(bfd_elf32_ntradlittlemips_vec): Likewise.
+	(bfd_elf32_tradbigmips_vec): Likewise.
+	(bfd_elf32_tradlittlemips_vec): Likewise.
+	(bfd_elf64_bigmips_vec): Likewise.
+	(bfd_elf64_littlemips_vec): Likewise.
+	(bfd_elf64_tradbigmips_vec): Likewise.
+	(bfd_elf64_tradlittlemips_vec): Likewise.
+	* elf32-mips.c: Include elf-vxworks.h.
+	(mips_info_to_howto_rel): Use elf_backend_mips_rtype_to_howto
+	instead of calling mips_elf32_rtype_to_howto directly.
+	(mips_vxworks_copy_howto_rela): New reloc howto.
+	(mips_vxworks_jump_slot_howto_rela): Likewise.
+	(mips_vxworks_bfd_reloc_type_lookup): New function.
+	(mips_vxworks_rtype_to_howto): Likewise.
+	(mips_vxworks_final_write_processing): Likewise.
+	(TARGET_LITTLE_SYM, TARGET_LITTLE_NAME): Override for VxWorks.
+	(TARGET_BIG_SYM, TARGET_BIG_NAME, elf_bed, ELF_MAXPAGESIZE): Likewise.
+	(elf_backend_want_got_plt): Likewise.
+	(elf_backend_want_plt_sym): Likewise.
+	(elf_backend_got_symbol_offset): Likewise.
+	(elf_backend_want_dynbss): Likewise.
+	(elf_backend_may_use_rel_p): Likewise.
+	(elf_backend_may_use_rela_p): Likewise.
+	(elf_backend_default_use_rela_p): Likewise.
+	(elf_backend_got_header_size: Likewise.
+	(elf_backend_plt_readonly): Likewise.
+	(bfd_elf32_bfd_reloc_type_lookup): Likewise.
+	(elf_backend_mips_rtype_to_howto): Likewise.
+	(elf_backend_adjust_dynamic_symbol): Likewise.
+	(elf_backend_finish_dynamic_symbol): Likewise.
+	(bfd_elf32_bfd_link_hash_table_create): Likewise.
 	(elf_backend_add_symbol_hook): Likewise.
-	(elf_backend_common_section_index): Likewise.
-	(elf_backend_common_section): Likewise.
-	(elf_backend_common_definition): Likewise.
-	(elf_backend_merge_symbol): Likewise.
-	(elf_backend_special_sections): Likewise.
+	(elf_backend_link_output_symbol_hook): Likewise.
+	(elf_backend_emit_relocs): Likewise.
+	(elf_backend_final_write_processing: Likewise.
 	(elf_backend_additional_program_headers): Likewise.
-
-2005-07-25  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf-bfd.h (elf_backend_data): Add common_definition,
-	common_section_index, common_section, and merge_symbol.
-	(_bfd_elf_common_definition): New.
-	(_bfd_elf_common_section_index): New.
-	(_bfd_elf_common_section): New.
-
-	* elf.c (elf_fake_sections): Don't clear sh_flags.
-
-	* elflink.c (_bfd_elf_merge_symbol): Call backend merge_symbol
-	if it is available.
-	(is_global_data_symbol_definition): Call backend
-	common_definition instead of checking SHN_COMMON.
-	(elf_link_add_object_symbols): Likewise.
-	(elf_link_output_extsym): Call backend common_section_index
-	for common section index.
-	(_bfd_elf_common_definition): New.
-	(_bfd_elf_common_section_index): New.
-	(_bfd_elf_common_section): New.
-
-	* elfxx-target.h (elf_backend_common_definition): New.
-	(elf_backend_common_section_index): New.
-	(elf_backend_common_section): New.
-	(elf_backend_merge_symbol): New.
-	(elfNN_bed): Initialize common_definition, common_section_index,
-	common_section, and merge_symbol.
-
-	* section.c (BFD_FAKE_SECTION): New.
-	(STD_SECTION): Use it.
-	* bfd-in2.h: Regenerated.
-
-2005-07-23  Olaf Hering <olh at suse.de>
-
-	* elflink.c (elf_link_input_bfd): Add '\n' for linker einfo
-	callback.
-
-2005-07-21  Ralf Corsepius  <ralf.corsepius at rtems.org>
-
-	* config.bfd: Remove i[3-7]86-*-rtemself*.
-	Remove sparc-*-rtemself*.
-
-2005-07-22  Kazuhiro Inaoka <inaoka.kazuhiro at renesas.com>
-
-	* elf32-m32r.c (m32r_elf_check_relocs): Fix pc count for
-	R_M32R_REL32.
-
-2005-07-21  Ben Elliston  <bje at gnu.org>
-
-	* Makefile.am (BFD32_BACKENDS): Remove cf-m68klynx.lo.
-	(BFD32_BACKENDS): Likewise, remove m68klynx.lo.
-	(BFD32_BACKENDS_CFILES): Remove cf-m68klynx.c, m68klynx.c.
-	(cf-m68klynx.lo, m68klynx.lo): Remove targets.
-	* Makefile.in: Regenerate.
-	* cf-m68klynx.c: Remove.
-	* m68klynx.c: Likewise.
-	* configure.in (m68klynx_aout_vec): Remove vector.
-	(m68klynx_coff_vec): Likewise.
-	* configure: Regenerate.
-	* targets.c (m68klynx_aout_vec): Remove extern.
-	(m68klynx_coff_vec): Likewise.
-	(_bfd_target_vector): Remove m68klynx_{aout,coff}_vec.
-	* po/SRC-POTFILES.in: Remove cf-m68klynx.c, m68klynx.c.
-
-2005-07-20  Kazuhiro Inaoka  <inaoka.kazuhiro at renesas.com>
-
-	* elf32-m32r.c (m32r_elf_howto_table): Support R_M32R_REL32.
-	(m32r_reloc_map): Likewise.
-	(m32r_elf_relocate_section): Likewise.
-	(m32r_elf_gc_sweep_hook): Likewise.
-	(m32r_elf_check_relocs): Likewise.
-
-2005-07-18  Nick Clifton  <nickc at redhat.com>
-
-	* reloc.c: Add M32C and MS1 relocs.
-	* bfd-in2.h: Regenerate.
+	(elf_backend_modify_segment_map): Likewise.
+	(elf_backend_symbol_processing): Likewise.
+	* elfxx-mips.c: Include elf-vxworks.h.
+	(mips_elf_link_hash_entry): Add is_relocation_target and
+	is_branch_target fields.
+	(mips_elf_link_hash_table): Add is_vxworks, srelbss, sdynbss, srelplt,
+	srelplt2, sgotplt, splt, plt_header_size and plt_entry_size fields.
+	(MIPS_ELF_RELA_SIZE, MIPS_ELF_REL_DYN_NAME): New macros.
+	(MIPS_RESERVED_GOTNO): Take a mips_elf_link_hash_table argument.
+	Return 3 for VxWorks.
+	(ELF_MIPS_GP_OFFSET): Change the argument from a bfd to a
+	mips_elf_link_hash_table.  Return 0 for VxWorks.
+	(MIPS_ELF_GOT_MAX_SIZE): Change the argument from a bfd to a
+	mips_elf_link_hash_table.  Update the call to ELF_MIPS_GP_OFFSET.
+	(mips_vxworks_exec_plt0_entry): New variable.
+	(mips_vxworks_exec_plt_entry): Likewise.
+	(mips_vxworks_shared_plt0_entry): Likewise.
+	(mips_vxworks_shared_plt_entry): Likewise.
+	(mips_elf_link_hash_newfunc): Initialize the new hash_entry fields.
+	(mips_elf_rel_dyn_section): Change the bfd argument to a
+	mips_elf_link_hash_table.  Use MIPS_ELF_REL_DYN_NAME to get
+	the name of the section.
+	(mips_elf_initialize_tls_slots): Update the call to
+	mips_elf_rel_dyn_section.
+	(mips_elf_gotplt_index): New function.
+	(mips_elf_local_got_index): Add an input_section argument.
+	Update the call to mips_elf_create_local_got_entry.
+	(mips_elf_got_page): Likewise.
+	(mips_elf_got16_entry): Likewise.
+	(mips_elf_create_local_got_entry): Add bfd_link_info and input_section
+	arguments.  Create dynamic relocations for each entry on VxWorks.
+	(mips_elf_merge_gots): Update the use of MIPS_ELF_GOT_MAX_SIZE.
+	(mips_elf_multi_got): Update the uses of MIPS_ELF_GOT_MAX_SIZE
+	and MIPS_RESERVED_GOTNO.
+	(mips_elf_create_got_section): Update the uses of
+	MIPS_ELF_GOT_MAX_SIZE.  Create .got.plt on VxWorks.
+	(is_gott_symbol): New function.
+	(mips_elf_calculate_relocation): Use a dynobj local variable.
+	Update the calls to mips_elf_local_got_index, mips_elf_got16_entry and
+	mips_elf_got_page_entry.  Set G to the .got.plt entry when calculating
+	VxWorks R_MIPS_CALL* relocations.  Calculate and use G for all GOT
+	relocations on VxWorks.  Add dynamic relocations for references
+	to the VxWorks __GOTT_BASE__ and __GOTT_INDEX__ symbols.  Don't
+	create dynamic relocations for R_MIPS_32, R_MIPS_REL32 or R_MIPS_64
+	in VxWorks executables.
+	(mips_elf_allocate_dynamic_relocations): Add a bfd_link_info argument.
+	Use MIPS_ELF_RELA_SIZE to calculate the size of a VxWorks entry.
+	Don't allocate a null entry on VxWorks.
+	(mips_elf_create_dynamic_relocation): Update the call to
+	mips_elf_rel_dyn_section.  Use absolute rather than relative
+	relocations for VxWorks, and make them RELA rather than REL.
+	(_bfd_mips_elf_create_dynamic_sections): Don't make .dynamic
+	read-only on VxWorks.  Update the call to mips_elf_rel_dyn_section.
+	Create the .plt, .rela.plt, .dynbss and .rela.bss sections on
+	VxWorks.  Likewise create the _PROCEDURE_LINKAGE_TABLE symbol.
+	Call elf_vxworks_create_dynamic_sections for VxWorks and
+	initialize the plt_header_size and plt_entry_size fields.
+	(_bfd_mips_elf_check_relocs): Don't allow GOT relocations to be
+	used in VxWorks executables.  Don't allocate dynamic relocations
+	for R_MIPS_32, R_MIPS_REL32 or R_MIPS_64 in VxWorks executables.
+	Set is_relocation_target for each symbol referenced by a relocation.
+	Allocate .rela.dyn entries for relocations against the special
+	VxWorks __GOTT_BASE__ and __GOTT_INDEX__ symbols.  Create GOT
+	entries for all VxWorks R_MIPS_GOT16 relocations.  Don't allocate
+	a global GOT entry for symbols mentioned in VxWorks R_MIPS_CALL*,
+	R_MIPS_32, R_MIPS_REL32 or R_MIPS_64 relocations.  Update the calls
+	to mips_elf_rel_dyn_section and mips_elf_allocate_dynamic_relocations.
+	Set is_branch_target for symbols mentioned in R_MIPS_PC16 or R_MIPS_26
+	relocations.  Don't set no_fn_stub on VxWorks.
+	(_bfd_mips_elf_adjust_dynamic_symbol): Update the call to
+	mips_elf_allocate_dynamic_relocations.
+	(_bfd_mips_vxworks_adjust_dynamic_symbol): New function.
+	(_bfd_mips_elf_always_size_sections): Do not allocate GOT page
+	entries for VxWorks, and do not create multiple GOTs.
+	(_bfd_mips_elf_size_dynamic_sections): Use MIPS_ELF_REL_DYN_NAME.
+	Handle .got specially for VxWorks.  Update the uses of
+	MIPS_RESERVED_GOTNO and mips_elf_allocate_dynamic_relocations.
+	Check for sgotplt and splt.  Allocate the .rel(a).dyn contents last,
+	once its final size is known.  Set DF_TEXTREL for VxWorks.  Add
+	DT_RELA, DT_RELASZ, DT_RELAENT, DT_PLTREL, DT_PLTRELSZ and DT_JMPREL
+	tags on VxWorks.  Do not add the MIPS-specific tags for VxWorks.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): New function.
+	(mips_vxworks_finish_exec_plt): Likewise.
+	(mips_vxworks_finish_shared_plt): Likewise.
+	(_bfd_mips_elf_finish_dynamic_sections): Remove an unncessary call
+	to mips_elf_rel_dyn_section.  Use a VxWorks-specific value of
+	DT_PLTGOT.  Handle DT_RELA, DT_RELASZ, DT_RELAENT, DT_PLTREL,
+	DT_PLTRELSZ and DT_JMPREL.  Update the uses of MIPS_RESERVED_GOTNO
+	and mips_elf_rel_dyn_section.  Use a different GOT header for
+	VxWorks.  Don't sort .rela.dyn on VxWorks.  Finish the PLT on VxWorks.
+	(_bfd_mips_elf_link_hash_table_create): Initialize the new
+	mips_elf_link_hash_table fields.
+	(_bfd_mips_vxworks_link_hash_table_create): New function.
+	(_bfd_mips_elf_final_link): Set the GP value to _GLOBAL_OFFSET_TABLE_
+	on VxWorks.  Update the call to ELF_MIPS_GP_OFFSET.
+	* elfxx-mips.h (_bfd_mips_vxworks_adjust_dynamic_symbol): Declare.
+	(_bfd_mips_vxworks_finish_dynamic_symbol): Likewise.
+	(_bfd_mips_vxworks_link_hash_table_create): Likewise.
 	* libbfd.h: Regenerate.
-
-2005-07-18  Nick Clifton  <nickc at redhat.com>
-
-	* config.bfd: Move m32c entry to correct location.
-	* archures.c: Likewise.
-	* configure.in: Likewise.
-	* configure: Regenerate.
-	* targets.c: Move ms1 vector to correct location.
-
-2005-07-18  Jan Beulich  <jbeulich at novell.com>
-
-	* elf32-i386.c (elf_howto_table): Adjust overflow complaint handler
-	for R_386_PC16.
-	* elf64-x86-64.c (x86_64_elf_howto_table): Adjust overflow complaint
-	handler for R_X86_64_PC16, R_X86_64_8, and R_X86_64_DTPOFF.
-
-2005-07-16  Eric Botcazou  <ebotcazou at libertysurf.fr>
-
-	PR ld/1021
-	PR ld/1031
-	* elflink.c (elf_link_add_object_symbols): Also append the version
-	name to non-hidden absolute symbols that are functions.
-
-2005-07-16  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_set_sdata_syms): Return void.  Remove hack
-	for zero size sections.  Don't set .sbss syms here.
-	* elf32-ppc.h (ppc_elf_set_sdata_syms): Adjust prototype.
-
-2005-07-16  Alan Modra  <amodra at bigpond.net.au>
-
-	* Makefile.am: Run "make dep-am".
+	* Makefile.am (elfxx-mips.lo): Depend on elf-vxworks.h.
+	(elf32-mips.lo): Likewise.
 	* Makefile.in: Regenerate.
+	* reloc.c (BFD_RELOC_MIPS_COPY, BFD_RELOC_MIPS_JUMP_SLOT): Declare.
+	* targets.c (bfd_elf32_bigmips_vxworks_vec): Declare.
+	(bfd_elf32_littlemips_vxworks_vec): Likewise.
+	(_bfd_target_vector): Add entries for them.
 
-2005-07-15  Bob Wilson  <bob.wilson at acm.org>
+2006-03-19  John David Anglin  <dave.anglin at nrc-cnrc.gc.ca>
 
-	* elf32-xtensa.c (vsprint_msg): Add prototype.
-	(build_encoding_error_message): Delete.  Code moved into....
-	(elf_xtensa_do_reloc): ....here, and changed to give better
-	error messages for out of range literals.
+	* elf64-hppa.c (elf64_hppa_special_sections): Change flags for .tbss
+	section from SHF_PARISC_WEAKORDER to SHF_HP_TLS.
+	(elf_backend_special_sections): Remove #undef.
 
-2005-07-15  Alan Modra  <amodra at bigpond.net.au>
+2006-03-18  John David Anglin  <dave.anglin at nrc-cnrc.gc.ca>
 
-	* elflink.c (bfd_elf_record_link_assignment): Remove output_bfd param.
-	(_bfd_elf_provide_symbol): Allow redefinition of weak syms and those
-	defined in output sections.  Call bfd_elf_record_link_assignment.
-	* bfd-in.h (bfd_elf_record_link_assignment): Update prototype.
-	* bfd-in2.h: Regenerate.
+	* elf64-hppa.c (allocate_global_data_opd): Don't create an OPD entry
+	for undefined weak symbols.
 
-2005-07-14  Jim Blandy  <jimb at redhat.com>
+2006-03-17  Daniel Jacobowitz  <dan at codesourcery.com>
 
-	Add support for m32c-*-elf (Renesas m32c and m16c).
-	* Makefile.am (ALL_MACHINES): Add cpu-m32c.lo.
-	(ALL_MACHINES_CFILES): Add cpu-m32c.c.
-	(BFD32_BACKENDS): Add elf32-m32c.lo.
-	(BFD32_BACKENDS_CFILES): Add elf32-m32c.c.
-	(cpu-m32c.lo, elf32-m32c.lo): New rules, generated by 'make dep-am'.
-	* Makefile.in: Regenerated.
-	* archures.c (bfd_arch_m32c, bfd_mach_m16c, bfd_mach_m32c): New
-	arch and mach codes.
-	(bfd_m32c_arch): New arch info object.
-	(bfd_archures_list): List bfd_m32c_arch.
-	* bfd-in2.h: Regenerated.
-	* config.bfd: Add case for the m32c.
-	* configure.in: Add case for the m32c.
-	* configure: Regenerated.
-	* cpu-m32c.c, elf32-m32c.c: New files.
-	* libbfd.h: Regenerated.
-	* targets.c (bfd_elf32_m32c_vec): Declare.
-	(_bfd_target_vector): List bfd_elf32_m32c_vec.
+	PR ld/2462
+	* elflink.c (bfd_elf_final_link): Remove
+	bed->elf_backend_emit_relocs from emit_relocs.
 
-2005-07-14  Alan Modra  <amodra at bigpond.net.au>
+2006-03-17  Alexandre Oliva  <aoliva at redhat.com>
 
-	* bfd-in.h (_bfd_elf_fix_excluded_sec_syms): Declare.
-	(_bfd_elf_provide_section_bound_symbols): Remove param name.
-	Formatting.
-	* bfd-in2.h: Regenerate.
-	* elflink.c (bfd_elf_gc_sections): Don't call generic function.
-	(_bfd_elf_provide_symbol): Formatting.
-	(_bfd_elf_provide_section_bound_symbols): Remove all hacks, just
-	create section relative syms.
-	(fix_syms, _bfd_elf_fix_excluded_sec_syms): New functions.
-	* elf32-ppc.c (ppc_elf_set_sdata_syms): Use
-	_bfd_elf_provide_section_bound_symbols.
-	* reloc.c (bfd_mark_used_section): Delete.
-	(bfd_generic_gc_sections): Don't call the above.
+	* elf32-ppc.c (ppc_elf_relocate_section): Copy addend from
+	first relocation to the second when relaxing TLS GD to LE;
+	zero it out when relaxing to IE.
 
-2005-07-14  Paul Woegerer <paul.woegerer at nsc.com>
+2006-03-17  Alan Modra  <amodra at bigpond.net.au>
 
-	PR 1063
-	* cache.c (bfd_last_cache): Initialise to NULL.
+	PR 2434
+	* elflink.c (elf_link_add_object_symbols): Save and restore
+	warning sym's linked sym.
 
-2005-07-14  Daniel Marques  <marques at cs.cornell.edu>
-	    Nick Clifton  <nickc at redhat.com>
+2006-03-16  Alan Modra  <amodra at bigpond.net.au>
 
-	* coff-alpha.c (alpha_ecoff_bad_format_hook): Detect compressed
-	Alpha binaries and issue a helpful error message.
-	(alpha_ecoff_swap_reloc_out): Increase maximum allowed internal
-	symbol index to 15 to allow for binaries produced by DEC
-	compilers.
-
-2005-07-13  Steve Ellcey  <sje at cup.hp.com>
-
-	* bfd.m4 (BFD_NEED_DECLARATION): Remove.
-
-2005-07-12  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (ppc64_elf_relocate_section): Don't use a plt stub
-	when !can_plt_call.
-
-2005-07-12  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-xtensa.c (bfd_elf_xtensa_reloc): Warning fix.
-
-2005-07-12  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_set_sdata_syms): Correct __sbss_start value.
-
-2005-07-11  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elflink.c (_bfd_elf_symbol_refs_local_p): Revert the last
-	change.
-
-2005-07-08  Paul Koning  <pkoning at equallogic.com>
-
-	* dwarf2.c (read_address): Check sign_extend_vma to handle targets
-	where addresses are sign extended.
-
-2005-07-08  Ralf Corsepius <ralf.corsepius at rtems.org>
-
-	* config.bfd: Mark i960-*-rtems*, or32-*-rtems* as obsolete.
-	Mark a29k-*rtems*, hppa*-*-rtems*, *-go32-rtems*,
-	i[3-7]86*-*-rtemscoff*, mips*el-*-rtems*, powerpcle-*-rtems*,
-	sparc*-*-rtemsaout* as removed
-
-2005-07-08  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf-hppa.h (elf_hppa_final_link): Use gp val of zero when none
-	of the usual sections are found.
-	* elf-m10300.c (_bfd_mn10300_elf_size_dynamic_sections): Tidy.
-	Strip .dynbss if it is zero size.
-	* elf32-arm.c (elf32_arm_size_dynamic_sections): Likewise.
-	* elf32-cris.c (elf_cris_size_dynamic_sections): Likewise.
-	* elf32-hppa.c (elf32_hppa_size_dynamic_sections): Likewise.
-	* elf32-i370.c (i370_elf_size_dynamic_sections): Likewise, and
-	.dynsbss.
-	(i370_elf_finish_dynamic_sections): Don't attempt to write .got
-	when it is zero size.
-	* elf32-i386.c (elf_i386_size_dynamic_sections): Correct handling
-	of .dynbss and zero size sections.
-	* elf32-m32r.c (m32r_elf_size_dynamic_sections): Strip .dynbss if
-	it is zero size.
-	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Tidy.  Strip
-	.dynbss if zero size.
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Likewise, .dynsbss
-	too.
-	* elf32-s390.c (elf_s390_size_dynamic_sections): Likewise.
-	* elf32-sh.c (sh_elf_size_dynamic_sections): Likewise.
-	* elf32-vax.c (elf_vax_size_dynamic_sections): Likewise.
-	* elf32-xtensa.c (elf_xtensa_size_dynamic_sections): Tidy.  Strip
-	.plt.* and .got.plt.* if zero size.
-	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Tidy.  Strip
-	.got* and .dynbss if zero size.
-	* elf64-hppa.c (elf64_hppa_size_dynamic_sections): Tidy.  Strip
-	* elf64-ppc.c (create_linkage_sections): Create branch lookup table
-	in .data.rel.ro.brlt or .rodata.brlt, and similarly for associated
-	reloc section.
-	(create_got_section): Always create new .got and .rela.got sections.
-	(ppc64_elf_size_dynamic_sections): Tidy.  Strip .dynbss if zero size.
-	* elf64-s390.c (elf_s390_size_dynamic_sections): Likewise.
-	* elf64-sh64.c (sh64_elf64_size_dynamic_sections): Likewise.
-	* elf64-x86-64.c (elf64_x86_64_size_dynamic_sections): Handle
-	dynamic bss sections correctly.
-	* elfxx-mips.c (_bfd_mips_elf_size_dynamic_sections): Tidy.
-	* elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections): Tidy.  Strip
-	.dynbss if zero size.
-
-2005-07-08  Ben Elliston  <bje at au.ibm.com>
-
-	* elf32-xtensa.c: Include <stdarg.h> unconditionally, not only
-	when ANSI_PROTOTYPES is defined.  Remove #ifdef logic.
-
-2005-07-07  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf-bfd.h (elf_backend_data): Add special_sections.
-
-	* elf.c (_bfd_elf_get_sec_type_attr): Check special_sections
-	first.
-
-	* elf32-arm.c (elf_backend_get_sec_type_attr): Removed.
-	(elf_backend_special_sections): New. Defined.
-	* elf32-m32r.c: Likewise.
-	* elf32-m68hc11.c: Likewise.
-	* elf32-m68hc12.c: Likewise.
-	* elf32-mcore.c: Likewise.
-	* elf32-sh64.c: Likewise.
-	* elf32-v850.c: Likewise.
-	* elf32-xtensa.c: Likewise.
-	* elf64-alpha.c: Likewise.
-	* elf64-hppa.c: Likewise.
-	* elf64-ppc.c: Likewise.
-	* elf64-sh64.c: Likewise.
-	* elfxx-ia64.c: Likewise.
-	* elfxx-mips.c: Likewise.
-	* elfxx-mips.h: Likewise.
-
-	* elfxx-target.h (elf_backend_special_sections): New.
-	(elfNN_bed): Initialize special_sections.
-
-2005-07-07  Bob Wilson  <bob.wilson at acm.org>
-
-	* xtensa-modules.c: Update tables with Xtensa MMU features.
-
-2005-07-07  Kaveh R. Ghazi  <ghazi at caip.rutgers.edu>
-
-	* elf32-xtensa.c (vsprint_msg): Add format attribute.  Fix
-	format bugs.
-	* vms.h (_bfd_vms_debug): Add format attribute.
-	(_bfd_vms_debug, _bfd_hexdump): Fix typos.
-
-2005-07-07  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 975
-	* elflink.c (_bfd_elf_symbol_refs_local_p): Only undefined
-	symbol with default visibility is local.
-
-2005-07-07  Ben Elliston  <bje at gnu.org>
-
-	* config.bfd: Mark m68*-*-rtemscoff as obsolete.
-
-2005-07-06  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* dwarf2.c (varinfo): Add addr.
-	(lookup_symbol_in_variable_table): Also check addr.
-	(scan_unit_for_symbols): Set addr for variable.
-	(comp_unit_find_line): Updated.
-
-2005-07-06  Nick Clifton  <nickc at redhat.com>
-
-	* coff-alpha.c (alpha_adjust_reloc_in): Issue an informative error
-	message if an unknown reloc is encountered.
-	(alpha_relocate_section): Likewise.
-
-	* ecoff.c (_bfd_ecoff_write_object_contents): Cope with a reloc
-	with a missing howto field.
-
-2005-07-06  Alan Modra  <amodra at bigpond.net.au>
-
-	* po/SRC-POTFILES.in: Add cpu-ms1.c, elf32-ms1.c, elf-vxworks.c,
-	elfxx-sparc.c.
-
-2005-07-05  Paul Brook  <paul at codesourcery.com>
-
-	* elf32-ppc.c (ppc_elf_vxworks_special_sections): Remove.
-	(ppc_elf_vxworks_get_sec_type_attr): New function.
-	(elf_backend_special_sections): Remove vxwords definition.
-	(elf_backend_get_sec_type_attr): Define for vxworks.
-
-2005-07-05  Nick Clifton  <nickc at redhat.com>
-
-	* elf64-ppc.c (ppc64_elf_info_to_howto): Fix typo.
-
-2005-07-05  Paul Brook  <paul at codesourcery.com>
-
-	* config.bfd: Add separate case for ppc-vxworks.
-	* configure: Regenerate.
-	* configure.in: Include elf-vxworks.lo on ppc targets.
-	* elf-vxworks.c (elf_vxworks_final_write_processing): Handle
-	.rela.plt.unloaded.
-	* elf32-ppc.c: Add VxWorks target vec.	Include elf-vxworks.h.
-	(PLT_ENTRY_SIZE, PLT_INITIAL_ENTRY_SIZE, PLT_SLOT_SIZE): Remove.
-	(VXWORKS_PLT_ENTRY_SIZE, ppc_elf_vxworks_plt_entry,
-	ppc_elf_vxworks_pic_plt_entry, VXWORKS_PLT_INITIAL_ENTRY_SIZE,
-	ppc_elf_vxworks_plt0_entry, ppc_elf_vxworks_pic_plt0_entry,
-	VXWORKS_PLT_NON_JMP_SLOT_RELOCS, VXWORKS_PLTRESOLVE_RELOCS,
-	VXWORKS_PLTRESOLVE_RELOCS_SHLIB): New.
-	(ppc_elf_link_hash_table): Add srelplt2, sgotplt, hgot, hplt,
-	is_vxworks, plt_entry_size, plt_slot_size, plt_initial_entry_size.
-	(ppc_elf_link_hash_table_create): Initialize hadtab plt fields.
-	(ppc_elf_create_got): Create .got.plt for VxWorks.
-	(ppc_elf_create_dynamic_sections): Create unloaded plt relocation
-	section for VxWorks.
-	(ppc_elf_select_plt_layout): Handle VxWorks plt format.
-	(allocate_got): VxWorks does not need a got header.
-	(allocate_dynrelocs): Handle VxWorks plt format.
-	(ppc_elf_size_dynamic_sections): Save _G_O_T_ and _P_L_T_ symbols for
-	VxWorks.  Handle VxWorks plt/got.
-	(ppc_elf_finish_dynamic_sections): Fill in VxWorks plt.
-	(ppc_elf_vxworks_special_sections): New.
-	(ppc_elf_vxworks_link_hash_table_create,
-	ppc_elf_vxworks_add_symbol_hook,
-	elf_i386_vxworks_link_output_symbol_hook,
-	ppc_elf_vxworks_final_write_processing): New functions.
-	* targets.c (bfd_elf32_powerpc_vxworks_vec): Declare.
-	(_bfd_target_vector): Use it.
-
-2005-07-05  Jakub Jelinek  <jakub at redhat.com>
-
-	* libbfd-in.h (struct artdata): Add extended_names_size field.
-	* libbfd.h: Rebuilt.
-	* coff-rs600.c (_bfd_xcoff_archive_p): Don't clear fields in freshly
-	allocated object by bfd_zalloc.
-	* coff64-rs6000.c (xcoff64_archive_p): Likewise.
-	* ecoff.c (_bfd_ecoff_archive_p): Likewise.
-	* archive.c (_bfd_generic_mkarchive, bfd_generic_archive_p): Likewise.
-	(get_extended_arelt_filename): Fail if index is bigger or equal to
-	extended_names_size.
-	(_bfd_generic_read_ar_hdr_mag): Don't set bfd_error_malformed_archive,
-	get_extended_arelt_filename already did that.
-	(_bfd_slurp_extended_name_table): Initialize extended_names_size field.
-	Allocate one extra byte and clear it, in case extended names table
-	is not terminated.
-
-	* libbfd-in.h (bfd_malloc2, bfd_realloc2, bfd_zmalloc2, bfd_alloc2,
-	bfd_zalloc2): New prototypes.
-	* bfd-in.h (HALF_BFD_SIZE_TYPE): Define.
-	* libbfd.c (bfd_malloc2, bfd_realloc2, bfd_zmalloc2): New functions.
-	* opncls.c (bfd_alloc2, bfd_zalloc2): New functions.
-	* elf.c (bfd_elf_get_elf_syms, setup_group, assign_section_numbers,
-	elf_map_symbols, map_sections_to_segments,
-	assign_file_positions_for_segments, copy_private_bfd_data,
-	swap_out_syms, _bfd_elf_slurp_version_tables): Use bfd_*alloc2
-	where appropriate.
-	* bfd-in2.h: Rebuilt.
-	* libbfd.h: Rebuilt.
-
-	* elf.c (_bfd_elf_print_private_bfd_data): Don't crash on bogus
-	verdef or verneed section.
-	(_bfd_elf_slurp_version_tables): Handle corrupt verdef and/or
-	verneed sections gracefully.
-	* elfxx-sparc.c (_bfd_sparc_elf_info_to_howto_ptr): Don't crash on
-	bogus relocation values.
-	* elf64-ppc.c (ppc64_elf_info_to_howto): Likewise.
-	* elf64-s390.c (elf_s390_info_to_howto): Likewise.
-	* elf32-s390.c (elf_s390_info_to_howto): Likewise.
-	* elf64-x86-64.c (elf64_x86_64_info_to_howto): Likewise.
-	* elfxx-ia64.c (lookup_howto): Likewise.
-
-	* elf.c (bfd_elf_get_str_section): Allocate an extra byte after
-	the end of strtab and clear it.
-	(elf_read): Remove.
-
-2005-07-05  Nick Clifton  <nickc at redhat.com>
-
-	* po/vi.po: New Vietnamese translation.
-	* configure.in (ALL_LINGUAS): Add vi.
-	* configure: Regenerate.
-
-2005-07-05  Peter S. Mazinger <ps.m at gmx.net>
-
-	* elf32-arm.c (elf32_arm_size_dynamic_sections): Fix a typo and
-	touchup logic like i386/ppc.
-
-2005-07-05  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf.c (special_sections): Move const qualifier.
-	(special_sections_b..special_sections_t): Likewise.
-	* elf32-arm.c (elf32_arm_symbian_get_sec_type_attr): Remove duplicate
-	const.
-	(elf32_arm_symbian_special_sections): Move const qualifier.
-	* elf32-m32r.c: Similarly.
-	* elf32-m68hc11.c: Similarly.
-	* elf32-m68hc12.c: Similarly.
-	* elf32-mcore.c: Similarly.
-	* elf32-ppc.c: Similarly.
-	* elf32-sh64.c: Similarly.
-	* elf32-v850.c: Similarly.
-	* elf32-xtensa.c: Similarly.
-	* elf64-alpha.c: Similarly.
-	* elf64-hppa.c: Similarly.
-	* elf64-ppc.c: Similarly.
-	* elf64-sh64.c: Similarly.
-	* elfxx-ia64.c: Similarly.
-	* elfxx-mips.c: Similarly.
-
-2005-07-04  Kazuhiro Inaoka  <inaoka.kazuhiro at renesas.com>
-
-	* elf32-m32r.c (m32r_elf_size_dynamic_sections): Use
-	info->executable instead of !info->shared where appropriate.
-
-2005-07-04  Alan Modra  <amodra at bigpond.net.au>
-
-	PR 1042
-	* elf.c (assign_file_positions_for_segments): Remove excluded
-	sections from the segment map.
-
-2005-07-04  Alan Modra  <amodra at bigpond.net.au>
-
-	PR 1004
-	* elf-bfd.h (struct elf_backend_data): Add get_sec_type_attr.  Delete
-	special_sections.
-	(_bfd_elf_get_special_section): Declare.
-	(bfd_elf_special_section): Update prototype.
-	* elf.c (special_sections): Remove unused outer entries.
-	(get_special_section): Delete.
-	(_bfd_elf_get_special_section): New function.
-	(_bfd_elf_get_sec_type_attr): Replace "name" arg with "sec".  Update
-	special_sections indexing.
-	(_bfd_elf_new_section_hook): Call backend get_sec_type_attr.
-	* elf32-arm.c (symbian_special_sections_d): Delete.
-	(symbian_special_sections_g, symbian_special_sections_h): Delete.
-	(symbian_special_sections_i, symbian_special_sections_f): Delete.
-	(symbian_special_sections_p): Delete.
-	(elf32_arm_symbian_special_sections): Merge above to here.
-	(elf32_arm_symbian_get_sec_type_attr): New function.
-	(elf_backend_special_sections): Don't define.
-	(elf_backend_get_sec_type_attr): Define.
-	* elf32-m32r.c: Similarly to elf32-arm.c.
-	* elf32-m68hc11.c: Likewise.
-	* elf32-m68hc12.c: Likewise.
-	* elf32-mcore.c: Likewise.
-	* elf32-sh64.c: Likewise.
-	* elf32-v850.c: Likewise.
-	* elf32-xtensa.c: Likewise.
-	* elf64-alpha.c: Likewise.
-	* elf64-hppa.c: Likewise.
-	* elf64-ppc.c: Likewise.
-	* elf64-sh64.c: Likewise.
-	* elfxx-ia64.c: Likewise.
-	* elfxx-mips.c: Likewise.
-	* elf32-ppc.c: Likewise.
-	(bfd_elf_special_section ppc_alt_plt): New.  Use it if .plt loadable.
-	* elfxx-mips.h (_bfd_mips_elf_get_sec_type_attr): Declare.
-	(_bfd_mips_elf_special_sections, elf_backend_special_sections): Delete.
-	(elf_backend_get_sec_type_attr): Define.
-	* elfxx-target.h (elf_backend_get_sec_type_attr): Define.
-	(elf_backend_special_sections): Don't define.
-	(elfNN_bed): Update.
-
-2005-07-01  Nick Clifton  <nickc at redhat.com>
-
-	* cpu-d10v.c: Update to ISO C90 style function declarations and
-	fix formatting.
-	* cpu-d30v.c: Likewsie.
-	* cpu-i370.c: Likewsie.
-	* cpu-xstormy16.c: Likewsie.
-	* elf32-arc.c: Likewsie.
-	* elf32-d10v.c: Likewsie.
-	* elf32-d30v.c: Likewsie.
-	* elf32-dlx.c: Likewsie.
-	* elf32-i370.c: Likewsie.
-	* elf32-i960.c: Likewsie.
-	* elf32-ip2k.c: Likewsie.
-	* elf32-m32r.c: Likewsie.
-	* elf32-mcore.c: Likewsie.
-	* elf32-openrisc.c: Likewsie.
-	* elf32-or32.c: Likewsie.
-	* elf32-pj.c: Likewsie.
-	* elf32-v850.c: Likewsie.
-	* elf32-xstormy16.c: Likewsie.
-
-2005-07-01  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-alpha.c (elf64_alpha_create_got_section): Always create
-	a new .got section.
-	(elf64_alpha_create_dynamic_sections): Always make new sections
-	by using bfd_make_section_anyway_with_flags.  Check that .got not
-	already created.
-	(elf64_alpha_check_relocs): Delete "got_created".  Use tdata->gotobj
-	instead.
-
-2005-06-30  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Ignore dynamic
-	_SDA_BASE_ and _SDA2_BASE_ symbols.
-	* elflink.c (_bfd_elf_provide_symbol): Correct comment.  Define
-	sym if not def_regular.
-	(_bfd_elf_provide_section_bound_symbols): Similarly.
-
-2005-06-30  Ben Elliston  <bje at gnu.org>
-
-	* config.bfd: Mark as obsolete:
-	    m68*-apollo-*
-	    m68*-apple-aux*
-	    m68*-bull-sysv*
-
-2005-06-29  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (_bfd_elf_gc_mark): Mark sections referenced by
-	.eh_frame specially..
-	(bfd_elf_gc_sections): ..rather than totally ignoring .eh_frame.
-	Don't recheck sections we have already marked.
-	(elf_gc_sweep): Keep non-code sections referenced from .eh_frame.
-	* section.c (struct bfd_section): Add gc_mark_from_eh.
-	(STD_SECTION): Adjust.
-	* ecoff.c (bfd_debug_section): Adjust.
-	* bfd-in2.h: Regenerate.
-
-2005-06-29  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (elf_gc_sweep): Do not refcount on sections that have
-	not been processed by check_relocs.
-
-2005-06-29  Paul Brook  <paul at codesourcery.com>
-
-	* bfd-in.h (_bfd_elf_provide_symbol): Update prototype.
-	* bfd-in2.h: Regenerate.
-	* elf32-ppc.c (ppc_elf_set_sdata_syms): Make sdata symbols section
-	relative.
-	* elflink.c (bfd_elf_set_symbol): Add section argument.
-	(_bfd_elf_provide_symbol): Ditto.
-	(_bfd_elf_provide_section_bound_symbols): Pass NULL section argument.
-
-2005-06-27  Carlos O'Donell <carlos at systemhalted.org>
-
-	* bfd/elf32-hppa.c (struct elf32_hppa_stub_hash_entry):
-	Use bh_root, and hh.
-	(struct elf32_hppa_link_hash_entry): Use eh, and hsh_cache.
-	(struct elf32_hppa_dyn_reloc_entry): Use hdh_next.
-	(struct elf32_hppa_link_hash_table): Use etab and bstab.
-	(stub_hash_newfunc): Use hh.
-	(hppa_link_hash_newfunc): Use hsh_cache.
-	(elf32_hppa_link_hash_table_create): Use etab, and bstab.
-	(elf32_hppa_link_hash_table_free): Use bstab.
-	(hppa_stub_name): Use eh.
-	(hppa_get_stub_entry): Use hh, hsh_entry, and hsh_cache.
-	(hppa_add_stub): Use bstab.
-	(hppa_type_of_stub): Use eh.
-	(hppa_build_one_stub): Use hh and bh_root.
-	(elf32_hppa_copy_indirect_symbol): Use hdh_next.
-	(elf32_hppa_check_relocs): Use eh, etab, and hdh_next.
-	(elf32_hppa_gc_sweep_hook): Use hdh_next.
-	(elf32_hppa_adjust_dynamic_symbol): Use hdh_next, and etab.
-	(allocate_plt_static): Use etab.
-	(allocate_dynrelocs): Use etab, and hdh_next.
-	(readonly_dynrelocs): Use hdh_next.
-	(elf32_hppa_size_dynamic_sections): Use etab, and hdh_next.
-	(get_local_syms): Use eh, bstab, and hh.
-	(elf32_hppa_size_stubs): Use eh, bstab, and hh.
-	(elf32_hppa_set_gp): Use etab.
-	(elf32_hppa_build_stubs): Use bstab.
-	(final_link_relocate): Use eh, bh_root.
-	(elf32_hppa_relocate_section): Use elf, etab.
-	(elf32_hppa_finish_dynamic_sections): Use etab.
-
-2005-06-27  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elfxx-ia64.c (elfNN_hpux_backend_symbol_processing): Remove
-	the extra `;'.
-
-2005-06-21  Carlos O'Donell <carlos at systemhalted.org>
-
-	* bfd/elf32-hppa.c (hppa_elf_hash_entry): Define.
-	(hppa_stub_hash_entry): Define.
-	(stub_hash_newfunc): Rename variables.
-	(hppa_link_hash_newfunc): Likewise.
-	(elf32_hppa_link_hash_table_free): Likewise.
-	(hppa_stub_name): Likewise.
-	(hppa_get_stub_entry): Likewise.
-	(hppa_add_stub): Likewise.
-	(hppa_type_of_stub): Likewise.
-	(hppa_build_one_stub): Likewise.
-	(hppa_size_one_stub): Likewise.
-	(elf32_hppa_create_dynamic_sections): Likewise.
-	(elf32_hppa_copy_indirect_symbol): Likewise.
-	(elf32_hppa_check_relocs): Likewise.
-	(elf32_hppa_gc_mark_hook): Likewise.
-	(elf32_hppa_gc_sweep_hook): Likewise.
-	(elf32_hppa_grok_psinfo): Likewise.
-	(elf32_hppa_hide_symbol): Likewise.
-	(elf32_hppa_adjust_dynamic_symbol): Likewise.
-	(allocate_dynrelocs): Likewise.
-	(clobber_millicode_symbols): Likewise.
-	(readonly_dynrelocs): Likewise.
-	(elf32_hppa_size_dynamic_sections): Likewise.
-	(get_local_syms): Likewise.
-	(elf32_hppa_size_stubs): Likewise.
-	(hppa_record_segment_addr): Likewise.
-	(final_link_relocate): Likewise.
-	(elf32_hppa_relocate_section): Likewise.
-	(elf32_hppa_finish_dynamic_symbol): Likewise.
-
-2005-06-20  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 1025
-	* elf-m10300.c (mn10300_elf_check_relocs): Handle indirect
-	symbol.
-	* elf32-arm.c (elf32_arm_check_relocs): Likewise.
-	* elf32-avr.c (elf32_avr_check_relocs): Likewise.
-	* elf32-cris.c (cris_elf_check_relocs): Likewise.
-	* elf32-d10v.c (elf32_d10v_check_relocs): Likewise.
-	* elf32-dlx.c (elf32_dlx_check_relocs): Likewise.
-	* elf32-fr30.c (fr30_elf_check_relocs): Likewise.
-	* elf32-frv.c (elf32_frv_check_relocs): Likewise.
-	* elf32-i370.c (i370_elf_check_relocs): Likewise.
-	* elf32-iq2000.c (iq2000_elf_check_relocs): Likewise.
-	* elf32-m32r.c (m32r_elf_check_relocs): Likewise.
-	* elf32-m68hc1x.c (elf32_m68hc11_check_relocs): Likewise.
-	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
-	* elf32-mcore.c (mcore_elf_check_relocs): Likewise.
-	* elf32-ms1.c (ms1_elf_check_relocs): Likewise.
-	* elf32-msp430.c (elf32_msp430_check_relocs): Likewise.
-	* elf32-openrisc.c (openrisc_elf_check_relocs): Likewise.
-	* elf32-ppc.c (ppc_elf_check_relocs): Likewise.
-	* elf32-s390.c (elf_s390_check_relocs): Likewise.
-	* elf32-sh.c (sh_elf_check_relocs): Likewise.
-	* elf32-v850.c (v850_elf_check_relocs): Likewise.
-	* elf32-vax.c (elf_vax_check_relocs): Likewise.
-	* elf64-mmix.c (mmix_elf_check_relocs): Likewise.
-	* elf64-ppc.c (ppc64_elf_check_relocs): Likewise.
-	* elf64-s390.c (elf_s390_check_relocs): Likewise.
-	* elf64-sh64.c (sh_elf64_check_relocs): Likewise.
-	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Likewise.
-	* elfxx-sparc.c (_bfd_sparc_elf_check_relocs): Likewise.
-
-2005-06-20  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 1022
-	* elf32-hppa.c (elf32_hppa_check_relocs): Handle indirect
-	symbol.
-
-2005-06-20  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 1025
-	* elf32-i386.c (elf_i386_check_relocs): Handle indirect symbol.
-	* elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
-
-2005-06-18  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* reloc.c: Add BFD_RELOC_X86_64_GOTOFF64 and
-	BFD_RELOC_X86_64_GOTPC32.
-	* bfd-in2.h: Regenerated.
-
-2005-06-17  Jakub Jelinek  <jakub at redhat.com>
-
-	* elf.c (bfd_section_from_shdr): Kill bogus warning.
-
-	* elf.c (bfd_section_from_shdr): Fail if sh_entsize is bogus for
-	symbol, relocation, group or versym sections.
-
-	* coffcode.h (coff_slurp_reloc_table): Don't crash if native_relocs
-	is NULL.
-	* peXXigen.c (pe_print_idata): Don't crash if dll_name or start_address
-	doesn't point into the section.
-
-2005-06-17  Jan Beulich  <jbeulich at novell.com>
-
-	* bfd-in2.h (elf_x86_64_reloc_type): Add BFD_RELOC_X86_64_GOTOFF64
-	and BFD_RELOC_X86_64_GOTPC32.
-	* libbfd.h (bfd_reloc_code_real_names): Likewise.
-	* elf64-x86-64.c (x86_64_elf_howto_table): Add entries for
-	R_X86_64_PC64, R_X86_64_GOTOFF64, and R_X86_64_GOTPC32.
-	(x86_64_reloc_map): Add entries for R_X86_64_PC64, R_X86_64_GOTOFF64,
-	and R_X86_64_GOTPC32.
-	(elf64_x86_64_info_to_howto): Adjust bounding relocation type.
-	(elf64_x86_64_check_relocs): Also handle R_X86_64_PC64,
-	R_X86_64_GOTOFF64, and R_X86_64_GOTPC32.
-	(elf64_x86_64_relocate_section): Likewise.
-	(elf64_x86_64_gc_sweep_hook): Also handle R_X86_64_PC64.
-
-2005-06-15  Mark Kettenis  <kettenis at gnu.org>
-
-	* archive.c: Include "libiberty.h".
-
-2005-06-15  Nick Clifton  <nickc at redhat.com>
-
-	* elf32-v850.c (ELF_MACHINE_ALT2): Define so that binaries
-	produced by the GreenHills toolchain can be assimilated.
-
-2005-06-14  Steve Ellcey  <sje at cup.hp.com>
-
-	* som.c (som_find_inliner_info): New.
-
-2005-06-14  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elflink.c (_bfd_elf_merge_symbol): Fix a typo in comment.
-
-2005-06-14  Jakub Jelinek  <jakub at redhat.com>
-
-	* elf.c (bfd_section_from_shdr): Fail if name is NULL.
-	Prevent endless recursion on broken objects.
-
-	* archive.c (do_slurp_coff_armap): Check for overflows.
-
-2005-06-10  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* elfcode.h (elf_write_relocs): Do nothing if there are no
-	relocations.
-
-2005-06-10  Alan Modra  <amodra at bigpond.net.au>
-
-	* dwarf2.c (decode_line_info): Revert last change.  Instead set
-	initial low_pc to -1 to avoid need to test whether loc_pc has
-	been set.
-
-2005-06-09  Christopher Faylor  <cgf at timesys.com>
-
-	* coffcode.h (sec_to_styp_flags): Set appropriate section flags when
-	either SEC_ALLOC OR SEC_LOAD.
-
-2005-06-09  Christopher Faylor  <cgf at timesys.com>
-
-	* coffcode.h (sec_to_styp_flags): Remove read/write flags from noload
-	section header.  Do not add STYP_NOLOAD since it does not appear to be
-	a valid PE flag.
-
-2005-06-09  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 1000
-	* dwarf2.c (lookup_address_in_line_info_table): Restore code
-	handling NULL function info, removed with 2005-04-03 change.
-
-2005-06-08  Mark Mitchell  <mark at codesourcery.com>
-
-	* opncls.c (bfd_fopen): Mark returned BFD as cacheable if FD == -1.
-
-2005-06-09  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (elf_mark_used_section): Delete.
-	(bfd_elf_gc_sections): Call bfd_generic_gc_sections.
-	* reloc.c (bfd_mark_used_section): New function.
-	(bfd_generic_gc_sections): Call bfd_mark_used_section.
-
-2005-06-08  Alan Modra  <amodra at bigpond.net.au>
-
-	* opncls.c (bfd_fopen): Don't set bfd_error unconditionally.
-	(bfd_fdopenr): Same.
-
-2005-06-07  Mark Mitchell  <mark at codesourcery.com>
-
-	* opncls.c (bfd_fdopenr): Add missing break statements.
-
-2005-06-07  Mark Mitchell  <mark at codesourcery.com>
-
-	* opncls.c (bfd_fopen): New API.
-	(bfd_openr): Use it.
-	(bfd_fdopenr): Likewise.
-	* bfd-in2.h: Regenerated.
-
-2005-06-07  Aldy Hernandez  <aldyh at redhat.com>
-	    Michael Snyder  <msnyder at redhat.com>
-	    Stan Cox  <scox at redhat.com>
-
-	* Makefile.am (ALL_MACHINES): Add ms1 support.
-	(ALL_MACHINES_CFILES): Same.
-	(BFD32_BACKENDS): Same.
-	(BFD32_BACKENDS_CFILES): Same.
-
-	* Makefile.in: Regenerate.
-
-	* archures.c (bfd_architecture): Add ms1 entries.
-	Externalize bfd_ms1_arch.
-	(bfd_archures_list): Add bfd_ms1_arch.
-
-	* bfd-in2.h: Regenerate.
-
-	* cpu-ms1.c: New file.
-
-	* elf32-ms1.c: New file.
-
-	* targets.c: Define extern of bfd_elf32_ms1_vec.
-	Add bfd_elf32_ms1_vec to _bfd_target_vector.
-
-	* configure.in: Add bfd_elf32_ms1_vec case.
-
-	* configure: Regenerate.
-
-	* config.bfd: Add ms1-*-elf to table.
-
-2005-06-07  Zack Weinberg  <zack at codesourcery.com>
-
-	* coff-i386.c: Change md_apply_fix3 to md_apply_fix in comment.
-
-2005-06-07  Alan Modra  <amodra at bigpond.net.au>
-
-	* coff-rs6000.c (rs6000coff_vec, pmac_xcoff_vec): Init _bfd_find_line.
-	* coff64-rs6000.c (rs6000coff64_vec, aix5coff64_vec): Likewise.
-
-2005-06-06  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 990
-	* bfd.c (bfd_find_line): New.
-
-	* dwarf2.c (comp_unit): Add variable_table.
-	(funcinfo): Add file, line, and sec.
-	(varinfo): New.
-	(lookup_symbol_in_function_table): New.
-	(lookup_symbol_in_variable_table): New.
-	(scan_unit_for_functions): Renamed to ...
-	(scan_unit_for_symbols): This. Handle DW_TAG_entry_point and
-	DW_TAG_variable.
-	(comp_unit_find_nearest_line): Updated.
-	(comp_unit_find_line): New.
-	(_bfd_dwarf2_find_line): New.
-
-	* elf-bfd.h (_bfd_elf_find_line): New.
-	(_bfd_generic_find_line): New. Defined.
-
-	* elf.c (_bfd_elf_find_line): New.
-
-	* libbfd-in.h (_bfd_dwarf2_find_line): New.
-	(_bfd_generic_find_line): New.
-
-	* bfd-in2.h: Regenerated.
-	* libbfd.h: Likewise.
-
-	* libbfd.c (_bfd_generic_find_line): New.
-
-	* targets.c (BFD_JUMP_TABLE_SYMBOLS): Initialize _bfd_find_line
-	with _bfd_generic_find_line.
-	(bfd_target): Add _bfd_find_line.
-
-2005-06-06  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* dwarf2.c (decode_line_info): Properly set low_pc.
-
-2005-06-06  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-pcc.c (ppc64_elf_gc_mark_hook): For the local sym in .opd
-	case, include addend when indexing .opd section map.
-	(ppc64_elf_edit_opd): Add no_opd_opt param.  Do nothing besides
-	clear opd_adjust array if no_opd_opt set.  Tidy code.
-	Ignore zero size .opd.  Check bfd_alloc return value.
-	(ppc_stub_name): Return immediately on bfd_malloc fail.
-	* elf64-ppc.h (ppc64_elf_edit_opd): Update prototype.
-
-2005-06-04  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* dwarf2.c (comp_unit): Fix a typo in comment.
-
-2005-06-03  Jan-Benedict Glaw  <jbglaw at lug-owl.de>
-
-	* elf32-vax.c (rtype_to_howto): Remove PARAMS.
-	(reloc_type_lookup): Dito.
-	(elf_vax_discard_copies): Dito.
-	(elf_vax_instantiate_got_entries): Dito.
-	(elf_vax_link_hash_traverse): Dito.
-	(elf_vax_link_hash_newfunc): Dito.
-	(elf_vax_link_hash_table_create): Dito.
-	(elf32_vax_set_private_flags): Dito.
-	(elf32_vax_merge_private_bfd_data): Dito.
-	(elf32_vax_print_private_bfd_data): Dito.
-	(elf_vax_check_relocs): Dito.
-	(elf_vax_gc_mark_hook): Dito.
-	(elf_vax_gc_sweep_hook): Dito.
-	(elf_vax_size_dynamic_sections): Dito.
-	(elf_vax_discard_copies): Dito.
-	(elf_vax_instantiate_got_entries): Dito.
-	(elf_vax_relocate_section): Dito.
-	(elf_vax_finish_dynamic_symbol): Dito.
-	(elf_vax_finish_dynamic_sections): Dito.
-	(elf_vax_hash_table): Break-up of line isn't needed.
-	(elf_vax_check_relocs): Remove leading whitespace
-	(elf_vax_relocate_section): Remove redundant whitespace
-	(elf_vax_link_hash_newfunc): Don't cast NULL.
-	(elf_vax_link_hash_table_create): Dito.
-	* cpu-vax.c (bfd_vax_arch) Remove a trailing space.
-
-2005-06-03  Alan Modra  <amodra at bigpond.net.au>
-
-	PR 568
-	* configure.in: Bump version
-	* configure: Regenerate.
-	* elflink.c (elf_link_input_bfd): Use einfo linker callback to print
-	discarded section sym refs and kill linker output.
-	* simple.c (simple_dummy_einfo): New function.
-	(bfd_simple_get_relocated_section_contents): Init callbacks.einfo.
-
-	* elf32-i386.c (elf_i386_relocate_section): Handle zero symndx
-	for all reloc types.
-
-2005-06-02  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (add_symbol_adjust): Set sym visibility to most
-	restrictive of func code and func descr for undefined syms as well
-	as defined.
-
-2005-05-31  Jim Blandy  <jimb at redhat.com>
-
-	* Makefile.am: Regenerate dependencies with 'make dep-am'.
-	* Makefile.in: Regenerate.
-
-2005-05-31  Richard Henderson  <rth at redhat.com>
-
-	* elf64-alpha.c (ALPHA_ELF_LINK_HASH_LU_JSRDIRECT): New.
-	(ALPHA_ELF_LINK_HASH_TLS_IE): Renumber to 0x80.
-	(ALPHA_ELF_LINK_HASH_LU_PLT): Rename from ALPHA_ELF_LINK_HASH_LU_FUNC.
-	(elf64_alpha_want_plt): Update to match.
-	(elf64_alpha_check_relocs): Collect JSRDIRECT in gotent_flags.
-	(elf64_alpha_relax_with_lituse): Likewise.  Handle JSRDIRECT.
-
-2005-05-31  Zack Weinberg  <zack at codesourcery.com>
-
-	* elf32-arm.c (elf32_arm_reloc_type_lookup)
-	(elf32_arm_nabi_grok_prstatus, elf32_arm_nabi_grok_psinfo):
-	Use ISO C90 function declaration style.
-
-2005-05-31  James E Wilson  <wilson at specifixinc.com>
-
-	* elfcode.h (NAME(bfd_elf,bfd_from_remote_memory)): Check for program
-	header PF_R flag on PT_LOAD segments.
-
-2005-05-30  Richard Henderson  <rth at redhat.com>
-
-	* elf64-alpha.c (elf64_alpha_relocate_section): Use dtp_base for
-	the zero index relocs produced by elf64_alpha_relax_tls_get_addr.
-
-2005-05-29  Richard Henderson  <rth at redhat.com>
-
-	* configure.in (--enable-secureplt): New.
-	* elf64-alpha.c (INSN_LDA, INSN_LDAH, INSN_LDQ, INSN_BR): New.
-	(INSN_SUBQ, INSN_S4SUBQ, INSN_JMP): New.
-	(INSN_A, INSN_AB, INSN_ABC, INSN_ABO, INSN_AD): New.
-	(elf64_alpha_use_secureplt): New.
-	(OLD_PLT_HEADER_SIZE, OLD_PLT_ENTRY_SIZE): New.
-	(NEW_PLT_HEADER_SIZE, NEW_PLT_ENTRY_SIZE): New.
-	(PLT_HEADER_SIZE, PLT_ENTRY_SIZE): Conditionalize on secureplt.
-	(ALPHA_ELF_LINK_HASH_PLT_LOC): Remove.
-	(struct alpha_elf_link_hash_entry): Add plt_offset.
-	(PLT_HEADER_WORD1, PLT_HEADER_WORD2, PLT_HEADER_WORD3): Remove.
-	(PLT_HEADER_WORD4, PLT_ENTRY_WORD1, PLT_ENTRY_WORD2): Remove.
-	(PLT_ENTRY_WORD3): Remove.
-	(elf64_alpha_create_dynamic_sections): If secureplt, set SEC_READONLY
-	on .plt and create .got.plt.
-	(elf64_alpha_output_extsym): Remove .plt frobbing for symbol values.
-	(get_got_entry): Initialize plt_offset.
-	(elf64_alpha_want_plt): New.
-	(elf64_alpha_check_relocs): Use it.
-	(elf64_alpha_adjust_dynamic_symbol): Likewise.  Don't allocate
-	plt entries here.
-	(elf64_alpha_calc_got_offsets_for_symbol): Don't report internal
-	error as user error.
-	(elf64_alpha_size_plt_section_1): Allocate one plt entry per
-	got subsection.
-	(elf64_alpha_size_plt_section): Size .got.plt section.
-	(elf64_alpha_size_rela_got_1): Don't allocate relocations if
-	plt entries used.
-	(elf64_alpha_size_dynamic_sections): Call elf64_alpha_size_plt_section.
-	Add PLTRO DYNAMIC entry.
-	(elf64_alpha_finish_dynamic_symbol): Generate secureplt format.
-	(elf64_alpha_finish_dynamic_sections): Likewise.
-
-2005-05-28  David Daney  <ddaney at avtrex.com>
-
-	* elfxx-mips.c (_bfd_mips_elf_finish_dynamic_sections):  Move
-	calculation of DT_RELSZ to occur after all dynamic relocations
-	are created.
-
-2005-05-28  Eli Zaretskii  <eliz at gnu.org>
-
-	* configure.in: Add snprintf and vsnprintf to AC_CHECK_DECLS.
-	* config.in, configure: Regenerate.
-
-2005-05-26  Mark Kettenis  <kettenis at gnu.org>
-	    Maciej W. Rozycki  <macro at linux-mips.org>
-
-	* elfxx-mips.c (_bfd_mips_elf_section_processing): Warn and
-	stop processing of options if one of invalid size is
-	encountered.
-	(_bfd_mips_elf_section_from_shdr): Likewise.
-	(_bfd_mips_elf_fake_sections): Reset the type of empty special
-	sections.
-
-2005-05-26  Richard Henderson  <rth at redhat.com>
-
-	* elf64-alpha.c (struct alpha_elf_link_hash_entry): Remove
-	plt_old_section, plt_old_value.
-	(elf64_alpha_adjust_dynamic_symbol): Don't set it.
-	(elf64_alpha_size_plt_section_1): Don't use it.
-
-2005-05-26  Jakub Jelinek  <jakub at redhat.com>
-
-	* elfcode.h (elf_object_p): Fail if e_shoff != 0, e_shnum == 0 and
-	first shdr has sh_size == 0.  Fail if e_shnum is large to cause
-	arithmetic overflow when allocating the i_shdr array.
-	Sanity check sh_link and sh_info fields.  Fix e_shstrndx sanity check.
-
-2005-05-25  Richard Henderson  <rth at redhat.com>
-
-	* elf64-alpha.c: Update all function definitions to ISO C.  Remove
-	all function prototypes; rearrange functions into def-use order.
-
-2005-05-25  Richard Henderson  <rth at redhat.com>
-
-	* elf64-alpha.c (elf64_alpha_merge_gots): Fix gotent iteration
-	in the presence of deleting elements.
-	(elf64_alpha_size_got_sections): Zero dead got section size.
-
-2005-05-23  Fred Fish  <fnf at specifixinc.com>
-
-	* dwarf2.c (struct dwarf2_debug): Add inliner_chain member.
-	(struct funcinfo): Add caller_func, caller_file, caller_line.
-	tag, and nesting_level members.
-	(lookup_address_in_function_table): Change first passed parameter
-	from "struct funcinfo *" to "struct comp_unit *".
-	(lookup_address_in_function_table): Dereference unit to find function
-	table.
-	(lookup_address_in_function_table): Traverse the function list to
-	create a chain of inlined functions back to the first non inlined
-	function.
-	(scan_unit_for_functions): Remember tag and nesting level.  Handle
-	DW_AT_call_file and DW_AT_call_line.
-	(comp_unit_find_nearest_line): Adjust lookup_address_in_function_table
-	call to pass unit pointer instead of function table pointer.  For
-	inlined functions, save pointer to the inliner chain.
-	(_bfd_dwarf2_find_nearest_line): Initialize inliner_chain to NULL.
-	(_bfd_dwarf2_find_inliner_info): New function that returns information
-	from the inliner chain after a call to bfd_find_nearest_line.
-
-	* bfd.c (bfd_find_inliner_info): Define using BFD_SEND.
-	* targets.c (BFD_JUMP_TABLE_SYMBOLS): Add entry for
-	NAME##_find_inliner_info.
-	(bfd_target): Add _bfd_find_inliner_info.
-	* bfd-in2.h: Regenerate.
-
-	* libbfd-in.h (_bfd_nosymbols_find_inliner_info): Define as
-	macro that always returns bfd_false.
-	(_bfd_dwarf2_find_inliner_info): Declare.
-	* libbfd.h: Regenerate.
-
-	* elf32-arm.c (elf32_arm_find_inliner_info): New function
-	that calls _bfd_dwarf2_find_inliner_info.
-	(bfd_elf32_find_inliner_info): Define to elf32_arm_find_inliner_info.
-
-	* elfxx-mips.c (_bfd_mips_elf_find_inliner_info): New function
-	that calls _bfd_dwarf2_find_inliner_info.
-	* elfxx-mips.h (_bfd_mips_elf_find_inliner_info): Declare.
-	* elfn32-mips.c (bfd_elf32_find_inliner_info): Define to
-	_bfd_mips_elf_find_inliner_info.
-	* elf64-mips.c (bfd_elf64_find_inliner_info): Ditto.
-	* elf32-mips.c (bfd_elf32_find_inliner_info): Ditto.
-
-	* elf.c (_bfd_elf_find_inliner_info): New function that calls
-	_bfd_dwarf2_find_inliner_info.
-	* elf-bfd.h (_bfd_elf_find_inliner_info): Declare.
-	* elfxx-target.h (bfd_elfNN_find_inliner_info): Define to
-	_bfd_elf_find_inliner_info.
-
-	* coffgen.c (coff_find_inliner_info): New function that
-	calls _bfd_dwarf2_find_inliner_info.
-	* libcoff-in.h (coff_find_inliner_info): Declare.
-	* libcoff.h: Regenerate.
-	* coff-rs6000.c (rs6000coff_vec): Add coff_find_inliner_info.
-	(pmac_xcoff_vec) Ditto.
-	* coff64-rs6000.c (rs6000coff64_vec): Ditto.
-	(aix5coff64_vec): Ditto.
-
-	* aout-target.h (MY_find_inliner_info): Define as
-	_bfd_nosymbols_find_inliner_info.
-	* aout-tic30.c (MY_find_inliner_info): Ditto.
-	* binary.c (binary_find_inliner_info): Ditto.
-	* i386msdos.c (msdos_find_inliner_info): Ditto.
-	* ihex.c (ihex_find_inliner_info): Ditto.
-	* libaout.h (aout_32_find_inliner_info): Ditto.
-	* libecoff.h (_bfd_ecoff_find_inliner_info): Ditto.
-	* mach-o.c (bfd_mach_o_find_inliner_info): Ditto.
-	* mmo.c (mmo_find_inliner_info): Ditto.
-	* nlm-target.h (nlm_find_inliner_info): Ditto.
-	* pef.c (bfd_pef_find_inliner_info): Ditto.
-	* ppcboot.c (ppcboot_find_inliner_info): Ditto.
-	* srec.c (srec_find_inliner_info): Ditto.
-	* tekhex.c (tekhex_find_inliner_info): Ditto.
-	* versados.c (versados_find_inliner_info): Ditto.
-	* xsym.c (bfd_sym_find_inliner_info): Ditto.
-
-	* ieee.c (ieee_find_inliner_info): New function that always
-	returns FALSE.
-	* oasys.c (oasys_find_inliner_info): Ditto.
-	* vms.c (vms_find_inliner_info): Ditto.
-
-2005-05-24  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_check_relocs): For old gcc -fPIC code
-	force old plt layout.
-
-2005-05-22  Richard Henderson  <rth at redhat.com>
-
-	* elf64-alpha.c (elf64_alpha_relax_section): Ignore non-allocated
-	sections.
-	(elf64_alpha_check_relocs): Likewise.
-	(elf64_alpha_relocate_section): Don't emit dynamic relocations to
-	non-allocated sections.
-
-2005-05-22  Richard Henderson  <rth at redhat.com>
-
-	* elf64-alpha.c (elf64_alpha_relax_with_lituse): Relax jsr to
-	undefweak to use zero register.  Call elf64_alpha_relax_got_load
-	if not all uses removed.
-	(elf64_alpha_relax_got_load): Relax undefweak to lda zero.
-	(elf64_alpha_relax_section): Handle undefweak symbols.
-	(elf64_alpha_calc_dynrel_sizes): Don't add relocs for undefweak.
-	(elf64_alpha_size_rela_got_1): Likewise.
-	(elf64_alpha_relocate_section): Likewise.
-
-2005-05-22  Richard Henderson  <rth at redhat.com>
-
-	* elf64-alpha.c (elf64_alpha_relax_section): Only operate
-	on SEC_CODE sections.
-
-2005-05-22  John David Anglin  <dave.anglin at nrc-cnrc.gc.ca>
-
-	* som.c (try_prev_fixup): Changed type of subspace_reloc_sizep to
-	unsigned int *.
-	(som_write_space_strings): Change type of tmp_space and p to char *.
-	(som_write_symbol_strings): Likewise.  Also change type of comp to
-	char *comp[4].
-	(som_begin_writing): Change type of strings_size to unsigned int.
-	(som_finish_writing): Likewise.
-	(som_slurp_reloc_table): Change type of external_relocs to unsigned
-	char *.
-	* som.h (struct som_section_data_struct): Change type of reloc_stream
-	field to unsigned char *.
-
-2005-05-20  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't eliminate
-	copy relocations for VxWorks.
-
-2005-05-20  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* bfd/elf32-ppc.c (struct ppc_elf_link_hash_entry): Add new field
-	has_sda_refs.
-	(ppc_elf_copy_indirect_symbol): Copy has_sda_refs.
-	(ppc_elf_check_relocs): Set has_sda_refs.
-	(ppc_elf_adjust_dynamic_symbol): Check has_sda_refs before eliminating
-	copy relocations.  Use has_sda_refs to place variables in .sbss.
-	(ppc_elf_finish_dynamic_symbol): Use has_sda_refs to place variables in
-	.sbss.
-
-2005-05-20  Bob Wilson  <bob.wilson at acm.org>
-
-	* elf32-xtensa.c (bfd_elf_xtensa_reloc): Make sure that
-	xtensa_default_isa is initialized.
-
-2005-05-20  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (allocate_dynrelocs): Correct plt offset assigned
-	for second and subsequent list entries.  Only allocate multiple
-	glink stubs when shared or pie.
-	(ppc_elf_finish_dynamic_symbol): Break out early when only one
-	glink stub is needed.
-
-2005-05-19  Zack Weinberg  <zack at codesourcery.com>
-
-	* Makefile.am: Have 'all' depend on 'info'.
-	* Makefile.in: Regenerate.
-
-2005-05-19  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf-bfd.h (struct elf_link_hash_table): Delete init_refcount and
-	init_offset.  Add init_got_refcount, init_plt_refcount,
-	init_got_offset and init_plt_offset.
-	* elf.c (_bfd_elf_link_hash_newfunc): Adjust for above change.
-	(_bfd_elf_link_hash_hide_symbol): Likewise.
-	(_bfd_elf_link_hash_table_init): Likewise.
-	* elf32-hppa.c (elf32_hppa_hide_symbol): Likewise.
-	* elf64-ppc.c (ppc64_elf_link_hash_table_create): Likewise.
-	* elflink.c (_bfd_elf_adjust_dynamic_symbol): Likewise.
-	(bfd_elf_size_dynamic_sections): Likewise.
-	* elf32-ppc.c (GLINK_PLTRESOLVE): Now 16 insns.
-	(LWZU_0_X_12, LWZ_0_4_30, LWZ_0_X_12, LWZ_11_X_11, LWZ_11_X_30,
-	LWZ_12_4_12, LWZ_12_8_30, LWZ_12_X_12, SUB_11_11_30): Delete.
-	(ADDIS_12_12, BCL_20_31, LWZU_0_12, LWZ_0_12, LWZ_11_11, LWZ_11_30,
-	LWZ_12_12, MFLR_0, MFLR_12, MTLR_0, SUB_11_11_12): Define.
-	(struct plt_entry): New.
-	(ppc_elf_link_hash_table_create): Set new init_plt fields.
-	(ppc_elf_copy_indirect_symbol): Handle merge of plt plist.  Don't
-	use _bfd_elf_link_hash_copy_indirect.
-	(update_plt_info, find_plt_ent): New functions.
-	(ppc_elf_check_relocs): Handle R_PPC_PLTREL24 with non-zero addend
-	and adjust for use of plt list rather than refcount.
-	(ppc_elf_gc_sweep_hook): Likewise.
-	(ppc_elf_tls_optimize): Likewise.
-	(ppc_elf_adjust_dynamic_symbol): Likewise.
-	(allocate_dynrelocs): Likewise.
-	(ppc_elf_relax_section): Likewise.
-	(ppc_elf_relocate_section): Likewise.  Adjust R_PPC_PLTREL24 addends
-	when performing a relocatable link.
-	(ppc_elf_finish_dynamic_symbol): Likewise.  Write .glink stubs here..
-	(ppc_elf_finish_dynamic_sections): ..rather than here.  Use new
-	pic resolver stub.
-
-2005-05-19  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf.c (assign_file_positions_for_segments): Use maximum of
-	maxpagesize and section alignment when adjusting initial
-	segment offset and section offsets.
-
-2005-05-18  Zack Weinberg  <zack at codesourcery.com>
-
-	* elf32-arm.c: Make all #ifndef OLD_ARM_ABI blocks
-	unconditional.
-
-2005-05-18  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf.c (group_signature): Undo the last change. Check if the
-	symbol table section is correct.
-
-2005-05-17  Zack Weinberg  <zack at codesourcery.com>
-
-	* elf32-arm.c: Wherever possible, use official reloc names
-	from AAELF.
-	(elf32_arm_howto_table, elf32_arm_tls_gd32_howto)
-	(elf32_arm_tls_ldo32_howto, elf32_arm_tls_ldm32_howto)
-	(elf32_arm_tls_le32_howto, elf32_arm_tls_ie32_howto)
-	(elf32_arm_vtinherit_howto, elf32_arm_vtentry_howto)
-	(elf32_arm_pc11_howto, elf32_arm_thm_pc9_howto, elf32_arm_got_prel)
-	(elf32_arm_r_howto): Replace with elf32_arm_howto_table_1,
-	elf32_arm_howto_table_2, and elf32_arm_howto_table_3.
-	Add many new relocations from AAELF.
-	(elf32_arm_howto_from_type): Update to match.
-	(elf32_arm_reloc_map): Add entries for R_ARM_THM_JUMP24,
-	R_ARM_THM_JUMP11, R_ARM_THM_JUMP19, R_ARM_THM_JUMP8,
-	R_ARM_THM_JUMP6, R_ARM_GNU_VTINHERIT, and R_ARM_GNU_VTENTRY.
-	(elf32_arm_reloc_type_lookup): Use elf32_arm_howto_from_type.
-	(elf32_arm_final_link_relocate): Add support for
-	R_ARM_THM_JUMP24, R_ARM_THM_JUMP19, R_ARM_THM_JUMP6.  Remove
-	case entries redundant with default.
-
-	* reloc.c: Reorganize ARM relocations.  Add Thumb
-	assembler-internal relocations BFD_RELOC_ARM_T32_OFFSET_U8,
-	BFD_RELOC_ARM_T32_OFFSET_IMM, BFD_RELOC_ARM_T32_IMMEDIATE.
-	Add visible relocations BFD_RELOC_THUMB_PCREL_BRANCH7,
-	BFD_RELOC_THUMB_BRANCH20, BFD_RELOC_THUMB_BRANCH25.
-	Delete unused relocations BFD_RELOC_ARM_GOT12, BFD_RELOC_ARM_COPY.
-	* bfd-in2.h, libbfd.h: Regenerate.
-
-2005-05-17  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* elf.c (_bfd_elf_write_object_contents): Check for non-NULL
-	elf_shstrtab.
-	* format.c (bfd_check_format_matches): Set output_has_begun
-	for both_direction.
-	* section.c (bfd_set_section_contents): Use bfd_write_p.  Remove
-	special case for both_direction.
-
-2005-05-17  Nick Clifton  <nickc at redhat.com>
-
-	* elf.c (group_signature): Check for a group section which is
-	actually a (corrupt) symbol table section in disguise and prevent
-	an infinite loop from occurring.
-
-2005-05-17  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elfxx-ia64.c (elfNN_ia64_relax_brl): Undo the change made on
-	2005-02-16.
-
-2005-05-17  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elfxx-ia64.c (elfNN_ia64_relax_br): Keep the original
-	predicate on slot 0 only if slot 0 isn't br.
-
-2005-05-17  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 797
-	* elf32-i386.c (elf_i386_size_dynamic_sections): Also remove
-	empty sdynbss section.
-	* elf64-x86-64.c (elf64_x86_64_size_dynamic_sections): Likewise.
-
-2005-05-17  Tavis Ormandy <taviso at gentoo.org>
-
-	* elf.c (bfd_section_from_shdr): Add sanity check when parsing
-	dynamic sections.
-
-2005-05-17  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (LIS_11. LIS_12): Define.
-	(LWZU_0_X_12, LWZ_0_X_12, LWZ_12_4_12, LWZ_12_X_12): Define.
-	(ppc_elf_finish_dynamic_sections): Provide non-pic plt call stub
-	for --data-plt when building non-pie executables.
-
-2005-05-17  Nick Clifton  <nickc at redhat.com>
-
-	* elf32-arm.c (elf32_arm_final_link_relocate): Gracefully handle
-	the situation where a symbols's section is not known but a section
-	relative R_ARM_RELATIVE reloc has to be generated for the Symbian
-	OS.
-
-	* elf32-v850.c (v850_elf_relocate_section): Move code to test for
-	the presence of a symbol table to just before the symbol table is
-	actually used.
-
-2005-05-16  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 834
-	* elfxx-ia64.c (elfNN_ia64_relax_br): New.
-	(elfNN_ia64_relax_section): Use it.
-
-2005-05-14  Mark Kettenis  <kettenis at gnu.org>
-
-	* elflink.c (bfd_elf_size_dynamic_sections): Use lbasename instead
-	of basename.
-
-2005-05-14  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Set DT_PPC_GOT,
-	not DT_PPC_GLINK.
-	(ppc_elf_finish_dynamic_sections): Likewise.
-
-2005-05-13  Fred Fish  <fnf at specifixinc.com>
-
-	* libbfd-in.h: Fix a comment typo, 'neaderst' -> 'nearest'
-	* libbfd.h: Rebuilt.
-
-2005-05-13  Bob Wilson  <bob.wilson at acm.org>
-
-	* elf32-xtensa.c (xtensa_get_property_section_name): Add missing
-	periods in linkonce_kind values.
-
-2005-05-12  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf32-i386.c (elf_i386_relocate_section): Allow R_386_GOTOFF
-	against protected function when building executable.
-
-2005-05-12  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (LWZU_0_X_11): Delete.
-	(B, LWZ_11_X_11, LWZ_11_X_30, MTCTR_11): Define.
-	(ppc_elf_select_plt_layout): Set .got flags too.  Formatting.
-	(ppc_elf_size_dynamic_sections): Allocate space for .glink branch
-	table.
-	(ppc_elf_finish_dynamic_symbol): Point .plt entries into the branch
-	table.
-	(ppc_elf_finish_dynamic_sections): Adjust DT_PPC_GLINK value.
-	Generate .glink branch table and updated stubs.
-
-2005-05-11  Alan Modra  <amodra at bigpond.net.au>
-
-	* reloc.c (BFD_RELOC_HI16_PCREL): Define.
-	(BFD_RELOC_HI16_S_PCREL, BFD_RELOC_LO16_PCREL): Define.
-	* elf32-ppc.c (GLINK_PLTRESOLVE, GLINK_ENTRY_SIZE): Define.
-	(CROR_151515, CROR_313131): Delete.
-	(ADDIS_11_11, ADDI_11_11, SUB_11_11_30, ADD_0_11_11, ADD_11_0_11,
-	LWZ_0_4_30, MTCTR_0, LWZ_12_8_30, BCTR, ADDIS_11_30,
-	LWZU_0_X_11): Define.
-	(ppc_elf_howto_raw): Add R_PPC_REL16, R_PPC_REL16_LO, R_PPC_REL16_HI
-	and R_PPC_REL16_HA entries.
-	(ppc_elf_reloc_type_lookup): Convert new bfd reloc types.
-	(ppc_elf_addr16_ha_reloc): Also handle R_PPC_REL16_HA.
-	(struct ppc_elf_link_hash_table): Add glink, glink_pltresolve,
-	new_plt, and old_plt.
-	(ppc_elf_create_dynamic_sections): Create .glink section.
-	(ppc_elf_check_relocs): Set new_plt and old_plt.
-	(ppc_elf_select_plt_layout): New function.
-	(ppc_elf_tls_setup): Set plt output section elf type and flags.
-	(allocate_got): Handle differences between old and new got layout.
-	(allocate_dynrelocs): Likewise for plt.
-	(ppc_elf_size_dynamic_sections): Likewise.  Allocate memory for
-	.glink.  Don't allocate memory for old bss .plt.  Emit DT_PPC_GLINK.
-	(ppc_elf_relax_section): Rename ppc_info to htab.  Handle .glink
-	destination of R_PPC_PLTREL24 relocs.
-	(ppc_elf_relocate_section): Handle new relocs and changed destination
-	of R_PPC_PLTREL24.
-	(ppc_elf_finish_dynamic_symbol): Init new style plt and handle
-	differences in layout.
-	(ppc_elf_finish_dynamic_sections): Set DT_PPC_GLINK value.  Don't
-	put a blrl in new got.  Write glink contents.
-	* elf32-ppc.h (ppc_elf_select_plt_layout): Declare.
-	* libbfd.h: Regenerate.
-	* bfd-in2.h: Regenerate.
-
-2005-05-11  Andreas Schwab  <schwab at suse.de>
-
-	* elf32-i386.c (elf_i386_finish_dynamic_sections): Fix signedness
-	warning.
-
-2005-05-10  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf.c (_bfd_elf_make_section_from_shdr): Only check debug
-	section if SEC_ALLOC isn't set.
-
-2005-05-09  Kelley Cook  <kcook at gcc.gnu.org>
-
-	* configure.in: Replace AC_COMPILE_CHECK_SIZEOF with AC_CHECK_SIZEOF.
-	* acinclude.m4: Don't sinclude accross.m4.
-	* config.in, configure, Makefile.in, doc/Makefile.in: Regenerate.
-
-2005-05-09  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (struct ppc64_elf_obj_tdata): Add has_dotsym.
-	(ppc64_elf_add_symbol_hook): Set has_dotsym.
-	(ppc64_elf_check_directives): Only process syms when has_dotsym.
-	(func_desc_adjust): Hide fake function descriptors when function
-	code entry is defined.
-	(adjust_opd_syms): Adjust for deleted_section becoming union field.
-
-2005-05-09  Alan Modra  <amodra at bigpond.net.au>
-
-	* elfcode.h (elf_object_p): Add more sanity checks on elf header.
-
-2005-05-08  Dave Korn   <dave.korn at artimi.com>
-
-	* coff-tic80.c:  Undefine _CONST after system headers to prevent
-	clash with tic80-specific definition in include/coff/tic80.h
-
-2005-05-08  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 939
-	* elflink.c (elf_link_output_extsym): Use output_bfd if
-	h->root.u.def.section is bfd_abs_section_ptr when reporting
-	error.
-
-2005-05-07  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf-bfd.h (elf_backend_data): Update special_sections to
-	array of pointer to bfd_elf_special_section.
-	* elf.c (special_sections): Likewise.
-	* elf32-arm.c (elf32_arm_symbian_special_sections): Likewise.
-	* elf32-m32r.c (m32r_elf_special_sections): Likewise.
-	* elf32-m68hc11.c (elf32_m68hc11_special_sections): Likewise.
-	* elf32-m68hc12.c (elf32_m68hc12_special_sections): Likewise.
-	* elf32-mcore.c (mcore_elf_special_sections): Likewise.
-	* elf32-ppc.c (ppc_elf_special_sections): Likewise.
-	* elf32-sh64.c (sh64_elf_special_sections): Likewise.
-	* elf32-v850.c (v850_elf_special_sections): Likewise.
-	* elf32-xtensa.c (elf_xtensa_special_sections): Likewise.
-	* elf64-alpha.c (elf64_alpha_special_sections): Likewise.
-	* elf64-hppa.c (elf64_hppa_special_sections): Likewise.
-	* elf64-ppc.c (ppc64_elf_special_sections): Likewise.
-	* elf64-sh64.c (sh64_elf64_special_sections): Likewise.
-	* elfxx-ia64.c (elfNN_ia64_special_sections): Likewise.
-	* elfxx-mips.c (_bfd_mips_elf_special_sections): Likewise.
-	* elfxx-mips.h (_bfd_mips_elf_special_sections): Likewise.
-
-	* elf.c (get_special_section): Updated.
-
-2005-05-07  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf-bfd.h (struct elf_backend_data): Remove got_symbol_offset.
-	* elfxx-target.h (elf_backend_got_symbol_offset): Delete.
-	* elflink.c (_bfd_elf_create_got_section): Use zero in place of
-	got_symbol_offset.
-	* elf-m10300.c (_bfd_mn10300_elf_create_got_section): Likewise.
-	* elf32-frv.c (_frv_create_got_section): Likewise.
-	* elf32-i370.c (i370_elf_finish_dynamic_sections): Delete ppc code.
-	(elf_backend_got_symbol_offset): Don't define.
-	* elf64-ppc.c (elf_backend_got_symbol_offset): Don't define.
-	* elf32-ppc.c (struct ppc_elf_link_hash_table): Add got_header_size
-	and got_gap.
-	(ppc_elf_create_got): Tidy.
-	(ppc_elf_create_dynamic_sections): Don't set SEC_IN_MEMORY for .plt.
-	(ppc_elf_check_relocs): Reduce string comparisons by using elf.hgot.
-	(ppc_elf_gc_sweep_hook): Likewise.
-	(ppc_elf_relocate_section): Likewise.
-	(ppc_elf_finish_dynamic_symbol): Likewise.
-	(allocate_got): New function.
-	(allocate_dynrelocs): Use allocate_got.
-	(ppc_elf_size_dynamic_sections): Likewise.  Delay tlsld_got allocation
-	so that local got can refcount it.  Set got_header_size.
-	(ppc_elf_relocate_section): Use value of elf.hgot rather than hard-
-	coded 4.
-	(ppc_elf_finish_dynamic_sections): Likewise.
-	(elf_backend_got_symbol_offset): Don't define.
-	(elf_backend_got_header_size): Ditto.
-
-2005-05-05  Steve Ellcey  <sje at cup.hp.com>
-
-	* configure.in (ACX_HEADER_STRING): New.
-	* configure: Regenerate.
-	* config.in: Regenerate.
-	* sysdep.h (STRING_WITH_STRINGS): Use.
-
-2005-05-05  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf.c (_bfd_elf_close_and_cleanup): Only call
-	_bfd_dwarf2_cleanup_debug_info on bfd_object.
-
-2005-05-05  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elflink.c (_bfd_elf_provide_section_bound_symbols): Use
-	"__bss_start" instead of "_edata" as fallback.
-
-2005-05-05  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* bfd-in2.h: Regenerated.
-
-2005-05-05  Paul Brook  <paul at codesourcery.com>
-
-	* config.bfd: Use bfd_elf32_i386_vxworks_vec for i?86-*-vxworks.
-	* configure.in: Add bfd_elf32_i386_vxworks_vec. i386 targets need
-	elf-vxworks.lo.
-	* configure: Regenerate.
-	* Makefile.am (BFD32_BACKENDS): Add elf-vxworks.lo.
-	(BFD32_BACKENDS_CFILES): Add elf-vxworks.c.
-	(elf32-i386.lo): Depend on elf-vxworks.h.
-	(elf-vxworks.lo): New rule.
-	* Makefile.in: Regenerate.
-	* elf-bfd.h (elf_backend_data): Update type of
-	elf_backend_emit_relocs.
-	(_bfd_elf_link_output_relocs): Update prototype.
-	* elflink.c (_bfd_elf_link_output_relocs): Always use
-	bed->elf_backend_emit_relocs when outputting relocations.
-	* elfxx-target.h (elf_backend_emit_relocs): Default to
-	_bfd_elf_link_output_relocs.
-	* targets.c (bfd_elf32_i386_vxworks_vec): Declare.
-	(_bfd_target_vector): Add bfd_elf32_i386_vxworks_vec.
-	* elf32-i386.c: Add elf32-i386-vxworks target BFD.
-	(elf_i386_plt0_entry): Remove padding.
-	(elf_i386_pic_plt0_entry): Ditto.
-	(PLTRESOLVE_RELOCS_SHLIB, PLTRESOLVE_RELOCS): Define.
-	(PLT_NON_JUMP_SLOT_RELOCS): Define.
-	(elf_i386_link_hash_table): Add srelplt2, hgot, hplt, is_vxworks and
-	plt0_pad_byte fields.
-	(elf_i386_link_hash_table_create): Zero them.
-	(elf_i386_create_dynamic_sections): Create static relocation section.
-	(allocate_dynrelocs): Allocate space for static PLT relocations.
-	(elf_i386_size_dynamic_sections): Save shortcuts to PLT and GOT
-	symbols.  Give PLT symbols function type.  Don't strip PLT sections
-	if we have exported symbols from them.
-	(elf_i386_finish_dynamic_symbol): Fill in VxWorks PLT static
-	relocation section.  Don't mark _GLOBAL_OFFSET_TABLE_ as absolute on
-	VxWorks.
-	(elf_i386_finish_dynamic_sections): Allow different pad bytes.
-	Add relocation for GOT location.  Fill in PLT static relocations.
-	(elf_i386_vxworks_link_hash_table_create): New function.
-	(elf_i386_vxworks_link_output_symbol_hook): New function.
-	* elf-vxworks.h: New file.
-
-2005-05-05  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* section.c (bfd_make_section_anyway_with_flags): New.
-	(bfd_make_section_anyway): Call bfd_make_section_anyway_with_flags,
-	(bfd_make_section_with_flags): New.
-	(bfd_make_section): Call bfd_make_section_with_flags.
-
-	* elf-m10300.c (_bfd_mn10300_elf_create_got_section): Call
-	bfd_make_section_with_flags/bfd_make_section_anyway_with_flags
-	instead of bfd_make_section/bfd_make_section and don't call
-	bfd_set_section_flags.
-	(mn10300_elf_check_relocs): Likewise.
-	(_bfd_mn10300_elf_create_dynamic_sections): Likewise.
-	* elf32-arm.c (create_got_section): Likewise.
-	(bfd_elf32_arm_add_glue_sections_to_bfd): Likewise.
-	(elf32_arm_check_relocs): Likewise.
-	* elf32-cris.c (cris_elf_check_relocs): Likewise.
-	* elf32-frv.c (elf32_frv_add_symbol_hook): Likewise.
-	(_frv_create_got_section): Likewise.
-	(elf32_frvfdpic_create_dynamic_sections): Likewise.
-	* elf32-hppa.c (elf32_hppa_create_dynamic_sections): Likewise.
-	(elf32_hppa_check_relocs): Likewise.
-	* elf32-i370.c (i370_elf_create_dynamic_sections): Likewise.
-	(i370_elf_check_relocs): Likewise.
-	* elf32-i386.c (create_got_section): Likewise.
-	(elf_i386_check_relocs): Likewise.
-	* elf32-m32r.c (m32r_elf_add_symbol_hook): Likewise.
-	(create_got_section): Likewise.
-	(m32r_elf_create_dynamic_sections): Likewise.
-	(m32r_elf_check_relocs): Likewise.
-	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
-	* elf32-ppc.c (ppc_elf_create_got): Likewise.
-	(ppc_elf_create_dynamic_sections): Likewise.
-	(ppc_elf_add_symbol_hook): Likewise.
-	(ppc_elf_check_relocs): Likewise.
-	* elf32-s390.c (create_got_section): Likewise.
-	(elf_s390_check_relocs): Likewise.
-	* elf32-sh.c (create_got_section): Likewise.
-	(sh_elf_create_dynamic_sections): Likewise.
-	(sh_elf_check_relocs): Likewise.
-	* elf32-vax.c (elf_vax_check_relocs): Likewise.
-	* elf32-xstormy16.c (xstormy16_elf_check_relocs): Likewise.
-	* elf32-xtensa.c (elf_xtensa_create_dynamic_sections): Likewise.
-	(add_extra_plt_sections): Likewise.
-	* elf64-alpha.c (elf64_alpha_add_symbol_hook): Likewise.
-	(elf64_alpha_create_got_section): Likewise.
-	(elf64_alpha_create_dynamic_sections): Likewise.
-	(elf64_alpha_check_relocs): Likewise.
-	* elf64-hppa.c (get_reloc_section): Likewise.
-	(get_opd): Likewise.
-	(get_plt): Likewise.
-	(get_dlt): Likewise.
-	(get_stub): Likewise.
-	(elf64_hppa_create_dynamic_sectionso): Likewise.
-	* elf64-mmix.c (mmix_elf_check_common_relocs): Likewise.
-	* elf64-ppc.c (create_linkage_sections): Likewise.
-	(ppc64_elf_check_relocs): Likewise.
-	* elf64-s390.c (create_got_section): Likewise.
-	(elf_s390_check_relocs): Likewise.
-	* elf64-sh64.c (sh_elf64_check_relocs): Likewise.
-	(sh64_elf64_create_dynamic_sections): Likewise.
-	* elf64-x86-64.c (create_got_section): Likewise.
-	(elf64_x86_64_check_relocs): Likewise.
-	* elflink.c (_bfd_elf_create_got_section): Likewise.
-	(_bfd_elf_link_create_dynamic_sections): Likewise.
-	(elf_link_add_object_symbols): Likewise.
-	* elfxx-ia64.c (elfNN_ia64_add_symbol_hook): Likewise.
-	(elfNN_ia64_create_dynamic_sections): Likewise.
-	(get_fptr): Likewise.
-	(get_pltoff): Likewise.
-	(get_reloc_section): Likewise.
-	(elfNN_ia64_object_p): Likewise.
-	* elfxx-mips.c (mips_elf_rel_dyn_section): Likewise.
-	(mips_elf_create_compact_rel_section): Likewise.
-	(mips_elf_create_got_section): Likewise.
-	(_bfd_mips_elf_create_dynamic_sections): Likewise.
-	* elfxx-sparc.c (create_got_section): Likewise.
-	(_bfd_sparc_elf_check_relocs): Likewise.
-
-	* elf.c (_bfd_elf_new_section_hook): Call _bfd_elf_get_sec_type_attr
-	on linker created sections.
-
-2005-05-05  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 882
-	* elflink.c (_bfd_elf_link_assign_sym_version): Allow version
-	script on executable.
-
-2005-05-05  John Levon  <levon at movementarian.org>
-
-	* dwarf2.c (read_abbrevs): If bfd_realloc fails, free currently
-	allocated memory before returning.
-	(decode_line_info): Likewise.
-	(_bfd_dwarf2_cleanup_debug_info): New function:  Frees memory
-	allocated by functions in this file.
-	* elf-bfd.h (_bfd_dwarf2_cleanup_debug_info): Prototype.
-	* elf.c (_bfd_elf_close_and_cleanup): Call
-	_bfd_dwarf2_cleanup_debug_info.
-
-2005-05-05  Hans-Peter Nilsson  <hp at axis.com>
-
-	* Makefile.am (INCLUDES): Don't -D_GNU_SOURCE here.
-	* configure.in: Call AC_GNU_SOURCE here, after AC_PROG_CC.
-	* configure, config.in, Makefile.in: Regenerate.
-	* sysdep.h (stpcpy): Revert last change.
-
-2005-05-05  Hans-Peter Nilsson  <hp at axis.com>
-
-	* sysdep.h (stpcpy): Wrap declaration in parentheses.
-
-2005-05-04  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elfxx-ia64.c (ARCH_SIZE): New.
-	(LOG_SECTION_ALIGN): Likewise.
-	(elfNN_ia64_create_dynamic_sections): Use LOG_SECTION_ALIGN to
-	align relocation sections.
-	(get_fptr): Likewise.
-	(get_reloc_section): Likewise.
-	(elfNN_ia64_tprel_base): Likewise.
-	(elfNN_ia64_check_relocs): Support 32bit relocations.
-	(allocate_global_fptr_got): Likewise.
-	(allocate_dynrel_entries): Likewise.
-	(set_got_entry): Likewise.
-	(set_pltoff_entry): Likewise.
-	(elfNN_ia64_relocate_section): Likewise.
-
-2005-05-04  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* configure.in: Add AC_CHECK_DECLS(stpcpy).
-	* configure: Regenerate.
-	* config.in: Likewise.
-
-	* sysdep.h (stpcpy): New.
-
-2005-05-04  Nick Clifton  <nickc at redhat.com>
-
-	* Update the address and phone number of the FSF organization in
-	the GPL notices in the following files:
-	aix386-core.c, aix5ppc-core.c, aout-adobe.c, aout-arm.c,
-	aout-cris.c, aout-ns32k.c, aout-sparcle.c, aout-target.h,
-	aout-tic30.c, aout0.c, aout32.c, aout64.c, aoutf1.h, aoutx.h,
-	archive.c, archive64.c, archures.c, armnetbsd.c, bfd-in.h,
-	bfd-in2.h, bfd.c, bfdio.c, bfdwin.c, binary.c, bout.c, cache.c,
-	cf-i386lynx.c, cf-m68klynx.c, cf-sparclynx.c, cisco-core.c,
-	coff-a29k.c, coff-alpha.c, coff-apollo.c, coff-arm.c, coff-aux.c,
-	coff-go32.c, coff-h8300.c, coff-h8500.c, coff-i386.c, coff-i860.c,
-	coff-i960.c, coff-ia64.c, coff-m68k.c, coff-m88k.c, coff-maxq.c,
-	coff-mcore.c, coff-mips.c, coff-or32.c, coff-pmac.c, coff-ppc.c,
-	coff-rs6000.c, coff-sh.c, coff-sparc.c, coff-stgo32.c,
-	coff-svm68k.c, coff-tic30.c, coff-tic4x.c, coff-tic54x.c,
-	coff-tic80.c, coff-u68k.c, coff-w65.c, coff-we32k.c, coff-z8k.c,
-	coff64-rs6000.c, coffcode.h, coffgen.c, cofflink.c, coffswap.h,
-	corefile.c, cpu-a29k.c, cpu-alpha.c, cpu-arc.c, cpu-arm.c,
-	cpu-avr.c, cpu-cr16c.c, cpu-cris.c, cpu-crx.c, cpu-d10v.c,
-	cpu-d30v.c, cpu-dlx.c, cpu-fr30.c, cpu-frv.c, cpu-h8300.c,
-	cpu-h8500.c, cpu-hppa.c, cpu-i370.c, cpu-i386.c, cpu-i860.c,
-	cpu-i960.c, cpu-ia64-opc.c, cpu-ia64.c, cpu-ip2k.c, cpu-iq2000.c,
-	cpu-m10200.c, cpu-m10300.c, cpu-m32r.c, cpu-m68hc11.c,
-	cpu-m68hc12.c, cpu-m68k.c, cpu-m88k.c, cpu-maxq.c, cpu-mcore.c,
-	cpu-mips.c, cpu-mmix.c, cpu-msp430.c, cpu-ns32k.c, cpu-openrisc.c,
-	cpu-or32.c, cpu-pdp11.c, cpu-pj.c, cpu-powerpc.c, cpu-rs6000.c,
-	cpu-s390.c, cpu-sh.c, cpu-sparc.c, cpu-tic30.c, cpu-tic4x.c,
-	cpu-tic54x.c, cpu-tic80.c, cpu-v850.c, cpu-vax.c, cpu-w65.c,
-	cpu-we32k.c, cpu-xstormy16.c, cpu-xtensa.c, cpu-z8k.c, demo64.c,
-	dwarf1.c, dwarf2.c, ecoff.c, ecofflink.c, ecoffswap.h,
-	efi-app-ia32.c, efi-app-ia64.c, elf-bfd.h, elf-eh-frame.c,
-	elf-hppa.h, elf-m10200.c, elf-m10300.c, elf-strtab.c, elf.c,
-	elf32-am33lin.c, elf32-arc.c, elf32-arm.c, elf32-avr.c,
-	elf32-cr16c.c, elf32-cris.c, elf32-crx.c, elf32-d10v.c,
-	elf32-d30v.c, elf32-dlx.c, elf32-fr30.c, elf32-frv.c, elf32-gen.c,
-	elf32-h8300.c, elf32-hppa.c, elf32-hppa.h, elf32-i370.c,
-	elf32-i386.c, elf32-i860.c, elf32-i960.c, elf32-ip2k.c,
-	elf32-iq2000.c, elf32-m32r.c, elf32-m68hc11.c, elf32-m68hc12.c,
-	elf32-m68hc1x.c, elf32-m68hc1x.h, elf32-m68k.c, elf32-m88k.c,
-	elf32-mcore.c, elf32-mips.c, elf32-msp430.c, elf32-openrisc.c,
-	elf32-or32.c, elf32-pj.c, elf32-ppc.c, elf32-ppc.h, elf32-s390.c,
-	elf32-sh-symbian.c, elf32-sh.c, elf32-sh64-com.c, elf32-sh64.c,
-	elf32-sh64.h, elf32-sparc.c, elf32-v850.c, elf32-vax.c,
-	elf32-xstormy16.c, elf32-xtensa.c, elf32.c, elf64-alpha.c,
-	elf64-gen.c, elf64-hppa.c, elf64-hppa.h, elf64-mips.c,
-	elf64-mmix.c, elf64-ppc.c, elf64-ppc.h, elf64-s390.c,
-	elf64-sh64.c, elf64-sparc.c, elf64-x86-64.c, elf64.c, elfcode.h,
-	elfcore.h, elflink.c, elfn32-mips.c, elfxx-ia64.c, elfxx-mips.c,
-	elfxx-mips.h, elfxx-sparc.c, elfxx-sparc.h, elfxx-target.h,
-	epoc-pe-arm.c, epoc-pei-arm.c, format.c, freebsd.h, gen-aout.c,
-	genlink.h, hash.c, host-aout.c, hp300bsd.c, hp300hpux.c,
-	hppabsd-core.c, hpux-core.c, i386aout.c, i386bsd.c, i386dynix.c,
-	i386freebsd.c, i386linux.c, i386lynx.c, i386mach3.c, i386msdos.c,
-	i386netbsd.c, i386os9k.c, ieee.c, ihex.c, init.c, irix-core.c,
-	libaout.h, libbfd-in.h, libbfd.c, libbfd.h, libcoff-in.h,
-	libcoff.h, libecoff.h, libhppa.h, libieee.h, libnlm.h, liboasys.h,
-	libpei.h, libxcoff.h, linker.c, lynx-core.c, m68k4knetbsd.c,
-	m68klinux.c, m68klynx.c, m68knetbsd.c, m88kmach3.c, m88kopenbsd.c,
-	mach-o-target.c, mach-o.c, mach-o.h, merge.c, mipsbsd.c, mmo.c,
-	netbsd-core.c, netbsd.h, newsos3.c, nlm-target.h, nlm.c,
-	nlm32-alpha.c, nlm32-i386.c, nlm32-ppc.c, nlm32-sparc.c, nlm32.c,
-	nlm64.c, nlmcode.h, nlmswap.h, ns32k.h, ns32knetbsd.c, oasys.c,
-	opncls.c, osf-core.c, pc532-mach.c, pdp11.c, pe-arm.c, pe-i386.c,
-	pe-mcore.c, pe-mips.c, pe-ppc.c, pe-sh.c, peXXigen.c,
-	pef-traceback.h, pef.c, pef.h, pei-arm.c, pei-i386.c, pei-mcore.c,
-	pei-mips.c, pei-ppc.c, pei-sh.c, peicode.h, ppcboot.c,
-	ptrace-core.c, reloc.c, reloc16.c, riscix.c, rs6000-core.c,
-	sco5-core.c, section.c, simple.c, som.c, som.h, sparclinux.c,
-	sparclynx.c, sparcnetbsd.c, srec.c, stab-syms.c, stabs.c, sunos.c,
-	syms.c, sysdep.h, targets.c, tekhex.c, ticoff.h, trad-core.c,
-	vax1knetbsd.c, vaxbsd.c, vaxnetbsd.c, versados.c, vms-gsd.c,
-	vms-hdr.c, vms-misc.c, vms-tir.c, vms.c, vms.h, xcoff-target.h,
-	xcofflink.c, xsym.c, xsym.h, xtensa-isa.c, xtensa-modules.c,
-	hosts/alphavms.h
-
-2005-05-04  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* bfd-in.h (_bfd_elf_provide_section_bound_symbols): New.
-	* bfd-in2.h: Regenerated.
-
-	* elflink.c (bfd_elf_set_symbol): New.
-	(_bfd_elf_provide_symbol): Call it.
-	(_bfd_elf_provide_section_bound_symbols): New.
-
-2005-05-04  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elflink.c (_bfd_elf_merge_symbol): Only skip weak definitions
-	at the end, if a strong definition has already been seen.
-
-2005-05-04  Alan Modra  <amodra at bigpond.net.au>
-
-	* section.c (struct bfd_section): Replace link_order_head and
-	link_order_tail with map_head and map_tail union.
-	(STD_SECTION): Update.
-	(_bfd_strip_section_from_output): Delete.
-	* aoutx.h: Update throughout for above changes.
+	PR 2434
+	* elflink.c (struct elf_smash_syms_data, elf_smash_syms): Delete.
+	(elf_link_add_object_symbols): Delete unnecessary locals.  Rename
+	hash_table -> htab.  Formatting.  Save entire symbol table
+	before loading as-needed syms, and restore afterwards if lib not
+	needed.  Use bfd_hash_allocate rather than bfd_alloc for sym
+	name.  Free some buffers earlier.
+	* bfd-in.h (struct bfd_hash_table): Add entsize.
+	(bfd_hash_table_init, bfd_hash_table_init_n): Adjust prototype.
+	* elf-bfd.h (_bfd_elf_link_hash_table_init): Likewise
+	* hash.c (bfd_hash_table_init_n): Add entsize param, save to
+	hash table.
+	(bfd_hash_table_init): Add param, adjust calls.
+	* aoutx.h: Adjust all hash_table_init functions and calls.
+	* bfd.c: Likewise.
+	* coff-arm.c: Likewise.
+	* coff-h8300.c: Likewise.
 	* coff-ppc.c: Likewise.
 	* cofflink.c: Likewise.
 	* ecoff.c: Likewise.
-	* elf-eh-frame.c: Likewise.
+	* ecofflink.c: Likewise.
 	* elf-m10300.c: Likewise.
+	* elf-strtab.c: Likewise.
 	* elf.c: Likewise.
 	* elf32-arm.c: Likewise.
+	* elf32-bfin.c: Likewise.
 	* elf32-cris.c: Likewise.
+	* elf32-frv.c: Likewise.
 	* elf32-hppa.c: Likewise.
 	* elf32-i386.c: Likewise.
 	* elf32-m32r.c: Likewise.
@@ -2963,7171 +481,662 @@
 	* elf32-s390.c: Likewise.
 	* elf32-sh.c: Likewise.
 	* elf32-vax.c: Likewise.
-	* elf32-xtensa.c: Likewise.
 	* elf64-alpha.c: Likewise.
 	* elf64-hppa.c: Likewise.
 	* elf64-ppc.c: Likewise.
 	* elf64-s390.c: Likewise.
 	* elf64-sh64.c: Likewise.
 	* elf64-x86-64.c: Likewise.
-	* elflink.c: Likewise.
 	* elfxx-ia64.c: Likewise.
 	* elfxx-mips.c: Likewise.
 	* elfxx-sparc.c: Likewise.
+	* i386linux.c: Likewise.
+	* libaout.h: Likewise.
+	* libbfd-in.h: Likewise.
+	* libcoff-in.h: Likewise.
 	* linker.c: Likewise.
+	* m68klinux.c: Likewise.
 	* merge.c: Likewise.
+	* opncls.c: Likewise.
 	* pdp11.c: Likewise.
+	* sparclinux.c: Likewise.
+	* stabs.c: Likewise.
+	* sunos.c: Likewise.
+	* vms.c: Likewise.
 	* xcofflink.c: Likewise.
-	* elflink.c (bfd_boolean bfd_elf_size_dynsym_hash_dynstr): Split
-	out from bfd_elf_size_dynamic_sections.
-	* bfd-in.h (bfd_boolean bfd_elf_size_dynsym_hash_dynstr): Declare.
-	* bfd-in2.h: Regenerate.
-
-2005-05-04  Alan Modra  <amodra at bigpond.net.au>
-
-	* section.c (bfd_section_list_remove): Don't clear s->next.
-	(bfd_section_list_append): Always init s->prev.
-	(bfd_section_list_prepend): Define.
-	(bfd_section_list_insert_after): Minor optimization.
-	(bfd_section_removed_from_list): Rewrite.
-	* elf.c (assign_section_numbers): Simplify list traversal now that
-	bfd_section_list_remove doesn't destroy removed section next ptr.
-	* sunos.c (sunos_add_dynamic_symbols): Likewise.
-	* elfxx-ia64.c (elfNN_ia64_object_p): Use bfd_section_list_prepend.
-	* xcofflink.c (_bfd_xcoff_bfd_final_link): Simplify list traversal.
-	* bfd-in2.h: Regenerate.
-
-2005-05-02  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* bfd.c (bfd): Remove section_tail and add section_last.
-	(bfd_preserve): Likewise.
-	(bfd_preserve_save): Likewise.
-	(bfd_preserve_restore): Likewise.
-	* opncls.c (_bfd_new_bfd): Likewise.
-
-	* coffcode.h (coff_compute_section_file_positions): Updated.
-	(coff_compute_section_file_positions): Likewise.
-	* elf.c (assign_section_numbers): Likewise.
-	* elf32-i370.c (i370_elf_size_dynamic_sections): Likewise.
-	* elf64-mmix.c (mmix_elf_final_link): Likewise.
-	* elfxx-ia64.c (elfNN_ia64_object_p): Likewise.
-	* elfxx-mips.c (_bfd_mips_elf_link_hash_table_create): Likewise.
-	* sunos.c (sunos_add_dynamic_symbols): Likewise.
-	* xcofflink.c (_bfd_xcoff_bfd_final_link): Likewise.
-
-	* ecoff.c (bfd_debug_section): Initialize prev.
-
-	* section.c (bfd_section): Add prev.
-	(bfd_section_list_remove): Updated.
-	(bfd_section_list_append): New.
-	(bfd_section_list_insert_after): New.
-	(bfd_section_list_insert_before): New.
-	(bfd_section_list_insert): Removed.
-	(bfd_section_removed_from_list): Updated.
-	(STD_SECTION): Initialize prev.
-	(bfd_section_init): Updated.
-	(bfd_section_list_clear): Updated.
-
-	* bfd-in2.h: Regenerated.
-
-2005-05-02  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf.c (_bfd_elf_new_section_hook): Don't call
-	_bfd_elf_get_sec_type_attr on sections from input files.
-
-2005-05-02  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* merge.c (sec_merge_init): Call bfd_hash_table_init_n with
-	hash table size 16699 instead of bfd_hash_table_init.
-
-2005-05-01  Paul Brook  <paul at codesourcery.com>
-
-	* elflink.c (_bfd_elf_merge_symbol): Skip weak definitions if a strong
-	definition has already been seen.
-
-2005-05-01  Paul Brook  <paul at codesourcery.com>
-
-	* elf32-arm.c (bfd_elf32_arm_process_before_allocation): Treat
-	R_ARM_PLT32 the same as R_ARM_PC24.
-	(arm_add_to_rel): Ditto.
-
-2005-04-29  Ralf Corsepius <ralf.corsepius at rtems.org>
-
-	* config.bfd: Add h8300*-*-rtemscoff.
-	Switch h8300*-*-rtems* to elf.
-
-2005-04-29  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* aclocal.m4, Makefile.in: Regnerated.
-
-2005-04-28  Paul Brook  <paul at codesourcery.com>
-
-	Merge changes only applied to Makefile.in.
-	* Makefile.am (BFD32_BACKENDS): Add elfxx-sparc.lo
-	(BFD32_BACKENDS_CFILES): Add elfxx-sparc.c
-	(elfxx-sparc.lo): New rule.
-	(elf32-sparc.lo): Add elfxx-sparc.h dependency.
-	(elf64-sparc.lo): Likewise.
-
-2005-04-28  Julian Brown  <julian at codesourcery.com>
-
-	* elflink.c (_bfd_elf_provide_symbol): Provide symbol for weak
-	import.
-
-2005-04-27  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf-bfd.h (bfd_elf_sym_name): Also take "asection *".
-
-	* elf.c (bfd_elf_sym_name): Updated.
-	(group_signature): Likewise.
-	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
-	* elf64-ppc.c (ppc64_elf_edit_opd): Likewise.
-	(ppc64_elf_edit_toc): Likewise.
-	(ppc64_elf_relocate_section): Likewise.
-	* elfcode.h (elf_slurp_symbol_table): Likewise.
-	* elflink.c (elf_link_input_bfd): Likewise.
-
-	* elfxx-ia64.c (elfNN_ia64_relocate_section): Call
-	bfd_elf_sym_name to get local symbol name when reporting errors.
-
-2005-04-27  Nick Clifton  <nickc at redhat.com>
-
-	* elflink.c (elf_link_input_bfd): Handle the case where a badly
-	formatted input file results in a reloc which has no associated
-	global symbol.
-
-2005-04-26  Jerome Guitton  <guitton at gnat.com>
-
-	* bfd.m4 (BFD_NEED_DECLARATION): Restore.
-
-2005-04-25  David S. Miller  <davem at davemloft.net>
-
-	* elfxx-sparc.c (sparc_elf_append_rela_64): Add BFD64 protection.
-	(sparc_elf_r_info_64, _bfd_sparc_elf_finish_dynamic_symbol,
-	sparc64_finish_dyn, _bfd_sparc_elf_finish_dynamic_sections):
-	Likewise.
-
-2005-04-25  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 858
-	* elflink.c (elf_link_input_bfd): Make non-debugging reference
-	to discarded section an error.
-
-2005-04-21  Jerome Guitton  <guitton at gnat.com>
-
-	* configure.in: Replace BFD_NEED_DECLARATION checks by the
-	corresponding AC_CHECK_DECLS.
-	* sysdep.h: Replace NEED_DECLARATION_* checks by the corresponding
-	HAVE_DECL_*.
-	* bfd.m4 (BFD_NEED_DECLARATION): Remove, obsolete.
-	* configure: Regenerate.
-	* config.in: Ditto.
-
-2005-04-21  Andreas Schwab  <schwab at suse.de>
-
-	* elfxx-sparc.h (struct _bfd_sparc_elf_link_hash_table): Remove
-	unsigned from type of dynamic_interpreter.
-	* elfxx-sparc.c (_bfd_sparc_elf_link_hash_table_create): Remove
-	casts again.
-
-	* elf.c (assign_section_numbers): Fix comment.
-
-2005-04-21  Jerome Guitton  <guitton at gnat.com>
-
-	* som.c (som_bfd_print_private_bfd_data): Add explicit cast to long
-	for struct som_exec_auxhdr fields.
-
-2005-04-21  Nick Clifton  <nickc at redhat.com>
-
-	* aout-adobe.c: Convert to ISO C and fix formatting.
-	* aout-arm.c: Convert to ISO C and fix formatting.
-	* aout-cris.c: Convert to ISO C and fix formatting.
-	* aout-ns32k.c: Convert to ISO C and fix formatting.
-	* aout-tic30.c: Convert to ISO C and fix formatting.
-	* coffcode.h: Convert to ISO C and fix formatting.
-	* coffswap.h: Convert to ISO C and fix formatting.
-	* i386aout.c: Convert to ISO C and fix formatting.
-	* libaout.h: Convert to ISO C and fix formatting.
-	* libcoff-in.h: Convert to ISO C and fix formatting.
-	* libcoff.h: Convert to ISO C and fix formatting.
-	* libecoff.h: Convert to ISO C and fix formatting.
-	* libnlm.h: Convert to ISO C and fix formatting.
-	* libpei.h: Convert to ISO C and fix formatting.
-	* libxcoff.h: Convert to ISO C and fix formatting.
-	* nlm-target.h: Convert to ISO C and fix formatting.
-	* nlm.c: Convert to ISO C and fix formatting.
-	* nlm32-alpha.c: Convert to ISO C and fix formatting.
-	* nlm32-i386.c: Convert to ISO C and fix formatting.
-	* nlm32-ppc.c: Convert to ISO C and fix formatting.
-	* nlm32-sparc.c: Convert to ISO C and fix formatting.
-	* nlmcode.h: Convert to ISO C and fix formatting.
-	* nlmswap.h: Convert to ISO C and fix formatting.
-	* pe-mips.c: Convert to ISO C and fix formatting.
-	* peXXigen.c: Convert to ISO C and fix formatting.
-	* peicode.h: Convert to ISO C and fix formatting.
-	* vms-gsd.c: Convert to ISO C and fix formatting.
-	* vms-hdr.c: Convert to ISO C and fix formatting.
-	* vms-misc.c: Convert to ISO C and fix formatting.
-	* vms-tir.c: Convert to ISO C and fix formatting.
-	* vms.c: Convert to ISO C and fix formatting.
-	* vms.h: Convert to ISO C and fix formatting.
-
-	* coffgen.c (coff_print_symbol): Restore correct formatting of
-	output.
-
-2005-04-20  David S. Miller  <davem at davemloft.net>
-
-	* elfxx-sparc.c (sparc_elf_r_symndx_64): Fix compiler warning.
-	(_bfd_sparc_elf_link_hash_table_create): Likewise.
-	(allocate_dynrelocs): Likewise.
-
-2005-04-20  Jerome Guitton  <guitton at gnat.com>
-
-	* configure.in: Fix the check for basename declaration. Add check
-	for declarations of ftello, ftello64, fseeko, fseeko64.
-	* configure: Regenerate.
-	* config.in: Ditto.
-	* sysdep.h: If needed, declare ftello, ftello64, fseeko, fseeko64.
-
-2005-04-19  David S. Miller  <davem at davemloft.net>
-
-	* elfxx-sparc.c: New file.
-	* elfxx-sparc.h: New file.
-	* Makefile.in (BFD32_BACKENDS): Add elfxx-sparc.lo
-	(BFD32_BACKENDS_CFILES): Add elfxx-sparc.c
-	(elfxx-sparc.lo): New rule.
-	(elf32-sparc.lo): Add elfxx-sparc.h dependency.
-	(elf64-sparc.lo): Likewise.
-	* configure.in (bfd_elf32_sparc_vec): Add elfxx-sparc.lo
-	(bfd_elf64_sparc_vec): Likewise.
-	* configure: Regenerate.
-	* elf32-sparc.c: Remove common code now in elfxx-sparc.c
-	* elf64-sparc.c: Likewise, also use elf64_sparc_*() naming
-	which is more consistent with elf32-sparc.c
-
-2005-04-19  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* elfxx-mips.c (struct mips_elf_link_hash_entry): Update comment.
-	(mips_elf_create_local_got_entry): Check h->root.forced_local.
-
-2005-04-19  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_check_relocs): Don't bother with
-	dynamic relocs in non-SEC_ALLOC sections.
-	(ppc_elf_gc_sweep_hook): Likewise.
-	(ppc_elf_relax_section): Likewise.
-	(ppc_elf_relocate_section): Likewise.
-
-2005-04-18  Nick Clifton  <nickc at redhat.com>
-
-	* aix5ppc-core.c (xcoff64_core_p): Fix compile time warning
-	assigning a value to return_value.
-
-2005-04-17  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 855
-	* elf.c (_bfd_elf_copy_private_section_data): Don't copy linker
-	created group data.
-
-2005-04-17  H.J. Lu  <hongjiu.lu at intel.com>
-
-	PR 855
-	* elf.c (setup_group): Properly handle zero group count.
-
-2005-04-17  Mark Kettenis  <kettenis at gnu.org>
-
-	* som.c (hppa_som_reloc, som_mkobject, som_is_space)
-	(som_is_subspace, compare_subspaces, som_compute_checksum)
-	(som_build_and_write_symbol_table, som_slurp_symbol_table): New
-	protoypes.
-	(hppa_som_reloc, compare_syms, compare_subspaces)
-	(som_print_symbol, som_get_section_contents)
-	(som_set_section_contents): Remove space after 'void *'.
-	(som_bfd_print_private_bfd_data): Use %lx to print longs.
-	(som_bfd_merge_private_bfd_data)
-	(som_bfd_copy_private_header_data, som_bfd_set_private_flags): New
-	defines.
-
-2004-04-15  Julian Brown  <julian at codesourcery.com>
-
-	* bfd-in.h (bfd_elf32_arm_set_target_relocs): Update prototype.
-	* bfd-in2.h: Regenerate.
-	* elf32-arm.c (elf32_arm_link_hash_table): New field, 'use_blx'.
-	(elf32_arm_link_hash_table_create): Initialise fix_v4bx, use_blx.
-	(bfd_elf32_arm_set_target_relocs): Handle use_blx.
-	(elf32_arm_final_link_relocate): Use Thumb BLX for R_ARM_THM_PC22
-	relocations if requested to.
-	(allocate_dynrelocs): Don't count size of omitted Thumb stubs based on
-	use_blx rather than symbian_p.
-	(elf32_arm_finish_dynamic_symbol): Don't output Thumb PLT stubs if
-	use_blx is in effect.
-	(elf32_arm_symbian_link_hash_table_create): Enable use_blx by default
-	for SymbianOS.
-
-2005-04-15  Nick Clifton  <nickc at redhat.com>
-
-	* coffgen.c (coff_print_symbol): Use fprintf_vma to print vma
-	values.
-
-2005-04-15  Alan Modra  <amodra at bigpond.net.au>
-
-	PR ld/815
-	* elflink.c (elf_smash_syms): Clear undef.next if it's not being
-	used as a list pointer.
-
-2005-04-14  Alan Modra  <amodra at bigpond.net.au>
-
-	* Makefile.am (NO_WERROR): Define.
-	* warning.m4: New file
-	* acinclude.m4: Include warning.m4.
-	* configure.in: Invoke AM_BINUTILS_WARNINGS.
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-2005-04-14  Alan Modra  <amodra at bigpond.net.au>
-
-	* merge.c (sec_merge_emit): Tidy.  Check for bfd_zmalloc errors.
-	Write trailing padding.
-
-	* merge.c (merge_strings): Round up section size for alignment.
-
-2005-04-14  David S. Miller  <davem at davemloft.net>
-
-	Add TLS support for 64-bit Sparc ELF.
-	*  elf64-sparc.c (sparc64_elf_dyn_relocs,
-	sparc64_elf_link_hash_entry, sparc64_elf_obj_tdata): New structs.
-	(GOT_UNKNOWN, GOT_NORMAL, GOT_TLD_GD, GOT_TLD_IE,
-	sparc64_elf_hash_entry, sparc64_elf_tdata,
-	sparc64_elf_local_got_tls_type): New defines.
-	(sparc64_elf_mkobject): New function.
-	(sparc64_elf_link_hash_table): Add members for dynamic linker
-	sections PLT, RELPLT, DYNBSS, and RELBSS.  Add tls_ldm_got
-	uion to track TLS GOT references.  Add sym_sec to cache
-	mappings from local sym to section.
-	(link_hash_newfunc): New function.
-	(sparc64_elf_bfd_link_hash_table_create): Rename to
-	sparc64_elf_link_hash_table_create for consistency.
-	Pass link_hash_newfunc to _bfd_elf_link_hash_table_init.
-	(sparc64_elf_create_dynamic_sections): Initialize new section
-	members of sparc64_elf_link_hash_table.  Only init srelbss
-	if not-shared.
-	(sparc64_elf_copy_indirect_symbol, sparc64_elf_tls_transition):
-	New functions.
-	(SPARC_NOP): Define.
-	(sparc64_elf_build_plt, sparc64_elf_plt_entry_offset,
-	sparc64_elf_plt_ptr_offset): Delete.
-	(sparc64_plt_entry_build): New function to build PLT entries
-	gradually instread of all at once at the end of linking.
-	(sparc64_elf_check_relocs): Delete dynobj, sgot, and srelgot
-	local vars.  Get them from sparc64_elf_hash_table instead.
-	Check early on if r_symndx is in bounds.  Handle TLS transitions.
-	Account for TLS GOT references and DF_STATIC_TLS, as needed.
-	For TLS relocs, record the tls_type in either
-	sparc64_elf_local_got_tls_type or sparc64_elf_hash_entry as
-	appropriate.  For R_SPARC_TLS_{GD,LDM}_CALL, emit a reference
-	to the __tls_get_addr symbol.  For PLT relocs, track references
-	via h->plt.refcount.  When R_SPARC_{PC10,PC22,PC_HH22,PC_HM10,
-	PC_LM22} and h not-NULL, set h->non_got_ref.  For global data
-	symbol references, count the number of relocations needed for
-	that symbol.  For default switch case, don't error, this lets
-	the TLS relocs not explicitly handled by this function get
-	accepted.
-	(sparc64_elf_gc_mark_hook, sparc64_gc_sweep_hook): New functions.
-	(sparc64_elf_adjust_dynamic_symbol): Remove dynobj local var, get
-	it from sparc64_elf_hash_table.  Store the real PLT offset
-	in h->plt.offset, and build PLT entries one at a time.  Also
-	get .dynbss section pointer from htab.
-	(allocate_dynrelocs, readonly_dynrelocs,
-	sparc64_omit_section_dynsym): New functions.
-	(sparc64_elf_omit_section_dynsym): Use these new functions as
-	helpers.
-	(dtpoff_base, tpoff): New functions.
-	(sparc64_elf_relocate_section): Kill dynobj, sgot, and splt
-	locals, get them from sparc64_elf_hash_table.  Handle TLS
-	relocations and refcounting in main relocation loop.
-	(sparc64_elf_finish_dynamic_symbol): Use
-	sparc64_elf_link_hash_table.  Build PLT entries as we see
-	them.  Handle TLS GOT relocations.
-	(sparc64_elf_finish_dynamic_sections): Get sgot and dynobj
-	from sparc64_elf_hash_table.  Initialize only PLT header
-	not all entries since we not build PLT entries one by one.
-	(elf_backend_copy_indirect_symbol, bfd_elf64_mkobject,
-	elf_backend_gc_mark_hook, elf_backend_gc_sweep_hook,
-	elf_backend_can_gc_sections, elf_backend_can_refcount): Define.
-
-2005-04-13  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* elflink.c (elf_link_input_bfd): Update check for removed
-	sections.
-
-2005-04-12  Alan Modra  <amodra at bigpond.net.au>
-
-	* Makefile.am: Run "make dep-am".
-	* Makefile.in: Regenerate.
-	* aclocal.m4: Regenerate.
-	* libcoff.h: Regenerate.
-
-2005-04-11  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* linker.c (_bfd_generic_link_output_symbols): Also check if
-	the output section of an input section has been removed from
-	the output file.
-
-	* section.c (bfd_section_list_remove): Clear the next field
-	of the removed section.
-	(bfd_section_removed_from_list): New.
-	* bfd-in2.h: Regenerated.
-
-2005-04-11  David S. Miller  <davem at davemloft.net>
-
-	* elf32-sparc.c (elf32_sparc_relocate_section,
-	R_SPARC_TLS_LDO_{HIX22,LOX10}): When not shared, transition to
-	R_SPARC_TLS_LE_{HIX22,LOX10}.
-	(elf32_sparc_relocate_section, R_SPARC_TLS_{LDO,LE}_HIX22): Only
-	xor relocation with 0xffffffff if R_SPARC_TLS_LE_HIX22.
-	(elf32_sparc_relocate_section, R_SPARC_TLS_{LDO,LE}_LOX10): Only
-	or 0x1c00 into relocation if R_SPARC_TLS_LE_HIX22.
-
-2005-04-11  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* coffcode.h (STRING_SIZE_SIZE): Updated to match libcoff-in.h.
-
-2005-04-11  Nick Clifton  <nickc at redhat.com>
-
-	* aout-target.h:  Convert to ISO C.
-	* aoutf1.h:  Convert to ISO C.
-	* aoutx.h:  Convert to ISO C.
-	* bout.c:  Convert to ISO C.
-	* dwarf1.c:  Convert to ISO C.
-	* ecoffswap.h:  Convert to ISO C.
-	* freebsd.h:  Convert to ISO C.
-	* genlink.h:  Convert to ISO C.
-	* ieee.c:  Convert to ISO C.
-	* ihex.c:  Convert to ISO C.
-	* libcoff-in.h:  Convert to ISO C.
-	* mach-o.c:  Convert to ISO C.
-	* mach-o.h:  Convert to ISO C.
-	* netbsd.h:  Convert to ISO C.
-	* ns32k.h:  Convert to ISO C.
-	* ns32knetbsd.c:  Convert to ISO C.
-	* oasys.c:  Convert to ISO C.
-	* pdp11.c:  Convert to ISO C.
-	* pef-traceback.h:  Convert to ISO C.
-	* pef.c:  Convert to ISO C.
-	* pef.h:  Convert to ISO C.
-	* riscix.c:  Convert to ISO C.
-	* som.c:  Convert to ISO C.
-	* som.h:  Convert to ISO C.
-	* srec.c:  Convert to ISO C.
-	* stabs.c:  Convert to ISO C.
-	* sunos.c:  Convert to ISO C.
-	* tekhex.c:  Convert to ISO C.
-	* versados.c:  Convert to ISO C.
-	* version.h:  Convert to ISO C.
-	* xcoff-target.h:  Convert to ISO C.
-	* xcofflink.c:  Convert to ISO C.
-	* xsym.c:  Convert to ISO C.
-	* xsym.h:  Convert to ISO C.
-
-2005-04-08  Paul Brook  <paul at codesourcery.com>
-
-	* elf32-arm.c (ARM2THUMB_GLUE_SIZE): Rename...
-	(ARM2THUMB_STATIC_GLUE_SIZE): ... to this.
-	(ARM2THUMB_PIC_GLUE_SIZE): Define.
-	(a2t1p_ldr_insn, a2t2p_add_pc_insn, a2t3p_bx_r12_insn): Add.
-	(elf32_arm_to_thumb_stub): Create PIC stubs.
-	(record_arm_to_thumb_glue): Use different stub size for relocatable
-	images.
-
-2005-04-05  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (dec_dynrel_count): New function split out from
-	ppc64_elf_edit_toc, with additional code from ppc64_elf_edit_opd.
-	(ppc64_elf_edit_toc, ppc64_elf_edit_opd): Use it.
-	(ppc64_elf_tls_optimize): Likewise.
-
-2005-04-05  Mark Kettenis  <kettenis at gnu.org>
-
-	* netbsd-core.c (SPARC_WCOOKIE_OFFSET): Renamed from
-	CORE_WCOOKIE_OFFSET.
-	(SPARC64_WCOOKIE_OFFSET): New.
-	(netbsd_core_file_p): Provide .wcookie section for OpenBSD/sparc64.
-
-2005-04-05  Nick Clifton  <nickc at redhat.com>
-
-	* po/rw.po: New translation: Kinyarwanda
-	* configure.in (ALL_LINGUAS): Add rw
-	* configure: Regenerate.
-
-2005-04-05  Richard Sandiford  <rsandifo at redhat.com>
-
-	* elfxx-mips.c (MIPS_ELF_OPTIONS_SECTION_NAME_P): New macro.
-	(_bfd_mips_elf_section_from_shdr): Use it to check for recognized
-	SHT_MIPS_OPTIONS names.  Allow all sections with unrecognised
-	section flags.
-	(_bfd_mips_elf_fake_sections): Use MIPS_ELF_OPTIONS_SECTION_NAME_P
-	to check for SHT_MIPS_OPTIONS sections.
-	(_bfd_mips_elf_set_section_contents): Likewise.
-
-2005-04-04  Eric Christopher  <echristo at redhat.com>
-
-	* elfxx-mips.c (_bfd_elf_mips_get_relocated_section_contents):
-	Clean up gp handling code.
-
-2005-04-04  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf.c (bfd_elf_set_group_contents): Ignore linker created
-	group section.
-	(assign_section_numbers): Accept link_info. Check SHT_GROUP
-	sections for relocatable files only. Remove the linker created
-	group sections.
-	(_bfd_elf_compute_section_file_positions): Pass link_info to
-	assign_section_numbers.
-
-	* elfxx-ia64.c (elfNN_ia64_object_p): New.
-	(elf_backend_object_p): Defined.
-
-2005-04-04  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf-bfd.h (elf_section_data): Use (sec) instead of sec.
-
-2005-04-03  Fred Fish  <fnf at specifixinc.com>
-
-	* dwarf2.c (struct dwarf2_debug): Add dwarf_ranges_buffer and
-	dwarf_ranges_size members.
-	(struct comp_unit): Add base_address member.
-	(struct funcinfo): Replace low/high members with an arange.
-	(arange_add): Replace incoming "unit" parameter with "abfd" and
-	"first_arange" pointers.  Reorganize/rewrite function body.
-	(decode_line_info): Change arange_add call to pass bfd and arange
-	pointers.
-	(lookup_address_in_line_info_table): Use arange list instead of
-	individual low/high members.  Walk function's arange list to find
-	lowest PC in list, to test for overlapping functions.
-	(read_debug_ranges): New function, reads the debug_ranges section.
-	(lookup_address_in_function_table): Use arange list instead of
-	individual low/high members.  Rewrite to find smallest range that
-	matches.
-	(read_rangelist): Read a given rangelist from debug_ranges.
-	(scan_unit_for_functions): Use arange list instead of individual
-	low/high members.  Handle a DW_AT_ranges attribute.
-	(parse_comp_unit): Use arange list instead of individual low/high
-	members.  Save comp unit base address.  Handle a DW_AT_ranges
-	attribute.
-
-2005-04-01  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf.c (assign_section_numbers): Really use the kept section.
-
-2005-03-31  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf-bfd.h (_bfd_elf_check_kept_section): New.
-
-	* elf.c (assign_section_numbers): When sh_link points to a
-	discarded section, call _bfd_elf_check_kept_section to see if
-	the kept section can be used. Otherwise reject sh_link
-	pointing to discarded section.
-
-	* elflink.c (_bfd_elf_check_kept_section): New.
-	(elf_link_input_bfd): Use it.
-
-2005-04-01  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (ppc64_elf_edit_toc): Account for dynamic relocs
-	that we no longer need.
-
-2005-04-01  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Return -1 on errors
-	rather than 0.
-	(ppc64_elf_check_relocs): Remove unnecessary SEC_ALLOC check.
-
-2005-03-31  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elf.c (assign_section_numbers): Fix a typo.
-
-2005-03-31  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* elflink.c (elf_link_input_bfd): Remove the extra `\n' in
-	error message.
-	(_bfd_elf_section_already_linked): Likewise.
-
-2005-03-31  Jerome Guitton  <guitton at gnat.com>
-
-	* config.in: Regenerate.
-
-2005-03-31  Jerome Guitton  <guitton at gnat.com>
-
-	* config.in (HAVE_DECL_BASENAME): New configure macro.
-	* configure.in: Check for basename.
-	* configure: Regenerate.
-
-2005-03-30  Julian Brown  <julian at codesourcery.com>
-
-	* bfd-in.h (bfd_is_arm_mapping_symbol_name): Rename from
-	bfd_elf32_is_arm_mapping_symbol_name.
-	* bfd-in2.h: Regenerate.
-	* cpu-arm.c (bfd_is_arm_mapping_symbol_name): Rename from
-	bfd_elf32_is_arm_mapping_symbol_name.
-	* elf32-arm.c (elf32_arm_is_target_special_symbol): Rename
-	bfd_elf32_is_arm_mapping_symbol_name to bfd_is_arm_mapping_symbol_name.
-	(arm_elf_find_function): Likewise.
-	(elf32_arm_output_symbol_hook): Likewise.
-
-2005-03-30  Julian Brown  <julian at codesourcery.com>
-
-	* bfd-in.h (bfd_elf32_is_arm_mapping_symbol_name): Add prototype.
-	* bfd-in2.h: Regenerate.
-	* elf32-arm.c (elf32_arm_is_target_special_symbol): Rename call to
-	bfd_elf32_is_arm_mapping_symbol_name.
-	(elf32_arm_output_symbol_hook): Likewise.
-	(arm_elf_find_function): Likewise, and include STT_NOTYPE in test for
-	mapping symbols.
-	(is_arm_mapping_symbol_name): Function moved from here...
-	* cpu-arm.c (bfd_elf32_is_arm_mapping_symbol_name): ...to here, renamed
-	and made global.
-
-2005-03-29  Aaron W. LaFramboise  <aaron98wiridge9 at aaronwl.com>
-
-	* configure.in: Check for ffs decl and alphabetize.
-	* config.in: Regenerate.
-	* configure: Regenerate.
-	* sysdep.h [NEED_DECLARATION_FFS] (ffs): Prototype and alphabetize.
-
-2005-03-29  Fred Fish  <fnf at specifixinc.com>
-
-	* dwarf2.c (struct comp_unit): Fix typo.
-	(scan_unit_for_functions): Remove unused local variable "name"
-	and dead code that set it.
-
-2005-03-29  Daniel Jacobowitz  <dan at codesourcery.com>
-	    Phil Blundell  <philb at gnu.org>
-
-	* bfd-in2.h, libbfd.h: Regenerated.
-	* reloc.c: Add ARM TLS relocations.
-	* elf32-arm.c (elf32_arm_howto_table): Add dynamic TLS
-	relocations.
-	(elf32_arm_tls_gd32_howto, elf32_arm_tls_ldo32_howto)
-	(elf32_arm_tls_ldm32_howto, elf32_arm_tls_le32_howto)
-	(elf32_arm_tls_ie32_howto): New.
-	(elf32_arm_howto_from_type): Support TLS relocations.
-	(elf32_arm_reloc_map): Likewise.
-	(elf32_arm_reloc_type_lookup): Likewise.
-	(TCB_SIZE): Define.
-	(struct elf32_arm_obj_tdata): New.
-	(elf32_arm_tdata, elf32_arm_local_got_tls_type): Define.
-	(elf32_arm_mkobject): New function.
-	(struct elf32_arm_relocs_copied): Add pc_count.
-	(elf32_arm_hash_entry, GOT_UNKNOWN, GOT_NORMAL, GOT_TLS_GD)
-	(GOT_TLS_IE): Define.
-	(struct elf32_arm_link_hash_table): Add tls_ldm_got.
-	(elf32_arm_link_hash_newfunc): Initialize tls_type.
-	(elf32_arm_copy_indirect_symbol): Copy pc_count and tls_type.
-	(elf32_arm_link_hash_table_create): Initialize tls_ldm_got.
-	(dtpoff_base, tpoff): New functions.
-	(elf32_arm_final_link_relocate): Handle TLS relocations.
-	(IS_ARM_TLS_RELOC): Define.
-	(elf32_arm_relocate_section): Warn about TLS mismatches.
-	(elf32_arm_gc_sweep_hook): Handle TLS relocations and pc_count.
-	(elf32_arm_check_relocs): Detect invalid symbol indexes.  Handle
-	TLS relocations and pc_count.
-	(elf32_arm_adjust_dynamic_symbol): Check non_got_ref.
-	(allocate_dynrelocs): Handle TLS.  Bind REL32 relocs to local
-	calls.
-	(elf32_arm_size_dynamic_sections): Handle TLS.
-	(elf32_arm_finish_dynamic_symbol): Likewise.
-	(bfd_elf32_mkobject): Define.
-
-2005-03-29  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* elf32-arm.c (elf32_arm_check_relocs): Increment count for all
-	relocation types.  Don't count relocations which will use a PLT.
-
-2005-03-29  Joel Brobecker  <brobecker at gnat.com>
-
-	* elf.c (elfcore_grok_nto_status): Print tid as long.
-	(elfcore_grok_nto_regs): Likewise.
-
-2005-03-29  Joel Brobecker  <brobecker at gnat.com>
-
-	* irix-core.c: Remove some unnecessary prototypes.
-
-2005-03-28  Joel Brobecker  <brobecker at adacore.com>
-
-	* irix-core.c: Convert to ISO C.
-
-2005-03-28  Joel Brobecker  <brobecker at adacore.com>
-
-	* irix-core.c (do_sections): Replace + by | in expression.
-	(irix_core_core_file_matches_executable_p): Add ATTRIBUTE_UNUSED
-	to unused parameters to avoid a compiler warning.
-
-2005-03-28  Mark Kettenis  <kettenis at gnu.org>
-
-	* netbsd-core.c: Convert to ISO C.  Fix formatting.
-
-2005-03-24  Eric Christopher  <echristo at redhat.com>
-
-	* elfxx-mips.c: Revert previous patch.
-
-2005-03-24  Nick Clifton  <nickc at redhat.com>
-
-	* targets.c (_bfd_target_vector): Only include the
-	bfd_elf32_ia64_hpux_big_vec vector when building a 64-bit BFD with
-	all targets enabled.
-
-2005-03-24  James E Wilson  <wilson at specifixinc.com>
-
-	* Makefile.am (BFD32_BACKENDS): Delete elf32-ia64.lo.
-	(BFD64_BACKENDS): Add elf32-ia64.lo.
-	* Makefile.in: Regenerate.
-
-2005-03-23  Eric Christopher  <echristo at redhat.com>
-
-	* elfxx-mips.c (MIPS_ELF_READONLY_SECTION): New.
-	(mips_elf_calculate_relocation): Use. Define DF_TEXTREL
-	after emitting relocation.
-	(_bfd_mips_elf_adjust_dynamic_symbol): Ditto.
-	(_bfd_mips_elf_check_relocs): Remove code to set DF_TEXTREL
-	and readonly_reloc.
-
-2005-03-23  Mike Frysinger  <vapier at gentoo.org>
-	    Nick Clifton  <nickc at redhat.com>
-
-	* config.bfd: Accept any C library to accompany a GNU Linux
-	implementation, not just the GNU C library.
-	* configure.in: Likewise.
-	* configure: Regenerate.
-
-2005-03-22  H.J. Lu  <hongjiu.lu at intel.com>
-
-	* bfd-in.h (_bfd_elf_provide_symbol): New.
-	* bfd-in2.h: Regenerated.
-
-	* elf32-ppc.c (set_linker_sym): Moved to elflink.c.
-	(ppc_elf_set_sdata_syms): Call _bfd_elf_provide_symbol instead
-	of set_linker_sym.
-
-	* elflink.c (_bfd_elf_provide_symbol): New. Moved and renamed
-	from elf32-ppc.c.
-
-2005-03-22  Hans-Peter Nilsson  <hp at axis.com>
-
-	* hash.c (strtab_hash_newfunc): Fix typo in allocated size.
-
-2005-03-22  Bob Wilson  <bob.wilson at acm.org>
-
-	* xtensa-isa.c (xtensa_opcode_lookup, xtensa_state_lookup,
-	xtensa_sysreg_lookup_name, xtensa_interface_lookup,
-	xtensa_funcUnit_lookup): Skip bsearch call if count is zero.
-	(xtensa_opcode_decode): Rearrange code.
-
-2005-03-22  Nick Clifton  <nickc at redhat.com>
-
-	* binary.c: Convert to ISO C90 formatting.
-	* coff-arm.c: Convert to ISO C90 formatting.
-	* coffgen.c: Convert to ISO C90 formatting.
-	* elf32-gen.c: Convert to ISO C90 formatting.
-	* elf64-gen.c: Convert to ISO C90 formatting.
-	* hash.c: Convert to ISO C90 formatting.
-	* ieee.c: Convert to ISO C90 formatting.
-
-2005-03-22  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* elf32-arm.c (elf32_arm_final_link_relocate): Don't fail for
-	unresolved symbols in R_ARM_NONE relocations.
-
-2005-03-22  Daniel Jacobowitz  <dan at codesourcery.com>
-
-	* elf32-arm.c (elf32_arm_final_link_relocate): Add
-	UNRESOLVED_RELOC_P argument.  Set it appropriately.
-	(elf32_arm_relocate_section): Update call to
-	elf32_arm_final_link_relocate.  Don't clobber RELOCATION; use
-	unresolved_reloc instead.
-
-2005-03-23  Alan Modra  <amodra at bigpond.net.au>
-
-	* elflink.c (elf_link_add_object_symbols): Set SEC_EXCLUDE on
-	.gnu.warning.* sections.
-
-2005-03-22  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (elf_linker_section_pointers_t): Remove
-	written_address_p.
-	(ppc_elf_create_linker_section): Don't try to reuse existing section.
-	(elf_create_pointer_linker_section): Delete info parm.  Don't make
-	h dynamic.  Don't set written_address_p.
-	(ppc_elf_check_relocs): Adjust ppc_elf_create_linker_section calls.
-	(bfd_put_ptr): Delete.
-	(elf_finish_pointer_linker_section): Remove output_bfd and info parms.
-	Always write section contents.  Assert global sym is def_regular.
-	Use offset bottom bit as a written flag.
-	(ppc_elf_relocate_section): Adjust elf_finish_pointer_linker_section
-	calls.
-
-2005-03-22  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_set_sdata_syms): New function, extracted from..
-	(ppc_elf_set_sdata_syms): ..here.  Expand comment.  Set .sbss start
-	and end syms.
-
-2005-03-21  Nick Clifton  <nickc at redhat.com>
-
-	* coff-arm.c (coff_link_hash_entry): Only define for non WINCE
-	targets.
-	(t2a1_bx_pc_insn): Likewise.
-	(t2a2_noop_insn): Likewise.
-	(t2a3_b_insn): Likewise.
-	(t2a1_push_insn): Likewise.
-	(t2a2_ldr_insn): Likewise.
-	(t2a3_mov_insn): Likewise.
-	(t2a4_bx_insn): Likewise.
-	(t2a5_pop_insn): Likewise.
-	(t2a6_bx_insn): Likewise.
-	(coff_arm_relocate_section): Only declare the high_address
-	variable for non WINCE targets.
-
-2005-03-22  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (ppc_elf_add_symbol_hook): Make htab->sbss
-	SEC_LINKER_CREATED.  Attach to dynobj.
-	(ppc_elf_size_dynamic_sections): Strip htab->sbss if zero size.
-
-2005-03-21  Alan Modra  <amodra at bigpond.net.au>
-
-	* elf32-ppc.c (struct elf_linker_section): Remove sym_hash and
-	sym_offset.  Add name, bss_name, sym_name, sym_val.
-	(struct ppc_elf_link_hash_table): Remove sdata and sdata2 pointers.
-	Add sdata array of elf_linker_section_t.
-	(ppc_elf_link_hash_table_create): Set name, sym_name, and bss_name.
-	(enum elf_linker_section_enum): Delete.
-	(ppc_elf_create_linker_section): Rewrite.  Don't create syms here.
-	(ppc_elf_check_relocs): Delay ppc_elf_create_linker_section until
-	the special sections are