* ldver.c (ldversion): Updated version number.

* cdtest-foo.cc: Use explicit "#pragma implementation".
* cdtest-bar.cc: Renamed from cdtest-func.cc.
* Makefile.in: References to cdtest-func.o changed to cdtest-bar.o.

5 files changed, 120 insertions, 85 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d37570a..e9db192 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+Wed May 11 18:16:46 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* ldver.c (ldversion): Updated version number.
+
+	* cdtest-foo.cc: Use explicit "#pragma implementation".
+	* cdtest-bar.cc: Renamed from cdtest-func.cc.
+	* Makefile.in: References to cdtest-func.o changed to
+	cdtest-bar.o.
+
 Wed May 11 16:24:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	Don't create unnecessary output sections.
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 1dd97d3..b197bdd 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -170,16 +170,16 @@ ALL_CFLAGS = $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(CFLAGS)
 BFDLIB = ../bfd/libbfd.a
 LIBIBERTY = ../libiberty/libiberty.a
 
-ALL_EMULATIONS = em_lnk960.o em_sun3.o em_i386aout.o em_go32.o em_vsta.o \
-	em_m88kbcs.o em_a29k.o em_news.o em_hp300bsd.o em_hp3hpux.o \
-	em_h8300.o em_h8300h.o em_ebmon29k.o em_sun4.o em_gld960.o \
-	em_m68kcoff.o em_st2000.o em_sa29200.o em_i386mach.o \
-	em_vanilla.o em_i386coff.o em_z8ksim.o em_mipslit.o em_i386bsd.o \
-	em_mipsbig.o em_mipsbsd.o em_mipsidt.o em_vax.o em_h8500.o \
-	em_h8500b.o em_h8500s.o em_h8500c.o em_h8500m.o \
-	em_hppaelf.o em_mipsidtl.o em_sh.o em_elf_i386.o em_alpha.o \
-	em_i386lynx.o em_m68klynx.o em_sparclynx.o em_coff_sparc.o \
-	em_delta68.o em_elf32ppc.o em_i386go32.o \
+ALL_EMULATIONS = elnk960.o esun3.o ei386aout.o ego32.o evsta.o \
+	em88kbcs.o ea29k.o enews.o ehp300bsd.o ehp3hpux.o \
+	eh8300.o eh8300h.o eebmon29k.o esun4.o egld960.o \
+	em68kcoff.o est2000.o esa29200.o ei386mach.o \
+	evanilla.o ei386coff.o ez8ksim.o emipslit.o ei386bsd.o \
+	emipsbig.o emipsbsd.o emipsidt.o evax.o eh8500.o \
+	eh8500b.o eh8500s.o eh8500c.o eh8500m.o \
+	ehppaelf.o emipsidtl.o esh.o eelf_i386.o ealpha.o \
+	ei386lynx.o em68klynx.o esparclynx.o ecoff_sparc.o \
+	eelf32ppc.o ei386go32.o em68kaout.o \
 	$(OTHER_EMULATIONS)
 
 # This is now set by configure.in.
@@ -201,9 +201,9 @@ 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 ${EMULATION_OFILES}
 
-LINTSOURCES = $(CFILES) $(GENERATED_CFILES) em_*.c
+LINTSOURCES = $(CFILES) $(GENERATED_CFILES) e*.c
 
-STAGESTUFF = *.o ldscripts/* em_*.c $(GENERATED_CFILES) $(GENERATED_HFILES)
+STAGESTUFF = *.o ldscripts/* e*.c
 
 info: ld.info
 .PHONY: info
@@ -222,16 +222,16 @@ ldmain.o: ldmain.c config.status
 	  $(CC) -c $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) -DDEFAULT_EMULATION='"$(EMUL)"' -DSCRIPTDIR='"$(scriptdir)"' $(CFLAGS) $< ; \
 	fi
 
-ldemul-list.h: config.status
+ldemul-list.h: Makefile
 	(echo "/* This file is automatically generated.  DO NOT EDIT! */";\
 	for f in `echo " " ${EMULATION_OFILES} "" \
-	 | sed -e 's/em_/ld/g' -e 's/ ld/ /g' -e 's/[.]o//g'`; do \
+	 | sed -e 's/ e/ ld/g' -e 's/ ld/ /g' -e 's/[.]o//g'`; do \
 	    echo "extern ld_emulation_xfer_type ld_$${f}_emulation;"; \
 	done;\
 	echo "";\
 	echo "#define EMULATION_LIST \\";\
 	for f in `echo " " ${EMULATION_OFILES} "" \
-	 | sed -e 's/em_/ld/g' -e 's/ ld/ /g' -e 's/[.]o//g'`; do \
+	 | sed -e 's/ e/ ld/g' -e 's/ ld/ /g' -e 's/[.]o//g'`; do \
 	    echo "  &ld_$${f}_emulation, \\"; \
 	done;\
 	echo "  0") >ldemul-tmp.h
@@ -246,149 +246,152 @@ ldlex.c: ldlex.l
 	-rm lex.yy.c
 	mv ldlex.c.new ./ldlex.c
 
-# These all start with em_ so 'make clean' can find them.
+# These all start with e so 'make clean' can find them.
 
 GENSCRIPTS = $(SHELL) $(srcdir)/genscripts.sh ${srcdir} ${libdir} ${host_alias} ${target_alias} ${EMUL} "$(NATIVE_LIB_DIRS)"
 GEN_DEPENDS = $(srcdir)/genscripts.sh
 
-em_sun4.c: $(srcdir)/emulparams/sun4.sh \
+esun4.c: $(srcdir)/emulparams/sun4.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} sun4
-em_sun3.c: $(srcdir)/emulparams/sun3.sh \
+esun3.c: $(srcdir)/emulparams/sun3.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} sun3
-em_vsta.c: $(srcdir)/emulparams/vsta.sh \
+evsta.c: $(srcdir)/emulparams/vsta.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} vsta
-em_go32.c: $(srcdir)/emulparams/go32.sh \
+ego32.c: $(srcdir)/emulparams/go32.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} go32
-em_news.c: $(srcdir)/emulparams/news.sh \
+enews.c: $(srcdir)/emulparams/news.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} news
-em_vax.c: $(srcdir)/emulparams/vax.sh \
+evax.c: $(srcdir)/emulparams/vax.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} vax
-em_hp300bsd.c: $(srcdir)/emulparams/hp300bsd.sh \
+ehp300bsd.c: $(srcdir)/emulparams/hp300bsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} hp300bsd
-em_hp3hpux.c: $(srcdir)/emulparams/hp3hpux.sh \
+ehp3hpux.c: $(srcdir)/emulparams/hp3hpux.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} hp3hpux
-em_hppaelf.c: $(srcdir)/emulparams/hppaelf.sh \
+ehppaelf.c: $(srcdir)/emulparams/hppaelf.sh \
   $(srcdir)/emultempl/hppaelf.em $(srcdir)/scripttempl/hppaelf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} hppaelf
-em_i386aout.c: $(srcdir)/emulparams/i386aout.sh \
+ei386aout.c: $(srcdir)/emulparams/i386aout.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} i386aout
-em_i386go32.c: $(srcdir)/emulparams/i386go32.sh \
+ei386go32.c: $(srcdir)/emulparams/i386go32.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386go32.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} i386go32
-em_i386mach.c: $(srcdir)/emulparams/i386mach.sh \
+ei386mach.c: $(srcdir)/emulparams/i386mach.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} i386mach
-em_ebmon29k.c: $(srcdir)/emulparams/ebmon29k.sh \
+eebmon29k.c: $(srcdir)/emulparams/ebmon29k.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/ebmon29k.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} ebmon29k
-em_sa29200.c: $(srcdir)/emulparams/sa29200.sh \
+esa29200.c: $(srcdir)/emulparams/sa29200.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sa29200.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} sa29200
-em_a29k.c: $(srcdir)/emulparams/a29k.sh \
+ea29k.c: $(srcdir)/emulparams/a29k.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/a29k.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} a29k
-em_m88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
+em88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
   $(srcdir)/emultempl/m88kbcs.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m88kbcs
-em_h8300.c: $(srcdir)/emulparams/h8300.sh \
+eh8300.c: $(srcdir)/emulparams/h8300.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8300
-em_h8300h.c: $(srcdir)/emulparams/h8300h.sh \
+eh8300h.c: $(srcdir)/emulparams/h8300h.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8300h.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8300h
-em_h8500.c: $(srcdir)/emulparams/h8500.sh \
+eh8500.c: $(srcdir)/emulparams/h8500.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8500
-em_h8500b.c: $(srcdir)/emulparams/h8500b.sh \
+eh8500b.c: $(srcdir)/emulparams/h8500b.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500b.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8500b
-em_h8500c.c: $(srcdir)/emulparams/h8500c.sh \
+eh8500c.c: $(srcdir)/emulparams/h8500c.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500c.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8500c
-em_h8500m.c: $(srcdir)/emulparams/h8500m.sh \
+eh8500m.c: $(srcdir)/emulparams/h8500m.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500m.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8500m
-em_h8500s.c: $(srcdir)/emulparams/h8500s.sh \
+eh8500s.c: $(srcdir)/emulparams/h8500s.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/h8500s.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} h8500s
-em_sh.c: $(srcdir)/emulparams/sh.sh \
+esh.c: $(srcdir)/emulparams/sh.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} sh
-em_st2000.c: $(srcdir)/emulparams/st2000.sh \
+est2000.c: $(srcdir)/emulparams/st2000.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/st2000.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} st2000
-em_z8ksim.c: $(srcdir)/emulparams/z8ksim.sh \
+ez8ksim.c: $(srcdir)/emulparams/z8ksim.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/z8ksim.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} z8ksim
-em_vanilla.c: $(srcdir)/emulparams/vanilla.sh \
+evanilla.c: $(srcdir)/emulparams/vanilla.sh \
   $(srcdir)/emultempl/vanilla.em $(srcdir)/scripttempl/vanilla.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} vanilla
-em_lnk960.c: $(srcdir)/emulparams/lnk960.sh \
+elnk960.c: $(srcdir)/emulparams/lnk960.sh \
   $(srcdir)/emultempl/lnk960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} lnk960
-em_gld960.c: $(srcdir)/emulparams/gld960.sh \
+egld960.c: $(srcdir)/emulparams/gld960.sh \
   $(srcdir)/emultempl/gld960.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} gld960
-em_m68kcoff.c: $(srcdir)/emulparams/m68kcoff.sh \
+egld960coff.c: $(srcdir)/emulparams/gld960coff.sh \
+  $(srcdir)/emultempl/gld960c.em $(srcdir)/scripttempl/i960.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} gld960coff
+em68kcoff.c: $(srcdir)/emulparams/m68kcoff.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m68kcoff.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m68kcoff
-em_delta68.c: $(srcdir)/emulparams/delta68.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS}
-	${GENSCRIPTS} delta68
-em_m68klynx.c: $(srcdir)/emulparams/m68klynx.sh \
+em68klynx.c: $(srcdir)/emulparams/m68klynx.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m68klynx.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m68klynx
-em_i386coff.c: $(srcdir)/emulparams/i386coff.sh \
+ei386coff.c: $(srcdir)/emulparams/i386coff.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386coff.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} i386coff
-em_i386lynx.c: $(srcdir)/emulparams/i386lynx.sh \
+ei386lynx.c: $(srcdir)/emulparams/i386lynx.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/i386lynx.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} i386lynx
-em_mipslit.c:  $(srcdir)/emulparams/mipslit.sh \
+emipslit.c:  $(srcdir)/emulparams/mipslit.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mips.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mipslit
-em_i386bsd.c: $(srcdir)/emulparams/i386bsd.sh \
+ei386bsd.c: $(srcdir)/emulparams/i386bsd.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} i386bsd
-em_mipsbig.c:  $(srcdir)/emulparams/mipsbig.sh \
+emipsbig.c:  $(srcdir)/emulparams/mipsbig.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mips.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mipsbig
-em_mipsbsd.c: $(srcdir)/emulparams/mipsbsd.sh \
-  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
+emipsbsd.c: $(srcdir)/emulparams/mipsbsd.sh \
+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mipsbsd.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mipsbsd
-em_mipsidt.c: $(srcdir)/emulparams/mipsidt.sh \
+emipsidt.c: $(srcdir)/emulparams/mipsidt.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mips.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mipsidt
-em_mipsidtl.c: $(srcdir)/emulparams/mipsidtl.sh \
+emipsidtl.c: $(srcdir)/emulparams/mipsidtl.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mips.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mipsidtl
-em_elf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
+eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_i386
-em_elf32mipb.c: $(srcdir)/emulparams/elf32mipb.sh \
+eelf32mipb.c: $(srcdir)/emulparams/elf32mipb.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32mipb
-em_alpha.c: $(srcdir)/emulparams/alpha.sh \
+ealpha.c: $(srcdir)/emulparams/alpha.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/alpha.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} alpha
-em_coff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \
+ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sparccoff.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} coff_sparc
-em_sparclynx.c: $(srcdir)/emulparams/sparclynx.sh \
+esparclynx.c: $(srcdir)/emulparams/sparclynx.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sparclynx.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} sparclynx
-em_elf32ppc.c: $(srcdir)/emulparams/elf32ppc.sh \
+eelf32ppc.c: $(srcdir)/emulparams/elf32ppc.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32ppc
+em68kaout.c: $(srcdir)/emulparams/m68kaout.sh \
+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} m68kaout
 
 $(LD_PROG): $(OFILES) $(BFDLIB) $(LIBIBERTY)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $(LD_PROG) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(EXTRALIBS)
@@ -492,17 +495,17 @@ bootstrap: ld3
 
 # A test program for C++ constructors and destructors.
 
-cdtest: cdtest-main.o cdtest-func.o cdtest-foo.o ld.new
+cdtest: cdtest-main.o cdtest-bar.o cdtest-foo.o ld.new
 	./ld.new $(HOSTING_EMU) -o cdtest $(HOSTING_CRT0) \
-	  cdtest-main.o cdtest-func.o cdtest-foo.o $(HOSTING_LIBS)
+	  cdtest-main.o cdtest-bar.o cdtest-foo.o $(HOSTING_LIBS)
 
 cdtest.out: cdtest
 	./cdtest > cdtest.tmp
 	mv cdtest.tmp cdtest.out
 
-cdtest-ur.o: cdtest-main.o cdtest-func.o cdtest-foo.o ld.new
+cdtest-ur.o: cdtest-main.o cdtest-bar.o cdtest-foo.o ld.new
 	./ld.new $(HOSTING_EMU) -o cdtest-ur.o -Ur cdtest-main.o \
-	  cdtest-func.o cdtest-foo.o
+	  cdtest-bar.o cdtest-foo.o
 
 cdtest-ur: cdtest-ur.o
 	./ld.new $(HOSTING_EMU) -o cdtest-ur $(HOSTING_CRT0) cdtest-ur.o \
@@ -665,13 +668,15 @@ mostlyclean:
 	-rm -f $(STAGESTUFF) ld.?? ld.??? ldlex.[qp]
 	-rm -f ld ld1 ld2 ld3 *.o y.output cdtest cdtest.out cdtest.tmp
 	-rm -f cdtest-ur cdtest-ur.out cdtest-ur.tmp
+	-rm -f $(GENERATED_CFILES) $(GENERATED_HFILES)
+	-rm -fr tmpdir
 clean: mostlyclean
 	-rm -f $(LD_PROG) configdoc.texi
 distclean:
-	-rm -fr Makefile config.status TAGS sysdep.h ldscripts site.exp \
+	-rm -fr Makefile config.status TAGS sysdep.h ldscripts site.exp site.bak \
 		$(STAGESTUFF) ld.?? ld.??s ld.toc ld.aux ld.log ldlex.[qp] \
 		$(LD_PROG) ld ld1 ld2 ld3 *.o y.output cdtest cdtest.out \
-		configdoc.texi
+		configdoc.texi tmpdir
 realclean: clean distclean
 	-rm -f $(LDDISTSTUFF)
 
@@ -705,8 +710,13 @@ install:
 	   || $(INSTALL_PROGRAM) ld.new $(tooldir)/bin/ld
 
 install-info: ld.info
-	for i in $<* ; do \
-		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
+	if [ -r ld.info ]; then \
+	  dir=. ; \
+	else \
+	  dir=$(srcdir) ; \
+	fi ; \
+	for i in `cd $$dir ; echo ld.info*` ; do \
+		$(INSTALL_DATA) $$dir/$$i $(infodir)/$$i ; \
 	done
 
 clean-info:
diff --git a/ld/cdtest-func.cc b/ld/cdtest-bar.cc
index 79000e3..79000e3 100644
--- a/ld/cdtest-func.cc
+++ b/ld/cdtest-bar.cc
diff --git a/ld/cdtest-foo.cc b/ld/cdtest-foo.cc
index f29930f..615e33c 100644
--- a/ld/cdtest-foo.cc
+++ b/ld/cdtest-foo.cc
@@ -1,5 +1,5 @@
 // Class Foo
-//#pragma implementation
+#pragma implementation
 
 
 // We don't use header files, since we only want to see, whether the
diff --git a/ld/ldver.c b/ld/ldver.c
index 02d583b..8750352 100644
--- a/ld/ldver.c
+++ b/ld/ldver.c
@@ -16,29 +16,23 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/*
- * $Id$ 
-*/
-
-
-
 #include <stdio.h>
 #include "bfd.h"
 #include "sysdep.h"
 
+#include "ld.h"
 #include "ldver.h"
 #include "ldemul.h"
+#include "ldmain.h"
 
 void
-DEFUN(ldversion,(noisy),
-      int noisy)
-
+ldversion (noisy)
+     int noisy;
 {
-  fprintf(stdout,"ld version 1.97 (with BFD %s)\n", BFD_VERSION);
+  fprintf(stdout,"ld version 2.4.1 (with BFD %s)\n", BFD_VERSION);
 
   if (noisy) 
   {
-    extern ld_emulation_xfer_type *ld_emulations[];
     ld_emulation_xfer_type **ptr = ld_emulations;
     
     printf("  Supported emulations:\n");
@@ -49,3 +43,25 @@ DEFUN(ldversion,(noisy),
     }
   }
 }
+
+void
+help ()
+{
+  printf ("\
+Usage: %s [-o output] objfile...\n\
+Options:\n\
+       [-A architecture] [-b input-format] [-Bstatic]\n\
+       [-c MRI-commandfile] [-d | -dc | -dp]\n\
+       [-defsym symbol=expression] [-e entry] [-F] [-Fformat]\n",
+	  program_name);
+  puts ("\
+       [-format input-format] [-g] [-G size] [-help] [-i]\n\
+       [-l archive] [-L searchdir] [-M] [-Map mapfile]\n\
+       [-m emulation] [-N | -n] [-noinhibit-exec]\n\
+       [-oformat output-format] [-R filename] [-relax]");
+  puts ("\
+       [-r | -Ur] [-S] [-s] [-sort-common] [-T commandfile]\n\
+       [-Ttext textorg] [-Tdata dataorg] [-Tbss bssorg] [-t]\n\
+       [-u symbol] [-V] [-v] [-version] [-warn-common]\n\
+       [-X] [-x] [-y symbol]");
+}