Include stab-syms.o for a.out/b.out targets and hp300{bsd,hpux}.

1 files changed, 49 insertions, 16 deletions

diff --git a/bfd/configure.in b/bfd/configure.in
index 55102a7..47728f0 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -188,12 +188,30 @@ if [ x${all_targets} = xfalse ]; then
     SELECT_VECS=`sed -n '
     s/DEFAULT_VECTOR[ 	]*=[ 	]*\([^ 	]*\)/\1/p
     s/SELECT_VECS[ 	]*=[ 	]*\([^ 	]*\)/\1/p
-    ' $allfrags | sort -u`
+    ' $allfrags`
+    # uniq the list.
+    f=""
+    for i in $SELECT_VECS ; do
+	case " $f " in
+	*" $i "*) ;;
+	*) f="$f $i" ;;
+	esac
+    done
+    SELECT_VECS="$f"
 
     # The architectures in all the configured targets.
     SELECT_ARCHITECTURES=`sed -n '
     s/SELECT_ARCHITECTURES[ 	]*=[ 	]*//p
-    ' $allfrags | sort -u`
+    ' $allfrags`
+    # uniq the list.
+    f=""
+    for i in $SELECT_ARCHITECTURES ; do
+	case " $f " in
+	*" $i "*) ;;
+	*) f="$f $i" ;;
+	esac
+    done
+    SELECT_ARCHITECTURES="$f"
 
     # Target backend .o files.
     tb=
@@ -202,10 +220,10 @@ if [ x${all_targets} = xfalse ]; then
     do
 	case "$vec" in
 	a29kcoff_big_vec)	tb="$tb coff-a29k.o" ;;
-	a_out_adobe_vec)	tb="$tb aout-adobe.o aout32.o" ;;
-	aout_mips_little_vec)	tb="$tb mipsbsd.o aout32.o" ;;
-	b_out_vec_big_host)	tb="$tb bout.o aout32.o" ;;
-	b_out_vec_little_host)	tb="$tb bout.o aout32.o" ;;
+	a_out_adobe_vec)	tb="$tb aout-adobe.o aout32.o stab-syms.o" ;;
+	aout_mips_little_vec)	tb="$tb mipsbsd.o aout32.o stab-syms.o" ;;
+	b_out_vec_big_host)	tb="$tb bout.o aout32.o stab-syms.o" ;;
+	b_out_vec_little_host)	tb="$tb bout.o aout32.o stab-syms.o" ;;
 	bfd_elf32_hppa_vec)	tb="$tb elf32-hppa.o elf32.o elf.o" ;;
 	bfd_elf32_i386_vec)	tb="$tb elf32-i386.o elf32.o elf.o" ;;
 	bfd_elf32_i860_vec)	tb="$tb elf32-i860.o elf32.o elf.o" ;;
@@ -220,22 +238,22 @@ if [ x${all_targets} = xfalse ]; then
 	ecoffalpha_little_vec)	tb="$tb coff-alpha.o" ;;
 	h8300coff_vec)		tb="$tb coff-h8300.o" ;;
 	h8500coff_vec)		tb="$tb coff-h8500.o" ;;
-	host_aout_vec)		tb="$tb host-aout.o aout32.o" ;;
-	hp300bsd_vec)		tb="$tb hp300bsd.o" ;;
-	hp300hpux_vec)		tb="$tb hp300hpux.o" ;;
+	host_aout_vec)		tb="$tb host-aout.o aout32.o stab-syms.o" ;;
+	hp300bsd_vec)		tb="$tb hp300bsd.o aout32.o stab-syms.o" ;;
+	hp300hpux_vec)		tb="$tb hp300hpux.o aout32.o stab-syms.o" ;;
 	hppa_vec)		tb="$tb hppa.o" ;;
-	i386aout_vec)		tb="$tb i386aout.o aout32.o" ;;
-	i386bsd_vec)		tb="$tb i386bsd.o aout32.o" ;;
+	i386aout_vec)		tb="$tb i386aout.o aout32.o stab-syms.o" ;;
+	i386bsd_vec)		tb="$tb i386bsd.o aout32.o stab-syms.o" ;;
 	i386coff_vec)		tb="$tb coff-i386.o" ;;
-	i386linux_vec)		tb="$tb i386linux.o aout32.o" ;;
-	i386lynx_vec)		tb="$tb i386lynx.o aout32.o" ;;
+	i386linux_vec)		tb="$tb i386linux.o aout32.o stab-syms.o" ;;
+	i386lynx_vec)		tb="$tb i386lynx.o aout32.o stab-syms.o" ;;
 	icoff_big_vec)		tb="$tb coff-i960.o" ;;
 	icoff_little_vec)	tb="$tb coff-i960.o" ;;
 	ieee_vec)		tb="$tb ieee.o" ;;
 	m68kcoff_vec)		tb="$tb coff-m68k.o" ;;
 	m68kcoffun_vec)		tb="$tb coff-u68k.o" ;;
 	m88kbcs_vec)		tb="$tb coff-m88k.o" ;;
-	newsos3_vec)		tb="$tb newsos3.o aout32.o" ;;
+	newsos3_vec)		tb="$tb newsos3.o aout32.o stab-syms.o" ;;
 	rs6000coff_vec)		tb="$tb coff-rs6000.o" ;;
 	shcoff_vec)		tb="$tb coff-sh.o" ;;
 	srec_vec)		tb="$tb srec.o" ;;
@@ -253,8 +271,23 @@ if [ x${all_targets} = xfalse ]; then
     ta=`echo $SELECT_ARCHITECTURES | sed -e s/bfd_/cpu-/g -e s/_arch/.o/g`
 
     # Weed out duplicate .o files.
-    tb=`echo $tb | tr -s ' ' '\012' | sort -u | tr '\012' ' '`
-    ta=`echo $ta | tr -s ' ' '\012' | sort -u | tr '\012' ' '`
+    f=""
+    for i in $tb ; do
+	case " $f " in
+	*" $i "*) ;;
+	*) f="$f $i" ;;
+	esac
+    done
+    tb="$f"
+
+    f=""
+    for i in $ta ; do
+	case " $f " in
+	*" $i "*) ;;
+	*) f="$f $i" ;;
+	esac
+    done
+    ta="$f"
 
     echo "BFD_BACKENDS = $tb" >> Makefile.2
     echo "BFD_MACHINES = $ta" >> Makefile.2