* Makefile.in: Change definition of $(tooldir) to match FSF.

	* vax.sh, config/vax.mt, configure.in, Makefile.in:
	Support VAX Ultrix and BSD.

5 files changed, 71 insertions, 237 deletions

diff --git a/ld/.Sanitize b/ld/.Sanitize
index a26680a..ae94f45 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -132,6 +132,7 @@ sun4.sh
 vanilla.em
 vanilla.sc-sh
 vanilla.sh
+vax.sh
 z8ksim.em
 z8ksim.sc-sh
 z8ksim.sh
@@ -163,224 +164,4 @@ else
 	done
 fi
 
-#
-#
-# $Log$
-# Revision 1.57  1993/04/27 01:36:30  sac
-# sh.em, sh.sh, sh.sc-sh: New files supporting Hitachi SH.
-#
-# Revision 1.56  1993/04/09  17:44:54  sac
-# Support for the H8/500
-#
-# Revision 1.55  1993/03/30  23:24:53  pesch
-# ld.texinfo:
-# Conditionalize manual to maintain Cygnus, Hitachi versions in parallel.
-# (Texinfo conditionals are stable enough to permit this, at last!)
-# NOTE: @ignore'd passages from earlier versions DELETED; use CVS history
-#       to retrieve if wanted.
-#
-# gen-doc.texi, h8-doc.texi: manual configuration definitions.
-#
-# Makefile.in: link config defn (`gen' by default) to configdoc.texi, included
-#       by ld.texinfo
-#
-# .Sanitize: add gen-doc.texi, h8-doc.texi
-#
-# Revision 1.54  1993/03/09  18:12:14  ian
-# Removed obsolete Makefile.dos.
-#
-# Revision 1.53  1993/03/04  20:49:05  ian
-# 	* mips.sc-sh: Added variables which may be overridden by a
-# 	specific emulation.
-# 	* mipsidt.sh: New file; emulation for IDT MIPS board.
-# 	* Makefile.in (ALL_EMULATIONS): Added em_mipsidt.o.
-# 	(em_mipsidt.c): New target.  Uses mipsidt.sh and mips.sc-sh.
-# 	* config/mips-idt.mt: New file; sets EMUL to mipsidt.
-# 	* configure.in (mips-idt-ecoff): New target; uses mips-idt.
-#
-# Revision 1.52  1993/02/28  14:42:15  raeburn
-# mips-bsd and 386bsd support
-#
-# Revision 1.51  1993/02/26  18:53:13  dje
-# Added initial sparc-v9 support.
-#
-# Revision 1.50  1993/02/13  10:15:14  zoo
-# removing excess verbosity
-#
-# Revision 1.49  1993/02/03  17:11:08  ian
-# Keep forgetting those .Sanitize files.
-#
-# Revision 1.48  1993/01/22  22:30:34  ian
-# Fri Jan 22 14:22:44 1993  Ian Lance Taylor  (ian@cygnus.com)
-#
-# 	* mips.sc-sh: New file.  Ultrix, and hopefully other MIPS ECOFF
-# 	targets, linker script.
-# 	* mipslit.sh: New file.  Little endian MIPS emulation.
-# 	* config/mips-lit.mt: New file.  Use mipslit emulation.
-# 	* configure.in (mips-dec-ultrix*): Use target mips-lit.
-# 	* Makefile.in (ALL_EMULATIONS): Added em_mipslit.o.
-# 	(em_mipslit.c): New target.  Uses mipslit.sh.
-#
-# Revision 1.47  1992/09/25  18:10:41  sac
-# Fri Sep 25 11:08:01 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-#
-# 	Added initial support for the z8k
-# 	* z8ksim.em, z8ksim.sc-sh, z8ksim.sh: new files
-# 	* configure.in, Makefile.in: modified to reflect above
-#
-# 	* ldlang.c (lang_check): when linking conflicting architectures,
-# 	make the output file reflect at least one of the bad inputs.
-#
-# Revision 1.46  1992/09/11  20:43:30  sac
-# Sanitize slip
-#
-# Revision 1.45  1992/09/11  17:47:22  sac
-# Add i386coff.sh
-#
-# Revision 1.44  1992/09/09  18:59:04  ian
-# Brought in from p3.  If anybody knows good numbers for m68k COFF,
-# please let me know, or plug them in yourself.
-#
-# Wed Sep  9 11:52:58 1992  Ian Lance Taylor  (ian@cygnus.com)
-#
-# 	* Makefile.in, m68kcoff.sh, m68kcoff.sc-sh, config/m68k-coff.mt:
-# 	added m68k-coff emulation mode, stolen from a29k emulation.
-# 	Almost certainly wrong, but perhaps better than sun3.
-#
-# Also fixed an error message in configure.in so that it started with
-# '***' like the other error messages do.
-#
-# Revision 1.43  1992/09/03  22:56:45  bothner
-# Add TODO.
-#
-# Revision 1.42  1992/09/01  22:14:49  bothner
-# Add scripts.
-#
-# Revision 1.41  1992/08/31  01:14:44  bothner
-# 	* cplus-dem.c:  Removed.  Use the version in libiberty now.
-# 	* ldmisc.c:  Use new libiberty version of cplus_demangle().
-#
-# Revision 1.40  1992/08/17  18:35:55  pesch
-# Use new name of man page (ld.1).
-#
-# Revision 1.39  1992/08/07  01:37:34  bothner
-# 	* ldint.texinfo:  New internals manual (beginnings thereof).
-# 	* PORTING:  Removed, merged into ldint.texinfo.
-#
-# Revision 1.38  1992/08/05  04:15:24  bothner
-# 	* cdtest-main.cc, cdtest-func.cc, cdtest-foo.h, cdtest-foo.cc,
-# 	cdtest.exp:  A test program (copied from libg++/test-install)
-# 	that tests that constructor and destructors are handled
-# 	corrrectly.
-#
-# Revision 1.37  1992/05/02  02:08:16  sac
-# New stuff for 29200
-#
-# Revision 1.36  1992/05/01  22:08:40  sac
-# Add mri.h
-#
-# Revision 1.35  1992/04/17  15:59:22  sac
-# 	* relax.c: added handling for new "padding" seclet type, used to
-# 	fill out gaps between section.
-# 	* ldgram.y, ldlex.l: now -defsym on the command line is done
-# 	properly.
-#
-# Revision 1.34  1992/04/15  23:11:53  sac
-# added mri.c
-#
-# Revision 1.33  1992/04/05  01:46:05  sac
-# New lexer.
-#
-# New targets for h8/300 simulator and DOS
-#
-# Revision 1.32  1992/03/07  18:32:27  sac
-# *** empty log message ***
-#
-# Revision 1.31  1992/02/27  17:23:59  sac
-# Why didn't it start emacs
-#
-# Revision 1.30  1992/02/22  00:11:38  sac
-# DJ naming change
-#
-# Revision 1.29  1992/02/16  20:49:26  bothner
-# *** empty log message ***
-#
-# Revision 1.28  1992/02/07  22:32:29  hgs
-# added h8300hms.c and h8300hms.sc
-#
-# Revision 1.27  1992/01/29  16:44:08  sac
-# ldlnk960.c: Special #ifdef to choose little endian ony
-# ldgram.y: allow forward ref of section
-#
-# Revision 1.26  1992/01/24  22:35:55  sac
-# .Sanitize: added relax.c
-# ldsym.c ldlang.* more map stuff
-#
-# Revision 1.25  1991/12/12  03:42:08  sac
-# New dos files
-#
-# Revision 1.24  1991/12/08  01:27:59  sac
-# *** empty log message ***
-#
-# Revision 1.23  1991/11/15  21:09:49  bothner
-# Remove ldgld.c, ldgld68k.c, ldm88k.c, since these are
-# now automatically generated.
-#
-# Revision 1.22  1991/11/06  09:26:59  sac
-# Added three files which had been forgotten
-#
-# Revision 1.21  1991/11/05  21:56:06  sac
-# *** empty log message ***
-#
-# Revision 1.20  1991/11/05  20:36:54  sac
-# *** empty log message ***
-#
-# Revision 1.19  1991/11/04  00:46:44  steve
-# 	 i386 aout changes from Bob Kukura
-#
-# Revision 1.18  1991/10/12  06:43:01  bothner
-# Fixed typo.
-#
-# Revision 1.17  1991/10/11  19:31:38  steve
-# *** empty log message ***
-#
-# Revision 1.16  1991/10/10  11:59:25  rich
-# updating
-#
-# Revision 1.15  1991/10/09  20:40:37  bothner
-# Added h8300hds.{c,sc}.
-#
-# Revision 1.14  1991/10/05  04:55:04  gnu
-# * Makefile.in:  Avoid using $< in non-suffix rules (breaks on Sun Make).
-# * ldfile.c, ldlang.c, ldmain.c, ldwrite.c:  Cope with renames of a
-# few BFD types & enums.
-# * ChangeLog:  Create.
-#
-# Revision 1.13  1991/09/27  20:19:25  bothner
-# Update for deleted (and some added) files.
-#
-# Revision 1.12  1991/09/24  02:30:20  rich
-# ldgram.h is not cvs'd source.
-#
-# Revision 1.11  1991/09/23  20:59:12  steve
-# Cleaned it up for 88k
-#
-# Revision 1.5  1991/08/27  00:21:34  steve
-# Added config.sub
-#
-# Revision 1.4  1991/08/06  21:28:21  steve
-# Patches to fix bugs reported by roland McGrath
-#
-# Revision 1.3  1991/08/01  23:59:06  steve
-# *** empty log message ***
-#
-# Revision 1.2  1991/07/16  00:31:15  steve
-# *** empty log message ***
-#
-# Revision 1.1  1991/05/23  21:45:12  rich
-# Initial revision
-#
-#
-#
-
 # End of file.
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 28114f4..e3a8b46 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,30 @@
+Mon May  3 19:43:39 1993  Per Bothner  (bothner@cygnus.com)
+
+	* Makefile.in:  Change definition of $(tooldir) to match FSF.
+	* vax.sh, config/vax.mt, configure.in, Makefile.in:
+	Support VAX Ultrix and BSD.
+
+Mon Apr 26 18:35:47 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* sh.em, sh.sh, sh.sc-sh: New files supporting Hitachi SH.
+
+Wed Apr 14 21:01:51 1993  John Gilmore  (gnu@cygnus.com)
+
+	* ldlang.h (struct memory_region):  Change `length' and
+	`old_length' fields to bfd_size_type.  Eliminate use of bfd_offset.
+	* ldlang.c, mri.c:  Corresponding changes, plus lint.
+
+Thu Apr  8 22:08:18 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure.in: For all i386 targets, accept i486 as well.
+
+Mon Apr  5 17:33:39 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* ldlang.c (wild_doit): Preserve all flags for a
+	SEC_SHARED_LIBRARY section.
+	(size_input_section): Consider any SEC_HAS_CONTENTS section when
+	computing largest_section.
+
 Fri Apr  2 14:33:52 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* ldlang.c (lang_output_section_statement_lookup): Initialize all
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 73cf6fe..02823aa 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -26,7 +26,7 @@ program_transform_name =
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
-tooldir = $(bindir)/$(target_alias)
+tooldir = $(exec_prefix)/$(target_alias)
 datadir = $(prefix)/lib
 mandir = $(prefix)/man
 man1dir = $(mandir)/man1
@@ -122,12 +122,16 @@ LIBIBERTY=./../libiberty/libiberty.a
 ALL_EMULATIONS=em_lnk960.o em_sun3.o em_i386aout.o em_go32.o \
 	em_m88kbcs.o em_a29k.o em_news.o em_hp300bsd.o \
 	em_h8300hms.o em_ebmon29k.o em_sun4.o em_gld960.o \
-	em_m68kcoff.o em_h8300xray.o em_st2000.o em_sa29200.o \
+	em_m68kcoff.o em_st2000.o em_sa29200.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_mipsbig.o em_mipsbsd.o em_mipsidt.o em_vax.o em_h8500hms.o
 
-EMULATION_OFILES=${ALL_EMULATIONS}
-#EMULATION_OFILES=em_${EMUL}.o ${OTHER_EMULATIONS}
+# start-sanitize-sh
+OTHER_EMULATIONS=em_sh.o
+# end-sanitize-sh
+
+#EMULATION_OFILES=${ALL_EMULATIONS}
+EMULATION_OFILES=${ALL_EMULATIONS} ${OTHER_EMULATIONS}
 
 OFILES= ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o ldindr.o \
 	ldwarn.o ldwrite.o ldexp.o  ldemul.o ldver.o ldmisc.o ldsym.o \
@@ -215,6 +219,9 @@ em_go32.c: $(srcdir)/go32.sh \
 em_news.c: $(srcdir)/news.sh \
   $(srcdir)/generic.em $(srcdir)/aout.sc-sh ${GEN_DEPENDS}
 	${GENSCRIPTS} news.sh
+em_vax.c: $(srcdir)/vax.sh \
+  $(srcdir)/generic.em $(srcdir)/aout.sc-sh ${GEN_DEPENDS}
+	${GENSCRIPTS} vax.sh
 em_hp300bsd.c: $(srcdir)/hp300bsd.sh \
   $(srcdir)/generic.em $(srcdir)/aout.sc-sh ${GEN_DEPENDS}
 	${GENSCRIPTS} hp300bsd.sh
@@ -236,9 +243,14 @@ em_m88kbcs.c: $(srcdir)/m88kbcs.sh \
 em_h8300hms.c: $(srcdir)/h8300hms.sh \
   $(srcdir)/h8300hms.em $(srcdir)/h8300hms.sc-sh ${GEN_DEPENDS}
 	${GENSCRIPTS} h8300hms.sh
-em_h8300xray.c: $(srcdir)/h8300xray.sh \
-  $(srcdir)/h8300xray.em $(srcdir)/h8300xray.sc-sh ${GEN_DEPENDS}
-	${GENSCRIPTS} h8300xray.sh
+em_h8500hms.c: $(srcdir)/h8500hms.sh \
+  $(srcdir)/h8500hms.em $(srcdir)/h8500hms.sc-sh ${GEN_DEPENDS}
+	${GENSCRIPTS} h8500hms.sh
+# start-sanitize-sh
+em_sh.c: $(srcdir)/sh.sh \
+  $(srcdir)/sh.em $(srcdir)/sh.sc-sh ${GEN_DEPENDS}
+	${GENSCRIPTS} sh.sh
+# end-sanitize-sh
 em_st2000.c: $(srcdir)/st2000.sh \
   $(srcdir)/st2000.em $(srcdir)/st2000.sc-sh ${GEN_DEPENDS}
 	${GENSCRIPTS} st2000.sh
@@ -312,9 +324,9 @@ check-cdtest: cdtest $(srcdir)/cdtest.exp
 # because almost all configs use "gen" version of manual.
 #  Set DOCVER above to change.
 configdoc.texi:	${DOCVER}-doc.texi
-	ln -s ${DOCVER}-doc.texi configdoc.texi || \
-	ln ${DOCVER}-doc.texi configdoc.texi || \
-	cp ${DOCVER}-doc.texi configdoc.texi
+	ln -s ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi || \
+	ln ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi || \
+	cp ${srcdir}/${DOCVER}-doc.texi ./configdoc.texi
 
 # TeX output
 dvi: ld.dvi
diff --git a/ld/configure.in b/ld/configure.in
index 7cf3c53..249f490 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -62,17 +62,17 @@ case "${target}" in
 			;;
   *-tandem-none)	my_target=st2000 # FIXME needs better name
 			;;
-  i386-*-go32)		my_target=go32
+  i[34]86-*-go32)	my_target=go32
 			;;
-  i386-*-sco*)		my_target=i386-coff
+  i[34]86-*-sco*)	my_target=i386-coff
 			;;
-  i386-*-coff)          my_target=i386-coff
+  i[34]86-*-coff)	my_target=i386-coff
 			;;
   i[34]86-*-bsd)	my_target=i386-bsd
 			;;
-  i386-*-aout)		my_target=i386-aout
+  i[34]86-*-aout)	my_target=i386-aout
 			;;
-  i386-*-sysv*)		my_target=i386-coff
+  i[34]86-*-sysv*)	my_target=i386-coff
 			;;
   m88k-*-*)		my_target=m88k-bcs
 			;;
@@ -84,8 +84,12 @@ case "${target}" in
 			;;
   h8300-*-hms)		my_target=coff-h8300
 			;;
-  h8300-*-xray)		my_target=ieee-h8300
+  h8500-*-hms)		my_target=coff-h8500
 			;;
+# start-sanitize-sh
+  sh-*-*)		my_target=coff-sh	
+			;;
+# end-sanitize-sh
   m68k-sony-*)		my_target=news
 			;;
   m68k-hp-bsd*)		my_target=hp300bsd
@@ -97,10 +101,14 @@ case "${target}" in
   m68*-*-*)		echo '***' "Unknown m68k target vendor for ld:" ${target_vendor} 1>&2
 			exit 1
 			;;
+  vax-dec-ultrix* | vax-dec-bsd*) my_target=vax
+			;;
   mips-dec-ultrix*)	my_target=mips-lit
 			;;
   mips-sgi-irix*)	my_target=mips-big
 			;;
+  mips-idt-ecoff)	my_target=mips-idt
+			;;
   mips-dec-bsd*)	my_target=mipsbsd
 			;;
   z8k-*sim)		my_target=z8ksim
diff --git a/ld/vax.sh b/ld/vax.sh
new file mode 100755
index 0000000..18a9857
--- /dev/null
+++ b/ld/vax.sh
@@ -0,0 +1,6 @@
+EMULATION_NAME=vax
+SCRIPT_NAME=aout
+OUTPUT_FORMAT="a.out-vax"
+TEXT_START_ADDR=0
+PAGE_SIZE=1024
+ARCH=vax