* Makefile.am (libbfd.h): Add "Extracted from.." comment.

[deliverable/binutils-gdb.git] / bfd / libaout.h

diff --git a/bfd/libaout.h b/bfd/libaout.h
index 71b699e21b8e6525bf3a337009fce32a74b2a4e0..d7e5c7166ffcf4756fed588c8c1ec32e4a3f5867 100644 (file)
--- a/bfd/libaout.h
+++ b/bfd/libaout.h
@@ -1,5 +1,7 @@
 /* BFD back-end data structures for a.out (and similar) files.
 /* BFD back-end data structures for a.out (and similar) files.

-   Copyright 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001
+   Free Software Foundation, Inc.

    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -16,7 +18,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 
 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.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 #ifndef LIBAOUT_H
 #define LIBAOUT_H
 
 #ifndef LIBAOUT_H
 #define LIBAOUT_H


@@ -27,27 +29,94 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "bfdlink.h"
 
 
 #include "bfdlink.h"
 

+/* Macros for accessing components in an aout header.  Saves cluttering
+   the source with (bfd_vma) and (bfd_byte *) casts.  */
+
+#define H_PUT_64(abfd, val, where) \
+  bfd_h_put_64 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_32(abfd, val, where) \
+  bfd_h_put_32 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_16(abfd, val, where) \
+  bfd_h_put_16 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_8 bfd_h_put_8
+
+#define H_PUT_S64(abfd, val, where) \
+  bfd_h_put_signed_64 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_S32(abfd, val, where) \
+  bfd_h_put_signed_32 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_S16(abfd, val, where) \
+  bfd_h_put_signed_16 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_S8 bfd_h_put_signed_8
+
+#define H_GET_64(abfd, where) \
+  bfd_h_get_64 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_32(abfd, where) \
+  bfd_h_get_32 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_16(abfd, where) \
+  bfd_h_get_16 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_8 bfd_h_get_8
+
+#define H_GET_S64(abfd, where) \
+  bfd_h_get_signed_64 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_S32(abfd, where) \
+  bfd_h_get_signed_32 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_S16(abfd, where) \
+  bfd_h_get_signed_16 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_S8 bfd_h_get_signed_8
+

 /* Parameterize the a.out code based on whether it is being built
    for a 32-bit architecture or a 64-bit architecture.  */
 /* Parameterize the a.out code based on whether it is being built
    for a 32-bit architecture or a 64-bit architecture.  */

+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */

 #if ARCH_SIZE==64
 #if ARCH_SIZE==64

-#define GET_WORD bfd_h_get_64
-#define GET_SWORD bfd_h_get_signed_64
-#define PUT_WORD bfd_h_put_64
+#define GET_WORD H_GET_64
+#define GET_SWORD H_GET_S64
+#define GET_MAGIC H_GET_32
+#define PUT_WORD H_PUT_64
+#define PUT_MAGIC H_PUT_32

 #ifndef NAME
 #ifndef NAME

-#define NAME(x,y) CAT3(x,_64_,y)
+#define NAME(x,y) CONCAT3 (x,_64_,y)

 #endif
 #endif

-#define JNAME(x) CAT(x,_64)
+#define JNAME(x) CONCAT2 (x,_64)

 #define BYTES_IN_WORD 8
 #define BYTES_IN_WORD 8

+#else
+#if ARCH_SIZE==16
+#define GET_WORD H_GET_16
+#define GET_SWORD H_GET_S16
+#define GET_MAGIC H_GET_16
+#define PUT_WORD H_PUT_16
+#define PUT_MAGIC H_PUT_16
+#ifndef NAME
+#define NAME(x,y) CONCAT3 (x,_16_,y)
+#endif
+#define JNAME(x) CONCAT2 (x,_16)
+#define BYTES_IN_WORD 2

 #else /* ARCH_SIZE == 32 */
 #else /* ARCH_SIZE == 32 */

-#define GET_WORD bfd_h_get_32
-#define GET_SWORD bfd_h_get_signed_32
-#define PUT_WORD bfd_h_put_32
+#define GET_WORD H_GET_32
+#define GET_SWORD H_GET_S32
+#define GET_MAGIC H_GET_32
+#define PUT_WORD H_PUT_32
+#define PUT_MAGIC H_PUT_32

 #ifndef NAME
 #ifndef NAME

-#define NAME(x,y) CAT3(x,_32_,y)
+#define NAME(x,y) CONCAT3 (x,_32_,y)

 #endif
 #endif

-#define JNAME(x) CAT(x,_32)
+#define JNAME(x) CONCAT2 (x,_32)

 #define BYTES_IN_WORD 4
 #endif /* ARCH_SIZE==32 */
 #define BYTES_IN_WORD 4
 #endif /* ARCH_SIZE==32 */

+#endif /* ARCH_SIZE==64 */

 
 /* Declare at file level, since used in parameter lists, which have
    weird scope.  */
 
 /* Declare at file level, since used in parameter lists, which have
    weird scope.  */


@@ -105,6 +174,12 @@ struct aout_backend_data
      If not, the text section starts on the next page.  */
   unsigned char text_includes_header;
 
      If not, the text section starts on the next page.  */
   unsigned char text_includes_header;
 

+  /* If this flag is set, then if the entry address is not in the
+     first SEGMENT_SIZE bytes of the text section, it is taken to be
+     the address of the start of the text section.  This can be useful
+     for kernels.  */
+  unsigned char entry_is_text_address;
+

   /* The value to pass to N_SET_FLAGS.  */
   unsigned char exec_hdr_flags;
 
   /* The value to pass to N_SET_FLAGS.  */
   unsigned char exec_hdr_flags;
 


@@ -118,7 +193,8 @@ struct aout_backend_data
 
   /* Callback for setting the page and segment sizes, if they can't be
      trivially determined from the architecture.  */
 
   /* Callback for setting the page and segment sizes, if they can't be
      trivially determined from the architecture.  */

-  boolean (*set_sizes) PARAMS ((bfd *));
+  boolean (*set_sizes)
+    PARAMS ((bfd *));

 
   /* zmagic files only. For go32, the length of the exec header contributes
      to the size of the text section in the file for alignment purposes but
 
   /* zmagic files only. For go32, the length of the exec header contributes
      to the size of the text section in the file for alignment purposes but


@@ -127,39 +203,43 @@ struct aout_backend_data
 
   /* Callback from the add symbols phase of the linker code to handle
      a dynamic object.  */
 
   /* Callback from the add symbols phase of the linker code to handle
      a dynamic object.  */

-  boolean (*add_dynamic_symbols) PARAMS ((bfd *, struct bfd_link_info *));
+  boolean (*add_dynamic_symbols)
+    PARAMS ((bfd *, struct bfd_link_info *, struct external_nlist **,
+            bfd_size_type *, char **));

 
   /* Callback from the add symbols phase of the linker code to handle
      adding a single symbol to the global linker hash table.  */
 
   /* Callback from the add symbols phase of the linker code to handle
      adding a single symbol to the global linker hash table.  */

-  boolean (*add_one_symbol) PARAMS ((struct bfd_link_info *, bfd *,
-                                    const char *, flagword, asection *,
-                                    bfd_vma, const char *, boolean,
-                                    boolean,
-                                    struct bfd_link_hash_entry **));
+  boolean (*add_one_symbol)
+    PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword,
+            asection *, bfd_vma, const char *, boolean, boolean,
+            struct bfd_link_hash_entry **));

 
   /* Called to handle linking a dynamic object.  */
 
   /* Called to handle linking a dynamic object.  */

-  boolean (*link_dynamic_object) PARAMS ((struct bfd_link_info *, bfd *));
+  boolean (*link_dynamic_object)
+    PARAMS ((struct bfd_link_info *, bfd *));

 
   /* Called for each global symbol being written out by the linker.
      This should write out the dynamic symbol information.  */
 
   /* Called for each global symbol being written out by the linker.
      This should write out the dynamic symbol information.  */

-  boolean (*write_dynamic_symbol) PARAMS ((bfd *, struct bfd_link_info *,
-                                          struct aout_link_hash_entry *));
-
-  /* This callback is called by the linker for each reloc against an
-     external symbol.  RELOC is a pointer to the unswapped reloc.  If
-     *SKIP is set to true, the reloc will be skipped.  */
-  boolean (*check_dynamic_reloc) PARAMS ((struct bfd_link_info *info,
-                                         bfd *input_bfd,
-                                         asection *input_section,
-                                         struct aout_link_hash_entry *h,
-                                         PTR reloc, boolean *skip));
+  boolean (*write_dynamic_symbol)
+    PARAMS ((bfd *, struct bfd_link_info *, struct aout_link_hash_entry *));
+
+  /* If this callback is not NULL, the linker calls it for each reloc.
+     RELOC is a pointer to the unswapped reloc.  If *SKIP is set to
+     true, the reloc will be skipped.  *RELOCATION may be changed to
+     change the effects of the relocation.  */
+  boolean (*check_dynamic_reloc)
+    PARAMS ((struct bfd_link_info *info, bfd *input_bfd,
+            asection *input_section, struct aout_link_hash_entry *h,
+            PTR reloc, bfd_byte *contents, boolean *skip,
+            bfd_vma *relocation));

 
   /* Called at the end of a link to finish up any dynamic linking
      information.  */
 
   /* Called at the end of a link to finish up any dynamic linking
      information.  */

-  boolean (*finish_dynamic_link) PARAMS ((bfd *, struct bfd_link_info *));
+  boolean (*finish_dynamic_link)
+    PARAMS ((bfd *, struct bfd_link_info *));

 };
 #define aout_backend_info(abfd) \
 };
 #define aout_backend_info(abfd) \

-       ((CONST struct aout_backend_data *)((abfd)->xvec->backend_data))
+       ((const struct aout_backend_data *)((abfd)->xvec->backend_data))

 
 /* This is the layout in memory of a "struct exec" while we process it.
    All 'lengths' are given as a number of bytes.
 
 /* This is the layout in memory of a "struct exec" while we process it.
    All 'lengths' are given as a number of bytes.


@@ -186,15 +266,15 @@ struct internal_exec
     char a_relaxable;           /* Enough info for linker relax */
 };
 
     char a_relaxable;           /* Enough info for linker relax */
 };
 

-/* Magic number is written 
-< MSB        >
+/* Magic number is written
+< MSB          >

 3130292827262524232221201918171615141312111009080706050403020100
 3130292827262524232221201918171615141312111009080706050403020100

-< FLAGS      >< MACHINE TYPE ><  MAGIC NUMBER                 >
+< FLAGS        >< MACHINE TYPE ><  MAGIC NUMBER                >

 */
 /* Magic number for NetBSD is
 */
 /* Magic number for NetBSD is

-<MSB         >
+<MSB           >

 3130292827262524232221201918171615141312111009080706050403020100
 3130292827262524232221201918171615141312111009080706050403020100

-< FLAGS    ><                  ><  MAGIC NUMBER                >
+< FLAGS    >< MACHINE TYPE     ><  MAGIC NUMBER                >

 */
 
 enum machine_type {
 */
 
 enum machine_type {


@@ -203,15 +283,38 @@ enum machine_type {
   M_68020 = 2,
   M_SPARC = 3,
   /* skip a bunch so we don't run into any of suns numbers */
   M_68020 = 2,
   M_SPARC = 3,
   /* skip a bunch so we don't run into any of suns numbers */

+  /* make these up for the ns32k*/
+  M_NS32032 = (64),            /* ns32032 running ? */
+  M_NS32532 = (64 + 5),                /* ns32532 running mach */
+

   M_386 = 100,
   M_29K = 101,          /* AMD 29000 */
   M_386_DYNIX = 102,   /* Sequent running dynix */
   M_386 = 100,
   M_29K = 101,          /* AMD 29000 */
   M_386_DYNIX = 102,   /* Sequent running dynix */

-  M_386_NETBSD = 134,          /* NetBSD/386 binary */
+  M_ARM = 103,         /* Advanced Risc Machines ARM */
+  M_SPARCLET = 131,    /* SPARClet = M_SPARC + 128 */
+  M_386_NETBSD = 134,  /* NetBSD/i386 binary */
+  M_68K_NETBSD = 135,  /* NetBSD/m68k binary */
+  M_68K4K_NETBSD = 136,        /* NetBSD/m68k4k binary */
+  M_532_NETBSD = 137,  /* NetBSD/ns32k binary */
+  M_SPARC_NETBSD = 138,        /* NetBSD/sparc binary */
+  M_PMAX_NETBSD = 139, /* NetBSD/pmax (MIPS little-endian) binary */
+  M_VAX_NETBSD = 140,  /* NetBSD/vax binary */
+  M_ALPHA_NETBSD = 141,        /* NetBSD/alpha binary */
+  M_ARM6_NETBSD = 143, /* NetBSD/arm32 binary */
+  M_SPARCLET_1 = 147,  /* 0x93, reserved */

   M_MIPS1 = 151,        /* MIPS R2000/R3000 binary */
   M_MIPS2 = 152,        /* MIPS R4000/R6000 binary */
   M_MIPS1 = 151,        /* MIPS R2000/R3000 binary */
   M_MIPS2 = 152,        /* MIPS R4000/R6000 binary */

+  M_SPARCLET_2 = 163,  /* 0xa3, reserved */
+  M_SPARCLET_3 = 179,  /* 0xb3, reserved */
+  M_SPARCLET_4 = 195,  /* 0xc3, reserved */

   M_HP200 = 200,       /* HP 200 (68010) BSD binary */
   M_HP300 = (300 % 256), /* HP 300 (68020+68881) BSD binary */
   M_HP200 = 200,       /* HP 200 (68010) BSD binary */
   M_HP300 = (300 % 256), /* HP 300 (68020+68881) BSD binary */

-  M_HPUX = (0x20c % 256)/* HP 200/300 HPUX binary */
+  M_HPUX = (0x20c % 256), /* HP 200/300 HPUX binary */
+  M_SPARCLET_5 = 211,  /* 0xd3, reserved */
+  M_SPARCLET_6 = 227,  /* 0xe3, reserved */
+  /*  M_SPARCLET_7 = 243       / * 0xf3, reserved */
+  M_SPARCLITE_LE = 243,
+  M_CRIS = 255         /* Axis CRIS binary.  */

 };
 
 #define N_DYNAMIC(exec) ((exec).a_info & 0x80000000)
 };
 
 #define N_DYNAMIC(exec) ((exec).a_info & 0x80000000)


@@ -237,7 +340,7 @@ enum machine_type {
 
 #ifndef N_SET_DYNAMIC
 # define N_SET_DYNAMIC(exec, dynamic) \
 
 #ifndef N_SET_DYNAMIC
 # define N_SET_DYNAMIC(exec, dynamic) \

-((exec).a_info = (dynamic) ? ((exec).a_info | 0x80000000) : \
+((exec).a_info = (dynamic) ? (long) ((exec).a_info | 0x80000000) : \

 ((exec).a_info & 0x7fffffff))
 #endif
 
 ((exec).a_info & 0x7fffffff))
 #endif
 


@@ -272,7 +375,7 @@ typedef struct aout_symbol {
 struct aoutdata {
   struct internal_exec *hdr;           /* exec file header */
   aout_symbol_type *symbols;           /* symtab for input bfd */
 struct aoutdata {
   struct internal_exec *hdr;           /* exec file header */
   aout_symbol_type *symbols;           /* symtab for input bfd */

-  
+

   /* For ease, we do this */
   asection *textsec;
   asection *datasec;
   /* For ease, we do this */
   asection *textsec;
   asection *datasec;


@@ -295,29 +398,50 @@ struct aoutdata {
   /* Segment size - needed for alignment of demand paged files. */
   unsigned long segment_size;
 
   /* Segment size - needed for alignment of demand paged files. */
   unsigned long segment_size;
 

+  /* Zmagic disk block size - need to align the start of the text
+     section in ZMAGIC binaries.  Normally the same as page_size.  */
+  unsigned long zmagic_disk_block_size;
+

   unsigned exec_bytes_size;
   unsigned vma_adjusted : 1;
 
   /* used when a bfd supports several highly similar formats */
   unsigned exec_bytes_size;
   unsigned vma_adjusted : 1;
 
   /* used when a bfd supports several highly similar formats */

-  enum {
-    default_format = 0,
-    gnu_encap_format } subformat;
-
-  enum {
-    undecided_magic = 0,
-    z_magic,
-    o_magic,
-    n_magic } magic;
+  enum
+    {
+      default_format = 0,
+      /* Used on HP 9000/300 running HP/UX.  See hp300hpux.c.  */
+      gnu_encap_format,
+      /* Used on Linux, 386BSD, etc.  See include/aout/aout64.h.  */
+      q_magic_format
+    } subformat;
+
+  enum
+    {
+      undecided_magic = 0,
+      z_magic,
+      o_magic,
+      n_magic
+    } magic;
+
+  /* A buffer for find_nearest_line.  */
+  char *line_buf;

 
   /* The external symbol information.  */
   struct external_nlist *external_syms;
   bfd_size_type external_sym_count;
 
   /* The external symbol information.  */
   struct external_nlist *external_syms;
   bfd_size_type external_sym_count;

+  bfd_window sym_window;

   char *external_strings;
   bfd_size_type external_string_size;
   char *external_strings;
   bfd_size_type external_string_size;

+  bfd_window string_window;

   struct aout_link_hash_entry **sym_hashes;
 
   /* A pointer for shared library information.  */
   PTR dynamic_info;
   struct aout_link_hash_entry **sym_hashes;
 
   /* A pointer for shared library information.  */
   PTR dynamic_info;

+
+  /* A mapping from local symbols to offsets into the global offset
+     table, used when linking on SunOS.  This is indexed by the symbol
+     index.  */
+  bfd_vma *local_got_offsets;

 };
 
 struct  aout_data_struct {
 };
 
 struct  aout_data_struct {


@@ -338,8 +462,10 @@ struct  aout_data_struct {
 #define obj_aout_subformat(bfd)        (adata(bfd).subformat)
 #define obj_aout_external_syms(bfd) (adata(bfd).external_syms)
 #define obj_aout_external_sym_count(bfd) (adata(bfd).external_sym_count)
 #define obj_aout_subformat(bfd)        (adata(bfd).subformat)
 #define obj_aout_external_syms(bfd) (adata(bfd).external_syms)
 #define obj_aout_external_sym_count(bfd) (adata(bfd).external_sym_count)

+#define obj_aout_sym_window(bfd) (adata(bfd).sym_window)

 #define obj_aout_external_strings(bfd) (adata(bfd).external_strings)
 #define obj_aout_external_string_size(bfd) (adata(bfd).external_string_size)
 #define obj_aout_external_strings(bfd) (adata(bfd).external_strings)
 #define obj_aout_external_string_size(bfd) (adata(bfd).external_string_size)

+#define obj_aout_string_window(bfd) (adata(bfd).string_window)

 #define obj_aout_sym_hashes(bfd) (adata(bfd).sym_hashes)
 #define obj_aout_dynamic_info(bfd) (adata(bfd).dynamic_info)
 
 #define obj_aout_sym_hashes(bfd) (adata(bfd).sym_hashes)
 #define obj_aout_dynamic_info(bfd) (adata(bfd).dynamic_info)
 


@@ -359,147 +485,136 @@ struct aout_section_data_struct
 #define aout_section_data(s) \
   ((struct aout_section_data_struct *) (s)->used_by_bfd)
 
 #define aout_section_data(s) \
   ((struct aout_section_data_struct *) (s)->used_by_bfd)
 

+#define set_aout_section_data(s,v) \
+  ((s)->used_by_bfd = (PTR)&(v)->relocs)
+

 /* Prototype declarations for functions defined in aoutx.h  */
 
 /* Prototype declarations for functions defined in aoutx.h  */
 

-boolean
-NAME(aout,squirt_out_relocs) PARAMS ((bfd *abfd, asection *section));
+extern boolean NAME(aout,squirt_out_relocs)
+  PARAMS ((bfd *, asection *));

 
 

-boolean
-NAME(aout,make_sections) PARAMS ((bfd *));
+extern boolean NAME(aout,make_sections)
+  PARAMS ((bfd *));

 
 

-bfd_target *
-NAME(aout,some_aout_object_p) PARAMS ((bfd *abfd,
-                       struct internal_exec *execp,
-                       bfd_target * (*callback)(bfd *)));
+extern const bfd_target * NAME(aout,some_aout_object_p)
+  PARAMS ((bfd *, struct internal_exec *, const bfd_target *(*) (bfd *)));

 
 

-boolean
-NAME(aout,mkobject) PARAMS ((bfd *abfd));
+extern boolean NAME(aout,mkobject)
+  PARAMS ((bfd *));

 
 

-enum machine_type
-NAME(aout,machine_type) PARAMS ((enum bfd_architecture arch,
-                                unsigned long machine,
-                                boolean *unknown));
+extern enum machine_type NAME(aout,machine_type)
+  PARAMS ((enum bfd_architecture, unsigned long, boolean *));

 
 

-boolean
-NAME(aout,set_arch_mach) PARAMS ((bfd *abfd, enum bfd_architecture arch,
-                                 unsigned long machine));
+extern boolean NAME(aout,set_arch_mach)
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));

 
 

-boolean
-NAME(aout,new_section_hook) PARAMS ((bfd *abfd, asection *newsect));
+extern boolean NAME(aout,new_section_hook)
+  PARAMS ((bfd *, asection *));

 
 

-boolean
-NAME(aout,set_section_contents) PARAMS ((bfd *abfd, sec_ptr section,
-                        PTR location, file_ptr offset, bfd_size_type count));
+extern boolean NAME(aout,set_section_contents)
+  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));

 
 

-asymbol *
-NAME(aout,make_empty_symbol) PARAMS ((bfd *abfd));
+extern asymbol * NAME(aout,make_empty_symbol)
+  PARAMS ((bfd *));

 
 

-boolean
-NAME(aout,translate_symbol_table) PARAMS ((bfd *, aout_symbol_type *,
-                                          struct external_nlist *,
-                                          bfd_size_type, char *,
-                                          bfd_size_type,
-                                          boolean dynamic));
+extern boolean NAME(aout,translate_symbol_table)
+  PARAMS ((bfd *, aout_symbol_type *, struct external_nlist *, bfd_size_type,
+          char *, bfd_size_type, boolean));

 
 

-boolean
-NAME(aout,slurp_symbol_table) PARAMS ((bfd *abfd));
+extern boolean NAME(aout,slurp_symbol_table)
+  PARAMS ((bfd *));

 
 

-boolean
-NAME(aout,write_syms) PARAMS ((bfd *abfd));
+extern boolean NAME(aout,write_syms)
+  PARAMS ((bfd *));

 
 

-void
-NAME(aout,reclaim_symbol_table) PARAMS ((bfd *abfd));
+extern void NAME(aout,reclaim_symbol_table)
+  PARAMS ((bfd *));

 
 

-long
-NAME(aout,get_symtab_upper_bound) PARAMS ((bfd *abfd));
+extern long NAME(aout,get_symtab_upper_bound)
+  PARAMS ((bfd *));

 
 

-long
-NAME(aout,get_symtab) PARAMS ((bfd *abfd, asymbol **location));
+extern long NAME(aout,get_symtab)
+  PARAMS ((bfd *, asymbol **));

 
 

-void
-NAME(aout,swap_ext_reloc_in) PARAMS ((bfd *, struct reloc_ext_external *,
-                                     arelent *, asymbol **));
-void
-NAME(aout,swap_std_reloc_in) PARAMS ((bfd *, struct reloc_std_external *,
-                                     arelent *, asymbol **));
+extern void NAME(aout,swap_ext_reloc_in)
+  PARAMS ((bfd *, struct reloc_ext_external *, arelent *, asymbol **,
+          bfd_size_type));
+extern void NAME(aout,swap_std_reloc_in)
+  PARAMS ((bfd *, struct reloc_std_external *, arelent *, asymbol **,
+          bfd_size_type));

 
 

-boolean
-NAME(aout,slurp_reloc_table) PARAMS ((bfd *abfd, sec_ptr asect,
-                                     asymbol **symbols));
+extern reloc_howto_type * NAME(aout,reloc_type_lookup)
+  PARAMS ((bfd *, bfd_reloc_code_real_type));

 
 

-long
-NAME(aout,canonicalize_reloc) PARAMS ((bfd *abfd, sec_ptr section,
-                                      arelent **relptr, asymbol **symbols));
+extern boolean NAME(aout,slurp_reloc_table)
+  PARAMS ((bfd *, sec_ptr, asymbol **));

 
 

-long
-NAME(aout,get_reloc_upper_bound) PARAMS ((bfd *abfd, sec_ptr asect));
+extern long NAME(aout,canonicalize_reloc)
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));

 
 

-void
-NAME(aout,reclaim_reloc) PARAMS ((bfd *ignore_abfd, sec_ptr ignore));
+extern long NAME(aout,get_reloc_upper_bound)
+  PARAMS ((bfd *, sec_ptr));

 
 

-alent *
-NAME(aout,get_lineno) PARAMS ((bfd *ignore_abfd, asymbol *ignore_symbol));
+extern void NAME(aout,reclaim_reloc)
+  PARAMS ((bfd *, sec_ptr));

 
 

-void
-NAME(aout,print_symbol) PARAMS ((bfd *ignore_abfd, PTR file,
-                           asymbol *symbol, bfd_print_symbol_type how));
+extern alent * NAME(aout,get_lineno)
+  PARAMS ((bfd *, asymbol *));

 
 

-void
-NAME(aout,get_symbol_info) PARAMS ((bfd *ignore_abfd,
-                           asymbol *symbol, symbol_info *ret));
+extern void NAME(aout,print_symbol)
+  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));

 
 

-boolean
-NAME(aout,find_nearest_line) PARAMS ((bfd *abfd, asection *section,
-      asymbol **symbols, bfd_vma offset, CONST char **filename_ptr,
-      CONST char **functionname_ptr, unsigned int *line_ptr));
+extern void NAME(aout,get_symbol_info)
+  PARAMS ((bfd *, asymbol *, symbol_info *));

 
 

-int
-NAME(aout,sizeof_headers) PARAMS ((bfd *abfd, boolean exec));
+extern boolean NAME(aout,find_nearest_line)
+  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
+          const char **, unsigned int *));

 
 

-boolean
-NAME(aout,adjust_sizes_and_vmas) PARAMS ((bfd *abfd,
-       bfd_size_type *text_size, file_ptr *text_end));
+extern long NAME(aout,read_minisymbols)
+  PARAMS ((bfd *, boolean, PTR *, unsigned int *));

 
 

-void
-NAME(aout,swap_exec_header_in) PARAMS ((bfd *abfd,
-       struct external_exec *raw_bytes, struct internal_exec *execp));
+extern asymbol * NAME(aout,minisymbol_to_symbol)
+  PARAMS ((bfd *, boolean, const PTR, asymbol *));

 
 

-void
-NAME(aout,swap_exec_header_out) PARAMS ((bfd *abfd,
-       struct internal_exec *execp, struct external_exec *raw_bytes));
+extern int NAME(aout,sizeof_headers)
+  PARAMS ((bfd *, boolean));

 
 

-struct bfd_hash_entry *
-NAME(aout,link_hash_newfunc)
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+extern boolean NAME(aout,adjust_sizes_and_vmas)
+  PARAMS ((bfd *, bfd_size_type *, file_ptr *));

 
 

-boolean
-NAME(aout,link_hash_table_init)
-     PARAMS ((struct aout_link_hash_table *, bfd *,
-             struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-                                         struct bfd_hash_table *,
-                                         const char *)));
+extern void NAME(aout,swap_exec_header_in)
+  PARAMS ((bfd *, struct external_exec *, struct internal_exec *));

 
 

-struct bfd_link_hash_table *
-NAME(aout,link_hash_table_create) PARAMS ((bfd *));
+extern void NAME(aout,swap_exec_header_out)
+  PARAMS ((bfd *, struct internal_exec *, struct external_exec *));

 
 

-boolean
-NAME(aout,link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
+extern struct bfd_hash_entry * NAME(aout,link_hash_newfunc)
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));

 
 

-boolean
-NAME(aout,final_link) PARAMS ((bfd *, struct bfd_link_info *,
-                              void (*) (bfd *, file_ptr *, file_ptr *,
-                                        file_ptr *)));
+extern boolean NAME(aout,link_hash_table_init)
+  PARAMS ((struct aout_link_hash_table *, bfd *,
+          struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+                                      struct bfd_hash_table *,
+                                      const char *)));

 
 

-boolean
-NAME(aout,bfd_free_cached_info) PARAMS ((bfd *));
+extern struct bfd_link_hash_table * NAME(aout,link_hash_table_create)
+  PARAMS ((bfd *));

 
 

-/* Prototypes for functions in stab-syms.c. */
+extern boolean NAME(aout,link_add_symbols)
+  PARAMS ((bfd *, struct bfd_link_info *));

 
 

-CONST char *
-aout_stab_name PARAMS ((int code));
+extern boolean NAME(aout,final_link)
+  PARAMS ((bfd *, struct bfd_link_info *,
+          void (*) (bfd *, file_ptr *, file_ptr *, file_ptr *)));
+
+extern boolean NAME(aout,bfd_free_cached_info)
+  PARAMS ((bfd *));

 
 /* A.out uses the generic versions of these routines... */
 
 
 /* A.out uses the generic versions of these routines... */
 

+#define        aout_16_get_section_contents    _bfd_generic_get_section_contents
+

 #define        aout_32_get_section_contents    _bfd_generic_get_section_contents
 
 #define        aout_64_get_section_contents    _bfd_generic_get_section_contents
 #define        aout_32_get_section_contents    _bfd_generic_get_section_contents
 
 #define        aout_64_get_section_contents    _bfd_generic_get_section_contents


@@ -507,8 +622,8 @@ aout_stab_name PARAMS ((int code));
 #define NO_WRITE_HEADER_KLUDGE 0
 #endif
 
 #define NO_WRITE_HEADER_KLUDGE 0
 #endif
 

-#ifndef aout_32_bfd_is_local_label
-#define aout_32_bfd_is_local_label bfd_generic_is_local_label
+#ifndef aout_32_bfd_is_local_label_name
+#define aout_32_bfd_is_local_label_name bfd_generic_is_local_label_name

 #endif
 
 #ifndef WRITE_HEADERS
 #endif
 
 #ifndef WRITE_HEADERS


@@ -528,35 +643,32 @@ aout_stab_name PARAMS ((int code));
                           obj_reloc_entry_size (abfd));                      \
        NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);           \
                                                                              \
                           obj_reloc_entry_size (abfd));                      \
        NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);           \
                                                                              \

-       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return false;       \
-       if (bfd_write ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)           \
-           != EXEC_BYTES_SIZE)                                               \
+       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0                      \
+           || bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, \
+                         abfd) != EXEC_BYTES_SIZE)                           \

          return false;                                                       \
        /* Now write out reloc info, followed by syms and strings */          \
                                                                              \
        if (bfd_get_outsymbols (abfd) != (asymbol **) NULL                    \
            && bfd_get_symcount (abfd) != 0)                                  \
          return false;                                                       \
        /* Now write out reloc info, followed by syms and strings */          \
                                                                              \
        if (bfd_get_outsymbols (abfd) != (asymbol **) NULL                    \
            && bfd_get_symcount (abfd) != 0)                                  \

-           {                                                                 \
-             if (bfd_seek (abfd, (file_ptr)(N_SYMOFF(*execp)), SEEK_SET)     \
-                 != 0)                                                       \
-               return false;                                                 \
-                                                                             \
-             if (! NAME(aout,write_syms)(abfd)) return false;                \
+         {                                                                   \
+           if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0)\
+             return false;                                                   \

                                                                              \
                                                                              \

-             if (bfd_seek (abfd, (file_ptr)(N_TRELOFF(*execp)), SEEK_SET)    \
-                 != 0)                                                       \
-               return false;                                                 \
+           if (! NAME(aout,write_syms) (abfd))                               \
+             return false;                                                   \
+         }                                                                   \

                                                                              \
                                                                              \

-             if (!NAME(aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))   \
-               return false;                                                 \
-             if (bfd_seek (abfd, (file_ptr)(N_DRELOFF(*execp)), SEEK_SET)    \
-                 != 0)                                                       \
-               return false;                                                 \
+       if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET) != 0)   \
+         return false;                                                       \
+       if (!NAME(aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))         \
+         return false;                                                       \

                                                                              \
                                                                              \

-             if (!NAME(aout,squirt_out_relocs)(abfd, obj_datasec (abfd)))    \
-               return false;                                                 \
-           }                                                                 \
-      }                                                                              
+       if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET) != 0)   \
+         return false;                                                       \
+       if (!NAME(aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))         \
+         return false;                                                       \
+      }

 #endif
 
 #endif /* ! defined (LIBAOUT_H) */
 #endif
 
 #endif /* ! defined (LIBAOUT_H) */