* reloc.c (bfd_check_overflow): Add casts before shifts which may

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

diff --git a/bfd/libaout.h b/bfd/libaout.h
index dd98d125cbebf52b8ac68ab260a96aff43329d24..a08af0a11fa5f06b3ee08c988fd0b28c15b914c8 100644 (file)
--- a/bfd/libaout.h
+++ b/bfd/libaout.h
@@ -1,5 +1,5 @@
 /* BFD back-end data structures for a.out (and similar) files.
-   Copyright 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -192,14 +192,14 @@ struct internal_exec
 };
 
 /* Magic number is written 
-< MSB        >
+< MSB          >
 3130292827262524232221201918171615141312111009080706050403020100
-< FLAGS      >< MACHINE TYPE ><  MAGIC NUMBER                 >
+< FLAGS        >< MACHINE TYPE ><  MAGIC NUMBER                >
 */
 /* Magic number for NetBSD is
-<MSB         >
+<MSB           >
 3130292827262524232221201918171615141312111009080706050403020100
-< FLAGS    ><                  ><  MAGIC NUMBER                >
+< FLAGS    >< MACHINE TYPE     ><  MAGIC NUMBER                >
 */
 
 enum machine_type {
@@ -216,15 +216,14 @@ enum machine_type {
   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_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_MIPS1 = 151,        /* MIPS R2000/R3000 binary */
   M_MIPS2 = 152,        /* MIPS R4000/R6000 binary */
-/* start-sanitize-rce */
-  M_RCE = 155,         /* Motorola RCE binary */
-/* end-sanitize-rce */
   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 */
@@ -336,11 +335,16 @@ struct aoutdata {
       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;
+  bfd_window sym_window;
   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.  */
@@ -370,8 +374,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_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_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)
 
@@ -539,11 +545,6 @@ NAME(aout,final_link) PARAMS ((bfd *, struct bfd_link_info *,
 boolean
 NAME(aout,bfd_free_cached_info) PARAMS ((bfd *));
 
-/* Prototypes for functions in stab-syms.c. */
-
-CONST char *
-aout_stab_name PARAMS ((int code));
-
 /* A.out uses the generic versions of these routines... */
 
 #define        aout_32_get_section_contents    _bfd_generic_get_section_contents
@@ -582,26 +583,22 @@ aout_stab_name PARAMS ((int code));
                                                                              \
        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