Update to gdb version 5.3.

Extract of changes below.

*** Changes in GDB 5.3:

* GNU/Linux shared library multi-threaded performance improved.

* ``gdbserver'' now supports multi-threaded applications on some targets

* GDB now supports C/C++ preprocessor macros.

* Multi-arched targets.
DEC Alpha (partial)                             alpha*-*-*
DEC VAX (partial)                               vax-*-*
NEC V850                                        v850-*-*
National Semiconductor NS32000 (partial)        ns32k-*-*
Motorola 68000 (partial)                        m68k-*-*
Motorola MCORE                                  mcore-*-*

* New targets.
Fujitsu FRV architecture added by Red Hat       frv*-*-*

* New native configurations
Alpha NetBSD                                    alpha*-*-netbsd*
SH NetBSD                                       sh*-*-netbsdelf*
MIPS NetBSD                                     mips*-*-netbsd*
UltraSPARC NetBSD                               sparc64-*-netbsd*

* OBSOLETE configurations and files
Mitsubishi D30V                                 d30v-*-*
OS/9000                                         i[34]86-*-os9k
IBM AIX PS/2                                    i[3456]86-*-aix
Fujitsu FR30                                    fr30-*-elf*
Motorola Delta 88000 running Sys V              m88k-motorola-sysv  or  delta88
Argonaut Risc Chip (ARC)                        arc-*-*
i386 running Mach 3.0                           i[3456]86-*-mach3*
i386 running Mach                               i[3456]86-*-mach*
i386 running OSF/1                              i[3456]86-*osf1mk*
HP/Apollo 68k Family                            m68*-apollo*-sysv*,
                                                m68*-apollo*-bsd*,
                                                m68*-hp-bsd*, m68*-hp-hpux*
I960 with MON960                                i960-*-coff

* OBSOLETE languages
CHILL, a Pascal like language used by telecommunications companies.

* REMOVED configurations and files

AMD 29k family via UDI                          a29k-amd-udi, udi29k
A29K VxWorks                                    a29k-*-vxworks
AMD 29000 embedded, using EBMON                 a29k-none-none
AMD 29000 embedded with COFF                    a29k-none-coff
AMD 29000 embedded with a.out                   a29k-none-aout

testsuite/gdb.hp/gdb.threads-hp/                directory

* New command "set max-user-call-depth <nnn>"

* Changes in FreeBSD/i386 native debugging.

Support for the "generate-core-file" has been added.

* New commands "dump", "append", and "restore".

* Improved "next/step" support on multi-processor Alpha Tru64.

9 files changed, 1069 insertions, 37 deletions

diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 339a6fd577f..338c58e2a7c 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/08/07 14:18:26 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/10 23:50:48 seb Exp $
 #
 
-DISTNAME=       gdb-5.2.1
+DISTNAME=       gdb-5.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gdb/}
 
@@ -9,13 +9,22 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/gdb/gdb.html
 COMMENT=	symbolic debugger for multiple language frontends
 
-MAKE_ENV+=	CPPFLAGS=
-INFO_FILES=	gdb.info gdbint.info stabs.info bfd.info
-INFO_FILES+=	mmalloc.info standards.info
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+USE_LIBTOOL=		YES
+USE_GMAKE=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/bfd/libtool ${WRKSRC}/opcodes/libtool
+REPLACE_LOCALEDIR_PATTERNS+=	Make-in
 INSTALL_TARGET=	install install-info
 
-do-configure:
-	cd ${WRKSRC}; ./configure --prefix=${PREFIX}
+.include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "SunOS"
+# Work around a bug in gdb's configure
+CONFIGURE_ENV+=		ac_cv_header_curses_h=yes
+.endif
+
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gdb/PLIST b/devel/gdb/PLIST
index 5eabffb5663..861b5abf408 100644
--- a/devel/gdb/PLIST
+++ b/devel/gdb/PLIST
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2002/11/30 14:18:41 grant Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/03/10 23:50:48 seb Exp $
 bin/gdb
 include/ansidecl.h
 include/bfd.h
 include/bfdlink.h
 include/dis-asm.h
 include/symcat.h
-@unexec ${INSTALL_INFO} --delete %D/info/mmalloc.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/bfd.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/gdb.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/gdbint.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/stabs.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/bfd.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gdb.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gdbint.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mmalloc.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/stabs.info
 info/bfd.info
 info/bfd.info-1
 info/bfd.info-2
@@ -20,10 +20,6 @@ info/bfd.info-6
 info/bfd.info-7
 info/bfd.info-8
 info/bfd.info-9
-info/configure.info
-info/configure.info-1
-info/configure.info-2
-info/configure.info-3
 info/gdb.info
 info/gdb.info-1
 info/gdb.info-10
@@ -32,7 +28,6 @@ info/gdb.info-12
 info/gdb.info-13
 info/gdb.info-14
 info/gdb.info-15
-info/gdb.info-16
 info/gdb.info-2
 info/gdb.info-3
 info/gdb.info-4
@@ -48,35 +43,39 @@ info/gdbint.info-3
 info/gdbint.info-4
 info/gdbint.info-5
 info/gdbint.info-6
+info/gdbint.info-7
 info/mmalloc.info
 info/stabs.info
 info/stabs.info-1
 info/stabs.info-2
 info/stabs.info-3
 info/stabs.info-4
-info/standards.info
-@exec ${INSTALL_INFO} %D/info/standards.info %D/info/dir
-@exec ${INSTALL_INFO} %D/info/configure.info %D/info/dir
-@exec ${INSTALL_INFO} %D/info/mmalloc.info %D/info/dir
-@exec ${INSTALL_INFO} %D/info/bfd.info %D/info/dir
-@exec ${INSTALL_INFO} %D/info/gdb.info %D/info/dir
-@exec ${INSTALL_INFO} %D/info/gdbint.info %D/info/dir
-@exec ${INSTALL_INFO} %D/info/stabs.info %D/info/dir
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/bfd.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gdb.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gdbint.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mmalloc.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/stabs.info
+lib/libbfd-2.13.90.so
+lib/libbfd.a
 lib/libbfd.la
+lib/libbfd.so
 lib/libiberty.a
-lib/libbfd.a
+lib/libmmalloc.a
+lib/libopcodes-2.13.90.so
 lib/libopcodes.a
 lib/libopcodes.la
-lib/libmmalloc.a
-man/man1/gdb.1
+lib/libopcodes.so
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bfd.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bfd.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/opcodes.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/bfd.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bfd.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/bfd.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/opcodes.mo
+man/man1/gdb.1
diff --git a/devel/gdb/distinfo b/devel/gdb/distinfo
index f3d4eba46da..30c928342cb 100644
--- a/devel/gdb/distinfo
+++ b/devel/gdb/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.3 2002/08/07 14:18:27 jschauma Exp $
+$NetBSD: distinfo,v 1.4 2003/03/10 23:50:48 seb Exp $
 
-SHA1 (gdb-5.2.1.tar.gz) = 516fc00911a661c6e29bfdb402f3863e5fc2a2aa
-Size (gdb-5.2.1.tar.gz) = 14715792 bytes
-SHA1 (patch-aa) = 11c29e1af9ec6301c81735310e85fe18e7407251
+SHA1 (gdb-5.3.tar.gz) = 24a6c9da6e89b1b82b7508f27f94098d989ff662
+Size (gdb-5.3.tar.gz) = 14707600 bytes
+SHA1 (patch-aa) = 8d3f7748c645b520488ee5499eb81a1e0a82593c
+SHA1 (patch-ab) = 56fe49b2f0b6a99053f48d6cf0df91c78ae24a92
+SHA1 (patch-ac) = 681168205196ad6451674f703fcf9148b673d4de
+SHA1 (patch-ad) = f831cd919d75ba8ab76c1f90b47ee443615397f8
+SHA1 (patch-ae) = e2a7e553cab2d447e9c27f6fd956577355714f28
+SHA1 (patch-af) = 4637beaaa978395547f7664504aced476ec946d8
diff --git a/devel/gdb/patches/patch-aa b/devel/gdb/patches/patch-aa
index 5ea77830922..a6320c0d7e5 100644
--- a/devel/gdb/patches/patch-aa
+++ b/devel/gdb/patches/patch-aa
@@ -1,8 +1,23 @@
-$NetBSD: patch-aa,v 1.2 2002/08/07 14:18:28 jschauma Exp $
+$NetBSD: patch-aa,v 1.3 2003/03/10 23:50:49 seb Exp $
 
---- Makefile.in.orig	Sat Jul 27 19:25:33 2002
-+++ Makefile.in	Sat Jul 27 19:25:41 2002
-@@ -712,7 +712,6 @@
+--- Makefile.in.orig	2002-12-10 21:30:40.000000000 +0000
++++ Makefile.in
+@@ -75,10 +75,10 @@ PWD = $${PWDCMD-pwd}
+ # cygwin host.
+ INSTALL_PROGRAM_ARGS =
+ 
+-INSTALL = $(SHELL) $$s/install-sh -c
+-INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS)
+-INSTALL_SCRIPT = $(INSTALL)
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL = $(BSD_INSTALL)
++INSTALL_PROGRAM = $(BSD_INSTALL_PROGRAM)
++INSTALL_SCRIPT = $(BSD_INSTALL_SCRIPT)
++INSTALL_DATA = $(BSD_INSTALL_DATA)
+ 
+ INSTALL_DOSREL = install-dosrel-fake
+ 
+@@ -707,7 +707,6 @@ INSTALL_MODULES = \
  	install-perl \
  	install-prms \
  	install-rcs \
diff --git a/devel/gdb/patches/patch-ab b/devel/gdb/patches/patch-ab
new file mode 100644
index 00000000000..adbb8ecd63e
--- /dev/null
+++ b/devel/gdb/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2003/03/10 23:50:49 seb Exp $
+
+--- bfd/Makefile.am.orig	2002-08-30 08:11:44.000000000 +0000
++++ bfd/Makefile.am
+@@ -724,8 +724,8 @@ install_libbfd: $(bfdlib_LTLIBRARIES) $(
+ 	$(mkinstalldirs) $(DESTDIR)$(bfdincludedir)
+ 	@list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \
+-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p; \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(bfdlibdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+ 	$(INSTALL_DATA) $(BFD_H) $(DESTDIR)$(bfdincludedir)/bfd.h
diff --git a/devel/gdb/patches/patch-ac b/devel/gdb/patches/patch-ac
new file mode 100644
index 00000000000..7915b01eed9
--- /dev/null
+++ b/devel/gdb/patches/patch-ac
@@ -0,0 +1,629 @@
+$NetBSD: patch-ac,v 1.1 2003/03/10 23:50:49 seb Exp $
+
+--- bfd/Makefile.in.orig	2003-03-10 21:23:58.000000000 +0000
++++ bfd/Makefile.in
+@@ -151,535 +151,45 @@ BFD_H = bfd.h
+ # for the debugger, so if you are downloading things as S-records you
+ # need two copies of the executable, one to download and one for the
+ # debugger).
+-BFD32_LIBS = \
+-	archive.lo archures.lo bfd.lo cache.lo coffgen.lo corefile.lo \
+-	format.lo init.lo libbfd.lo opncls.lo reloc.lo \
+-	section.lo syms.lo targets.lo hash.lo linker.lo \
+-	srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo \
+-	merge.lo dwarf2.lo
++BFD32_LIBS =  	archive.lo archures.lo bfd.lo cache.lo coffgen.lo corefile.lo 	format.lo init.lo libbfd.lo opncls.lo reloc.lo 	section.lo syms.lo targets.lo hash.lo linker.lo 	srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo 	merge.lo dwarf2.lo
+ 
+ 
+ BFD64_LIBS = archive64.lo
+ 
+-BFD32_LIBS_CFILES = \
+-	archive.c archures.c bfd.c cache.c coffgen.c corefile.c \
+-	format.c init.c libbfd.c opncls.c reloc.c \
+-	section.c syms.c targets.c hash.c linker.c \
+-	srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \
+-	merge.c dwarf2.c
++BFD32_LIBS_CFILES =  	archive.c archures.c bfd.c cache.c coffgen.c corefile.c 	format.c init.c libbfd.c opncls.c reloc.c 	section.c syms.c targets.c hash.c linker.c 	srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c 	merge.c dwarf2.c
+ 
+ 
+ BFD64_LIBS_CFILES = archive64.c
+ 
+ # This list is alphabetized to make it easier to keep in sync
+ # with the decls and initializer in archures.c.
+-ALL_MACHINES = \
+-	cpu-a29k.lo \
+-	cpu-alpha.lo \
+-	cpu-arc.lo \
+-	cpu-arm.lo \
+-	cpu-avr.lo \
+-	cpu-cris.lo \
+-	cpu-d10v.lo \
+-	cpu-d30v.lo \
+-	cpu-dlx.lo \
+-	cpu-fr30.lo \
+-	cpu-frv.lo \
+-	cpu-h8300.lo \
+-	cpu-h8500.lo \
+-	cpu-hppa.lo \
+-	cpu-ia64.lo \
+-	cpu-i370.lo \
+-	cpu-i386.lo \
+-	cpu-i860.lo \
+-	cpu-i960.lo \
+-	cpu-ip2k.lo \
+-	cpu-m32r.lo \
+-	cpu-m68hc11.lo \
+-	cpu-m68hc12.lo \
+-	cpu-m68k.lo \
+-	cpu-m88k.lo \
+-	cpu-m10200.lo \
+-	cpu-m10300.lo \
+-	cpu-mcore.lo \
+-	cpu-mips.lo \
+-	cpu-mmix.lo \
+-	cpu-or32.lo \
+-	cpu-ns32k.lo \
+-	cpu-openrisc.lo \
+-	cpu-pdp11.lo \
+-	cpu-pj.lo \
+-	cpu-powerpc.lo \
+-	cpu-rs6000.lo \
+-	cpu-s390.lo \
+-	cpu-sh.lo \
+-	cpu-sparc.lo \
+-	cpu-tic30.lo \
+-	cpu-tic4x.lo \
+-	cpu-tic54x.lo \
+-	cpu-tic80.lo \
+-	cpu-v850.lo \
+-	cpu-vax.lo \
+-	cpu-we32k.lo \
+-	cpu-w65.lo \
+-	cpu-xstormy16.lo \
+-	cpu-z8k.lo
+-
+-
+-ALL_MACHINES_CFILES = \
+-	cpu-a29k.c \
+-	cpu-alpha.c \
+-	cpu-arc.c \
+-	cpu-arm.c \
+-	cpu-avr.c \
+-	cpu-cris.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-ia64.c \
+-	cpu-i370.c \
+-	cpu-i386.c \
+-	cpu-i860.c \
+-	cpu-i960.c \
+-	cpu-ip2k.c \
+-	cpu-m32r.c \
+-	cpu-m68hc11.c \
+-	cpu-m68hc12.c \
+-	cpu-m68k.c \
+-	cpu-m88k.c \
+-	cpu-m10200.c \
+-	cpu-m10300.c \
+-	cpu-mcore.c \
+-	cpu-mips.c \
+-	cpu-mmix.c \
+-	cpu-or32.c \
+-	cpu-ns32k.c \
+-	cpu-openrisc.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-we32k.c \
+-	cpu-w65.c \
+-	cpu-xstormy16.c \
+-	cpu-z8k.c
++ALL_MACHINES =  	cpu-a29k.lo 	cpu-alpha.lo 	cpu-arc.lo 	cpu-arm.lo 	cpu-avr.lo 	cpu-cris.lo 	cpu-d10v.lo 	cpu-d30v.lo 	cpu-dlx.lo 	cpu-fr30.lo 	cpu-frv.lo 	cpu-h8300.lo 	cpu-h8500.lo 	cpu-hppa.lo 	cpu-ia64.lo 	cpu-i370.lo 	cpu-i386.lo 	cpu-i860.lo 	cpu-i960.lo 	cpu-ip2k.lo 	cpu-m32r.lo 	cpu-m68hc11.lo 	cpu-m68hc12.lo 	cpu-m68k.lo 	cpu-m88k.lo 	cpu-m10200.lo 	cpu-m10300.lo 	cpu-mcore.lo 	cpu-mips.lo 	cpu-mmix.lo 	cpu-or32.lo 	cpu-ns32k.lo 	cpu-openrisc.lo 	cpu-pdp11.lo 	cpu-pj.lo 	cpu-powerpc.lo 	cpu-rs6000.lo 	cpu-s390.lo 	cpu-sh.lo 	cpu-sparc.lo 	cpu-tic30.lo 	cpu-tic4x.lo 	cpu-tic54x.lo 	cpu-tic80.lo 	cpu-v850.lo 	cpu-vax.lo 	cpu-we32k.lo 	cpu-w65.lo 	cpu-xstormy16.lo 	cpu-z8k.lo
++
++
++ALL_MACHINES_CFILES =  	cpu-a29k.c 	cpu-alpha.c 	cpu-arc.c 	cpu-arm.c 	cpu-avr.c 	cpu-cris.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-ia64.c 	cpu-i370.c 	cpu-i386.c 	cpu-i860.c 	cpu-i960.c 	cpu-ip2k.c 	cpu-m32r.c 	cpu-m68hc11.c 	cpu-m68hc12.c 	cpu-m68k.c 	cpu-m88k.c 	cpu-m10200.c 	cpu-m10300.c 	cpu-mcore.c 	cpu-mips.c 	cpu-mmix.c 	cpu-or32.c 	cpu-ns32k.c 	cpu-openrisc.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-we32k.c 	cpu-w65.c 	cpu-xstormy16.c 	cpu-z8k.c
+ 
+ 
+ # The .o files needed by all of the 32 bit vectors that are configured into
+ # target_vector in targets.c if configured with --enable-targets=all.
+-BFD32_BACKENDS = \
+-	aout-adobe.lo \
+-	aout-arm.lo \
+-	aout-cris.lo \
+-	aout-ns32k.lo \
+-	aout-sparcle.lo \
+-	aout-tic30.lo \
+-	aout0.lo \
+-	aout32.lo \
+-	armnetbsd.lo \
+-	bout.lo \
+-	cf-i386lynx.lo \
+-	cf-m68klynx.lo \
+-	cf-sparclynx.lo \
+-	coff-a29k.lo \
+-	coff-apollo.lo \
+-	coff-arm.lo \
+-	coff-aux.lo \
+-	coff-h8300.lo \
+-	coff-h8500.lo \
+-	coff-i386.lo \
+-	coff-go32.lo \
+-	coff-i860.lo \
+-	coff-i960.lo \
+-	coff-m68k.lo \
+-	coff-m88k.lo \
+-	coff-mips.lo \
+-	coff-or32.lo \
+-	coff-rs6000.lo \
+-	coff-sh.lo \
+-	coff-sparc.lo \
+-	coff-stgo32.lo \
+-	coff-svm68k.lo \
+-	coff-tic30.lo \
+-	coff-tic4x.lo \
+-	coff-tic54x.lo \
+-	coff-tic80.lo \
+-	coff-u68k.lo \
+-	coff-we32k.lo \
+-	coff-w65.lo \
+-	coff-z8k.lo \
+-	cofflink.lo \
+-	dwarf1.lo \
+-	ecoff.lo \
+-	ecofflink.lo \
+-	efi-app-ia32.lo \
+-	elf.lo \
+-	elf32-arc.lo \
+-	elfarm-oabi.lo \
+-	elfarm-nabi.lo \
+-	elfarmqnx-nabi.lo \
+-	elf32-avr.lo \
+-	elf32-cris.lo \
+-	elf32-d10v.lo \
+-	elf32-d30v.lo \
+-	elf32-dlx.lo \
+-	elf32-fr30.lo \
+-	elf32-frv.lo \
+-	elf32-gen.lo \
+-	elf32-h8300.lo \
+-	elf32-hppa.lo \
+-	elf32-i370.lo \
+-	elf32-i386.lo \
+-	elf32-i386qnx.lo \
+-	elf32-i860.lo \
+-	elf32-i960.lo \
+-	elf32-ia64.lo \
+-	elf32-ip2k.lo \
+-	elf32-m32r.lo \
+-	elf32-m68hc11.lo \
+-	elf32-m68hc12.lo \
+-	elf32-m68k.lo \
+-	elf32-m88k.lo \
+-	elf-m10200.lo \
+-	elf-m10300.lo \
+-	elf32-mcore.lo \
+-	elfxx-mips.lo \
+-	elf32-mips.lo \
+-	elf32-openrisc.lo \
+-	elf32-or32.lo \
+-	elf32-pj.lo \
+-	elf32-ppc.lo \
+-	elf32-ppcqnx.lo \
+-	elf32-s390.lo \
+-	elf32-sh.lo \
+-	elf32-sh-lin.lo \
+-	elf32-sh64.lo \
+-	elf32-sh64-com.lo \
+-	elf32-sh-nbsd.lo \
+-	elf32-sh64-nbsd.lo \
+-	elf32-shqnx.lo \
+-	elf32-sparc.lo \
+-	elf32-v850.lo \
+-	elf32-vax.lo \
+-	elf32-xstormy16.lo \
+-	elf32.lo \
+-	elflink.lo \
+-	elf-strtab.lo \
+-	elf-eh-frame.lo \
+-	epoc-pe-arm.lo \
+-	epoc-pei-arm.lo \
+-	hp300bsd.lo \
+-	hp300hpux.lo \
+-	som.lo \
+-	i386aout.lo \
+-	i386bsd.lo \
+-	i386dynix.lo \
+-	i386freebsd.lo \
+-	i386linux.lo \
+-	i386lynx.lo \
+-	i386msdos.lo \
+-	i386netbsd.lo \
+-	i386mach3.lo \
+-	i386os9k.lo \
+-	ieee.lo \
+-	m68k4knetbsd.lo \
+-	m68klinux.lo \
+-	m68klynx.lo \
+-	m68knetbsd.lo \
+-	m88kmach3.lo \
+-	mipsbsd.lo \
+-	newsos3.lo \
+-	nlm.lo \
+-	nlm32-i386.lo \
+-	nlm32-sparc.lo \
+-	nlm32-ppc.lo \
+-	nlm32.lo \
+-	ns32knetbsd.lo \
+-	oasys.lo \
+-	pc532-mach.lo \
+-	pdp11.lo \
+-	pe-arm.lo \
+-	pei-arm.lo \
+-	pe-i386.lo \
+-	pei-i386.lo \
+-	pe-mcore.lo \
+-	pei-mcore.lo \
+-	pe-ppc.lo \
+-	pei-ppc.lo \
+-	pe-sh.lo \
+-	pei-sh.lo \
+-	pe-mips.lo \
+-	pei-mips.lo \
+-	peigen.lo \
+-	ppcboot.lo \
+-	reloc16.lo \
+-	riscix.lo \
+-	sparclinux.lo \
+-	sparclynx.lo \
+-	sparcnetbsd.lo \
+-	sunos.lo \
+-	vaxnetbsd.lo \
+-	vax1knetbsd.lo \
+-	vaxbsd.lo \
+-	versados.lo \
+-	vms.lo \
+-	vms-gsd.lo \
+-	vms-hdr.lo \
+-	vms-misc.lo \
+-	vms-tir.lo \
+-	xcofflink.lo
+-
+-
+-BFD32_BACKENDS_CFILES = \
+-	aout-adobe.c \
+-	aout-arm.c \
+-	aout-cris.c \
+-	aout-ns32k.c \
+-	aout-sparcle.c \
+-	aout-tic30.c \
+-	aout0.c \
+-	aout32.c \
+-	armnetbsd.c \
+-	bout.c \
+-	cf-i386lynx.c \
+-	cf-m68klynx.c \
+-	cf-sparclynx.c \
+-	coff-a29k.c \
+-	coff-apollo.c \
+-	coff-arm.c \
+-	coff-aux.c \
+-	coff-h8300.c \
+-	coff-h8500.c \
+-	coff-i386.c \
+-	coff-i860.c \
+-	coff-go32.c \
+-	coff-i960.c \
+-	coff-m68k.c \
+-	coff-m88k.c \
+-	coff-mips.c \
+-	coff-or32.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-we32k.c \
+-	coff-w65.c \
+-	coff-z8k.c \
+-	cofflink.c \
+-	dwarf1.c \
+-	ecoff.c \
+-	ecofflink.c \
+-	efi-app-ia32.c \
+-	elf.c \
+-	elf32-arc.c \
+-	elfarm-oabi.c \
+-	elfarm-nabi.c \
+-	elfarmqnx-nabi.c \
+-	elf32-avr.c \
+-	elf32-cris.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-i370.c \
+-	elf32-i386.c \
+-	elf32-i386qnx.c \
+-	elf32-i860.c \
+-	elf32-i960.c \
+-	elf32-ip2k.c \
+-	elf32-m32r.c \
+-	elf32-m68k.c \
+-	elf32-m68hc11.c \
+-	elf32-m68hc12.c \
+-	elf32-m88k.c \
+-	elf-m10200.c \
+-	elf-m10300.c \
+-	elf32-mcore.c \
+-	elfxx-mips.c \
+-	elf32-mips.c \
+-	elf32-openrisc.c \
+-	elf32-or32.c \
+-	elf32-pj.c \
+-	elf32-ppc.c \
+-	elf32-ppcqnx.c \
+-	elf32-sh64.c \
+-	elf32-sh64-com.c \
+-	elf32-s390.c \
+-	elf32-sh.c \
+-	elf32-sh-lin.c \
+-	elf32-sh-nbsd.c \
+-	elf32-sh64-nbsd.c \
+-	elf32-shqnx.c \
+-	elf32-sparc.c \
+-	elf32-v850.c \
+-	elf32-vax.c \
+-	elf32-xstormy16.c \
+-	elf32.c \
+-	elflink.c \
+-	elf-strtab.c \
+-	elf-eh-frame.c \
+-	epoc-pe-arm.c \
+-	epoc-pei-arm.c \
+-	hp300bsd.c \
+-	hp300hpux.c \
+-	som.c \
+-	i386aout.c \
+-	i386bsd.c \
+-	i386dynix.c \
+-	i386freebsd.c \
+-	i386linux.c \
+-	i386lynx.c \
+-	i386msdos.c \
+-	i386netbsd.c \
+-	i386mach3.c \
+-	i386os9k.c \
+-	ieee.c \
+-	m68k4knetbsd.c \
+-	m68klinux.c \
+-	m68klynx.c \
+-	m68knetbsd.c \
+-	m88kmach3.c \
+-	mipsbsd.c \
+-	newsos3.c \
+-	nlm.c \
+-	nlm32-i386.c \
+-	nlm32-sparc.c \
+-	nlm32-ppc.c \
+-	nlm32.c \
+-	ns32knetbsd.c \
+-	oasys.c \
+-	pc532-mach.c \
+-	pdp11.c \
+-	pe-arm.c \
+-	pei-arm.c \
+-	pe-i386.c \
+-	pei-i386.c \
+-	pe-mcore.c \
+-	pei-mcore.c \
+-	pe-ppc.c \
+-	pei-ppc.c \
+-	pe-sh.c \
+-	pei-sh.c \
+-	pe-mips.c \
+-	pei-mips.c \
+-	ppcboot.c \
+-	reloc16.c \
+-	riscix.c \
+-	sparclinux.c \
+-	sparclynx.c \
+-	sparcnetbsd.c \
+-	sunos.c \
+-	vaxnetbsd.c \
+-	vax1knetbsd.c \
+-	vaxbsd.c \
+-	versados.c \
+-	vms.c \
+-	vms-gsd.c \
+-	vms-hdr.c \
+-	vms-misc.c \
+-	vms-tir.c \
+-	xcofflink.c
++BFD32_BACKENDS =  	aout-adobe.lo 	aout-arm.lo 	aout-cris.lo 	aout-ns32k.lo 	aout-sparcle.lo 	aout-tic30.lo 	aout0.lo 	aout32.lo 	armnetbsd.lo 	bout.lo 	cf-i386lynx.lo 	cf-m68klynx.lo 	cf-sparclynx.lo 	coff-a29k.lo 	coff-apollo.lo 	coff-arm.lo 	coff-aux.lo 	coff-h8300.lo 	coff-h8500.lo 	coff-i386.lo 	coff-go32.lo 	coff-i860.lo 	coff-i960.lo 	coff-m68k.lo 	coff-m88k.lo 	coff-mips.lo 	coff-or32.lo 	coff-rs6000.lo 	coff-sh.lo 	coff-sparc.lo 	coff-stgo32.lo 	coff-svm68k.lo 	coff-tic30.lo 	coff-tic4x.lo 	coff-tic54x.lo 	coff-tic80.lo 	coff-u68k.lo 	coff-we32k.lo 	coff-w65.lo 	coff-z8k.lo 	cofflink.lo 	dwarf1.lo 	ecoff.lo 	ecofflink.lo 	efi-app-ia32.lo 	elf.lo 	elf32-arc.lo 	elfarm-oabi.lo 	elfarm-nabi.lo 	elfarmqnx-nabi.lo 	elf32-avr.lo 	elf32-cris.lo 	elf32-d10v.lo 	elf32-d30v.lo 	elf32-dlx.lo 	elf32-fr30.lo 	elf32-frv.lo 	elf32-gen.lo 	elf32-h8300.lo 	elf32-hppa.lo 	elf32-i370.lo 	elf32-i386.lo 	elf32-i386qnx.lo 	elf32-i860.lo 	elf32-i960.lo 	elf32-ia64.lo 	elf32-ip2k.lo 	elf32-m32r.lo 	elf32-m68hc11.lo 	elf32-m68hc12.lo 	elf32-m68k.lo 	elf32-m88k.lo 	elf-m10200.lo 	elf-m10300.lo 	elf32-mcore.lo 	elfxx-mips.lo 	elf32-mips.lo 	elf32-openrisc.lo 	elf32-or32.lo 	elf32-pj.lo 	elf32-ppc.lo 	elf32-ppcqnx.lo 	elf32-s390.lo 	elf32-sh.lo 	elf32-sh-lin.lo 	elf32-sh64.lo 	elf32-sh64-com.lo 	elf32-sh-nbsd.lo 	elf32-sh64-nbsd.lo 	elf32-shqnx.lo 	elf32-sparc.lo 	elf32-v850.lo 	elf32-vax.lo 	elf32-xstormy16.lo 	elf32.lo 	elflink.lo 	elf-strtab.lo 	elf-eh-frame.lo 	epoc-pe-arm.lo 	epoc-pei-arm.lo 	hp300bsd.lo 	hp300hpux.lo 	som.lo 	i386aout.lo 	i386bsd.lo 	i386dynix.lo 	i386freebsd.lo 	i386linux.lo 	i386lynx.lo 	i386msdos.lo 	i386netbsd.lo 	i386mach3.lo 	i386os9k.lo 	ieee.lo 	m68k4knetbsd.lo 	m68klinux.lo 	m68klynx.lo 	m68knetbsd.lo 	m88kmach3.lo 	mipsbsd.lo 	newsos3.lo 	nlm.lo 	nlm32-i386.lo 	nlm32-sparc.lo 	nlm32-ppc.lo 	nlm32.lo 	ns32knetbsd.lo 	oasys.lo 	pc532-mach.lo 	pdp11.lo 	pe-arm.lo 	pei-arm.lo 	pe-i386.lo 	pei-i386.lo 	pe-mcore.lo 	pei-mcore.lo 	pe-ppc.lo 	pei-ppc.lo 	pe-sh.lo 	pei-sh.lo 	pe-mips.lo 	pei-mips.lo 	peigen.lo 	ppcboot.lo 	reloc16.lo 	riscix.lo 	sparclinux.lo 	sparclynx.lo 	sparcnetbsd.lo 	sunos.lo 	vaxnetbsd.lo 	vax1knetbsd.lo 	vaxbsd.lo 	versados.lo 	vms.lo 	vms-gsd.lo 	vms-hdr.lo 	vms-misc.lo 	vms-tir.lo 	xcofflink.lo
++
++
++BFD32_BACKENDS_CFILES =  	aout-adobe.c 	aout-arm.c 	aout-cris.c 	aout-ns32k.c 	aout-sparcle.c 	aout-tic30.c 	aout0.c 	aout32.c 	armnetbsd.c 	bout.c 	cf-i386lynx.c 	cf-m68klynx.c 	cf-sparclynx.c 	coff-a29k.c 	coff-apollo.c 	coff-arm.c 	coff-aux.c 	coff-h8300.c 	coff-h8500.c 	coff-i386.c 	coff-i860.c 	coff-go32.c 	coff-i960.c 	coff-m68k.c 	coff-m88k.c 	coff-mips.c 	coff-or32.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-we32k.c 	coff-w65.c 	coff-z8k.c 	cofflink.c 	dwarf1.c 	ecoff.c 	ecofflink.c 	efi-app-ia32.c 	elf.c 	elf32-arc.c 	elfarm-oabi.c 	elfarm-nabi.c 	elfarmqnx-nabi.c 	elf32-avr.c 	elf32-cris.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-i370.c 	elf32-i386.c 	elf32-i386qnx.c 	elf32-i860.c 	elf32-i960.c 	elf32-ip2k.c 	elf32-m32r.c 	elf32-m68k.c 	elf32-m68hc11.c 	elf32-m68hc12.c 	elf32-m88k.c 	elf-m10200.c 	elf-m10300.c 	elf32-mcore.c 	elfxx-mips.c 	elf32-mips.c 	elf32-openrisc.c 	elf32-or32.c 	elf32-pj.c 	elf32-ppc.c 	elf32-ppcqnx.c 	elf32-sh64.c 	elf32-sh64-com.c 	elf32-s390.c 	elf32-sh.c 	elf32-sh-lin.c 	elf32-sh-nbsd.c 	elf32-sh64-nbsd.c 	elf32-shqnx.c 	elf32-sparc.c 	elf32-v850.c 	elf32-vax.c 	elf32-xstormy16.c 	elf32.c 	elflink.c 	elf-strtab.c 	elf-eh-frame.c 	epoc-pe-arm.c 	epoc-pei-arm.c 	hp300bsd.c 	hp300hpux.c 	som.c 	i386aout.c 	i386bsd.c 	i386dynix.c 	i386freebsd.c 	i386linux.c 	i386lynx.c 	i386msdos.c 	i386netbsd.c 	i386mach3.c 	i386os9k.c 	ieee.c 	m68k4knetbsd.c 	m68klinux.c 	m68klynx.c 	m68knetbsd.c 	m88kmach3.c 	mipsbsd.c 	newsos3.c 	nlm.c 	nlm32-i386.c 	nlm32-sparc.c 	nlm32-ppc.c 	nlm32.c 	ns32knetbsd.c 	oasys.c 	pc532-mach.c 	pdp11.c 	pe-arm.c 	pei-arm.c 	pe-i386.c 	pei-i386.c 	pe-mcore.c 	pei-mcore.c 	pe-ppc.c 	pei-ppc.c 	pe-sh.c 	pei-sh.c 	pe-mips.c 	pei-mips.c 	ppcboot.c 	reloc16.c 	riscix.c 	sparclinux.c 	sparclynx.c 	sparcnetbsd.c 	sunos.c 	vaxnetbsd.c 	vax1knetbsd.c 	vaxbsd.c 	versados.c 	vms.c 	vms-gsd.c 	vms-hdr.c 	vms-misc.c 	vms-tir.c 	xcofflink.c
+ 
+ 
+ # The .o files needed by all of the 64 bit vectors that are configured into
+ # target_vector in targets.c if configured with --enable-targets=all
+ # and --enable-64-bit-bfd.
+-BFD64_BACKENDS = \
+-	aix5ppc-core.lo \
+-	aout64.lo \
+-	coff-alpha.lo \
+-	coff64-rs6000.lo \
+-	demo64.lo \
+-	efi-app-ia64.lo \
+-	elf64-x86-64.lo \
+-	elf64-alpha.lo \
+-	elf64-hppa.lo \
+-	elf64-ia64.lo \
+-	elf64-gen.lo \
+-	elfn32-mips.lo \
+-	elf64-mips.lo \
+-	elf64-mmix.lo \
+-	elf64-sh64.lo \
+-	elf64-sh64-nbsd.lo \
+-	elf64-ppc.lo \
+-	elf64-s390.lo \
+-	elf64-sparc.lo \
+-	elf64.lo \
+-	mmo.lo \
+-	nlm32-alpha.lo \
+-	nlm64.lo \
+-	pepigen.lo
+-
+-
+-BFD64_BACKENDS_CFILES = \
+-	aix5ppc-core.c \
+-	aout64.c \
+-	coff-alpha.c \
+-	coff64-rs6000.c \
+-	demo64.c \
+-	efi-app-ia64.c \
+-	elf64-x86-64.c \
+-	elf64-alpha.c \
+-	elf64-hppa.c \
+-	elf64-gen.c \
+-	elfn32-mips.c \
+-	elf64-mips.c \
+-	elf64-mmix.c \
+-	elf64-ppc.c \
+-	elf64-s390.c \
+-	elf64-sh64.c \
+-	elf64-sh64-nbsd.c \
+-	elf64-sparc.c \
+-	elf64.c \
+-	mmo.c \
+-	nlm32-alpha.c \
+-	nlm64.c
+-
+-
+-OPTIONAL_BACKENDS = \
+-	aix386-core.lo \
+-	hpux-core.lo \
+-	irix-core.lo \
+-	lynx-core.lo \
+-	osf-core.lo \
+-	sco5-core.lo \
+-	trad-core.lo \
+-	cisco-core.lo
+-
+-
+-OPTIONAL_BACKENDS_CFILES = \
+-	aix386-core.c \
+-	hpux-core.c \
+-	irix-core.c \
+-	lynx-core.c \
+-	osf-core.c \
+-	sco5-core.c \
+-	trad-core.c \
+-	cisco-core.c
++BFD64_BACKENDS =  	aix5ppc-core.lo 	aout64.lo 	coff-alpha.lo 	coff64-rs6000.lo 	demo64.lo 	efi-app-ia64.lo 	elf64-x86-64.lo 	elf64-alpha.lo 	elf64-hppa.lo 	elf64-ia64.lo 	elf64-gen.lo 	elfn32-mips.lo 	elf64-mips.lo 	elf64-mmix.lo 	elf64-sh64.lo 	elf64-sh64-nbsd.lo 	elf64-ppc.lo 	elf64-s390.lo 	elf64-sparc.lo 	elf64.lo 	mmo.lo 	nlm32-alpha.lo 	nlm64.lo 	pepigen.lo
++
++
++BFD64_BACKENDS_CFILES =  	aix5ppc-core.c 	aout64.c 	coff-alpha.c 	coff64-rs6000.c 	demo64.c 	efi-app-ia64.c 	elf64-x86-64.c 	elf64-alpha.c 	elf64-hppa.c 	elf64-gen.c 	elfn32-mips.c 	elf64-mips.c 	elf64-mmix.c 	elf64-ppc.c 	elf64-s390.c 	elf64-sh64.c 	elf64-sh64-nbsd.c 	elf64-sparc.c 	elf64.c 	mmo.c 	nlm32-alpha.c 	nlm64.c
++
++
++OPTIONAL_BACKENDS =  	aix386-core.lo 	hpux-core.lo 	irix-core.lo 	lynx-core.lo 	osf-core.lo 	sco5-core.lo 	trad-core.lo 	cisco-core.lo
++
++
++OPTIONAL_BACKENDS_CFILES =  	aix386-core.c 	hpux-core.c 	irix-core.c 	lynx-core.c 	osf-core.c 	sco5-core.c 	trad-core.c 	cisco-core.c
+ 
+ 
+ # These are defined by configure.in:
+@@ -693,33 +203,18 @@ TDEFAULTS = @tdefaults@
+ INCLUDES = -D_GNU_SOURCE @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl
+ 
+ # C source files that correspond to .o's.
+-SOURCE_CFILES = \
+-	$(BFD32_LIBS_CFILES) \
+-	$(BFD64_LIBS_CFILES) \
+-	$(ALL_MACHINES_CFILES) \
+-	$(BFD32_BACKENDS_CFILES) \
+-	$(BFD64_BACKENDS_CFILES) \
+-	$(OPTIONAL_BACKENDS_CFILES)
++SOURCE_CFILES =  	$(BFD32_LIBS_CFILES) 	$(BFD64_LIBS_CFILES) 	$(ALL_MACHINES_CFILES) 	$(BFD32_BACKENDS_CFILES) 	$(BFD64_BACKENDS_CFILES) 	$(OPTIONAL_BACKENDS_CFILES)
+ 
+ 
+-BUILD_CFILES = \
+-	elf32-ia64.c elf64-ia64.c peigen.c pepigen.c
++BUILD_CFILES =  	elf32-ia64.c elf64-ia64.c peigen.c pepigen.c
+ 
+ 
+ CFILES = $(SOURCE_CFILES) $(BUILD_CFILES)
+ 
+-SOURCE_HFILES = \
+-	aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \
+-	elf-bfd.h elf-hppa.h elf32-arm.h elf32-hppa.h elf64-hppa.h \
+-	elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h \
+-	libaout.h libbfd.h libcoff.h libecoff.h libhppa.h \
+-	libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h \
+-	nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h \
+-	xcoff-target.h version.h
++SOURCE_HFILES =  	aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h 	elf-bfd.h elf-hppa.h elf32-arm.h elf32-hppa.h elf64-hppa.h 	elfcode.h elfcore.h elflink.h freebsd.h genlink.h go32stub.h 	libaout.h libbfd.h libcoff.h libecoff.h libhppa.h 	libieee.h libnlm.h liboasys.h libpei.h netbsd.h nlm-target.h 	nlmcode.h nlmswap.h ns32k.h peicode.h som.h vms.h libxcoff.h 	xcoff-target.h version.h
+ 
+ 
+-BUILD_HFILES = \
+-	elf32-target.h elf64-target.h targmatch.h
++BUILD_HFILES =  	elf32-target.h elf64-target.h targmatch.h
+ 
+ 
+ HFILES = $(SOURCE_HFILES) $(BUILD_HFILES)
+@@ -749,8 +244,7 @@ libbfd_a_SOURCES = 
+ BFD_H_DEPS = $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
+ LOCAL_H_DEPS = libbfd.h sysdep.h config.h
+ 
+-BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
+-	reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c version.h
++BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c 	reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c version.h
+ 
+ BFD64_H_FILES = archive64.c
+ LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c cache.c reloc.c archures.c elf.c
+@@ -758,8 +252,7 @@ LIBCOFF_H_FILES = libcoff-in.h coffcode.
+ 
+ MOSTLYCLEANFILES = ofiles stamp-ofiles
+ 
+-CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \
+-	stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
++CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib 	stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
+ 
+ 
+ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES)
+@@ -1267,8 +760,8 @@ install_libbfd: $(bfdlib_LTLIBRARIES) $(
+ 	$(mkinstalldirs) $(DESTDIR)$(bfdincludedir)
+ 	@list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \
+-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p; \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(bfdlibdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+ 	$(INSTALL_DATA) $(BFD_H) $(DESTDIR)$(bfdincludedir)/bfd.h
diff --git a/devel/gdb/patches/patch-ad b/devel/gdb/patches/patch-ad
new file mode 100644
index 00000000000..cae4ada52ee
--- /dev/null
+++ b/devel/gdb/patches/patch-ad
@@ -0,0 +1,27 @@
+$NetBSD: patch-ad,v 1.1 2003/03/10 23:50:49 seb Exp $
+
+--- etc/Makefile.in.orig	2002-01-26 21:35:45.000000000 +0000
++++ etc/Makefile.in
+@@ -67,20 +67,8 @@ info:
+ 	  fi; \
+ 	done
+ 
+-install-info: info
+-	$(SHELL) $(srcdir)/../mkinstalldirs $(infodir)
+-	if test ! -f standards.info; then cd $(srcdir); fi; \
+-	if test -f standards.info; then \
+-	  for i in standards.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
+-	  done; \
+-	fi
+-	if test ! -f configure.info; then cd $(srcdir); fi; \
+-	if test -f configure.info; then \
+-	  for i in configure.info*; do \
+-	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
+-	  done; \
+-	fi
++install-info:
++	true
+ 
+ dvi:
+ 	for f in $(DVIFILES); do \
diff --git a/devel/gdb/patches/patch-ae b/devel/gdb/patches/patch-ae
new file mode 100644
index 00000000000..14e9736a2da
--- /dev/null
+++ b/devel/gdb/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2003/03/10 23:50:49 seb Exp $
+
+--- opcodes/Makefile.am.orig	2002-08-28 10:38:50.000000000 +0000
++++ opcodes/Makefile.am
+@@ -312,8 +312,8 @@ install_libopcodes: $(bfdlib_LTLIBRARIES
+ 	$(mkinstalldirs) $(DESTDIR)$(bfdincludedir)
+ 	@list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \
+-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p; \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(bfdlibdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+ 	$(INSTALL_DATA) $(INCDIR)/dis-asm.h $(DESTDIR)$(bfdincludedir)/dis-asm.h
diff --git a/devel/gdb/patches/patch-af b/devel/gdb/patches/patch-af
new file mode 100644
index 00000000000..3199f93c167
--- /dev/null
+++ b/devel/gdb/patches/patch-af
@@ -0,0 +1,318 @@
+$NetBSD: patch-af,v 1.1 2003/03/10 23:50:49 seb Exp $
+
+--- opcodes/Makefile.in.orig	2003-03-10 21:25:02.000000000 +0000
++++ opcodes/Makefile.in
+@@ -133,244 +133,14 @@ BFD_H = ../bfd/bfd.h
+ LIBIBERTY = ../libiberty/libiberty.a
+ 
+ # Header files.
+-HFILES = \
+-	arm-opc.h \
+-	fr30-desc.h fr30-opc.h \
+-	frv-desc.h frv-opc.h \
+-	h8500-opc.h \
+-	ia64-asmtab.h \
+-	ia64-opc.h \
+-	ip2k-desc.h ip2k-opc.h \
+-	m32r-desc.h m32r-opc.h \
+-	mcore-opc.h \
+-	openrisc-desc.h openrisc-opc.h \
+-	sh-opc.h \
+-	sh64-opc.h \
+-	sysdep.h \
+-	w65-opc.h \
+-	xstormy16-desc.h xstormy16-opc.h \
+-	z8k-opc.h
++HFILES =  	arm-opc.h 	fr30-desc.h fr30-opc.h 	frv-desc.h frv-opc.h 	h8500-opc.h 	ia64-asmtab.h 	ia64-opc.h 	ip2k-desc.h ip2k-opc.h 	m32r-desc.h m32r-opc.h 	mcore-opc.h 	openrisc-desc.h openrisc-opc.h 	sh-opc.h 	sh64-opc.h 	sysdep.h 	w65-opc.h 	xstormy16-desc.h xstormy16-opc.h 	z8k-opc.h
+ 
+ 
+ # C source files that correspond to .o's.
+-CFILES = \
+-	a29k-dis.c \
+-	alpha-dis.c \
+-	alpha-opc.c \
+-	arc-dis.c \
+-	arc-opc.c \
+-	arc-ext.c \
+-	arm-dis.c \
+-	avr-dis.c \
+-	cgen-asm.c \
+-	cgen-dis.c \
+-	cgen-opc.c \
+-	cris-dis.c \
+-	cris-opc.c \
+-	d10v-dis.c \
+-	d10v-opc.c \
+-	d30v-dis.c \
+-	d30v-opc.c \
+-	dlx-dis.c \
+-	dis-buf.c \
+-	disassemble.c \
+-	fr30-asm.c \
+-	fr30-desc.c \
+-	fr30-dis.c \
+-	fr30-ibld.c \
+-	fr30-opc.c \
+-	frv-asm.c \
+-	frv-desc.c \
+-	frv-dis.c \
+-	frv-ibld.c \
+-	frv-opc.c \
+-	h8300-dis.c \
+-	h8500-dis.c \
+-	hppa-dis.c \
+-	i370-dis.c \
+-	i370-opc.c \
+-	i386-dis.c \
+-	i860-dis.c \
+-	i960-dis.c \
+-	ia64-dis.c \
+-	ia64-opc-a.c \
+-	ia64-opc-b.c \
+-	ia64-opc-f.c \
+-	ia64-opc-i.c \
+-	ia64-opc-m.c \
+-	ia64-opc-d.c \
+-	ia64-opc.c \
+-	ia64-gen.c \
+-	ia64-asmtab.c \
+-	ip2k-asm.c \
+-	ip2k-desc.c \
+-	ip2k-dis.c \
+-	ip2k-ibld.c \
+-	ip2k-opc.c \
+-	m32r-asm.c \
+-	m32r-desc.c \
+-	m32r-dis.c \
+-	m32r-ibld.c \
+-	m32r-opc.c \
+-	m32r-opinst.c \
+-	m68hc11-dis.c \
+-	m68hc11-opc.c \
+-	m68k-dis.c \
+-	m68k-opc.c \
+-	m88k-dis.c \
+-	mcore-dis.c \
+-	mips-dis.c \
+-	mips-opc.c \
+-	mips16-opc.c \
+-	m10200-dis.c \
+-	m10200-opc.c \
+-	m10300-dis.c \
+-	m10300-opc.c \
+-	mmix-dis.c \
+-	mmix-opc.c \
+-	ns32k-dis.c \
+-	openrisc-asm.c \
+-	openrisc-desc.c \
+-	openrisc-dis.c \
+-	openrisc-ibld.c \
+-	openrisc-opc.c \
+-	or32-dis.c \
+-	or32-opc.c \
+-	pdp11-dis.c \
+-	pdp11-opc.c \
+-	pj-dis.c \
+-	pj-opc.c \
+-	ppc-dis.c \
+-	ppc-opc.c \
+-	s390-mkopc.c \
+-	s390-opc.c \
+-	s390-dis.c \
+-	sh-dis.c \
+-	sh64-dis.c \
+-	sh64-opc.c \
+-	sparc-dis.c \
+-	sparc-opc.c \
+-	tic30-dis.c \
+-	tic4x-dis.c \
+-	tic54x-dis.c \
+-	tic54x-opc.c \
+-	tic80-dis.c \
+-	tic80-opc.c \
+-	v850-dis.c \
+-	v850-opc.c \
+-	vax-dis.c \
+-	w65-dis.c \
+-	xstormy16-asm.c \
+-	xstormy16-desc.c \
+-	xstormy16-dis.c \
+-	xstormy16-ibld.c \
+-	xstormy16-opc.c \
+-	z8k-dis.c \
+-	z8kgen.c
+-
+-
+-ALL_MACHINES = \
+-	a29k-dis.lo \
+-	alpha-dis.lo \
+-	alpha-opc.lo \
+-	arc-dis.lo \
+-	arc-opc.lo \
+-	arc-ext.lo \
+-	arm-dis.lo \
+-	avr-dis.lo \
+-	cgen-asm.lo \
+-	cgen-dis.lo \
+-	cgen-opc.lo \
+-	cris-dis.lo \
+-	cris-opc.lo \
+-	d10v-dis.lo \
+-	d10v-opc.lo \
+-	d30v-dis.lo \
+-	d30v-opc.lo \
+-	dlx-dis.lo \
+-	fr30-asm.lo \
+-	fr30-desc.lo \
+-	fr30-dis.lo \
+-	fr30-ibld.lo \
+-	fr30-opc.lo \
+-	frv-asm.lo \
+-	frv-desc.lo \
+-	frv-dis.lo \
+-	frv-ibld.lo \
+-	frv-opc.lo \
+-	h8300-dis.lo \
+-	h8500-dis.lo \
+-	hppa-dis.lo \
+-	i386-dis.lo \
+-	i370-dis.lo \
+-	i370-opc.lo \
+-	i860-dis.lo \
+-	i960-dis.lo \
+-	ia64-dis.lo \
+-	ia64-opc.lo \
+-	ip2k-asm.lo \
+-	ip2k-desc.lo \
+-	ip2k-dis.lo \
+-	ip2k-ibld.lo \
+-	ip2k-opc.lo \
+-	m32r-asm.lo \
+-	m32r-desc.lo \
+-	m32r-dis.lo \
+-	m32r-ibld.lo \
+-	m32r-opc.lo \
+-	m32r-opinst.lo \
+-	m68hc11-dis.lo \
+-	m68hc11-opc.lo \
+-	m68k-dis.lo \
+-	m68k-opc.lo \
+-	m88k-dis.lo \
+-	m10200-dis.lo \
+-	m10200-opc.lo \
+-	m10300-dis.lo \
+-	m10300-opc.lo \
+-	mcore-dis.lo \
+-	mips-dis.lo \
+-	mips-opc.lo \
+-	mips16-opc.lo \
+-	mmix-dis.lo \
+-	mmix-opc.lo \
+-	ns32k-dis.lo \
+-	openrisc-asm.lo \
+-	openrisc-desc.lo \
+-	openrisc-dis.lo \
+-	openrisc-ibld.lo \
+-	openrisc-opc.lo \
+-	or32-dis.lo \
+-	or32-opc.lo \
+-	pdp11-dis.lo \
+-	pdp11-opc.lo \
+-	pj-dis.lo \
+-	pj-opc.lo \
+-	ppc-dis.lo \
+-	ppc-opc.lo \
+-	s390-dis.lo \
+-	s390-opc.lo \
+-	sh-dis.lo \
+-	sh64-dis.lo \
+-	sh64-opc.lo \
+-	sparc-dis.lo \
+-	sparc-opc.lo \
+-	tic30-dis.lo \
+-	tic4x-dis.lo \
+-	tic54x-dis.lo \
+-	tic54x-opc.lo \
+-	tic80-dis.lo \
+-	tic80-opc.lo \
+-	v850-dis.lo \
+-	v850-opc.lo \
+-	vax-dis.lo \
+-	w65-dis.lo \
+-	xstormy16-asm.lo \
+-	xstormy16-desc.lo \
+-	xstormy16-dis.lo \
+-	xstormy16-ibld.lo \
+-	xstormy16-opc.lo \
+-	z8k-dis.lo
++CFILES =  	a29k-dis.c 	alpha-dis.c 	alpha-opc.c 	arc-dis.c 	arc-opc.c 	arc-ext.c 	arm-dis.c 	avr-dis.c 	cgen-asm.c 	cgen-dis.c 	cgen-opc.c 	cris-dis.c 	cris-opc.c 	d10v-dis.c 	d10v-opc.c 	d30v-dis.c 	d30v-opc.c 	dlx-dis.c 	dis-buf.c 	disassemble.c 	fr30-asm.c 	fr30-desc.c 	fr30-dis.c 	fr30-ibld.c 	fr30-opc.c 	frv-asm.c 	frv-desc.c 	frv-dis.c 	frv-ibld.c 	frv-opc.c 	h8300-dis.c 	h8500-dis.c 	hppa-dis.c 	i370-dis.c 	i370-opc.c 	i386-dis.c 	i860-dis.c 	i960-dis.c 	ia64-dis.c 	ia64-opc-a.c 	ia64-opc-b.c 	ia64-opc-f.c 	ia64-opc-i.c 	ia64-opc-m.c 	ia64-opc-d.c 	ia64-opc.c 	ia64-gen.c 	ia64-asmtab.c 	ip2k-asm.c 	ip2k-desc.c 	ip2k-dis.c 	ip2k-ibld.c 	ip2k-opc.c 	m32r-asm.c 	m32r-desc.c 	m32r-dis.c 	m32r-ibld.c 	m32r-opc.c 	m32r-opinst.c 	m68hc11-dis.c 	m68hc11-opc.c 	m68k-dis.c 	m68k-opc.c 	m88k-dis.c 	mcore-dis.c 	mips-dis.c 	mips-opc.c 	mips16-opc.c 	m10200-dis.c 	m10200-opc.c 	m10300-dis.c 	m10300-opc.c 	mmix-dis.c 	mmix-opc.c 	ns32k-dis.c 	openrisc-asm.c 	openrisc-desc.c 	openrisc-dis.c 	openrisc-ibld.c 	openrisc-opc.c 	or32-dis.c 	or32-opc.c 	pdp11-dis.c 	pdp11-opc.c 	pj-dis.c 	pj-opc.c 	ppc-dis.c 	ppc-opc.c 	s390-mkopc.c 	s390-opc.c 	s390-dis.c 	sh-dis.c 	sh64-dis.c 	sh64-opc.c 	sparc-dis.c 	sparc-opc.c 	tic30-dis.c 	tic4x-dis.c 	tic54x-dis.c 	tic54x-opc.c 	tic80-dis.c 	tic80-opc.c 	v850-dis.c 	v850-opc.c 	vax-dis.c 	w65-dis.c 	xstormy16-asm.c 	xstormy16-desc.c 	xstormy16-dis.c 	xstormy16-ibld.c 	xstormy16-opc.c 	z8k-dis.c 	z8kgen.c
++
++
++ALL_MACHINES =  	a29k-dis.lo 	alpha-dis.lo 	alpha-opc.lo 	arc-dis.lo 	arc-opc.lo 	arc-ext.lo 	arm-dis.lo 	avr-dis.lo 	cgen-asm.lo 	cgen-dis.lo 	cgen-opc.lo 	cris-dis.lo 	cris-opc.lo 	d10v-dis.lo 	d10v-opc.lo 	d30v-dis.lo 	d30v-opc.lo 	dlx-dis.lo 	fr30-asm.lo 	fr30-desc.lo 	fr30-dis.lo 	fr30-ibld.lo 	fr30-opc.lo 	frv-asm.lo 	frv-desc.lo 	frv-dis.lo 	frv-ibld.lo 	frv-opc.lo 	h8300-dis.lo 	h8500-dis.lo 	hppa-dis.lo 	i386-dis.lo 	i370-dis.lo 	i370-opc.lo 	i860-dis.lo 	i960-dis.lo 	ia64-dis.lo 	ia64-opc.lo 	ip2k-asm.lo 	ip2k-desc.lo 	ip2k-dis.lo 	ip2k-ibld.lo 	ip2k-opc.lo 	m32r-asm.lo 	m32r-desc.lo 	m32r-dis.lo 	m32r-ibld.lo 	m32r-opc.lo 	m32r-opinst.lo 	m68hc11-dis.lo 	m68hc11-opc.lo 	m68k-dis.lo 	m68k-opc.lo 	m88k-dis.lo 	m10200-dis.lo 	m10200-opc.lo 	m10300-dis.lo 	m10300-opc.lo 	mcore-dis.lo 	mips-dis.lo 	mips-opc.lo 	mips16-opc.lo 	mmix-dis.lo 	mmix-opc.lo 	ns32k-dis.lo 	openrisc-asm.lo 	openrisc-desc.lo 	openrisc-dis.lo 	openrisc-ibld.lo 	openrisc-opc.lo 	or32-dis.lo 	or32-opc.lo 	pdp11-dis.lo 	pdp11-opc.lo 	pj-dis.lo 	pj-opc.lo 	ppc-dis.lo 	ppc-opc.lo 	s390-dis.lo 	s390-opc.lo 	sh-dis.lo 	sh64-dis.lo 	sh64-opc.lo 	sparc-dis.lo 	sparc-opc.lo 	tic30-dis.lo 	tic4x-dis.lo 	tic54x-dis.lo 	tic54x-opc.lo 	tic80-dis.lo 	tic80-opc.lo 	v850-dis.lo 	v850-opc.lo 	vax-dis.lo 	w65-dis.lo 	xstormy16-asm.lo 	xstormy16-desc.lo 	xstormy16-dis.lo 	xstormy16-ibld.lo 	xstormy16-opc.lo 	z8k-dis.lo
+ 
+ 
+ OFILES = @BFD_MACHINES@
+@@ -391,10 +161,7 @@ noinst_LIBRARIES = libopcodes.a
+ 
+ POTFILES = $(HFILES) $(CFILES)
+ 
+-CLEANFILES = \
+-	stamp-ip2k stamp-m32r stamp-fr30 stamp-frv stamp-openrisc \
+-	stamp-xstormy16 \
+-	libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2
++CLEANFILES =  	stamp-ip2k stamp-m32r stamp-fr30 stamp-frv stamp-openrisc 	stamp-xstormy16 	libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2
+ 
+ 
+ CGENDIR = @cgendir@
+@@ -402,24 +169,19 @@ CPUDIR = $(CGENDIR)/cpu
+ CGEN = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
+ CGENFLAGS = -v
+ 
+-CGENDEPS = \
+-	$(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm \
+-	$(CGENDIR)/opcodes.scm $(CGENDIR)/opc-asmdis.scm \
+-	$(CGENDIR)/opc-ibld.scm $(CGENDIR)/opc-itab.scm \
+-	$(CGENDIR)/opc-opinst.scm \
+-	cgen-asm.in cgen-dis.in cgen-ibld.in
++CGENDEPS =  	$(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm 	$(CGENDIR)/opcodes.scm $(CGENDIR)/opc-asmdis.scm 	$(CGENDIR)/opc-ibld.scm $(CGENDIR)/opc-itab.scm 	$(CGENDIR)/opc-opinst.scm 	cgen-asm.in cgen-dis.in cgen-ibld.in
+ 
+-@CGEN_MAINT_TRUE@IP2K_DEPS = @CGEN_MAINT_TRUE@stamp-ip2k
++@CGEN_MAINT_TRUE@IP2K_DEPS = stamp-ip2k
+ @CGEN_MAINT_FALSE@IP2K_DEPS = 
+-@CGEN_MAINT_TRUE@M32R_DEPS = @CGEN_MAINT_TRUE@stamp-m32r
++@CGEN_MAINT_TRUE@M32R_DEPS = stamp-m32r
+ @CGEN_MAINT_FALSE@M32R_DEPS = 
+-@CGEN_MAINT_TRUE@FR30_DEPS = @CGEN_MAINT_TRUE@stamp-fr30
++@CGEN_MAINT_TRUE@FR30_DEPS = stamp-fr30
+ @CGEN_MAINT_FALSE@FR30_DEPS = 
+-@CGEN_MAINT_TRUE@FRV_DEPS = @CGEN_MAINT_TRUE@stamp-frv
++@CGEN_MAINT_TRUE@FRV_DEPS = stamp-frv
+ @CGEN_MAINT_FALSE@FRV_DEPS = 
+-@CGEN_MAINT_TRUE@OPENRISC_DEPS = @CGEN_MAINT_TRUE@stamp-openrisc
++@CGEN_MAINT_TRUE@OPENRISC_DEPS = stamp-openrisc
+ @CGEN_MAINT_FALSE@OPENRISC_DEPS = 
+-@CGEN_MAINT_TRUE@XSTORMY16_DEPS = @CGEN_MAINT_TRUE@stamp-xstormy16
++@CGEN_MAINT_TRUE@XSTORMY16_DEPS = stamp-xstormy16
+ @CGEN_MAINT_FALSE@XSTORMY16_DEPS = 
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+@@ -449,7 +211,7 @@ acinclude.m4 aclocal.m4 config.in config
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+-TAR = gtar
++TAR = tar
+ GZIP_ENV = --best
+ SOURCES = libopcodes.a.c $(libopcodes_la_SOURCES)
+ OBJECTS = libopcodes.a.$(OBJEXT) $(libopcodes_la_OBJECTS)
+@@ -842,8 +604,8 @@ install_libopcodes: $(bfdlib_LTLIBRARIES
+ 	$(mkinstalldirs) $(DESTDIR)$(bfdincludedir)
+ 	@list='$(bfdlib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \
+-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(bfdlibdir)/$$p; \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(bfdlibdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(bfdlibdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+ 	$(INSTALL_DATA) $(INCDIR)/dis-asm.h $(DESTDIR)$(bfdincludedir)/dis-asm.h