* stab-syms.c (__define_stab_duplicate): Define.

	(bfd_get_stab_name): Rename from aout_stab_name.  Rewrite to use a
	switch.
	* bfd-in.h (bfd_get_stab_name): Declare.
	* bfd-in2.h: Rebuild.
	* Makefile.in: Rebuild dependencies.
	(BFD_LIBS): Add stab-syms.o.
	(BFD_LIBS_CFILES): Add stab-syms.c.
	(BFD32_BACKENDS): Remove stab-syms.o.
	(BFD32_BACKENDS_CFILES): Remove stab-syms.c.
	* configure.in: Don't list stab-syms.o in bfd_backends.
	* configure: Rebuild.
	* libaout.h (aout_stab_name): Don't declare.
	* aoutx.h (NAME(aout,get_symbol_info)): Call bfd_get_stab_name,
	not aout_stab_name.

3 files changed, 77 insertions, 53 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c7e7d54..3ef263a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,26 @@
+Mon Mar 11 12:28:31 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* stab-syms.c (__define_stab_duplicate): Define.
+	(bfd_get_stab_name): Rename from aout_stab_name.  Rewrite to use a
+	switch.
+	* bfd-in.h (bfd_get_stab_name): Declare.
+	* bfd-in2.h: Rebuild.
+	* Makefile.in: Rebuild dependencies.
+	(BFD_LIBS): Add stab-syms.o.
+	(BFD_LIBS_CFILES): Add stab-syms.c.
+	(BFD32_BACKENDS): Remove stab-syms.o.
+	(BFD32_BACKENDS_CFILES): Remove stab-syms.c.
+	* configure.in: Don't list stab-syms.o in bfd_backends.
+	* configure: Rebuild.
+	* libaout.h (aout_stab_name): Don't declare.
+	* aoutx.h (NAME(aout,get_symbol_info)): Call bfd_get_stab_name,
+	not aout_stab_name.
+
+Fri Mar  8 11:26:20 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* elf.c (assign_file_positions_for_segments): Adjust file offset
+	for section alignment even if SEC_LOAD is not set.
+
 Tue Mar  5 12:02:23 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure.in: Don't set SHLIB or SHLINK to an empty string,
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 6ea54d1..b5b6099 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -692,7 +692,7 @@ NAME(aout,machine_type) (arch, machine, unknown)
   case bfd_arch_sparc:
     if (machine == 0
 	|| machine == bfd_mach_sparc
-	|| machine == bfd_mach_sparc64)
+	|| machine == bfd_mach_sparc_v9)
       arch_flags = M_SPARC;
     break;
 
@@ -2487,7 +2487,7 @@ NAME(aout,get_symbol_info) (ignore_abfd, symbol, ret)
   if (ret->type == '?')
     {
       int type_code = aout_symbol(symbol)->type & 0xff;
-      CONST char *stab_name = aout_stab_name(type_code);
+      const char *stab_name = bfd_get_stab_name (type_code);
       static char buf[10];
 
       if (stab_name == NULL)
diff --git a/bfd/configure b/bfd/configure
index 7aeefe4..416255e 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -714,8 +714,8 @@ target64=false
 
 ALLLIBS='$(TARGETLIB)'
 PICFLAG=
-SHLIB=
-SHLINK=
+SHLIB=unused-shlib
+SHLINK=unused-shlink
 if test "${shared}" = "true"; then
   PICFLAG=-fpic
   if test "${commonbfdlib}" = "true"; then
@@ -927,8 +927,9 @@ if test "${shared}" = "true"; then
   if test "${GCC}" != "yes" && test "${shared_non_gcc}" != "yes"; then
     echo "configure: warning: BFD --enable-shared only supported when using gcc" 1>&2
     shared=false
+    ALLLIBS='$(TARGETLIB)'
     PICFLAG=
-    SHLIB=
+    SHLIB=unused-shlib
   fi
 fi
 
@@ -963,7 +964,7 @@ else
   ac_cv_c_cross=yes
 else
 cat > conftest.$ac_ext <<EOF
-#line 967 "configure"
+#line 968 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
@@ -1005,7 +1006,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1009 "configure"
+#line 1010 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -1019,7 +1020,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1023 "configure"
+#line 1024 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -1052,7 +1053,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1056 "configure"
+#line 1057 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -1088,7 +1089,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1092 "configure"
+#line 1093 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -1123,7 +1124,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1127 "configure"
+#line 1128 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1182,7 +1183,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1186 "configure"
+#line 1187 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -1222,7 +1223,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1226 "configure"
+#line 1227 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -1509,7 +1510,7 @@ EOF
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1513 "configure"
+#line 1514 "configure"
 #include "confdefs.h"
 #include <sys/procfs.h>
 int main() { return 0; }
@@ -1615,21 +1616,21 @@ do
     # This list is alphabetized to make it easy to compare
     # with the two vector lists in targets.c.
     a29kcoff_big_vec)		tb="$tb coff-a29k.o cofflink.o" ;;
-    a_out_adobe_vec)		tb="$tb aout-adobe.o aout32.o stab-syms.o" ;;
+    a_out_adobe_vec)		tb="$tb aout-adobe.o aout32.o" ;;
     armcoff_little_vec)		tb="$tb coff-arm.o cofflink.o " ;;
     armcoff_big_vec)		tb="$tb coff-arm.o cofflink.o " ;;
     armpe_little_vec)		tb="$tb pe-arm.o cofflink.o " ;;
     armpe_big_vec)		tb="$tb pe-arm.o cofflink.o " ;;
     armpei_little_vec)		tb="$tb pei-arm.o cofflink.o " ;;
     armpei_big_vec)		tb="$tb pei-arm.o cofflink.o " ;;
-    aout0_big_vec)		tb="$tb aout0.o aout32.o stab-syms.o" ;;
-    aout_arm_big_vec)		tb="$tb aout-arm.o aout32.o stab-syms.o" ;;
-    aout_arm_little_vec)	tb="$tb aout-arm.o aout32.o stab-syms.o" ;;
-    aout_mips_big_vec)		tb="$tb mipsbsd.o aout32.o stab-syms.o" ;;
-    aout_mips_little_vec)	tb="$tb mipsbsd.o aout32.o stab-syms.o" ;;
+    aout0_big_vec)		tb="$tb aout0.o aout32.o" ;;
+    aout_arm_big_vec)		tb="$tb aout-arm.o aout32.o" ;;
+    aout_arm_little_vec)	tb="$tb aout-arm.o aout32.o" ;;
+    aout_mips_big_vec)		tb="$tb mipsbsd.o aout32.o" ;;
+    aout_mips_little_vec)	tb="$tb mipsbsd.o aout32.o" ;;
     apollocoff_vec)		tb="$tb coff-apollo.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" ;;
+    b_out_vec_big_host)		tb="$tb bout.o aout32.o" ;;
+    b_out_vec_little_host)	tb="$tb bout.o aout32.o" ;;
 # start-sanitize-arc
     bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.o elf32.o $elf" ;;
     bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.o elf32.o $elf" ;;
@@ -1653,7 +1654,7 @@ do
     bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.o elf64.o $elf"
 				target64=true ;;
     cisco_core_vec)		tb="$tb cisco-core.o" ;;
-    demo_64_vec)		tb="$tb demo64.o aout64.o stab-syms.o"
+    demo_64_vec)		tb="$tb demo64.o aout64.o"
 				target64=true ;;
     ecoff_big_vec)		tb="$tb coff-mips.o ecoff.o ecofflink.o" ;;
     ecoff_little_vec)		tb="$tb coff-mips.o ecoff.o ecofflink.o" ;;
@@ -1661,45 +1662,45 @@ do
 				target64=true ;;
     h8300coff_vec)		tb="$tb coff-h8300.o reloc16.o" ;;
     h8500coff_vec)		tb="$tb coff-h8500.o reloc16.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" ;;
-    i386aout_vec)		tb="$tb i386aout.o aout32.o stab-syms.o" ;;
-    i386bsd_vec)		tb="$tb i386bsd.o aout32.o stab-syms.o" ;;
+    host_aout_vec)		tb="$tb host-aout.o aout32.o" ;;
+    hp300bsd_vec)		tb="$tb hp300bsd.o aout32.o" ;;
+    hp300hpux_vec)		tb="$tb hp300hpux.o aout32.o" ;;
+    i386aout_vec)		tb="$tb i386aout.o aout32.o" ;;
+    i386bsd_vec)		tb="$tb i386bsd.o aout32.o" ;;
     i386coff_vec)		tb="$tb coff-i386.o cofflink.o" ;;
-    i386dynix_vec)		tb="$tb i386dynix.o aout32.o stab-syms.o" ;;
-    i386freebsd_vec)		tb="$tb i386freebsd.o aout32.o stab-syms.o" ;;
+    i386dynix_vec)		tb="$tb i386dynix.o aout32.o" ;;
+    i386freebsd_vec)		tb="$tb i386freebsd.o aout32.o" ;;
     i386msdos_vec)		tb="$tb i386msdos.o" ;;
     i386pe_vec)			tb="$tb pe-i386.o cofflink.o " ;;
     i386pei_vec)		tb="$tb pei-i386.o cofflink.o" ;;
-    i386linux_vec)		tb="$tb i386linux.o aout32.o stab-syms.o" ;;
-    i386lynx_aout_vec)		tb="$tb i386lynx.o lynx-core.o aout32.o stab-syms.o" ;;
-    i386lynx_coff_vec)		tb="$tb cf-i386lynx.o cofflink.o lynx-core.o stab-syms.o" ;;
-    i386mach3_vec)		tb="$tb i386mach3.o aout32.o stab-syms.o" ;;
-    i386netbsd_vec)		tb="$tb i386netbsd.o aout32.o stab-syms.o" ;;
-    i386os9k_vec)		tb="$tb i386os9k.o aout32.o stab-syms.o" ;;
+    i386linux_vec)		tb="$tb i386linux.o aout32.o" ;;
+    i386lynx_aout_vec)		tb="$tb i386lynx.o lynx-core.o aout32.o" ;;
+    i386lynx_coff_vec)		tb="$tb cf-i386lynx.o cofflink.o lynx-core.o" ;;
+    i386mach3_vec)		tb="$tb i386mach3.o aout32.o" ;;
+    i386netbsd_vec)		tb="$tb i386netbsd.o aout32.o" ;;
+    i386os9k_vec)		tb="$tb i386os9k.o aout32.o" ;;
     i860coff_vec)		tb="$tb coff-i860.o cofflink.o" ;;
     icoff_big_vec)		tb="$tb coff-i960.o cofflink.o" ;;
     icoff_little_vec)		tb="$tb coff-i960.o cofflink.o" ;;
     ieee_vec)			tb="$tb ieee.o" ;;
     m68kcoff_vec)		tb="$tb coff-m68k.o cofflink.o" ;;
     m68kcoffun_vec)		tb="$tb coff-u68k.o coff-m68k.o cofflink.o" ;;
-    m68klinux_vec)		tb="$tb m68klinux.o aout32.o stab-syms.o" ;;
-    m68klynx_aout_vec)		tb="$tb m68klynx.o lynx-core.o aout32.o stab-syms.o" ;;
-    m68klynx_coff_vec)		tb="$tb cf-m68klynx.o coff-m68k.o cofflink.o lynx-core.o stab-syms.o" ;;
-    m68knetbsd_vec)		tb="$tb m68knetbsd.o aout32.o stab-syms.o" ;;
-    m68k4knetbsd_vec)		tb="$tb m68k4knetbsd.o aout32.o stab-syms.o" ;;
+    m68klinux_vec)		tb="$tb m68klinux.o aout32.o" ;;
+    m68klynx_aout_vec)		tb="$tb m68klynx.o lynx-core.o aout32.o" ;;
+    m68klynx_coff_vec)		tb="$tb cf-m68klynx.o coff-m68k.o cofflink.o lynx-core.o" ;;
+    m68knetbsd_vec)		tb="$tb m68knetbsd.o aout32.o" ;;
+    m68k4knetbsd_vec)		tb="$tb m68k4knetbsd.o aout32.o" ;;
     m68kaux_coff_vec)		tb="$tb coff-aux.o coff-m68k.o cofflink.o" ;;
     m88kbcs_vec)		tb="$tb coff-m88k.o" ;;
-    newsos3_vec)		tb="$tb newsos3.o aout32.o stab-syms.o" ;;
+    newsos3_vec)		tb="$tb newsos3.o aout32.o" ;;
     nlm32_i386_vec)		tb="$tb nlm32-i386.o nlm32.o nlm.o" ;;
     nlm32_sparc_vec)		tb="$tb nlm32-sparc.o nlm32.o nlm.o" ;;
     nlm32_alpha_vec)		tb="$tb nlm32-alpha.o nlm32.o nlm.o"
 				target64=true ;;
-    riscix_vec)			tb="$tb aout32.o riscix.o stab-syms.o" ;;
+    riscix_vec)			tb="$tb aout32.o riscix.o" ;;
     nlm32_powerpc_vec)		tb="$tb nlm32-ppc.o nlm32.o nlm.o" ;;
-    pc532netbsd_vec)		tb="$tb ns32knetbsd.o aout-ns32k.o stab-syms.o" ;;
-    pc532machaout_vec)		tb="$tb pc532-mach.o aout-ns32k.o stab-syms.o" ;;
+    pc532netbsd_vec)		tb="$tb ns32knetbsd.o aout-ns32k.o" ;;
+    pc532machaout_vec)		tb="$tb pc532-mach.o aout-ns32k.o" ;;
     pmac_xcoff_vec)		tb="$tb coff-pmac.o xcofflink.o" ;;
     rs6000coff_vec)		tb="$tb coff-rs6000.o xcofflink.o" ;;
     bfd_powerpc_pe_vec)         tb="$tb pe-ppc.o cofflink.o" ;;  
@@ -1708,16 +1709,16 @@ do
     bfd_powerpcle_pei_vec)      tb="$tb pei-ppc.o cofflink.o" ;;
     shcoff_vec)			tb="$tb coff-sh.o cofflink.o" ;;
 # start-sanitize-rce
-    rce_aout_vec)		tb="$tb aout-rce.o aout32.o stab-syms.o" ;;
+    rce_aout_vec)		tb="$tb aout-rce.o aout32.o" ;;
 # end-sanitize-rce
     shlcoff_vec)		tb="$tb coff-sh.o cofflink.o" ;;
     som_vec)			tb="$tb som.o" ;;
-    sparclynx_aout_vec)		tb="$tb sparclynx.o lynx-core.o aout32.o stab-syms.o" ;;
-    sparclynx_coff_vec)		tb="$tb cf-sparclynx.o lynx-core.o stab-syms.o" ;;
-    sparcnetbsd_vec)		tb="$tb sparcnetbsd.o aout32.o stab-syms.o" ;;
+    sparclynx_aout_vec)		tb="$tb sparclynx.o lynx-core.o aout32.o" ;;
+    sparclynx_coff_vec)		tb="$tb cf-sparclynx.o lynx-core.o" ;;
+    sparcnetbsd_vec)		tb="$tb sparcnetbsd.o aout32.o" ;;
     sparccoff_vec)		tb="$tb coff-sparc.o" ;;
     srec_vec)			tb="$tb srec.o" ;;
-    sunos_big_vec)		tb="$tb sunos.o aout32.o stab-syms.o" ;;
+    sunos_big_vec)		tb="$tb sunos.o aout32.o" ;;
     symbolsrec_vec)		tb="$tb srec.o" ;;
     tekhex_vec)			tb="$tb tekhex.o" ;;
     we32kcoff_vec)		tb="$tb coff-we32k.o" ;;
@@ -1797,7 +1798,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1801 "configure"
+#line 1802 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1849,7 +1850,7 @@ else
   ac_cv_func_mmap=no
 else
 cat > conftest.$ac_ext <<EOF
-#line 1853 "configure"
+#line 1854 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test. */
@@ -1943,7 +1944,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1947 "configure"
+#line 1948 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */