From 086c5e37f4a1de76b0e528ca9caa642cdc4b63df Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Tue, 22 Dec 1992 23:46:19 +0000
Subject: [PATCH] 	* ldexp.c, ldlang.c, ldmain.c, ldsym.c, ldwarn.c:  Use
 new 	macro bfd_asymbol_bfd as appropriate. 	* Makefile.in:  Un-duplicate
 ldlex.c dependency. 	* condigure.in:  Replace my_host case table by
 sourcing 	../bfd/configure.host.  Allow std-host as the default. 	*
 ldmisc.c:  Change logic for C++ name demangling:  There is 	no initial '_'
 to remove from stab-derived function names.

---
 ld/ChangeLog    | 20 +++++++++++++
 ld/configure.in | 77 +++++--------------------------------------------
 ld/ldsym.c      |  2 +-
 ld/ldwarn.c     |  2 +-
 4 files changed, 30 insertions(+), 71 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5932cb6df67..813472bf945 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,23 @@
+Mon Dec 21 16:06:59 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+	* ldexp.c, ldlang.c, ldmain.c, ldsym.c, ldwarn.c:  Use new
+	macro bfd_asymbol_bfd as appropriate.
+	* Makefile.in:  Un-duplicate ldlex.c dependency.
+	* condigure.in:  Replace my_host case table by sourcing
+	../bfd/configure.host.  Allow std-host as the default.
+	* ldmisc.c:  Change logic for C++ name demangling:  There is
+	no initial '_' to remove from stab-derived function names.
+
+Sun Dec 13 16:31:26 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* ldlang.c (lang_init_script_file): don't attach the output file
+	sections to the script file.
+
+Wed Dec  9 08:38:05 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+	* ldlang.c (wild): run expansion loop over command line bfd too.
+	(lang_ini_script_file): initialize more parts of the command line
+	bfd.
+	* ldlex.l: fix DEFINED start states.
 Mon Dec  7 08:43:41 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
 	 -y support
 	* ld.texinfo: new doc.
diff --git a/ld/configure.in b/ld/configure.in
index de0638262a5..bfe527a760b 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -9,80 +9,15 @@ target_dependent=true
 
 # per-host:
 
-case "${host}" in
-
-  rs6000-ibm-aix*)	my_host=rs6000
-			;;
-  hppa*-hp-hpux)	my_host=hppahpux
-			;;
-  hppa*-hp-bsd)		my_host=hppabsd
-			;;
-  mips-dec-ultrix*)	my_host=decstation
-			;;
-  mips-sgi-irix3*)	my_host=irix3 
-			;;
-  mips-sgi-irix4*)	my_host=irix4
-			;;
-  m88k-motorola-*)	my_host=delta88
-			;;
-  m88k-dg-dgux*)	my_host=dgux
-			;;
-  m68k-cbm-amigados)	my_host=amigados
-			;;
-  m68k-cbm-svr4)	my_host=amix
-			;;
-  m68k-hp-hpux)		my_host=hp300    
-			;;
-  m68k-hp-bsd)		my_host=hp300bsd
-			;;
-  m68k-apollo*-sysv*)   my_host=apollov68
-			;;
-  m68k-apollo*-bsd*)    my_host=apollo68
-			;;
-  m68k-sony-*)		my_host=news
-			;;
-  m68k-sun-sunos*)	my_host=sun3
-			;;
-  i386-go32-*)		my_host=go32
-			;;
-  i386-*-sysv)		my_host=i386v
-			;;
-  i386-*-isc)		my_host=isc
-			;;
-  i386-*-mach)		my_host=i386mach
-			;;
-  i386-*-bsd)		my_host=i386-aout
-			;;
-  i386-*-msdos)		my_host=dose
-			;;
-  sparc-sun-sunos64)	my_host=sparc-ll
-			;;
-  sparc-sun-sunos4*)	my_host=sparc
-			;;
-  sparc-sun-solaris2)	my_host=solaris2
-			;;
-  romp-*-*)		my_host=rtbsd
-			;;
-  a29k-*-*)		my_host=ultra3
-			;;
-  tahoe-*-*)		my_host=tahoe
-			;;
-  vax-dec-ultrix*)	my_host=vaxult
-			;;
-  vax-dec-bsd*)		my_host=vaxbsd
-			;;
-esac
+. ${srcdir}/../bfd/configure.host
 
 # Set up to make a link between the host's include file and "sysdep.h".
 files="../bfd/hosts/${my_host}.h"
 links="sysdep.h"
 
 if [ ! -f ${srcdir}/${files} ] ; then
-	if [ -n "${my_host}" ] ; then
-		echo '***' No file ${srcdir}/${files} 1>&2
-	fi
-	echo '***' ${srcname} does not support host ${host} 1>&2
-	exit 1
+	files=../bfd/hosts/std-host.h
+	echo "[${srcname} has no specific support for host ${host} -- using std-host]"
 fi
 
 host_makefile_frag=
@@ -97,7 +32,7 @@ case "${target}" in
 
   sparc-sun-sunos4*) 	my_target=sun4 
 			;;
-  m68k-sun-sunos4*)	my_target=sun3
+  m68k-sun-sunos[34]*)	my_target=sun3
 			;;
   sparclite-fujitsu-*)  my_target=sun4
 			;;
@@ -117,10 +52,14 @@ case "${target}" in
 			;;
   i386-go32-*)		my_target=go32
 			;;
+  i386-*-sco*)		my_target=i386-coff
+			;;
   i386-*-coff)          my_target=i386-coff
 			;;
   i386-*-aout)		my_target=i386-aout
 			;;
+  i386-*-sysv*)		my_target=i386-coff
+			;;
   m88k-*-*)		my_target=m88k-bcs
 			;;
   a29k-*-udi)		my_target=sa29200
diff --git a/ld/ldsym.c b/ld/ldsym.c
index d7c13408d9d..24689ed34b3 100644
--- a/ld/ldsym.c
+++ b/ld/ldsym.c
@@ -467,7 +467,7 @@ asymbol **output_buffer;
       {
 	/* We are only interested in outputting 
 	   globals at this stage in special circumstances */
-	if (p->the_bfd == entry->the_bfd 
+	if (bfd_asymbol_bfd(p) == entry->the_bfd
 	    && flag_is_not_at_end(p->flags)) {
 	  /* And this is one of them */
 	  *(output_buffer++) = p;
diff --git a/ld/ldwarn.c b/ld/ldwarn.c
index 8aa189f66f1..37470cba255 100644
--- a/ld/ldwarn.c
+++ b/ld/ldwarn.c
@@ -87,7 +87,7 @@ DEFUN(produce_warnings,(lgs,it),
   ptr  = lgs->srefs_chain;
   while (ptr != (asymbol **)NULL) {
     asymbol *ref = *ptr;
-    info("%B: %s\n", ref->the_bfd, fetch_warning(it));
+    info("%B: %s\n", bfd_asymbol_bfd(ref), fetch_warning(it));
     ptr = (asymbol **)(ref->udata);
   }
 }
-- 
2.30.2