gdb: add target_ops::supports_displaced_step

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

diff --git a/bfd/libaout.h b/bfd/libaout.h
index 6324239135975bda4c2d9bd8062b27e97bec5531..8e620727419dd543c73bf4054536c185a329eef5 100644 (file)
--- a/bfd/libaout.h
+++ b/bfd/libaout.h
@@ -1,14 +1,12 @@
 /* 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, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,7 +16,8 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

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


@@ -31,22 +30,22 @@
 
 /* Macros for accessing components in an aout header.  */
 
 
 /* Macros for accessing components in an aout header.  */
 

-#define H_PUT_64 bfd_h_put_64
-#define H_PUT_32 bfd_h_put_32
-#define H_PUT_16 bfd_h_put_16
-#define H_PUT_8 bfd_h_put_8
+#define H_PUT_64  bfd_h_put_64
+#define H_PUT_32  bfd_h_put_32
+#define H_PUT_16  bfd_h_put_16
+#define H_PUT_8   bfd_h_put_8

 #define H_PUT_S64 bfd_h_put_signed_64
 #define H_PUT_S32 bfd_h_put_signed_32
 #define H_PUT_S16 bfd_h_put_signed_16
 #define H_PUT_S64 bfd_h_put_signed_64
 #define H_PUT_S32 bfd_h_put_signed_32
 #define H_PUT_S16 bfd_h_put_signed_16

-#define H_PUT_S8 bfd_h_put_signed_8
-#define H_GET_64 bfd_h_get_64
-#define H_GET_32 bfd_h_get_32
-#define H_GET_16 bfd_h_get_16
-#define H_GET_8 bfd_h_get_8
+#define H_PUT_S8  bfd_h_put_signed_8
+#define H_GET_64  bfd_h_get_64
+#define H_GET_32  bfd_h_get_32
+#define H_GET_16  bfd_h_get_16
+#define H_GET_8   bfd_h_get_8

 #define H_GET_S64 bfd_h_get_signed_64
 #define H_GET_S32 bfd_h_get_signed_32
 #define H_GET_S16 bfd_h_get_signed_16
 #define H_GET_S64 bfd_h_get_signed_64
 #define H_GET_S32 bfd_h_get_signed_32
 #define H_GET_S16 bfd_h_get_signed_16

-#define H_GET_S8 bfd_h_get_signed_8
+#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.  */


@@ -54,10 +53,10 @@
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
 #if ARCH_SIZE==64
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
 #if ARCH_SIZE==64

-#define GET_WORD H_GET_64
+#define GET_WORD  H_GET_64

 #define GET_SWORD H_GET_S64
 #define GET_MAGIC H_GET_32
 #define GET_SWORD H_GET_S64
 #define GET_MAGIC H_GET_32

-#define PUT_WORD H_PUT_64
+#define PUT_WORD  H_PUT_64

 #define PUT_MAGIC H_PUT_32
 #ifndef NAME
 #define NAME(x,y) CONCAT3 (x,_64_,y)
 #define PUT_MAGIC H_PUT_32
 #ifndef NAME
 #define NAME(x,y) CONCAT3 (x,_64_,y)


@@ -66,10 +65,10 @@
 #define BYTES_IN_WORD 8
 #else
 #if ARCH_SIZE==16
 #define BYTES_IN_WORD 8
 #else
 #if ARCH_SIZE==16

-#define GET_WORD H_GET_16
+#define GET_WORD  H_GET_16

 #define GET_SWORD H_GET_S16
 #define GET_MAGIC H_GET_16
 #define GET_SWORD H_GET_S16
 #define GET_MAGIC H_GET_16

-#define PUT_WORD H_PUT_16
+#define PUT_WORD  H_PUT_16

 #define PUT_MAGIC H_PUT_16
 #ifndef NAME
 #define NAME(x,y) CONCAT3 (x,_16_,y)
 #define PUT_MAGIC H_PUT_16
 #ifndef NAME
 #define NAME(x,y) CONCAT3 (x,_16_,y)


@@ -77,10 +76,10 @@
 #define JNAME(x) CONCAT2 (x,_16)
 #define BYTES_IN_WORD 2
 #else /* ARCH_SIZE == 32 */
 #define JNAME(x) CONCAT2 (x,_16)
 #define BYTES_IN_WORD 2
 #else /* ARCH_SIZE == 32 */

-#define GET_WORD H_GET_32
+#define GET_WORD  H_GET_32

 #define GET_SWORD H_GET_S32
 #define GET_MAGIC H_GET_32
 #define GET_SWORD H_GET_S32
 #define GET_MAGIC H_GET_32

-#define PUT_WORD H_PUT_32
+#define PUT_WORD  H_PUT_32

 #define PUT_MAGIC H_PUT_32
 #ifndef NAME
 #define NAME(x,y) CONCAT3 (x,_32_,y)
 #define PUT_MAGIC H_PUT_32
 #ifndef NAME
 #define NAME(x,y) CONCAT3 (x,_32_,y)


@@ -126,7 +125,7 @@ struct aout_link_hash_table
 #define aout_link_hash_traverse(table, func, info)                     \
   (bfd_link_hash_traverse                                              \
    (&(table)->root,                                                    \
 #define aout_link_hash_traverse(table, func, info)                     \
   (bfd_link_hash_traverse                                              \
    (&(table)->root,                                                    \

-    (bfd_boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func), \
+    (bfd_boolean (*) (struct bfd_link_hash_entry *, void *)) (func),   \

     (info)))
 
 /* Get the a.out link hash table from the info structure.  This is
     (info)))
 
 /* Get the a.out link hash table from the info structure.  This is


@@ -165,8 +164,7 @@ 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.  */

-  bfd_boolean (*set_sizes)
-    PARAMS ((bfd *));
+  bfd_boolean (*set_sizes) (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


@@ -176,39 +174,38 @@ struct aout_backend_data
   /* Callback from the add symbols phase of the linker code to handle
      a dynamic object.  */
   bfd_boolean (*add_dynamic_symbols)
   /* Callback from the add symbols phase of the linker code to handle
      a dynamic object.  */
   bfd_boolean (*add_dynamic_symbols)

-    PARAMS ((bfd *, struct bfd_link_info *, struct external_nlist **,
-            bfd_size_type *, char **));
+    (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.  */
   bfd_boolean (*add_one_symbol)
 
   /* Callback from the add symbols phase of the linker code to handle
      adding a single symbol to the global linker hash table.  */
   bfd_boolean (*add_one_symbol)

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

 
   /* Called to handle linking a dynamic object.  */
   bfd_boolean (*link_dynamic_object)
 
   /* Called to handle linking a dynamic object.  */
   bfd_boolean (*link_dynamic_object)

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

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

-    PARAMS ((bfd *, struct bfd_link_info *, struct aout_link_hash_entry *));
+    (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.  */
   bfd_boolean (*check_dynamic_reloc)
 
   /* 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.  */
   bfd_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, bfd_boolean *skip,
-            bfd_vma *relocation));
+    (struct bfd_link_info *info, bfd *input_bfd,
+     asection *input_section, struct aout_link_hash_entry *h,
+     void * reloc, bfd_byte *contents, bfd_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.  */

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

 };
 #define aout_backend_info(abfd) \
        ((const struct aout_backend_data *)((abfd)->xvec->backend_data))
 };
 #define aout_backend_info(abfd) \
        ((const struct aout_backend_data *)((abfd)->xvec->backend_data))


@@ -235,18 +232,18 @@ struct internal_exec
   unsigned char a_talign;      /* Alignment of text segment.  */
   unsigned char a_dalign;      /* Alignment of data segment.  */
   unsigned char a_balign;      /* Alignment of bss segment.  */
   unsigned char a_talign;      /* Alignment of text segment.  */
   unsigned char a_dalign;      /* Alignment of data segment.  */
   unsigned char a_balign;      /* Alignment of bss segment.  */

-  char a_relaxable;            /* Enough info for linker relax.  */
+  char a_relaxable;            /* Enough info for linker relax.  */

 };
 
 /* Magic number is written
 };
 
 /* Magic number is written

-   < MSB          >
+   < 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    >< MACHINE TYPE     ><  MAGIC NUMBER                >  */
+   < FLAGS    >< MACHINE TYPE    ><  MAGIC NUMBER                >  */

 
 enum machine_type
 {
 
 enum machine_type
 {


@@ -259,7 +256,7 @@ enum machine_type
   M_NS32032 = (64),      /* NS32032 running ?  */
   M_NS32532 = (64 + 5),          /* NS32532 running mach.  */
   M_386 = 100,
   M_NS32032 = (64),      /* NS32032 running ?  */
   M_NS32532 = (64 + 5),          /* NS32532 running mach.  */
   M_386 = 100,

-  M_29K = 101,            /* AMD 29000.  */
+  M_29K = 101,           /* AMD 29000.  */

   M_386_DYNIX = 102,     /* Sequent running dynix.  */
   M_ARM = 103,           /* Advanced Risc Machines ARM.  */
   M_SPARCLET = 131,      /* SPARClet = M_SPARC + 128.  */
   M_386_DYNIX = 102,     /* Sequent running dynix.  */
   M_ARM = 103,           /* Advanced Risc Machines ARM.  */
   M_SPARCLET = 131,      /* SPARClet = M_SPARC + 128.  */


@@ -275,8 +272,8 @@ enum machine_type
   M_SPARCLET_1 = 147,    /* 0x93, reserved.  */
   M_POWERPC_NETBSD = 149, /* NetBSD/powerpc (big-endian) binary.  */
   M_VAX4K_NETBSD = 150,          /* NetBSD/vax 4K pages binary.  */
   M_SPARCLET_1 = 147,    /* 0x93, reserved.  */
   M_POWERPC_NETBSD = 149, /* NetBSD/powerpc (big-endian) binary.  */
   M_VAX4K_NETBSD = 150,          /* NetBSD/vax 4K pages binary.  */

-  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_88K_OPENBSD = 153,   /* OpenBSD/m88k binary.  */
   M_HPPA_OPENBSD = 154,          /* OpenBSD/hppa binary.  */
   M_SPARC64_NETBSD = 156, /* NetBSD/sparc64 binary.  */
   M_88K_OPENBSD = 153,   /* OpenBSD/m88k binary.  */
   M_HPPA_OPENBSD = 154,          /* OpenBSD/hppa binary.  */
   M_SPARC64_NETBSD = 156, /* NetBSD/sparc64 binary.  */


@@ -294,48 +291,48 @@ enum machine_type
   M_CRIS = 255           /* Axis CRIS binary.  */
 };
 
   M_CRIS = 255           /* Axis CRIS binary.  */
 };
 

-#define N_DYNAMIC(exec) ((exec).a_info & 0x80000000)
+#define N_DYNAMIC(execp) ((execp)->a_info & 0x80000000)

 
 #ifndef N_MAGIC
 
 #ifndef N_MAGIC

-# define N_MAGIC(exec) ((exec).a_info & 0xffff)
+# define N_MAGIC(execp) ((execp)->a_info & 0xffff)

 #endif
 
 #ifndef N_MACHTYPE
 #endif
 
 #ifndef N_MACHTYPE

-# define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff))
+# define N_MACHTYPE(execp) ((enum machine_type)(((execp)->a_info >> 16) & 0xff))

 #endif
 
 #ifndef N_FLAGS
 #endif
 
 #ifndef N_FLAGS

-# define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff)
+# define N_FLAGS(execp) (((execp)->a_info >> 24) & 0xff)

 #endif
 
 #ifndef N_SET_INFO
 #endif
 
 #ifndef N_SET_INFO

-# define N_SET_INFO(exec, magic, type, flags) \
-((exec).a_info = ((magic) & 0xffff) \
+# define N_SET_INFO(execp, magic, type, flags) \
+((execp)->a_info = ((magic) & 0xffff) \

  | (((int)(type) & 0xff) << 16) \
  | (((int)(type) & 0xff) << 16) \

- | (((flags) & 0xff) << 24))
+ | (((flags) & 0xffu) << 24))

 #endif
 
 #ifndef N_SET_DYNAMIC
 #endif
 
 #ifndef N_SET_DYNAMIC

-# define N_SET_DYNAMIC(exec, dynamic) \
-((exec).a_info = (dynamic) ? (long) ((exec).a_info | 0x80000000) : \
-((exec).a_info & 0x7fffffff))
+# define N_SET_DYNAMIC(execp, dynamic) \
+((execp)->a_info = (dynamic) ? (long) ((execp)->a_info | 0x80000000) : \
+((execp)->a_info & 0x7fffffff))

 #endif
 
 #ifndef N_SET_MAGIC
 #endif
 
 #ifndef N_SET_MAGIC

-# define N_SET_MAGIC(exec, magic) \
-((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff)))
+# define N_SET_MAGIC(execp, magic) \
+((execp)->a_info = (((execp)->a_info & 0xffff0000) | ((magic) & 0xffff)))

 #endif
 
 #ifndef N_SET_MACHTYPE
 #endif
 
 #ifndef N_SET_MACHTYPE

-# define N_SET_MACHTYPE(exec, machtype) \
-((exec).a_info = \
- ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16))
+# define N_SET_MACHTYPE(execp, machtype) \
+((execp)->a_info = \
+ ((execp)->a_info & 0xff00ffff) | ((((int) (machtype)) &0xff) << 16))

 #endif
 
 #ifndef N_SET_FLAGS
 #endif
 
 #ifndef N_SET_FLAGS

-# define N_SET_FLAGS(exec, flags) \
-((exec).a_info = \
- ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24))
+# define N_SET_FLAGS(execp, flags) \
+((execp)->a_info = \
+ ((execp)->a_info & 0x00ffffff) | (((flags) & 0xffu) << 24))

 #endif
 
 typedef struct aout_symbol
 #endif
 
 typedef struct aout_symbol


@@ -350,6 +347,22 @@ typedef struct aout_symbol
    Various things depend on this struct being around any time an a.out
    file is being handled.  An example is dbxread.c in GDB.  */
 
    Various things depend on this struct being around any time an a.out
    file is being handled.  An example is dbxread.c in GDB.  */
 

+enum aout_subformat {
+  default_format = 0,
+  /* Used on HP 9000/300 running HP/UX.  */
+  gnu_encap_format,
+  /* Used on Linux, 386BSD, etc.  See include/aout/aout64.h.  */
+  q_magic_format
+};
+
+enum aout_magic {
+  undecided_magic = 0,
+  z_magic,
+  o_magic,
+  n_magic,
+  i_magic
+};
+

 struct aoutdata
 {
   struct internal_exec *hdr;           /* Exec file header.  */
 struct aoutdata
 {
   struct internal_exec *hdr;           /* Exec file header.  */


@@ -385,22 +398,9 @@ struct aoutdata
   unsigned vma_adjusted : 1;
 
   /* Used when a bfd supports several highly similar formats.  */
   unsigned vma_adjusted : 1;
 
   /* Used when a bfd supports several highly similar formats.  */

-  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;
+  enum aout_subformat subformat;
+
+  enum aout_magic magic;

 
   /* A buffer for find_nearest_line.  */
   char *line_buf;
 
   /* A buffer for find_nearest_line.  */
   char *line_buf;


@@ -415,7 +415,7 @@ struct aoutdata
   struct aout_link_hash_entry **sym_hashes;
 
   /* A pointer for shared library information.  */
   struct aout_link_hash_entry **sym_hashes;
 
   /* A pointer for shared library information.  */

-  PTR dynamic_info;
+  void * 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
 
   /* A mapping from local symbols to offsets into the global offset
      table, used when linking on SunOS.  This is indexed by the symbol


@@ -429,25 +429,25 @@ struct  aout_data_struct
   struct internal_exec e;
 };
 
   struct internal_exec e;
 };
 

-#define        adata(bfd)                         ((bfd)->tdata.aout_data->a)
-#define        exec_hdr(bfd)                      (adata (bfd).hdr)
-#define        obj_aout_symbols(bfd)              (adata (bfd).symbols)
-#define        obj_textsec(bfd)                   (adata (bfd).textsec)
-#define        obj_datasec(bfd)                   (adata (bfd).datasec)
-#define        obj_bsssec(bfd)                    (adata (bfd).bsssec)
-#define        obj_sym_filepos(bfd)               (adata (bfd).sym_filepos)
-#define        obj_str_filepos(bfd)               (adata (bfd).str_filepos)
-#define        obj_reloc_entry_size(bfd)          (adata (bfd).reloc_entry_size)
-#define        obj_symbol_entry_size(bfd)         (adata (bfd).symbol_entry_size)
-#define obj_aout_subformat(bfd)                   (adata (bfd).subformat)
-#define obj_aout_external_syms(bfd)        (adata (bfd).external_syms)
+#define        adata(bfd)                         ((bfd)->tdata.aout_data->a)
+#define        exec_hdr(bfd)                      (adata (bfd).hdr)
+#define        obj_aout_symbols(bfd)              (adata (bfd).symbols)
+#define        obj_textsec(bfd)                   (adata (bfd).textsec)
+#define        obj_datasec(bfd)                   (adata (bfd).datasec)
+#define        obj_bsssec(bfd)                    (adata (bfd).bsssec)
+#define        obj_sym_filepos(bfd)               (adata (bfd).sym_filepos)
+#define        obj_str_filepos(bfd)               (adata (bfd).str_filepos)
+#define        obj_reloc_entry_size(bfd)          (adata (bfd).reloc_entry_size)
+#define        obj_symbol_entry_size(bfd)         (adata (bfd).symbol_entry_size)
+#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_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_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_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_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)

 
 /* We take the address of the first element of an asymbol to ensure that the
    macro is only ever applied to an asymbol.  */
 
 /* We take the address of the first element of an asymbol to ensure that the
    macro is only ever applied to an asymbol.  */


@@ -459,137 +459,148 @@ struct  aout_data_struct
 struct aout_section_data_struct
 {
   /* The unswapped relocation entries for this section.  */
 struct aout_section_data_struct
 {
   /* The unswapped relocation entries for this section.  */

-  PTR relocs;
+  void * relocs;

 };
 
 #define aout_section_data(s) \
   ((struct aout_section_data_struct *) (s)->used_by_bfd)
 
 #define set_aout_section_data(s,v) \
 };
 
 #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)
+  ((s)->used_by_bfd = (void *)&(v)->relocs)

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

-extern bfd_boolean NAME(aout,squirt_out_relocs)
-  PARAMS ((bfd *, asection *));
+extern bfd_boolean NAME (aout, squirt_out_relocs)
+  (bfd *, asection *);

 
 

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

 
 

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

 
 

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

 
 

-extern enum machine_type NAME(aout,machine_type)
-  PARAMS ((enum bfd_architecture, unsigned long, bfd_boolean *));
+extern enum machine_type NAME (aout, machine_type)
+  (enum bfd_architecture, unsigned long, bfd_boolean *);

 
 

-extern bfd_boolean NAME(aout,set_arch_mach)
-  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+extern bfd_boolean NAME (aout, set_arch_mach)
+  (bfd *, enum bfd_architecture, unsigned long);

 
 

-extern bfd_boolean NAME(aout,new_section_hook)
-  PARAMS ((bfd *, asection *));
+extern bfd_boolean NAME (aout, new_section_hook)
+  (bfd *, asection *);

 
 

-extern bfd_boolean NAME(aout,set_section_contents)
-  PARAMS ((bfd *, sec_ptr, const PTR, file_ptr, bfd_size_type));
+extern bfd_boolean NAME (aout, set_section_contents)
+  (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-extern long NAME(aout,canonicalize_symtab)
-  PARAMS ((bfd *, asymbol **));
+extern long NAME (aout, canonicalize_symtab)
+  (bfd *, 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));
+extern void NAME (aout, swap_ext_reloc_in)
+  (bfd *, struct reloc_ext_external *, arelent *, asymbol **,
+   bfd_size_type);

 
 

-extern reloc_howto_type * NAME(aout,reloc_type_lookup)
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
+extern void NAME (aout, swap_std_reloc_in)
+  (bfd *, struct reloc_std_external *, arelent *, asymbol **,
+   bfd_size_type);

 
 

-extern bfd_boolean NAME(aout,slurp_reloc_table)
-  PARAMS ((bfd *, sec_ptr, asymbol **));
+extern reloc_howto_type * NAME (aout, reloc_type_lookup)
+  (bfd *, bfd_reloc_code_real_type);

 
 

-extern long NAME(aout,canonicalize_reloc)
-  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+extern reloc_howto_type * NAME (aout, reloc_name_lookup)
+  (bfd *, const char *);

 
 

-extern long NAME(aout,get_reloc_upper_bound)
-  PARAMS ((bfd *, sec_ptr));
+extern bfd_boolean NAME (aout, slurp_reloc_table)
+  (bfd *, sec_ptr, asymbol **);

 
 

-extern void NAME(aout,reclaim_reloc)
-  PARAMS ((bfd *, sec_ptr));
+extern long NAME (aout, canonicalize_reloc)
+  (bfd *, sec_ptr, arelent **, asymbol **);

 
 

-extern alent * NAME(aout,get_lineno)
-  PARAMS ((bfd *, asymbol *));
+extern long NAME (aout, get_reloc_upper_bound)
+  (bfd *, sec_ptr);

 
 

-extern void NAME(aout,print_symbol)
-  PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
+extern void NAME (aout, reclaim_reloc)
+  (bfd *, sec_ptr);

 
 

-extern void NAME(aout,get_symbol_info)
-  PARAMS ((bfd *, asymbol *, symbol_info *));
+extern alent * NAME (aout, get_lineno)
+  (bfd *, asymbol *);

 
 

-extern bfd_boolean NAME(aout,find_nearest_line)
-  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
-          const char **, unsigned int *));
+extern void NAME (aout, print_symbol)
+  (bfd *, void *, asymbol *, bfd_print_symbol_type);

 
 

-extern long NAME(aout,read_minisymbols)
-  PARAMS ((bfd *, bfd_boolean, PTR *, unsigned int *));
+extern void NAME (aout, get_symbol_info)
+  (bfd *, asymbol *, symbol_info *);

 
 

-extern asymbol * NAME(aout,minisymbol_to_symbol)
-  PARAMS ((bfd *, bfd_boolean, const PTR, asymbol *));
+extern bfd_boolean NAME (aout, find_nearest_line)
+  (bfd *, asymbol **, asection *, bfd_vma,
+   const char **, const char **, unsigned int *, unsigned int *);

 
 

-extern int NAME(aout,sizeof_headers)
-  PARAMS ((bfd *, bfd_boolean));
+extern long NAME (aout, read_minisymbols)
+  (bfd *, bfd_boolean, void * *, unsigned int *);

 
 

-extern bfd_boolean NAME(aout,adjust_sizes_and_vmas)
-  PARAMS ((bfd *, bfd_size_type *, file_ptr *));
+extern asymbol * NAME (aout, minisymbol_to_symbol)
+  (bfd *, bfd_boolean, const void *, asymbol *);

 
 

-extern void NAME(aout,swap_exec_header_in)
-  PARAMS ((bfd *, struct external_exec *, struct internal_exec *));
+extern int NAME (aout, sizeof_headers)
+  (bfd *, struct bfd_link_info *);

 
 

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

 
 

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

 
 

-extern bfd_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_out)
+  (bfd *, struct internal_exec *, struct external_exec *);

 
 

-extern struct bfd_link_hash_table * NAME(aout,link_hash_table_create)
-  PARAMS ((bfd *));
+extern struct bfd_hash_entry * NAME (aout, link_hash_newfunc)
+  (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);

 
 

-extern bfd_boolean NAME(aout,link_add_symbols)
-  PARAMS ((bfd *, struct bfd_link_info *));
+extern bfd_boolean NAME (aout, link_hash_table_init)
+  (struct aout_link_hash_table *, bfd *,
+   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+                              struct bfd_hash_table *,
+                              const char *),
+   unsigned int);

 
 

-extern bfd_boolean NAME(aout,final_link)
-  PARAMS ((bfd *, struct bfd_link_info *,
-          void (*) (bfd *, file_ptr *, file_ptr *, file_ptr *)));
+extern struct bfd_link_hash_table * NAME (aout, link_hash_table_create)
+  (bfd *);

 
 

-extern bfd_boolean NAME(aout,bfd_free_cached_info)
-  PARAMS ((bfd *));
+extern bfd_boolean NAME (aout, link_add_symbols)
+  (bfd *, struct bfd_link_info *);
+
+extern bfd_boolean NAME (aout, final_link)
+  (bfd *, struct bfd_link_info *,
+   void (*) (bfd *, file_ptr *, file_ptr *, file_ptr *));
+
+extern bfd_boolean NAME (aout, bfd_free_cached_info)
+  (bfd *);
+
+#define aout_32_find_inliner_info      _bfd_nosymbols_find_inliner_info
+#if 0  /* Are these needed? */
+#define aout_16_find_inliner_info      _bfd_nosymbols_find_inliner_info
+#define aout_64_find_inliner_info      _bfd_nosymbols_find_inliner_info
+#endif

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


@@ -598,56 +609,55 @@ extern bfd_boolean NAME(aout,bfd_free_cached_info)
 #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

-#ifndef NO_WRITE_HEADER_KLUDGE
-#define NO_WRITE_HEADER_KLUDGE 0
-#endif

 
 #ifndef aout_32_bfd_is_local_label_name
 #define aout_32_bfd_is_local_label_name bfd_generic_is_local_label_name
 #endif
 
 
 #ifndef aout_32_bfd_is_local_label_name
 #define aout_32_bfd_is_local_label_name bfd_generic_is_local_label_name
 #endif
 

+#ifndef aout_32_bfd_is_target_special_symbol
+#define aout_32_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false
+#endif
+

 #ifndef WRITE_HEADERS
 #define WRITE_HEADERS(abfd, execp)                                           \
       {                                                                              \
 #ifndef WRITE_HEADERS
 #define WRITE_HEADERS(abfd, execp)                                           \
       {                                                                              \

-       bfd_size_type text_size; /* Dummy vars.  */                           \
-       file_ptr text_end;                                                    \

        if (adata(abfd).magic == undecided_magic)                             \
        if (adata(abfd).magic == undecided_magic)                             \

-         NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);     \
-                                                                             \
+         NAME (aout, adjust_sizes_and_vmas) (abfd);                          \
+                                                                             \

        execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;        \
        execp->a_entry = bfd_get_start_address (abfd);                        \
        execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;        \
        execp->a_entry = bfd_get_start_address (abfd);                        \

-                                                                             \
+                                                                             \

        execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *                \
                           obj_reloc_entry_size (abfd));                      \
        execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *                \
                           obj_reloc_entry_size (abfd));                      \
        execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *                \
                           obj_reloc_entry_size (abfd));                      \
        execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *                \
                           obj_reloc_entry_size (abfd));                      \

-       NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);           \
+       NAME (aout, swap_exec_header_out) (abfd, execp, & exec_bytes);        \

                                                                              \
        if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0                      \
                                                                              \
        if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0                      \

-           || bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,\
+           || bfd_bwrite (& exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,     \

                          abfd) != EXEC_BYTES_SIZE)                           \
          return FALSE;                                                       \
        /* Now write out reloc info, followed by syms and strings.  */        \
                          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)                                  \
+                                                                             \
+       if (bfd_get_outsymbols (abfd) != NULL                                 \
+           && bfd_get_symcount (abfd) != 0)                                  \

          {                                                                   \
          {                                                                   \

-           if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0)\
+           if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (execp)), SEEK_SET) != 0)\

              return FALSE;                                                   \
                                                                              \
              return FALSE;                                                   \
                                                                              \

-           if (! NAME(aout,write_syms) (abfd))                               \
+           if (! NAME (aout, write_syms) (abfd))                             \

              return FALSE;                                                   \
          }                                                                   \
                                                                              \
              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 (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 (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;                                                       \
+       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
 


@@ -666,8 +676,8 @@ extern bfd_boolean NAME(aout,bfd_free_cached_info)
    && obj_textsec (abfd) != NULL                                       \
    && obj_datasec (abfd) != NULL                                       \
    && (sec)->vma >= (obj_textsec (abfd)->vma +                         \
    && obj_textsec (abfd) != NULL                                       \
    && obj_datasec (abfd) != NULL                                       \
    && (sec)->vma >= (obj_textsec (abfd)->vma +                         \

-                    obj_textsec (abfd)->_cooked_size)                  \
-   && ((sec)->vma + (sec)->_cooked_size) <= obj_datasec (abfd)->vma    \
+                    obj_textsec (abfd)->size)                          \
+   && ((sec)->vma + (sec)->size) <= obj_datasec (abfd)->vma            \

    && ((abfd)->flags & D_PAGED) != 0)
 
 #endif /* ! defined (LIBAOUT_H) */
    && ((abfd)->flags & D_PAGED) != 0)
 
 #endif /* ! defined (LIBAOUT_H) */