Run "make dep-am" and regenerate

21 files changed, 318 insertions, 259 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8bbd37d..1e2f99c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/SRC-POTFILES.in: Regenerate.
+
 2009-05-21  Alan Modra  <amodra@bigpond.net.au>
 
 	* elflink.c (elf_link_input_bfd): Correct *pindex change in last
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 05df78e..258551c 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -1071,8 +1071,6 @@ linker.lo: linker.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/bfdlink.h genlink.h
 srec.lo: srec.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
-verilog.lo: verilog.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
 binary.lo: binary.c $(INCDIR)/filenames.h $(INCDIR)/safe-ctype.h \
   $(INCDIR)/hashtab.h
 tekhex.lo: tekhex.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
@@ -1092,6 +1090,8 @@ dwarf2.lo: dwarf2.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
 simple.lo: simple.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/bfdlink.h
 compress.lo: compress.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
+verilog.lo: verilog.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
 archive64.lo: archive64.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/aout/ar.h
 cpu-alpha.lo: cpu-alpha.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
@@ -1397,10 +1397,10 @@ elf32-frv.lo: elf32-frv.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/frv.h \
   $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/dwarf2.h \
   elf32-target.h
-elf32-moxie.lo: elf32-moxie.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
-  elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/moxie.h \
-  $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/dwarf2.h \
+elf32-moxie.lo: elf32-moxie.c $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/moxie.h $(INCDIR)/elf/reloc-macros.h \
   elf32-target.h
 elf32-gen.lo: elf32-gen.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
@@ -1549,16 +1549,6 @@ elf32-s390.lo: elf32-s390.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/s390.h \
   $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-score.lo: elf32-score.c $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/elf/score.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-score.h elf32-target.h
-elf32-score7.lo: elf32-score7.c $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/elf/score.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-score.h
 elf32-sh.lo: elf32-sh.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h elf-vxworks.h \
@@ -1856,7 +1846,7 @@ vms-tir.lo: vms-tir.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
 vmsutil.lo: vmsutil.c vmsutil.h
 xcofflink.lo: xcofflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/xcoff.h \
-  libcoff.h libxcoff.h
+  libcoff.h libxcoff.h $(INCDIR)/libiberty.h
 xsym.lo: xsym.c $(INCDIR)/alloca-conf.h $(INCDIR)/filenames.h \
   xsym.h $(INCDIR)/hashtab.h
 xtensa-isa.lo: xtensa-isa.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
@@ -1880,11 +1870,10 @@ demo64.lo: demo64.c aoutf1.h $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h $(INCDIR)/aout/sun4.h libaout.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
   $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-pei-ia64.lo: pei-ia64.c $(INCDIR)/filenames.h \
-  coff-ia64.c $(INCDIR)/hashtab.h $(INCDIR)/coff/ia64.h \
-  $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \
-  peicode.h libpei.h
+pei-ia64.lo: pei-ia64.c $(INCDIR)/filenames.h coff-ia64.c \
+  $(INCDIR)/hashtab.h $(INCDIR)/coff/ia64.h $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
+  $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h
 elf64-x86-64.lo: elf64-x86-64.c $(INCDIR)/filenames.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h bfd_stdint.h \
@@ -1932,6 +1921,16 @@ elf64-s390.lo: elf64-s390.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/s390.h \
   $(INCDIR)/elf/reloc-macros.h elf64-target.h
+elf32-score.lo: elf32-score.c $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
+  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/elf/score.h $(INCDIR)/elf/reloc-macros.h \
+  elf32-score.h elf32-target.h
+elf32-score7.lo: elf32-score7.c $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
+  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/elf/score.h $(INCDIR)/elf/reloc-macros.h \
+  elf32-score.h
 elf64-sh64.lo: elf64-sh64.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/sh.h \
@@ -1964,11 +1963,10 @@ pe-x86_64.lo: pe-x86_64.c $(INCDIR)/filenames.h coff-x86_64.c \
   $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h coffcode.h \
   peicode.h libpei.h
-pei-x86_64.lo: pei-x86_64.c $(INCDIR)/filenames.h coff-x86_64.c \
-  $(INCDIR)/hashtab.h $(INCDIR)/coff/x86_64.h $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h coffcode.h \
-  peicode.h libpei.h
+pei-x86_64.lo: pei-x86_64.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
+  $(INCDIR)/coff/x86_64.h $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h libpei.h \
+  $(INCDIR)/libiberty.h coff-x86_64.c coffcode.h peicode.h
 aix386-core.lo: aix386-core.c $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h $(INCDIR)/coff/i386.h $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 282d961..d568e70 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1669,8 +1669,6 @@ linker.lo: linker.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/bfdlink.h genlink.h
 srec.lo: srec.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
-verilog.lo: verilog.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
-  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
 binary.lo: binary.c $(INCDIR)/filenames.h $(INCDIR)/safe-ctype.h \
   $(INCDIR)/hashtab.h
 tekhex.lo: tekhex.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
@@ -1690,6 +1688,8 @@ dwarf2.lo: dwarf2.c $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
 simple.lo: simple.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/bfdlink.h
 compress.lo: compress.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
+verilog.lo: verilog.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
+  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
 archive64.lo: archive64.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/aout/ar.h
 cpu-alpha.lo: cpu-alpha.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h
@@ -1995,10 +1995,10 @@ elf32-frv.lo: elf32-frv.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/frv.h \
   $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/dwarf2.h \
   elf32-target.h
-elf32-moxie.lo: elf32-moxie.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
-  elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(INCDIR)/elf/moxie.h \
-  $(INCDIR)/elf/reloc-macros.h $(INCDIR)/elf/dwarf2.h \
+elf32-moxie.lo: elf32-moxie.c $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
+  $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h \
+  $(INCDIR)/elf/moxie.h $(INCDIR)/elf/reloc-macros.h \
   elf32-target.h
 elf32-gen.lo: elf32-gen.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
@@ -2147,16 +2147,6 @@ elf32-s390.lo: elf32-s390.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/s390.h \
   $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-score.lo: elf32-score.c $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/elf/score.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-score.h elf32-target.h
-elf32-score7.lo: elf32-score7.c $(INCDIR)/filenames.h \
-  $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/elf/score.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-score.h
 elf32-sh.lo: elf32-sh.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h elf-vxworks.h \
@@ -2454,7 +2444,7 @@ vms-tir.lo: vms-tir.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
 vmsutil.lo: vmsutil.c vmsutil.h
 xcofflink.lo: xcofflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/xcoff.h \
-  libcoff.h libxcoff.h
+  libcoff.h libxcoff.h $(INCDIR)/libiberty.h
 xsym.lo: xsym.c $(INCDIR)/alloca-conf.h $(INCDIR)/filenames.h \
   xsym.h $(INCDIR)/hashtab.h
 xtensa-isa.lo: xtensa-isa.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
@@ -2478,11 +2468,10 @@ demo64.lo: demo64.c aoutf1.h $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h $(INCDIR)/aout/sun4.h libaout.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
   $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-pei-ia64.lo: pei-ia64.c $(INCDIR)/filenames.h \
-  coff-ia64.c $(INCDIR)/hashtab.h $(INCDIR)/coff/ia64.h \
-  $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h coffcode.h \
-  peicode.h libpei.h
+pei-ia64.lo: pei-ia64.c $(INCDIR)/filenames.h coff-ia64.c \
+  $(INCDIR)/hashtab.h $(INCDIR)/coff/ia64.h $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
+  $(INCDIR)/bfdlink.h coffcode.h peicode.h libpei.h
 elf64-x86-64.lo: elf64-x86-64.c $(INCDIR)/filenames.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h bfd_stdint.h \
@@ -2530,6 +2519,16 @@ elf64-s390.lo: elf64-s390.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/s390.h \
   $(INCDIR)/elf/reloc-macros.h elf64-target.h
+elf32-score.lo: elf32-score.c $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
+  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/elf/score.h $(INCDIR)/elf/reloc-macros.h \
+  elf32-score.h elf32-target.h
+elf32-score7.lo: elf32-score7.c $(INCDIR)/filenames.h \
+  $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h elf-bfd.h \
+  $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/elf/score.h $(INCDIR)/elf/reloc-macros.h \
+  elf32-score.h
 elf64-sh64.lo: elf64-sh64.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/hashtab.h elf-bfd.h $(INCDIR)/elf/common.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/sh.h \
@@ -2562,11 +2561,10 @@ pe-x86_64.lo: pe-x86_64.c $(INCDIR)/filenames.h coff-x86_64.c \
   $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h coffcode.h \
   peicode.h libpei.h
-pei-x86_64.lo: pei-x86_64.c $(INCDIR)/filenames.h coff-x86_64.c \
-  $(INCDIR)/hashtab.h $(INCDIR)/coff/x86_64.h $(INCDIR)/coff/external.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h coffcode.h \
-  peicode.h libpei.h
+pei-x86_64.lo: pei-x86_64.c $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
+  $(INCDIR)/coff/x86_64.h $(INCDIR)/coff/external.h $(INCDIR)/coff/internal.h \
+  $(INCDIR)/coff/pe.h libcoff.h $(INCDIR)/bfdlink.h libpei.h \
+  $(INCDIR)/libiberty.h coff-x86_64.c coffcode.h peicode.h
 aix386-core.lo: aix386-core.c $(INCDIR)/filenames.h \
   $(INCDIR)/hashtab.h $(INCDIR)/coff/i386.h $(INCDIR)/coff/external.h \
   $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h
diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
index f1bc085..e143bff 100644
--- a/bfd/doc/ChangeLog
+++ b/bfd/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.in: Regenerate.
+
 2009-04-22  Anthony Green  <green@moxielogic.com>
 
 	* bfdint.texi (BFD target vector miscellaneous): Mention verilog
diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in
index 6fbc49e..d49257d 100644
--- a/bfd/po/SRC-POTFILES.in
+++ b/bfd/po/SRC-POTFILES.in
@@ -100,6 +100,7 @@ cpu-mcore.c
 cpu-mep.c
 cpu-mips.c
 cpu-mmix.c
+cpu-moxie.c
 cpu-msp430.c
 cpu-mt.c
 cpu-ns32k.c
@@ -133,15 +134,6 @@ dwarf2.c
 ecoff.c
 ecofflink.c
 ecoffswap.h
-efi-app-ia32.c
-efi-app-ia64.c
-efi-app-x86_64.c
-efi-bsdrv-ia32.c
-efi-bsdrv-ia64.c
-efi-bsdrv-x86_64.c
-efi-rtdrv-ia32.c
-efi-rtdrv-ia64.c
-efi-rtdrv-x86_64.c
 elf-attrs.c
 elf-bfd.h
 elf-eh-frame.c
@@ -186,6 +178,7 @@ elf32-m88k.c
 elf32-mcore.c
 elf32-mep.c
 elf32-mips.c
+elf32-moxie.c
 elf32-msp430.c
 elf32-mt.c
 elf32-openrisc.c
@@ -194,6 +187,7 @@ elf32-pj.c
 elf32-ppc.c
 elf32-s390.c
 elf32-score.c
+elf32-score7.c
 elf32-sh-symbian.c
 elf32-sh.c
 elf32-sh64-com.c
@@ -304,6 +298,7 @@ pef.h
 pei-arm-wince.c
 pei-arm.c
 pei-i386.c
+pei-ia64.c
 pei-mcore.c
 pei-mips.c
 pei-ppc.c
@@ -333,6 +328,7 @@ trad-core.c
 vax1knetbsd.c
 vaxbsd.c
 vaxnetbsd.c
+verilog.c
 versados.c
 version.h
 vms-gsd.c
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c5c36bb..936e9c3 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
 2009-05-12  Alan Modra  <amodra@bigpond.net.au>
 
 	* objcopy.c (set_long_section_mode): Check input_bfd is coff
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 3ef352f..01768ca 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -577,7 +577,9 @@ objcopy.o: objcopy.c sysdep.h $(INCDIR)/alloca-conf.h \
   $(INCDIR)/progress.h $(INCDIR)/libiberty.h bucomm.h \
   budbg.h $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h
+  $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h \
+  $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/coff/i386.h \
+  $(INCDIR)/coff/external.h $(INCDIR)/coff/pe.h
 objdump.o: objdump.c sysdep.h $(INCDIR)/alloca-conf.h \
   config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 987a689..9f26b79 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1344,7 +1344,9 @@ objcopy.o: objcopy.c sysdep.h $(INCDIR)/alloca-conf.h \
   $(INCDIR)/progress.h $(INCDIR)/libiberty.h bucomm.h \
   budbg.h $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h
+  $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h \
+  $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/coff/i386.h \
+  $(INCDIR)/coff/external.h $(INCDIR)/coff/pe.h
 objdump.o: objdump.c sysdep.h $(INCDIR)/alloca-conf.h \
   config.h $(INCDIR)/ansidecl.h ../bfd/bfdver.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/binary-io.h ../bfd/bfd.h $(INCDIR)/symcat.h \
diff --git a/gas/ChangeLog b/gas/ChangeLog
index baba4a9..772dedc5 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
 2009-05-20  Kai Tietz  <kai.tietz@onevision.com>
 	    H.J. Lu  <hongjiu.lu@intel.com>
 
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 40c52be..af7d48e 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -1192,21 +1192,24 @@ DEPTC_i386_aout = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-aout.h \
   $(INCDIR)/opcode/i386.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
   dwarf2dbg.h dw2gencfi.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/x86-64.h \
-  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h
+  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h \
+  $(srcdir)/config/tc-i386-intel.c
 DEPTC_i386_coff = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-i386.h $(srcdir)/../opcodes/i386-opc.h \
-  $(INCDIR)/opcode/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/x86_64.h \
+  $(INCDIR)/opcode/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
   dwarf2dbg.h dw2gencfi.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/x86-64.h \
-  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h
+  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h \
+  $(srcdir)/config/tc-i386-intel.c
 DEPTC_i386_elf = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-elf.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i386.h \
   $(srcdir)/../opcodes/i386-opc.h $(INCDIR)/opcode/i386.h \
   dwarf2dbg.h $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
   dw2gencfi.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/x86-64.h \
-  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h
+  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h \
+  $(srcdir)/config/tc-i386-intel.c
 DEPTC_i860_elf = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-elf.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
   $(INCDIR)/elf/internal.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i860.h \
@@ -1633,7 +1636,7 @@ DEPOBJ_i386_aout = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-aout.h \
   $(INCDIR)/aout/aout64.h $(INCDIR)/obstack.h
 DEPOBJ_i386_coff = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-i386.h $(srcdir)/../opcodes/i386-opc.h \
-  $(INCDIR)/opcode/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/x86_64.h \
+  $(INCDIR)/opcode/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/obstack.h subsegs.h
 DEPOBJ_i386_elf = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-elf.h \
@@ -1993,14 +1996,14 @@ DEP_i386_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i386.h \
   $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h
 DEP_i386_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i386.h \
   $(srcdir)/../opcodes/i386-opc.h $(INCDIR)/opcode/i386.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/x86_64.h $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h $(INCDIR)/coff/external.h \
   $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
 DEP_i386_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i386.h $(srcdir)/../opcodes/i386-opc.h \
   $(INCDIR)/opcode/i386.h dwarf2dbg.h $(INCDIR)/alloca-conf.h \
   $(srcdir)/config/obj-coff.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/x86_64.h $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h
+  $(INCDIR)/coff/i386.h $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h
 DEP_i860_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i860.h dwarf2dbg.h \
diff --git a/gas/Makefile.in b/gas/Makefile.in
index d65f8e4..4d64233 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -957,15 +957,17 @@ DEPTC_i386_aout = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-aout.h \
   $(INCDIR)/opcode/i386.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
   dwarf2dbg.h dw2gencfi.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/x86-64.h \
-  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h
+  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h \
+  $(srcdir)/config/tc-i386-intel.c
 
 DEPTC_i386_coff = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-i386.h $(srcdir)/../opcodes/i386-opc.h \
-  $(INCDIR)/opcode/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/x86_64.h \
+  $(INCDIR)/opcode/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
   dwarf2dbg.h dw2gencfi.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/x86-64.h \
-  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h
+  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h \
+  $(srcdir)/config/tc-i386-intel.c
 
 DEPTC_i386_elf = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-elf.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
@@ -973,7 +975,8 @@ DEPTC_i386_elf = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-elf.h \
   $(srcdir)/../opcodes/i386-opc.h $(INCDIR)/opcode/i386.h \
   dwarf2dbg.h $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
   dw2gencfi.h $(INCDIR)/elf/dwarf2.h $(INCDIR)/elf/x86-64.h \
-  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h
+  $(INCDIR)/elf/reloc-macros.h $(srcdir)/../opcodes/i386-init.h \
+  $(srcdir)/config/tc-i386-intel.c
 
 DEPTC_i860_elf = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-elf.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h \
@@ -1481,7 +1484,7 @@ DEPOBJ_i386_aout = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-aout.h \
 
 DEPOBJ_i386_coff = $(INCDIR)/alloca-conf.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-i386.h $(srcdir)/../opcodes/i386-opc.h \
-  $(INCDIR)/opcode/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/x86_64.h \
+  $(INCDIR)/opcode/i386.h $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h \
   $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
   $(INCDIR)/obstack.h subsegs.h
 
@@ -1923,7 +1926,7 @@ DEP_i386_aout = $(srcdir)/config/obj-aout.h $(srcdir)/config/tc-i386.h \
 
 DEP_i386_coff = $(srcdir)/config/obj-coff.h $(srcdir)/config/tc-i386.h \
   $(srcdir)/../opcodes/i386-opc.h $(INCDIR)/opcode/i386.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/x86_64.h $(INCDIR)/coff/external.h \
+  $(INCDIR)/coff/internal.h $(INCDIR)/coff/i386.h $(INCDIR)/coff/external.h \
   $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h
 
 DEP_i386_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
@@ -1931,7 +1934,7 @@ DEP_i386_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/bfdlink.h $(srcdir)/config/tc-i386.h $(srcdir)/../opcodes/i386-opc.h \
   $(INCDIR)/opcode/i386.h dwarf2dbg.h $(INCDIR)/alloca-conf.h \
   $(srcdir)/config/obj-coff.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/x86_64.h $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h
+  $(INCDIR)/coff/i386.h $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h
 
 DEP_i860_elf = $(srcdir)/config/obj-elf.h $(BFDDIR)/elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/external.h $(INCDIR)/elf/internal.h \
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index f206f0a..c7ae638 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
 2009-04-15  Kazu Hirata  <kazu@codesourcery.com>
 
 	* gprof.h: Include gconfig.h.  #undef PACKAGE.
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 1d3d3ca..559723a 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -234,102 +234,110 @@ endif
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-basic_blocks.o: basic_blocks.c gprof.h $(BFDDIR)/sysdep.h \
+basic_blocks.o: basic_blocks.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
   ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/libiberty.h basic_blocks.h corefile.h \
-  gmon_io.h gmon_out.h search_list.h source.h symtab.h \
+  $(INCDIR)/libiberty.h basic_blocks.h corefile.h gmon_io.h \
+  gmon_out.h search_list.h source.h symtab.h sym_ids.h
+call_graph.o: call_graph.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h call_graph.h \
+  corefile.h gmon_io.h gmon_out.h sym_ids.h
+cg_arcs.o: cg_arcs.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
+  call_graph.h cg_arcs.h cg_dfn.h cg_print.h utils.h \
   sym_ids.h
-call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \
+cg_dfn.o: cg_dfn.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
   ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
-  call_graph.h corefile.h gmon_io.h gmon_out.h sym_ids.h
-cg_arcs.o: cg_arcs.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h call_graph.h cg_arcs.h \
-  cg_dfn.h cg_print.h utils.h sym_ids.h
-cg_dfn.o: cg_dfn.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h cg_arcs.h cg_dfn.h \
-  utils.h
-cg_print.o: cg_print.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h cg_arcs.h cg_print.h \
-  hist.h utils.h corefile.h
-corefile.o: corefile.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h hist.h corefile.h $(INCDIR)/safe-ctype.h
-gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/binary-io.h \
-  search_list.h source.h symtab.h cg_arcs.h basic_blocks.h \
-  corefile.h call_graph.h gmon_io.h gmon_out.h gmon.h \
-  hertz.h hist.h $(INCDIR)/libiberty.h
-gprof.o: gprof.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  ../bfd/bfdver.h search_list.h source.h symtab.h basic_blocks.h \
-  call_graph.h cg_arcs.h cg_print.h corefile.h gmon_io.h \
-  hertz.h hist.h sym_ids.h $(INCDIR)/demangle.h
-hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h hertz.h
-hist.o: hist.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h corefile.h gmon_io.h \
-  gmon_out.h hist.h sym_ids.h utils.h
-source.o: source.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h
-search_list.o: search_list.c gprof.h $(BFDDIR)/sysdep.h \
+  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
+  cg_arcs.h cg_dfn.h utils.h
+cg_print.o: cg_print.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
   ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/libiberty.h search_list.h
-symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h
-sym_ids.o: sym_ids.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/safe-ctype.h search_list.h source.h symtab.h \
-  cg_arcs.h sym_ids.h corefile.h
-utils.o: utils.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/demangle.h \
   $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  cg_arcs.h utils.h corefile.h
-i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
+  cg_arcs.h cg_print.h hist.h utils.h corefile.h
+corefile.o: corefile.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
+  hist.h corefile.h $(INCDIR)/safe-ctype.h
+gmon_io.o: gmon_io.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/binary-io.h search_list.h source.h symtab.h \
+  cg_arcs.h basic_blocks.h corefile.h call_graph.h gmon_io.h \
+  gmon_out.h gmon.h hertz.h hist.h $(INCDIR)/libiberty.h
+gprof.o: gprof.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h ../bfd/bfdver.h search_list.h \
+  source.h symtab.h basic_blocks.h call_graph.h cg_arcs.h \
+  cg_print.h corefile.h gmon_io.h hertz.h hist.h sym_ids.h \
+  $(INCDIR)/demangle.h
+hertz.o: hertz.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  hertz.h
+hist.o: hist.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
+  corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h utils.h
+source.o: source.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h source.h
+search_list.o: search_list.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h
+symtab.o: symtab.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h
+sym_ids.o: sym_ids.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h search_list.h \
+  source.h symtab.h cg_arcs.h sym_ids.h corefile.h
+utils.o: utils.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/demangle.h $(INCDIR)/libiberty.h search_list.h \
+  source.h symtab.h cg_arcs.h utils.h corefile.h
+i386.o: i386.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+alpha.o: alpha.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+vax.o: vax.c gprof.h gconfig.h $(BFDDIR)/sysdep.h ../bfd/config.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
+  ../bfd/bfd.h $(INCDIR)/symcat.h search_list.h source.h \
+  symtab.h cg_arcs.h corefile.h hist.h
+tahoe.o: tahoe.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+sparc.o: sparc.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+mips.o: mips.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
 flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
 bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
 fsf_callg_bl.o: fsf_callg_bl.c $(INCDIR)/ansidecl.h
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 08a9c96..7095370 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -995,102 +995,110 @@ dep-am: DEP
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-basic_blocks.o: basic_blocks.c gprof.h $(BFDDIR)/sysdep.h \
+basic_blocks.o: basic_blocks.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
   ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/libiberty.h basic_blocks.h corefile.h \
-  gmon_io.h gmon_out.h search_list.h source.h symtab.h \
+  $(INCDIR)/libiberty.h basic_blocks.h corefile.h gmon_io.h \
+  gmon_out.h search_list.h source.h symtab.h sym_ids.h
+call_graph.o: call_graph.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h call_graph.h \
+  corefile.h gmon_io.h gmon_out.h sym_ids.h
+cg_arcs.o: cg_arcs.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
+  call_graph.h cg_arcs.h cg_dfn.h cg_print.h utils.h \
   sym_ids.h
-call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \
+cg_dfn.o: cg_dfn.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
   ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h search_list.h source.h symtab.h cg_arcs.h \
-  call_graph.h corefile.h gmon_io.h gmon_out.h sym_ids.h
-cg_arcs.o: cg_arcs.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h call_graph.h cg_arcs.h \
-  cg_dfn.h cg_print.h utils.h sym_ids.h
-cg_dfn.o: cg_dfn.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h cg_arcs.h cg_dfn.h \
-  utils.h
-cg_print.o: cg_print.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h cg_arcs.h cg_print.h \
-  hist.h utils.h corefile.h
-corefile.o: corefile.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h hist.h corefile.h $(INCDIR)/safe-ctype.h
-gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/binary-io.h \
-  search_list.h source.h symtab.h cg_arcs.h basic_blocks.h \
-  corefile.h call_graph.h gmon_io.h gmon_out.h gmon.h \
-  hertz.h hist.h $(INCDIR)/libiberty.h
-gprof.o: gprof.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  ../bfd/bfdver.h search_list.h source.h symtab.h basic_blocks.h \
-  call_graph.h cg_arcs.h cg_print.h corefile.h gmon_io.h \
-  hertz.h hist.h sym_ids.h $(INCDIR)/demangle.h
-hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h hertz.h
-hist.o: hist.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h symtab.h corefile.h gmon_io.h \
-  gmon_out.h hist.h sym_ids.h utils.h
-source.o: source.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  search_list.h source.h
-search_list.o: search_list.c gprof.h $(BFDDIR)/sysdep.h \
+  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
+  cg_arcs.h cg_dfn.h utils.h
+cg_print.o: cg_print.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
   ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
   $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/libiberty.h search_list.h
-symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h
-sym_ids.o: sym_ids.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/safe-ctype.h search_list.h source.h symtab.h \
-  cg_arcs.h sym_ids.h corefile.h
-utils.o: utils.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/demangle.h \
   $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
-  cg_arcs.h utils.h corefile.h
-i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
-  $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
-mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
+  cg_arcs.h cg_print.h hist.h utils.h corefile.h
+corefile.o: corefile.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
+  hist.h corefile.h $(INCDIR)/safe-ctype.h
+gmon_io.o: gmon_io.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/binary-io.h search_list.h source.h symtab.h \
+  cg_arcs.h basic_blocks.h corefile.h call_graph.h gmon_io.h \
+  gmon_out.h gmon.h hertz.h hist.h $(INCDIR)/libiberty.h
+gprof.o: gprof.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h ../bfd/bfdver.h search_list.h \
+  source.h symtab.h basic_blocks.h call_graph.h cg_arcs.h \
+  cg_print.h corefile.h gmon_io.h hertz.h hist.h sym_ids.h \
+  $(INCDIR)/demangle.h
+hertz.o: hertz.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  hertz.h
+hist.o: hist.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h source.h symtab.h \
+  corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h utils.h
+source.o: source.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h source.h
+search_list.o: search_list.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h search_list.h
+symtab.o: symtab.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h
+sym_ids.o: sym_ids.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h search_list.h \
+  source.h symtab.h cg_arcs.h sym_ids.h corefile.h
+utils.o: utils.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  $(INCDIR)/demangle.h $(INCDIR)/libiberty.h search_list.h \
+  source.h symtab.h cg_arcs.h utils.h corefile.h
+i386.o: i386.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+alpha.o: alpha.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+vax.o: vax.c gprof.h gconfig.h $(BFDDIR)/sysdep.h ../bfd/config.h \
   $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h search_list.h \
-  source.h symtab.h cg_arcs.h corefile.h hist.h
+  ../bfd/bfd.h $(INCDIR)/symcat.h search_list.h source.h \
+  symtab.h cg_arcs.h corefile.h hist.h
+tahoe.o: tahoe.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+sparc.o: sparc.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
+mips.o: mips.c gprof.h gconfig.h $(BFDDIR)/sysdep.h \
+  ../bfd/config.h $(INCDIR)/ansidecl.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
+  search_list.h source.h symtab.h cg_arcs.h corefile.h \
+  hist.h
 flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
 bsd_callg_bl.o: bsd_callg_bl.c $(INCDIR)/ansidecl.h
 fsf_callg_bl.o: fsf_callg_bl.c $(INCDIR)/ansidecl.h
diff --git a/ld/ChangeLog b/ld/ChangeLog
index a7b8fdd..7af3e3c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+
 2009-05-19  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* NEWS:  Mention new feature.
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 6a4139a..670c1ed 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -942,7 +942,7 @@ eelf32i370.c: $(srcdir)/emulparams/elf32i370.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfi370.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32i370 "$(tdir_elf32i370)"
 eelf32ip2k.c: $(srcdir)/emulparams/elf32ip2k.sh \
-  $(ELF_DEPS) $(srcdir)/scripttempl/ip2k.sc ${GEN_DEPENDS}
+  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32ip2k "$(tdir_ip2k)"
 eelf32iq2000.c: $(srcdir)/emulparams/elf32iq2000.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
diff --git a/ld/Makefile.in b/ld/Makefile.in
index ae084a5..6aa9db1 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1789,7 +1789,7 @@ eelf32i370.c: $(srcdir)/emulparams/elf32i370.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elfi370.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32i370 "$(tdir_elf32i370)"
 eelf32ip2k.c: $(srcdir)/emulparams/elf32ip2k.sh \
-  $(ELF_DEPS) $(srcdir)/scripttempl/ip2k.sc ${GEN_DEPENDS}
+  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32ip2k "$(tdir_ip2k)"
 eelf32iq2000.c: $(srcdir)/emulparams/elf32iq2000.sh \
   $(ELF_GEN_DEPS) $(srcdir)/scripttempl/iq2000.sc ${GEN_DEPENDS}
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 1c6af47..30829d4 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* Makefile.am: Run "make dep-am".
+	* Makefile.in: Regenerate.
+	* po/POTFILES.in: Regenerate.
+
 2009-05-19  DJ Delorie  <dj@redhat.com>
 
 	* mep-asm.c: Regenerate.
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index 24c9296..0e9883c 100644
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -796,7 +796,7 @@ frv-opc.lo: frv-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/elf/frv.h $(INCDIR)/elf/reloc-macros.h
 moxie-dis.lo: moxie-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/opcode/moxie.h $(INCDIR)/dis-asm.h $(BFD_H) \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
+  $(INCDIR)/symcat.h
 moxie-opc.lo: moxie-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/opcode/moxie.h
 h8300-dis.lo: h8300-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
@@ -976,7 +976,8 @@ mcore-dis.lo: mcore-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
 mep-asm.lo: mep-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(BFD_H) $(INCDIR)/symcat.h mep-desc.h $(INCDIR)/opcode/cgen-bitset.h \
   $(INCDIR)/opcode/cgen.h mep-opc.h opintl.h $(INCDIR)/xregex.h \
-  $(INCDIR)/xregex2.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+  $(INCDIR)/xregex2.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/elf/mep.h $(INCDIR)/elf/reloc-macros.h
 mep-desc.lo: mep-desc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(BFD_H) $(INCDIR)/symcat.h mep-desc.h $(INCDIR)/opcode/cgen-bitset.h \
   $(INCDIR)/opcode/cgen.h mep-opc.h opintl.h $(INCDIR)/libiberty.h \
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index f0f4a91..d70fe38 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -1361,7 +1361,7 @@ frv-opc.lo: frv-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/elf/frv.h $(INCDIR)/elf/reloc-macros.h
 moxie-dis.lo: moxie-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/opcode/moxie.h $(INCDIR)/dis-asm.h $(BFD_H) \
-  $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
+  $(INCDIR)/symcat.h
 moxie-opc.lo: moxie-opc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/opcode/moxie.h
 h8300-dis.lo: h8300-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
@@ -1541,7 +1541,8 @@ mcore-dis.lo: mcore-dis.c sysdep.h config.h $(INCDIR)/ansidecl.h \
 mep-asm.lo: mep-asm.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(BFD_H) $(INCDIR)/symcat.h mep-desc.h $(INCDIR)/opcode/cgen-bitset.h \
   $(INCDIR)/opcode/cgen.h mep-opc.h opintl.h $(INCDIR)/xregex.h \
-  $(INCDIR)/xregex2.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+  $(INCDIR)/xregex2.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/elf/mep.h $(INCDIR)/elf/reloc-macros.h
 mep-desc.lo: mep-desc.c sysdep.h config.h $(INCDIR)/ansidecl.h \
   $(BFD_H) $(INCDIR)/symcat.h mep-desc.h $(INCDIR)/opcode/cgen-bitset.h \
   $(INCDIR)/opcode/cgen.h mep-opc.h opintl.h $(INCDIR)/libiberty.h \
diff --git a/opcodes/po/POTFILES.in b/opcodes/po/POTFILES.in
index 3180b79..80663bc 100644
--- a/opcodes/po/POTFILES.in
+++ b/opcodes/po/POTFILES.in
@@ -127,6 +127,8 @@ mips-opc.c
 mips16-opc.c
 mmix-dis.c
 mmix-opc.c
+moxie-dis.c
+moxie-opc.c
 mt-asm.c
 mt-desc.c
 mt-desc.h
@@ -155,6 +157,7 @@ s390-mkopc.c
 s390-opc.c
 score-dis.c
 score-opc.h
+score7-dis.c
 sh-dis.c
 sh-opc.h
 sh64-dis.c