* Makefile.am (check-DEJAGNU): Revert 2002-06-25 change.

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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b360622ff44c3190e6bf5c2661e47c52b9ae9ced..324674849977b12ab471185173582fad539514a8 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-03  Alan Modra  <amodra@bigpond.net.au>
+
+       * Makefile.am (check-DEJAGNU): Revert 2002-06-25 change.
+       Run "make dep-am".
+       * Makefile.in: Regenerate.
+
 2002-07-02  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
        * config/tc-s390.c (tc_s390_fix_adjustable): Prevent any adjustment

diff --git a/gas/Makefile.am b/gas/Makefile.am
index 6fe5bdc5db6a89f790291f795181d8156a6c1655..e8d060fa20d109db38019b824124e3f85592b687 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -534,7 +534,6 @@ check-DEJAGNU: site.exp
          TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
          export TCL_LIBRARY; \
        fi; \
-       LC_ALL=C; export LC_ALL; \
        runtest=$(RUNTEST); \
        cd testsuite; \
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
@@ -1073,16 +1072,17 @@ DEPTC_fr30_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
   $(srcdir)/../opcodes/fr30-opc.h cgen.h
 DEPTC_frv_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-frv.h $(INCDIR)/coff/internal.h \
-  $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h \
+  $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h dwarf2dbg.h \
   subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/frv-desc.h \
   $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/frv-opc.h \
-  cgen.h
+  cgen.h $(BFDDIR)/libbfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/frv.h \
+  $(INCDIR)/elf/reloc-macros.h
 DEPTC_frv_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-frv.h \
-  $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
-  $(srcdir)/../opcodes/frv-desc.h $(INCDIR)/opcode/cgen.h \
-  $(srcdir)/../opcodes/frv-opc.h cgen.h
+  dwarf2dbg.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/frv-desc.h \
+  $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/frv-opc.h \
+  cgen.h $(BFDDIR)/libbfd.h $(INCDIR)/elf/frv.h $(INCDIR)/elf/reloc-macros.h
 DEPTC_h8300_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-h8300.h $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/h8300.h $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h \
@@ -1429,21 +1429,24 @@ DEPTC_tic80_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
   $(INCDIR)/safe-ctype.h $(INCDIR)/opcode/tic80.h
 DEPTC_vax_aout = $(INCDIR)/symcat.h $(srcdir)/config/obj-aout.h \
   $(srcdir)/config/tc-vax.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \
-  $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h \
-  $(INCDIR)/safe-ctype.h
+  $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h subsegs.h \
+  $(INCDIR)/opcode/vax.h $(INCDIR)/safe-ctype.h
 DEPTC_vax_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-vax.h $(INCDIR)/coff/internal.h \
   $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h $(srcdir)/config/vax-inst.h \
-  $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h $(INCDIR)/safe-ctype.h
+  $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/vax.h \
+  $(INCDIR)/safe-ctype.h
 DEPTC_vax_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-vax.h \
-  $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h \
+  $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h subsegs.h \
+  $(INCDIR)/elf/vax.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/opcode/vax.h \
   $(INCDIR)/safe-ctype.h
 DEPTC_vax_vms = $(INCDIR)/symcat.h $(srcdir)/config/obj-vms.h \
   $(srcdir)/config/tc-vax.h $(INCDIR)/aout/stab_gnu.h \
   $(INCDIR)/aout/stab.def $(srcdir)/config/vax-inst.h \
-  $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h $(INCDIR)/safe-ctype.h
+  $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/vax.h \
+  $(INCDIR)/safe-ctype.h
 DEPTC_w65_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-w65.h $(INCDIR)/coff/internal.h \
   $(INCDIR)/coff/w65.h $(INCDIR)/coff/external.h $(BFDDIR)/libcoff.h \

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 4365c3f43cc89cb7ae5f0dd2fefe5607af6af756..c4118202662a77f80b327284b059220fbaec5c6a 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -800,17 +800,18 @@ DEPTC_fr30_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
 
 DEPTC_frv_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-frv.h $(INCDIR)/coff/internal.h \
-  $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h \
+  $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h dwarf2dbg.h \
   subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/frv-desc.h \
   $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/frv-opc.h \
-  cgen.h
+  cgen.h $(BFDDIR)/libbfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/frv.h \
+  $(INCDIR)/elf/reloc-macros.h
 
 DEPTC_frv_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-frv.h \
-  $(INCDIR)/safe-ctype.h subsegs.h $(INCDIR)/obstack.h \
-  $(srcdir)/../opcodes/frv-desc.h $(INCDIR)/opcode/cgen.h \
-  $(srcdir)/../opcodes/frv-opc.h cgen.h
+  dwarf2dbg.h subsegs.h $(INCDIR)/obstack.h $(srcdir)/../opcodes/frv-desc.h \
+  $(INCDIR)/opcode/cgen.h $(srcdir)/../opcodes/frv-opc.h \
+  cgen.h $(BFDDIR)/libbfd.h $(INCDIR)/elf/frv.h $(INCDIR)/elf/reloc-macros.h
 
 DEPTC_h8300_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-h8300.h $(INCDIR)/coff/internal.h \
@@ -1228,24 +1229,27 @@ DEPTC_tic80_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
 
 DEPTC_vax_aout = $(INCDIR)/symcat.h $(srcdir)/config/obj-aout.h \
   $(srcdir)/config/tc-vax.h $(BFDDIR)/libaout.h $(INCDIR)/bfdlink.h \
-  $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h \
-  $(INCDIR)/safe-ctype.h
+  $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h subsegs.h \
+  $(INCDIR)/opcode/vax.h $(INCDIR)/safe-ctype.h
 
 DEPTC_vax_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-vax.h $(INCDIR)/coff/internal.h \
   $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h $(srcdir)/config/vax-inst.h \
-  $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h $(INCDIR)/safe-ctype.h
+  $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/vax.h \
+  $(INCDIR)/safe-ctype.h
 
 DEPTC_vax_elf = $(INCDIR)/symcat.h $(srcdir)/config/obj-elf.h \
   $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(srcdir)/config/tc-vax.h \
-  $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h \
+  $(srcdir)/config/vax-inst.h $(INCDIR)/obstack.h subsegs.h \
+  $(INCDIR)/elf/vax.h $(INCDIR)/elf/reloc-macros.h $(INCDIR)/opcode/vax.h \
   $(INCDIR)/safe-ctype.h
 
 DEPTC_vax_vms = $(INCDIR)/symcat.h $(srcdir)/config/obj-vms.h \
   $(srcdir)/config/tc-vax.h $(INCDIR)/aout/stab_gnu.h \
   $(INCDIR)/aout/stab.def $(srcdir)/config/vax-inst.h \
-  $(INCDIR)/obstack.h $(INCDIR)/opcode/vax.h $(INCDIR)/safe-ctype.h
+  $(INCDIR)/obstack.h subsegs.h $(INCDIR)/opcode/vax.h \
+  $(INCDIR)/safe-ctype.h
 
 DEPTC_w65_coff = $(INCDIR)/symcat.h $(srcdir)/config/obj-coff.h \
   $(srcdir)/config/tc-w65.h $(INCDIR)/coff/internal.h \
@@ -2802,7 +2806,6 @@ check-DEJAGNU: site.exp
          TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
          export TCL_LIBRARY; \
        fi; \
-       LC_ALL=C; export LC_ALL; \
        runtest=$(RUNTEST); \
        cd testsuite; \
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3f3f946b0d3fa3538634f1f5c3042b0c09fc279f..44765dba10162edbd81ff59529a0f8f27830456d 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-03  Alan Modra  <amodra@bigpond.net.au>
+
+       * Makefile.am (check-DEJAGNU): Revert 2002-06-25 change.
+       Run "make dep-am".
+       * Makefile.in: Regenerate.
+
 2002-07-02  Alan Modra  <amodra@bigpond.net.au>
 
        * ldfile.c (ldfile_try_open_bfd): Formatting.

diff --git a/ld/Makefile.am b/ld/Makefile.am
index d6fb8214ca4ba4a3fa4938470f93fe25b6601506..72bb59fa7e4799a569695a4c810f74c69af2d89b 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -1091,7 +1091,6 @@ check-DEJAGNU: site.exp
          TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
          export TCL_LIBRARY; \
        fi; \
-       LC_ALL=C; export LC_ALL; \
        runtest=$(RUNTEST); \
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
          $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \
@@ -1379,9 +1378,9 @@ ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   mri.h ldctor.h ldlex.h
 ldlex.o: ldlex.c $(INCDIR)/ansidecl.h ../bfd/bfd.h \
   $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \
-  ldexp.h ldlang.h ldgram.h ldfile.h ldlex.h ldmain.h \
-  $(INCDIR)/libiberty.h
+  $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h \
+  ldmisc.h ldexp.h ldlang.h ldgram.h ldfile.h ldlex.h \
+  ldmain.h $(INCDIR)/libiberty.h
 deffilep.o: deffilep.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/safe-ctype.h ../bfd/bfd.h $(INCDIR)/symcat.h \
   sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 433598c7fc07cc5ab4d6d070824f6dd9c6dc090a..a37771c71d07cb5afe417eb99054906212e79c7d 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -152,7 +152,8 @@ MANCONF = -Dman
 
 TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl
 
-POD2MAN = pod2man --center="GNU Development Tools"     --release="binutils-$(VERSION)" --section=1
+POD2MAN = pod2man --center="GNU Development Tools" \
+       --release="binutils-$(VERSION)" --section=1
 
 
 #stuff for self hosting (can be overridden in config file).
@@ -161,19 +162,49 @@ HOSTING_LIBS = @HOSTING_LIBS@
 HOSTING_EMU = -m $(EMUL)
 
 # Setup the testing framework, if you have one
-EXPECT = `if [ -f $$r/../expect/expect ] ;     then echo $$r/../expect/expect ;        else echo expect ; fi`
+EXPECT = `if [ -f $$r/../expect/expect ] ; \
+       then echo $$r/../expect/expect ; \
+       else echo expect ; fi`
 
 
-RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ;  then echo $${srcroot}/../dejagnu/runtest ;      else echo runtest ; fi`
+RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; \
+       then echo $${srcroot}/../dejagnu/runtest ; \
+       else echo runtest ; fi`
 
 
 RUNTESTFLAGS = 
 
-CC_FOR_TARGET = `   if [ -f $$r/../gcc/xgcc ] ; then     if [ -f $$r/../newlib/Makefile ] ; then       echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc;     else       echo $$r/../gcc/xgcc -B$$r/../gcc/;     fi;   else     if [ "@host@" = "@target@" ] ; then       echo $(CC);     else       echo gcc | sed '$(transform)';     fi;   fi`
+CC_FOR_TARGET = ` \
+  if [ -f $$r/../gcc/xgcc ] ; then \
+    if [ -f $$r/../newlib/Makefile ] ; then \
+      echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
+    else \
+      echo $$r/../gcc/xgcc -B$$r/../gcc/; \
+    fi; \
+  else \
+    if [ "@host@" = "@target@" ] ; then \
+      echo $(CC); \
+    else \
+      echo gcc | sed '$(transform)'; \
+    fi; \
+  fi`
 
 
 CXX = gcc
-CXX_FOR_TARGET = `   if [ -f $$r/../gcc/xgcc ] ; then     if [ -f $$r/../newlib/Makefile ] ; then       echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc;     else       echo $$r/../gcc/xgcc -B$$r/../gcc/;     fi;   else     if [ "@host@" = "@target@" ] ; then       echo $(CXX);     else       echo gcc | sed '$(transform)';     fi;   fi`
+CXX_FOR_TARGET = ` \
+  if [ -f $$r/../gcc/xgcc ] ; then \
+    if [ -f $$r/../newlib/Makefile ] ; then \
+      echo $$r/../gcc/xgcc -B$$r/../gcc/ -idirafter $$r/../newlib/targ-include -idirafter $${srcroot}/../newlib/libc/include -nostdinc; \
+    else \
+      echo $$r/../gcc/xgcc -B$$r/../gcc/; \
+    fi; \
+  else \
+    if [ "@host@" = "@target@" ] ; then \
+      echo $(CXX); \
+    else \
+      echo gcc | sed '$(transform)'; \
+    fi; \
+  fi`
 
 
 noinst_PROGRAMS = ld-new
@@ -186,25 +217,231 @@ INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) -I$(to
 BFDLIB = ../bfd/libbfd.la
 LIBIBERTY = ../libiberty/libiberty.a
 
-ALL_EMULATIONS =       ea29k.o         eaixppc.o       eaixrs6.o       ealpha.o        earcelf.o       earm_epoc_pe.o  earmaoutb.o     earmaoutl.o     earmcoff.o      earmelf.o       earmelf_fbsd.o  earmelf_linux.o         earmelf_nbsd.o  earmelfb_nbsd.o         earmelf_oabi.o  earmnbsd.o      earmpe.o        eavr1200.o      eavr23xx.o      eavr4433.o      eavr44x4.o      eavr85xx.o      eavrmega103.o   eavrmega161.o   eavrmega603.o   eavr1.o         eavr2.o         eavr3.o         eavr4.o         eavr5.o         ecoff_sparc.o   ecrisaout.o     ecriself.o      ecrislinux.o    ed10velf.o      ed30v_e.o       ed30v_o.o       ed30velf.o      edelta68.o      eelf32_dlx.o    eebmon29k.o     eelf32_i960.o   eelf32_i860.o   eelf32_sparc.o  eelf32b4300.o   eelf32bmip.o    eelf32bmipn32.o         eelf32btsmip.o  eelf32ltsmip.o  eelf32ebmip.o   eelf32elmip.o   eelf32fr30.o    eelf32frv.o     eelf32i370.o    eelf32l4300.o   eelf32lmip.o    eelf32lppc.o    eelf32lppcsim.o         eelf32mcore.o   eelf32openrisc.o        eelf32ppc.o     eelf32ppc_fbsd.o        eelf32ppclinux.o        eelf32ppcsim.o  eelf32ppcwindiss.o      eelf32vax.o     eelf32xstormy16.o       eelf_i386.o     eelf_i386_be.o  eelf_i386_chaos.o       eelf_i386_fbsd.o        eelf_i386_ldso.o        eelf_s390.o     egld960.o       egld960coff.o   eh8300.o        eh8300h.o       eh8300s.o       eh8300elf.o     eh8300helf.o    eh8300self.o    eh8500.o        eh8500b.o       eh8500c.o       eh8500m.o       eh8500s.o       ehp300bsd.o     ehp3hpux.o      ehppaelf.o      ehppalinux.o    ehppanbsd.o     ei386aout.o     ei386beos.o     ei386bsd.o      ei386coff.o     ei386go32.o     ei386linux.o    ei386lynx.o     ei386mach.o     ei386moss.o     ei386msdos.o    ei386nbsd.o     ei386nto.o      ei386nw.o       ei386pe.o       ei386pe_posix.o         elnk960.o       em68hc11elf.o   em68hc11elfb.o  em68hc12elf.o   em68hc12elfb.o  em68k4knbsd.o   em68kaout.o     em68kaux.o      em68kcoff.o     em68kelf.o      em68kelfnbsd.o  em68klinux.o    em68klynx.o     em68knbsd.o     em68kpsos.o     em88kbcs.o      emcorepe.o      emipsbig.o      emipsbsd.o      emipsidt.o      emipsidtl.o     emipslit.o      emipslnews.o    emipspe.o       enews.o         ens32knbsd.o    eor32.o         eor32elf.o      epc532macha.o   epdp11.o        epjelf.o        epjlelf.o       eppcmacos.o     eppcnw.o        eppcpe.o        eriscix.o       esa29200.o      esh.o   eshelf32.o      eshlelf32.o     eshelf32_nbsd.o         eshlelf32_nbsd.o        eshelf.o        eshelf_linux.o  eshlelf_linux.o         eshelf_nbsd.o   eshlelf_nbsd.o  eshl.o  eshlelf.o       eshpe.o         esparcaout.o    esparclinux.o   esparclynx.o    esparcnbsd.o    est2000.o       esun3.o         esun4.o         etic30aout.o    etic30coff.o    etic54xcoff.o   etic80coff.o    evanilla.o      evax.o  evaxnbsd.o      evsta.o         ew65.o  ez8001.o        ez8002.o
-
-
-ALL_64_EMULATIONS =    eelf64_aix.o    eelf64_ia64.o   eelf64_ia64_fbsd.o      eshelf64.o      eshlelf64.o     eshelf64_nbsd.o         eshlelf64_nbsd.o        eelf_x86_64.o   eelf_x86_64_fbsd.o      eelf64_s390.o   eelf64_sparc.o  eelf64_sparc_fbsd.o     eelf64alpha.o   eelf64alpha_fbsd.o      eelf64alpha_nbsd.o      eelf64bmip.o    eelf64btsmip.o  eelf64ltsmip.o  eelf64hppa.o    eelf64mmix.o    emmo.o  eelf64ppc.o     eelf64lppc.o    ehppa64linux.o
-
-
-ALL_EMUL_EXTRA_OFILES =        deffilep.o      pe-dll.o
-
-
-CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c   ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c    mri.c ldcref.c pe-dll.c
-
-
-HFILES = ld.h ldctor.h ldemul.h ldexp.h ldfile.h       ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h      ldwrite.h mri.h deffile.h pe-dll.h
+ALL_EMULATIONS = \
+       ea29k.o \
+       eaixppc.o \
+       eaixrs6.o \
+       ealpha.o \
+       earcelf.o \
+       earm_epoc_pe.o \
+       earmaoutb.o \
+       earmaoutl.o \
+       earmcoff.o \
+       earmelf.o \
+       earmelf_fbsd.o \
+       earmelf_linux.o \
+       earmelf_nbsd.o \
+       earmelfb_nbsd.o \
+       earmelf_oabi.o \
+       earmnbsd.o \
+       earmpe.o \
+       eavr1200.o \
+       eavr23xx.o \
+       eavr4433.o \
+       eavr44x4.o \
+       eavr85xx.o \
+       eavrmega103.o \
+       eavrmega161.o \
+       eavrmega603.o \
+       eavr1.o \
+       eavr2.o \
+       eavr3.o \
+       eavr4.o \
+       eavr5.o \
+       ecoff_sparc.o \
+       ecrisaout.o \
+       ecriself.o \
+       ecrislinux.o \
+       ed10velf.o \
+       ed30v_e.o \
+       ed30v_o.o \
+       ed30velf.o \
+       edelta68.o \
+       eelf32_dlx.o \
+       eebmon29k.o \
+       eelf32_i960.o \
+       eelf32_i860.o \
+       eelf32_sparc.o \
+       eelf32b4300.o \
+       eelf32bmip.o \
+       eelf32bmipn32.o \
+       eelf32btsmip.o \
+       eelf32ltsmip.o \
+       eelf32ebmip.o \
+       eelf32elmip.o \
+       eelf32fr30.o \
+       eelf32frv.o \
+       eelf32i370.o \
+       eelf32l4300.o \
+       eelf32lmip.o \
+       eelf32lppc.o \
+       eelf32lppcsim.o \
+       eelf32mcore.o \
+       eelf32openrisc.o \
+       eelf32ppc.o \
+       eelf32ppc_fbsd.o \
+       eelf32ppclinux.o \
+       eelf32ppcsim.o \
+       eelf32ppcwindiss.o \
+       eelf32vax.o \
+       eelf32xstormy16.o \
+       eelf_i386.o \
+       eelf_i386_be.o \
+       eelf_i386_chaos.o \
+       eelf_i386_fbsd.o \
+       eelf_i386_ldso.o \
+       eelf_s390.o \
+       egld960.o \
+       egld960coff.o \
+       eh8300.o \
+       eh8300h.o \
+       eh8300s.o \
+       eh8300elf.o \
+       eh8300helf.o \
+       eh8300self.o \
+       eh8500.o \
+       eh8500b.o \
+       eh8500c.o \
+       eh8500m.o \
+       eh8500s.o \
+       ehp300bsd.o \
+       ehp3hpux.o \
+       ehppaelf.o \
+       ehppalinux.o \
+       ehppanbsd.o \
+       ei386aout.o \
+       ei386beos.o \
+       ei386bsd.o \
+       ei386coff.o \
+       ei386go32.o \
+       ei386linux.o \
+       ei386lynx.o \
+       ei386mach.o \
+       ei386moss.o \
+       ei386msdos.o \
+       ei386nbsd.o \
+       ei386nto.o \
+       ei386nw.o \
+       ei386pe.o \
+       ei386pe_posix.o \
+       elnk960.o \
+       em68hc11elf.o \
+       em68hc11elfb.o \
+       em68hc12elf.o \
+       em68hc12elfb.o \
+       em68k4knbsd.o \
+       em68kaout.o \
+       em68kaux.o \
+       em68kcoff.o \
+       em68kelf.o \
+       em68kelfnbsd.o \
+       em68klinux.o \
+       em68klynx.o \
+       em68knbsd.o \
+       em68kpsos.o \
+       em88kbcs.o \
+       emcorepe.o \
+       emipsbig.o \
+       emipsbsd.o \
+       emipsidt.o \
+       emipsidtl.o \
+       emipslit.o \
+       emipslnews.o \
+       emipspe.o \
+       enews.o \
+       ens32knbsd.o \
+       eor32.o \
+       eor32elf.o \
+       epc532macha.o \
+       epdp11.o \
+       epjelf.o \
+       epjlelf.o \
+       eppcmacos.o \
+       eppcnw.o \
+       eppcpe.o \
+       eriscix.o \
+       esa29200.o \
+       esh.o \
+       eshelf32.o \
+       eshlelf32.o \
+       eshelf32_nbsd.o \
+       eshlelf32_nbsd.o \
+       eshelf.o \
+       eshelf_linux.o \
+       eshlelf_linux.o \
+       eshelf_nbsd.o \
+       eshlelf_nbsd.o \
+       eshl.o \
+       eshlelf.o \
+       eshpe.o \
+       esparcaout.o \
+       esparclinux.o \
+       esparclynx.o \
+       esparcnbsd.o \
+       est2000.o \
+       esun3.o \
+       esun4.o \
+       etic30aout.o \
+       etic30coff.o \
+       etic54xcoff.o \
+       etic80coff.o \
+       evanilla.o \
+       evax.o \
+       evaxnbsd.o \
+       evsta.o \
+       ew65.o \
+       ez8001.o \
+       ez8002.o
+
+
+ALL_64_EMULATIONS = \
+       eelf64_aix.o \
+       eelf64_ia64.o \
+       eelf64_ia64_fbsd.o \
+       eshelf64.o \
+       eshlelf64.o \
+       eshelf64_nbsd.o \
+       eshlelf64_nbsd.o \
+       eelf_x86_64.o \
+       eelf_x86_64_fbsd.o \
+       eelf64_s390.o \
+       eelf64_sparc.o \
+       eelf64_sparc_fbsd.o \
+       eelf64alpha.o \
+       eelf64alpha_fbsd.o \
+       eelf64alpha_nbsd.o \
+       eelf64bmip.o \
+       eelf64btsmip.o \
+       eelf64ltsmip.o \
+       eelf64hppa.o \
+       eelf64mmix.o \
+       emmo.o \
+       eelf64ppc.o \
+       eelf64lppc.o \
+       ehppa64linux.o
+
+
+ALL_EMUL_EXTRA_OFILES = \
+       deffilep.o \
+       pe-dll.o
+
+
+CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \
+       ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \
+       mri.c ldcref.c pe-dll.c
+
+
+HFILES = ld.h ldctor.h ldemul.h ldexp.h ldfile.h \
+       ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h \
+       ldwrite.h mri.h deffile.h pe-dll.h
 
 
 GENERATED_CFILES = ldgram.c ldlex.c deffilep.c
 GENERATED_HFILES = ldgram.h ldemul-list.h deffilep.h
 
-OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o    ldwrite.o ldexp.o  ldemul.o ldver.o ldmisc.o    ldfile.o ldcref.o ${EMULATION_OFILES} ${EMUL_EXTRA_OFILES}
+OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o \
+       ldwrite.o ldexp.o  ldemul.o ldver.o ldmisc.o \
+       ldfile.o ldcref.o ${EMULATION_OFILES} ${EMUL_EXTRA_OFILES}
 
 
 STAGESTUFF = *.o ldscripts/* e*.c
@@ -223,7 +460,8 @@ GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed
 # We need this for automake to use YLWRAP.
 EXTRA_ld_new_SOURCES = deffilep.y
 
-ld_new_SOURCES = ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c    ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c
+ld_new_SOURCES = ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c \
+       ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c
 
 ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(INTLDEPS)
 ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(INTLLIBS)
@@ -236,7 +474,8 @@ MAINTAINERCLEANFILES = ldver.texi
 # We want to reconfigure if configure.host or configure.tgt changes.
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host $(srcdir)/configure.tgt
 
-MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT)        ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
+MOSTLYCLEANFILES = $(STAGESTUFF) ld1$(EXEEXT) ld2$(EXEEXT) ld3$(EXEEXT) \
+       ldemul-list.h crtbegin.o crtend.o ld.log ld.sum
 
 CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
 
@@ -1564,7 +1803,6 @@ check-DEJAGNU: site.exp
          TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd`; \
          export TCL_LIBRARY; \
        fi; \
-       LC_ALL=C; export LC_ALL; \
        runtest=$(RUNTEST); \
        if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
          $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \
@@ -1837,9 +2075,9 @@ ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
   mri.h ldctor.h ldlex.h
 ldlex.o: ldlex.c $(INCDIR)/ansidecl.h ../bfd/bfd.h \
   $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \
-  ldexp.h ldlang.h ldgram.h ldfile.h ldlex.h ldmain.h \
-  $(INCDIR)/libiberty.h
+  $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h \
+  ldmisc.h ldexp.h ldlang.h ldgram.h ldfile.h ldlex.h \
+  ldmain.h $(INCDIR)/libiberty.h
 deffilep.o: deffilep.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
   $(INCDIR)/safe-ctype.h ../bfd/bfd.h $(INCDIR)/symcat.h \
   sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \