* Makefile.am: Run "make dep-am".

        (AM_CPPFLAGS): New.
        (LIBDL): New.
        (ALL_MACHINES): Add cpu-plugin.lo.
        (ALL_MACHINES_CFILES): Add cpu-plugin.c.
        (BFD32_BACKENDS): Add plugin.lo.
        (BFD32_BACKENDS_CFILES): Add plugin.c.
        (libbfd_la_LIBADD): Add LIBDL
        * archures.c (bfd_architecture): Add bfd_arch_plugin.
        (bfd_plugin_arch): Declare.
        * bfd-in.h (BFD_SUPPORTS_PLUGINS): New.
        * bfd.c (bfd): Add plugin_data.
        * config.bfd: Handle the plugin target.
        * configure.in: Check for --enable-plugins.
        (LT_INIT): Use the dlopen option.
        * cpu-plugin.c: New.
        * plugin.c: New.
        * plugin.h: New.
        * targets.c (plugin_vec): Declare.
        (_bfd_target_vector): Add plugin_vec.
        * Makefile.in: Regenerate.
        * bfd-in2.h: Regenerate.
        * configure: Regenerate.
        * ar.c: Include plugin.h.
        (main): Handle the --plugin option.
        * nm.c: Include plugin.h.
        (OPTION_PLUGIN): New.
        (long_options): Add plugin.
        (main): Handle OPTION_PLUGIN.
        * NEWS: Mention  the new feature.
        * doc/binutils: Documement the new command line options.
        * configure.in: Check for --enable-plugins.
        * configure: Regenerate.

1 files changed, 144 insertions, 123 deletions

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 1f293f4..3f6a7ed 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -84,6 +84,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(bfdlibdir)"
 bfdlibLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(bfdlib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
 am__objects_1 = archive.lo archures.lo bfd.lo bfdio.lo bfdwin.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 \
@@ -199,6 +200,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGVERSION = @PKGVERSION@
+PLUGINS_FALSE = @PLUGINS_FALSE@
+PLUGINS_TRUE = @PLUGINS_TRUE@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@
@@ -273,6 +276,7 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+supports_plugins = @supports_plugins@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
@@ -294,6 +298,8 @@ SUBDIRS = doc po
 bfddocdir = doc
 bfdlib_LTLIBRARIES = libbfd.la
 AM_CFLAGS = $(WARN_CFLAGS)
+AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
+@PLUGINS_TRUE@LIBDL = -ldl
 
 # bfd.h goes here, for now
 BFD_H = bfd.h
@@ -341,38 +347,39 @@ ALL_MACHINES = \
 	cpu-dlx.lo \
 	cpu-fr30.lo \
 	cpu-frv.lo \
-	cpu-moxie.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-ia64.lo \
 	cpu-ip2k.lo \
 	cpu-iq2000.lo \
 	cpu-lm32.lo \
+	cpu-m10200.lo \
+	cpu-m10300.lo \
 	cpu-m32c.lo \
 	cpu-m32r.lo \
 	cpu-m68hc11.lo \
 	cpu-m68hc12.lo \
 	cpu-m68k.lo \
 	cpu-m88k.lo \
-	cpu-m10200.lo \
-	cpu-m10300.lo \
 	cpu-maxq.lo \
 	cpu-mcore.lo \
 	cpu-mep.lo \
 	cpu-mips.lo \
 	cpu-mmix.lo \
-	cpu-mt.lo \
+	cpu-moxie.lo \
 	cpu-msp430.lo \
-	cpu-or32.lo \
+	cpu-mt.lo \
 	cpu-ns32k.lo \
 	cpu-openrisc.lo \
+	cpu-or32.lo \
 	cpu-pdp11.lo \
 	cpu-pj.lo \
+	cpu-plugin.lo \
 	cpu-powerpc.lo \
 	cpu-rs6000.lo \
 	cpu-s390.lo \
@@ -386,11 +393,11 @@ ALL_MACHINES = \
 	cpu-tic80.lo \
 	cpu-v850.lo \
 	cpu-vax.lo \
-	cpu-we32k.lo \
 	cpu-w65.lo \
+	cpu-we32k.lo \
+	cpu-xc16x.lo \
 	cpu-xstormy16.lo \
 	cpu-xtensa.lo \
-	cpu-xc16x.lo \
 	cpu-z80.lo \
 	cpu-z8k.lo
 
@@ -401,46 +408,47 @@ ALL_MACHINES_CFILES = \
 	cpu-avr.c \
 	cpu-bfin.c \
 	cpu-cr16.c \
-	cpu-cris.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-moxie.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-ia64.c \
 	cpu-ip2k.c \
 	cpu-iq2000.c \
 	cpu-lm32.c \
+	cpu-m10200.c \
+	cpu-m10300.c \
 	cpu-m32c.c \
 	cpu-m32r.c \
 	cpu-m68hc11.c \
 	cpu-m68hc12.c \
 	cpu-m68k.c \
 	cpu-m88k.c \
-	cpu-m10200.c \
-	cpu-m10300.c \
 	cpu-maxq.c \
 	cpu-mcore.c \
 	cpu-mep.c \
 	cpu-mips.c \
 	cpu-mmix.c \
-	cpu-mt.c \
+	cpu-moxie.c \
 	cpu-msp430.c \
-	cpu-or32.c \
+	cpu-mt.c \
 	cpu-ns32k.c \
 	cpu-openrisc.c \
+	cpu-or32.c \
 	cpu-pdp11.c \
 	cpu-pj.c \
+	cpu-plugin.c \
 	cpu-powerpc.c \
 	cpu-rs6000.c \
 	cpu-s390.c \
@@ -454,11 +462,11 @@ ALL_MACHINES_CFILES = \
 	cpu-tic80.c \
 	cpu-v850.c \
 	cpu-vax.c \
-	cpu-we32k.c \
 	cpu-w65.c \
+	cpu-we32k.c \
+	cpu-xc16x.c \
 	cpu-xstormy16.c \
 	cpu-xtensa.c \
-	cpu-xc16x.c \
 	cpu-z80.c \
 	cpu-z8k.c
 
@@ -481,10 +489,10 @@ BFD32_BACKENDS = \
 	coff-apollo.lo \
 	coff-arm.lo \
 	coff-aux.lo \
+	coff-go32.lo \
 	coff-h8300.lo \
 	coff-h8500.lo \
 	coff-i386.lo \
-	coff-go32.lo \
 	coff-i860.lo \
 	coff-i960.lo \
 	coff-m68k.lo \
@@ -502,14 +510,20 @@ BFD32_BACKENDS = \
 	coff-tic54x.lo \
 	coff-tic80.lo \
 	coff-u68k.lo \
-	coff-we32k.lo \
 	coff-w65.lo \
+	coff-we32k.lo \
 	coff-z80.lo \
 	coff-z8k.lo \
 	cofflink.lo \
 	dwarf1.lo \
 	ecoff.lo \
 	ecofflink.lo \
+	elf-attrs.lo \
+	elf-eh-frame.lo \
+	elf-m10200.lo \
+	elf-m10300.lo \
+	elf-strtab.lo \
+	elf-vxworks.lo \
 	elf.lo \
 	elf32-am33lin.lo \
 	elf32-arc.lo \
@@ -525,7 +539,6 @@ BFD32_BACKENDS = \
 	elf32-dlx.lo \
 	elf32-fr30.lo \
 	elf32-frv.lo \
-	elf32-moxie.lo \
 	elf32-gen.lo \
 	elf32-h8300.lo \
 	elf32-hppa.lo \
@@ -543,51 +556,45 @@ BFD32_BACKENDS = \
 	elf32-m68hc1x.lo \
 	elf32-m68k.lo \
 	elf32-m88k.lo \
-	elf-m10200.lo \
-	elf-m10300.lo \
 	elf32-mcore.lo \
 	elf32-mep.lo \
-	elfxx-mips.lo \
 	elf32-mips.lo \
-	elf32-mt.lo \
+	elf32-moxie.lo \
 	elf32-msp430.lo \
+	elf32-mt.lo \
 	elf32-openrisc.lo \
 	elf32-or32.lo \
 	elf32-pj.lo \
 	elf32-ppc.lo \
 	elf32-s390.lo \
-	elf32-sh.lo \
 	elf32-sh-symbian.lo \
-	elf32-sh64.lo \
+	elf32-sh.lo \
 	elf32-sh64-com.lo \
-	elfxx-sparc.lo \
+	elf32-sh64.lo \
 	elf32-sparc.lo \
 	elf32-spu.lo \
 	elf32-v850.lo \
 	elf32-vax.lo \
+	elf32-xc16x.lo \
 	elf32-xstormy16.lo \
 	elf32-xtensa.lo \
-	elf32-xc16x.lo \
 	elf32.lo \
 	elflink.lo \
-	elf-attrs.lo \
-	elf-strtab.lo \
-	elf-eh-frame.lo \
-	elf-vxworks.lo \
+	elfxx-mips.lo \
+	elfxx-sparc.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 \
+	i386mach3.lo \
 	i386msdos.lo \
 	i386netbsd.lo \
-	i386mach3.lo \
 	i386os9k.lo \
 	ieee.lo \
 	m68k4knetbsd.lo \
@@ -600,45 +607,47 @@ BFD32_BACKENDS = \
 	newsos3.lo \
 	nlm.lo \
 	nlm32-i386.lo \
-	nlm32-sparc.lo \
 	nlm32-ppc.lo \
+	nlm32-sparc.lo \
 	nlm32.lo \
 	ns32knetbsd.lo \
 	oasys.lo \
 	pc532-mach.lo \
 	pdp11.lo \
-	pef.lo \
-	pe-arm.lo \
-	pei-arm.lo \
 	pe-arm-wince.lo \
-	pei-arm-wince.lo \
+	pe-arm.lo \
 	pe-i386.lo \
-	pei-i386.lo \
 	pe-mcore.lo \
-	pei-mcore.lo \
+	pe-mips.lo \
 	pe-ppc.lo \
-	pei-ppc.lo \
 	pe-sh.lo \
-	pei-sh.lo \
-	pe-mips.lo \
+	pef.lo \
+	pei-arm-wince.lo \
+	pei-arm.lo \
+	pei-i386.lo \
+	pei-mcore.lo \
 	pei-mips.lo \
+	pei-ppc.lo \
+	pei-sh.lo \
 	peigen.lo \
+	plugin.lo \
 	ppcboot.lo \
 	reloc16.lo \
 	riscix.lo \
+	som.lo \
 	sparclinux.lo \
 	sparclynx.lo \
 	sparcnetbsd.lo \
 	sunos.lo \
-	vaxnetbsd.lo \
 	vax1knetbsd.lo \
 	vaxbsd.lo \
+	vaxnetbsd.lo \
 	versados.lo \
-	vms.lo \
 	vms-gsd.lo \
 	vms-hdr.lo \
 	vms-misc.lo \
 	vms-tir.lo \
+	vms.lo \
 	vmsutil.lo \
 	xcofflink.lo \
 	xsym.lo \
@@ -661,11 +670,11 @@ BFD32_BACKENDS_CFILES = \
 	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-go32.c \
 	coff-i960.c \
 	coff-m68k.c \
 	coff-m88k.c \
@@ -682,14 +691,20 @@ BFD32_BACKENDS_CFILES = \
 	coff-tic54x.c \
 	coff-tic80.c \
 	coff-u68k.c \
-	coff-we32k.c \
 	coff-w65.c \
+	coff-we32k.c \
 	coff-z80.c \
 	coff-z8k.c \
 	cofflink.c \
 	dwarf1.c \
 	ecoff.c \
 	ecofflink.c \
+	elf-attrs.c \
+	elf-eh-frame.c \
+	elf-m10200.c \
+	elf-m10300.c \
+	elf-strtab.c \
+	elf-vxworks.c \
 	elf.c \
 	elf32-am33lin.c \
 	elf32-arc.c \
@@ -705,7 +720,6 @@ BFD32_BACKENDS_CFILES = \
 	elf32-dlx.c \
 	elf32-fr30.c \
 	elf32-frv.c \
-	elf32-moxie.c \
 	elf32-gen.c \
 	elf32-h8300.c \
 	elf32-hppa.c \
@@ -718,56 +732,50 @@ BFD32_BACKENDS_CFILES = \
 	elf32-lm32.c \
 	elf32-m32c.c \
 	elf32-m32r.c \
-	elf32-m68k.c \
 	elf32-m68hc11.c \
 	elf32-m68hc12.c \
 	elf32-m68hc1x.c \
+	elf32-m68k.c \
 	elf32-m88k.c \
-	elf-m10200.c \
-	elf-m10300.c \
 	elf32-mcore.c \
 	elf32-mep.c \
-	elfxx-mips.c \
 	elf32-mips.c \
-	elf32-mt.c \
+	elf32-moxie.c \
 	elf32-msp430.c \
+	elf32-mt.c \
 	elf32-openrisc.c \
 	elf32-or32.c \
 	elf32-pj.c \
 	elf32-ppc.c \
-	elf32-sh64.c \
-	elf32-sh64-com.c \
 	elf32-s390.c \
-	elf32-sh.c \
 	elf32-sh-symbian.c \
-	elfxx-sparc.c \
+	elf32-sh.c \
+	elf32-sh64-com.c \
+	elf32-sh64.c \
 	elf32-sparc.c \
 	elf32-spu.c \
 	elf32-v850.c \
 	elf32-vax.c \
+	elf32-xc16x.c \
 	elf32-xstormy16.c \
 	elf32-xtensa.c \
-	elf32-xc16x.c \
 	elf32.c \
 	elflink.c \
-	elf-attrs.c \
-	elf-strtab.c \
-	elf-eh-frame.c \
-	elf-vxworks.c \
+	elfxx-mips.c \
+	elfxx-sparc.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 \
+	i386mach3.c \
 	i386msdos.c \
 	i386netbsd.c \
-	i386mach3.c \
 	i386os9k.c \
 	ieee.c \
 	m68k4knetbsd.c \
@@ -780,44 +788,46 @@ BFD32_BACKENDS_CFILES = \
 	newsos3.c \
 	nlm.c \
 	nlm32-i386.c \
-	nlm32-sparc.c \
 	nlm32-ppc.c \
+	nlm32-sparc.c \
 	nlm32.c \
 	ns32knetbsd.c \
 	oasys.c \
 	pc532-mach.c \
 	pdp11.c \
-	pef.c \
-	pe-arm.c \
-	pei-arm.c \
 	pe-arm-wince.c \
-	pei-arm-wince.c \
+	pe-arm.c \
 	pe-i386.c \
-	pei-i386.c \
 	pe-mcore.c \
-	pei-mcore.c \
+	pe-mips.c \
 	pe-ppc.c \
-	pei-ppc.c \
 	pe-sh.c \
-	pei-sh.c \
-	pe-mips.c \
+	pef.c \
+	pei-arm-wince.c \
+	pei-arm.c \
+	pei-i386.c \
+	pei-mcore.c \
 	pei-mips.c \
+	pei-ppc.c \
+	pei-sh.c \
+	plugin.c \
 	ppcboot.c \
 	reloc16.c \
 	riscix.c \
+	som.c \
 	sparclinux.c \
 	sparclynx.c \
 	sparcnetbsd.c \
 	sunos.c \
-	vaxnetbsd.c \
 	vax1knetbsd.c \
 	vaxbsd.c \
+	vaxnetbsd.c \
 	versados.c \
-	vms.c \
 	vms-gsd.c \
 	vms-hdr.c \
 	vms-misc.c \
 	vms-tir.c \
+	vms.c \
 	vmsutil.c \
 	xcofflink.c \
 	xsym.c \
@@ -834,30 +844,30 @@ BFD64_BACKENDS = \
 	aix5ppc-core.lo \
 	aout64.lo \
 	coff-alpha.lo \
+	coff-x86_64.lo \
 	coff64-rs6000.lo \
 	demo64.lo \
-	pei-ia64.lo \
-	elf64-x86-64.lo \
+	elf32-ia64.lo \
+	elf32-score.lo \
+	elf32-score7.lo \
 	elf64-alpha.lo \
+	elf64-gen.lo \
 	elf64-hppa.lo \
-	elf32-ia64.lo \
 	elf64-ia64.lo \
-	elf64-gen.lo \
-	elfn32-mips.lo \
 	elf64-mips.lo \
 	elf64-mmix.lo \
-	elf32-score.lo \
-	elf32-score7.lo \
-	elf64-sh64.lo \
 	elf64-ppc.lo \
 	elf64-s390.lo \
+	elf64-sh64.lo \
 	elf64-sparc.lo \
+	elf64-x86-64.lo \
 	elf64.lo \
+	elfn32-mips.lo \
 	mmo.lo \
 	nlm32-alpha.lo \
 	nlm64.lo \
-	coff-x86_64.lo \
 	pe-x86_64.lo \
+	pei-ia64.lo \
 	pei-x86_64.lo \
 	pepigen.lo \
 	pex64igen.lo
@@ -866,49 +876,49 @@ BFD64_BACKENDS_CFILES = \
 	aix5ppc-core.c \
 	aout64.c \
 	coff-alpha.c \
+	coff-x86_64.c \
 	coff64-rs6000.c \
 	demo64.c \
-	pei-ia64.c \
-	elf64-x86-64.c \
+	elf32-score.c \
+	elf32-score7.c \
 	elf64-alpha.c \
-	elf64-hppa.c \
 	elf64-gen.c \
-	elfn32-mips.c \
+	elf64-hppa.c \
 	elf64-mips.c \
 	elf64-mmix.c \
 	elf64-ppc.c \
 	elf64-s390.c \
-	elf32-score.c \
-	elf32-score7.c \
 	elf64-sh64.c \
 	elf64-sparc.c \
+	elf64-x86-64.c \
 	elf64.c \
+	elfn32-mips.c \
 	mmo.c \
 	nlm32-alpha.c \
 	nlm64.c \
-	coff-x86_64.c \
 	pe-x86_64.c \
+	pei-ia64.c \
 	pei-x86_64.c
 
 OPTIONAL_BACKENDS = \
 	aix386-core.lo \
+	cisco-core.lo \
 	hpux-core.lo \
 	irix-core.lo \
 	lynx-core.lo \
 	osf-core.lo \
 	sco5-core.lo \
-	trad-core.lo \
-	cisco-core.lo
+	trad-core.lo
 
 OPTIONAL_BACKENDS_CFILES = \
 	aix386-core.c \
+	cisco-core.c \
 	hpux-core.c \
 	irix-core.c \
 	lynx-core.c \
 	osf-core.c \
 	sco5-core.c \
-	trad-core.c \
-	cisco-core.c
+	trad-core.c
 
 
 # We want to rerun configure if configure.in, config.bfd or
@@ -970,7 +980,7 @@ OFILES = $(BFD_BACKENDS) $(BFD_MACHINES) @COREFILE@ @bfd64_libs@
 # libbfd_la_SOURCES, we put BFD64_LIBS in OFILES instead.
 libbfd_la_SOURCES = $(BFD32_LIBS_CFILES)
 libbfd_la_DEPENDENCIES = $(OFILES) ofiles
-libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@
+libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL)
 libbfd_la_LDFLAGS = -release `cat libtool-soversion` @SHARED_LDFLAGS@
 
 # libtool will build .libs/libbfd.a.  We create libbfd.a in the build
@@ -1006,15 +1016,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --cygnus '; \
-	      cd $(srcdir) && $(AUTOMAKE) --cygnus  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --cygnus  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --cygnus  Makefile
+	  $(AUTOMAKE) --foreign  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -1874,10 +1884,6 @@ cpu-frv.lo: \
   cpu-frv.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-moxie.lo: \
-  cpu-moxie.c \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h
 cpu-h8300.lo: \
   cpu-h8300.c \
   $(INCDIR)/filenames.h \
@@ -1978,14 +1984,18 @@ cpu-mmix.lo: \
   cpu-mmix.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
-cpu-mt.lo: \
-  cpu-mt.c \
+cpu-moxie.lo: \
+  cpu-moxie.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
 cpu-msp430.lo: \
   cpu-msp430.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-mt.lo: \
+  cpu-mt.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-or32.lo: \
   cpu-or32.c \
   $(INCDIR)/filenames.h \
@@ -2007,6 +2017,10 @@ cpu-pj.lo: \
   cpu-pj.c \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h
+cpu-plugin.lo: \
+  cpu-plugin.c \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h
 cpu-powerpc.lo: \
   cpu-powerpc.c \
   $(INCDIR)/filenames.h \
@@ -2797,18 +2811,6 @@ elf32-frv.lo: \
   $(INCDIR)/hashtab.h \
   elf-bfd.h \
   elf32-target.h
-elf32-moxie.lo: \
-  elf32-moxie.c \
-  $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/moxie.h \
-  $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h \
-  elf-bfd.h \
-  elf32-target.h
 elf32-gen.lo: \
   elf32-gen.c \
   $(INCDIR)/bfdlink.h \
@@ -3111,13 +3113,13 @@ elf32-mips.lo: \
   elf32-target.h \
   elfxx-mips.h \
   genlink.h
-elf32-mt.lo: \
-  elf32-mt.c \
+elf32-moxie.lo: \
+  elf32-moxie.c \
   $(INCDIR)/bfdlink.h \
   $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/mt.h \
+  $(INCDIR)/elf/moxie.h \
   $(INCDIR)/elf/reloc-macros.h \
   $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h \
@@ -3136,6 +3138,18 @@ elf32-msp430.lo: \
   $(INCDIR)/libiberty.h \
   elf-bfd.h \
   elf32-target.h
+elf32-mt.lo: \
+  elf32-mt.c \
+  $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h \
+  $(INCDIR)/elf/internal.h \
+  $(INCDIR)/elf/mt.h \
+  $(INCDIR)/elf/reloc-macros.h \
+  $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h \
+  elf-bfd.h \
+  elf32-target.h
 elf32-openrisc.lo: \
   elf32-openrisc.c \
   $(INCDIR)/bfdlink.h \
@@ -4000,6 +4014,13 @@ pei-mips.lo: \
   libpei.h \
   pe-mips.c \
   peicode.h
+plugin.lo: \
+  plugin.c \
+  $(INCDIR)/plugin-api.h \
+  $(INCDIR)/filenames.h \
+  plugin.h \
+  $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h
 ppcboot.lo: \
   ppcboot.c \
   $(INCDIR)/filenames.h \