gdb: fix vfork with multiple threads

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

diff --git a/bfd/libaout.h b/bfd/libaout.h
index ed2ec45a5d58a0bbdf69d2dad04e18a84bf82361..0c379160b91208efba7fc08271c0b464b8c83a09 100644 (file)
--- a/bfd/libaout.h
+++ b/bfd/libaout.h
@@ -1,7 +1,5 @@
 /* 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, 2005, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2021 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.


@@ -104,7 +102,7 @@ struct aout_link_hash_entry
 {
   struct bfd_link_hash_entry root;
   /* Whether this symbol has been written out.  */
 {
   struct bfd_link_hash_entry root;
   /* Whether this symbol has been written out.  */

-  bfd_boolean written;
+  bool written;

   /* Symbol index in output file.  */
   int indx;
 };
   /* Symbol index in output file.  */
   int indx;
 };


@@ -127,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 (*) (struct bfd_link_hash_entry *, void *)) (func),   \
+    (bool (*) (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


@@ -166,7 +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) (bfd *);
+  bool (*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


@@ -175,39 +173,39 @@ 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.  */

-  bfd_boolean (*add_dynamic_symbols)
+  bool (*add_dynamic_symbols)

     (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 *, 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)
+  bool (*add_one_symbol)

     (struct bfd_link_info *, bfd *, const char *, flagword,
     (struct bfd_link_info *, bfd *, const char *, flagword,

-     asection *, bfd_vma, const char *, bfd_boolean, bfd_boolean,
+     asection *, bfd_vma, const char *, bool, bool,

      struct bfd_link_hash_entry **);
 
   /* Called to handle linking a dynamic object.  */
      struct bfd_link_hash_entry **);
 
   /* Called to handle linking a dynamic object.  */

-  bfd_boolean (*link_dynamic_object)
+  bool (*link_dynamic_object)

     (struct bfd_link_info *, bfd *);
 
   /* Called for each global symbol being written out by the linker.
      This should write out the dynamic symbol information.  */
     (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)
+  bool (*write_dynamic_symbol)

     (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 *, 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)
+  bool (*check_dynamic_reloc)

     (struct bfd_link_info *info, bfd *input_bfd,
      asection *input_section, struct aout_link_hash_entry *h,
     (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,
+     void * reloc, bfd_byte *contents, bool *skip,

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

-  bfd_boolean (*finish_dynamic_link) (bfd *, struct bfd_link_info *);
+  bool (*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))


@@ -234,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
 {


@@ -258,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.  */


@@ -274,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.  */


@@ -293,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


@@ -351,7 +349,7 @@ typedef struct aout_symbol
 
 enum aout_subformat {
   default_format = 0,
 
 enum aout_subformat {
   default_format = 0,

-  /* Used on HP 9000/300 running HP/UX.  See hp300hpux.c.  */
+  /* Used on HP 9000/300 running HP/UX.  */

   gnu_encap_format,
   /* Used on Linux, 386BSD, etc.  See include/aout/aout64.h.  */
   q_magic_format
   gnu_encap_format,
   /* Used on Linux, 386BSD, etc.  See include/aout/aout64.h.  */
   q_magic_format


@@ -361,7 +359,8 @@ enum aout_magic {
   undecided_magic = 0,
   z_magic,
   o_magic,
   undecided_magic = 0,
   z_magic,
   o_magic,

-  n_magic
+  n_magic,
+  i_magic

 };
 
 struct aoutdata
 };
 
 struct aoutdata


@@ -430,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.  */


@@ -471,41 +470,41 @@ struct aout_section_data_struct
 
 /* Prototype declarations for functions defined in aoutx.h.  */
 
 
 /* Prototype declarations for functions defined in aoutx.h.  */
 

-extern bfd_boolean NAME (aout, squirt_out_relocs)
+extern bool NAME (aout, squirt_out_relocs)

   (bfd *, asection *);
 
   (bfd *, asection *);
 

-extern bfd_boolean NAME (aout, make_sections)
+extern bool NAME (aout, make_sections)

   (bfd *);
 
   (bfd *);
 

-extern const bfd_target * NAME (aout, some_aout_object_p)
-  (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)
+extern bool NAME (aout, mkobject)

   (bfd *);
 
 extern enum machine_type NAME (aout, machine_type)
   (bfd *);
 
 extern enum machine_type NAME (aout, machine_type)

-  (enum bfd_architecture, unsigned long, bfd_boolean *);
+  (enum bfd_architecture, unsigned long, bool *);

 
 

-extern bfd_boolean NAME (aout, set_arch_mach)
+extern bool NAME (aout, set_arch_mach)

   (bfd *, enum bfd_architecture, unsigned long);
 
   (bfd *, enum bfd_architecture, unsigned long);
 

-extern bfd_boolean NAME (aout, new_section_hook)
+extern bool NAME (aout, new_section_hook)

   (bfd *, asection *);
 
   (bfd *, asection *);
 

-extern bfd_boolean NAME (aout, set_section_contents)
+extern bool NAME (aout, set_section_contents)

   (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);
 
 extern asymbol * NAME (aout, make_empty_symbol)
   (bfd *);
 
   (bfd *, sec_ptr, const void *, file_ptr, bfd_size_type);
 
 extern asymbol * NAME (aout, make_empty_symbol)
   (bfd *);
 

-extern bfd_boolean NAME (aout, translate_symbol_table)
+extern bool NAME (aout, translate_symbol_table)

   (bfd *, aout_symbol_type *, struct external_nlist *, bfd_size_type,
   (bfd *, aout_symbol_type *, struct external_nlist *, bfd_size_type,

-          char *, bfd_size_type, bfd_boolean);
+   char *, bfd_size_type, bool);

 
 

-extern bfd_boolean NAME (aout, slurp_symbol_table)
+extern bool NAME (aout, slurp_symbol_table)

   (bfd *);
 
   (bfd *);
 

-extern bfd_boolean NAME (aout, write_syms)
+extern bool NAME (aout, write_syms)

   (bfd *);
 
 extern void NAME (aout, reclaim_symbol_table)
   (bfd *);
 
 extern void NAME (aout, reclaim_symbol_table)


@@ -531,7 +530,7 @@ extern reloc_howto_type * NAME (aout, reloc_type_lookup)
 extern reloc_howto_type * NAME (aout, reloc_name_lookup)
   (bfd *, const char *);
 
 extern reloc_howto_type * NAME (aout, reloc_name_lookup)
   (bfd *, const char *);
 

-extern bfd_boolean NAME (aout, slurp_reloc_table)
+extern bool NAME (aout, slurp_reloc_table)

   (bfd *, sec_ptr, asymbol **);
 
 extern long NAME (aout, canonicalize_reloc)
   (bfd *, sec_ptr, asymbol **);
 
 extern long NAME (aout, canonicalize_reloc)


@@ -552,21 +551,21 @@ extern void NAME (aout, print_symbol)
 extern void NAME (aout, get_symbol_info)
   (bfd *, asymbol *, symbol_info *);
 
 extern void NAME (aout, get_symbol_info)
   (bfd *, asymbol *, symbol_info *);
 

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

 
 extern long NAME (aout, read_minisymbols)
 
 extern long NAME (aout, read_minisymbols)

-  (bfd *, bfd_boolean, void * *, unsigned int *);
+  (bfd *, bool, void * *, unsigned int *);

 
 extern asymbol * NAME (aout, minisymbol_to_symbol)
 
 extern asymbol * NAME (aout, minisymbol_to_symbol)

-  (bfd *, bfd_boolean, const void *, asymbol *);
+  (bfd *, bool, const void *, asymbol *);

 
 extern int NAME (aout, sizeof_headers)
   (bfd *, struct bfd_link_info *);
 
 
 extern int NAME (aout, sizeof_headers)
   (bfd *, struct bfd_link_info *);
 

-extern bfd_boolean NAME (aout, adjust_sizes_and_vmas)
-  (bfd *, bfd_size_type *, file_ptr *);
+extern bool NAME (aout, adjust_sizes_and_vmas)
+  (bfd *);

 
 extern void NAME (aout, swap_exec_header_in)
   (bfd *, struct external_exec *, struct internal_exec *);
 
 extern void NAME (aout, swap_exec_header_in)
   (bfd *, struct external_exec *, struct internal_exec *);


@@ -577,7 +576,7 @@ extern void NAME (aout, swap_exec_header_out)
 extern struct bfd_hash_entry * NAME (aout, link_hash_newfunc)
   (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
 
 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_hash_table_init)
+extern bool NAME (aout, link_hash_table_init)

   (struct aout_link_hash_table *, bfd *,
    struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
                               struct bfd_hash_table *,
   (struct aout_link_hash_table *, bfd *,
    struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
                               struct bfd_hash_table *,


@@ -587,14 +586,14 @@ extern bfd_boolean NAME (aout, link_hash_table_init)
 extern struct bfd_link_hash_table * NAME (aout, link_hash_table_create)
   (bfd *);
 
 extern struct bfd_link_hash_table * NAME (aout, link_hash_table_create)
   (bfd *);
 

-extern bfd_boolean NAME (aout, link_add_symbols)
+extern bool NAME (aout, link_add_symbols)

   (bfd *, struct bfd_link_info *);
 
   (bfd *, struct bfd_link_info *);
 

-extern bfd_boolean NAME (aout, final_link)
+extern bool NAME (aout, final_link)

   (bfd *, struct bfd_link_info *,
    void (*) (bfd *, file_ptr *, file_ptr *, file_ptr *));
 
   (bfd *, struct bfd_link_info *,
    void (*) (bfd *, file_ptr *, file_ptr *, file_ptr *));
 

-extern bfd_boolean NAME (aout, bfd_free_cached_info)
+extern bool NAME (aout, bfd_free_cached_info)

   (bfd *);
 
 #define aout_32_find_inliner_info      _bfd_nosymbols_find_inliner_info
   (bfd *);
 
 #define aout_32_find_inliner_info      _bfd_nosymbols_find_inliner_info


@@ -610,31 +609,24 @@ 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_target_special_symbol
 
 #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_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define aout_32_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false

 #endif
 
 #ifndef WRITE_HEADERS
 #define WRITE_HEADERS(abfd, execp)                                           \
       {                                                                              \
 #endif
 
 #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) *                \
        execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *                \
                           obj_reloc_entry_size (abfd));                      \
        execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *                \


@@ -644,28 +636,28 @@ extern bfd_boolean NAME (aout, bfd_free_cached_info)
        if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0                      \
            || bfd_bwrite (& exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,     \
                          abfd) != EXEC_BYTES_SIZE)                           \
        if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0                      \
            || bfd_bwrite (& exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE,     \
                          abfd) != EXEC_BYTES_SIZE)                           \

-         return FALSE;                                                       \
+         return false;                                                       \

        /* Now write out reloc info, followed by syms and strings.  */        \
        /* Now write out reloc info, followed by syms and strings.  */        \

-                                                                             \
+                                                                             \

        if (bfd_get_outsymbols (abfd) != NULL                                 \
        if (bfd_get_outsymbols (abfd) != NULL                                 \

-           && bfd_get_symcount (abfd) != 0)                                  \
+           && bfd_get_symcount (abfd) != 0)                                  \

          {                                                                   \
          {                                                                   \

-           if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET) != 0)\
-             return FALSE;                                                   \
+           if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (execp)), SEEK_SET) != 0)\
+             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