Fri Apr 15 11:53:46 1994 Stan Shebs ([email protected])

[binutils.git] / bfd / bfd-in2.h

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 276e05128a3e2c6a79cd6bd04611f04d5139f0f3..997abcd29021ca4d1cf29dc60fd972cb8175eae0 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1,9 +1,11 @@
 /* Main header file for the bfd library -- portable access to object files.
 /* Main header file for the bfd library -- portable access to object files.

-   ==> The bfd.h file is generated from bfd-in.h and various .c files; if you
-   ==> change it, your changes will probably be lost.
-   Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.

    Contributed by Cygnus Support.
 
    Contributed by Cygnus Support.
 

+** NOTE: bfd.h and bfd-in2.h are GENERATED files.  Don't change them;
+** instead, change bfd-in.h or the other BFD source files processed to
+** generate these files.
+

 This file is part of BFD, the Binary File Descriptor library.
 
 This program is free software; you can redistribute it and/or modify
 This file is part of BFD, the Binary File Descriptor library.
 
 This program is free software; you can redistribute it and/or modify


@@ -45,8 +47,8 @@ here.  */
 #include "ansidecl.h"
 #include "obstack.h"
 
 #include "ansidecl.h"
 #include "obstack.h"
 

-#define BFD_VERSION "2.2"
-
+/* These two lines get substitutions done by commands in Makefile.in.  */
+#define BFD_VERSION   "@VERSION@"

 #define BFD_ARCH_SIZE @WORDSIZE@
 
 #if BFD_ARCH_SIZE >= 64
 #define BFD_ARCH_SIZE @WORDSIZE@
 
 #if BFD_ARCH_SIZE >= 64


@@ -79,7 +81,13 @@ typedef struct _bfd bfd;
    force me to change it. */
 /* typedef enum boolean {false, true} boolean; */
 /* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h>  -fnf */
    force me to change it. */
 /* typedef enum boolean {false, true} boolean; */
 /* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h>  -fnf */

+/* It gets worse if the host also defines a true/false enum... -sts */
+#ifndef TRUE_FALSE_ALREADY_DEFINED

 typedef enum bfd_boolean {false, true} boolean;
 typedef enum bfd_boolean {false, true} boolean;

+#define BFD_TRUE_FALSE
+#else
+typedef enum bfd_boolean {bfd_false, bfd_true} boolean;
+#endif

 
 /* A pointer to a position in a file.  */
 /* FIXME:  This should be using off_t from <sys/types.h>.
 
 /* A pointer to a position in a file.  */
 /* FIXME:  This should be using off_t from <sys/types.h>.


@@ -92,9 +100,9 @@ typedef enum bfd_boolean {false, true} boolean;
 typedef long int file_ptr;
 
 /* Support for different sizes of target format ints and addresses.  If the
 typedef long int file_ptr;
 
 /* Support for different sizes of target format ints and addresses.  If the

-   host implements 64-bit values, it defines HOST_64_BIT to be the appropriate
+   host implements 64-bit values, it defines BFD_HOST_64_BIT to be the appropriate

    type.  Otherwise, this code will fall back on gcc's "long long" type if gcc
    type.  Otherwise, this code will fall back on gcc's "long long" type if gcc

-   is being used.  HOST_64_BIT must be defined in such a way as to be a valid
+   is being used.  BFD_HOST_64_BIT must be defined in such a way as to be a valid

    type name by itself or with "unsigned" prefixed.  It should be a signed
    type by itself.
 
    type name by itself or with "unsigned" prefixed.  It should be a signed
    type by itself.
 


@@ -103,27 +111,31 @@ typedef long int file_ptr;
 
 #ifdef BFD64
 
 
 #ifdef BFD64
 

-#if defined (__GNUC__) && !defined (HOST_64_BIT)
-#define HOST_64_BIT long long
-typedef HOST_64_BIT int64_type;
-typedef unsigned HOST_64_BIT uint64_type;
+#if defined (__GNUC__) && !defined (BFD_HOST_64_BIT)
+#define BFD_HOST_64_BIT long long
+typedef BFD_HOST_64_BIT int64_type;
+typedef unsigned BFD_HOST_64_BIT uint64_type;

 #endif
 
 #if !defined (uint64_type) && defined (__GNUC__)
 #define uint64_type unsigned long long
 #define int64_type long long
 #endif
 
 #if !defined (uint64_type) && defined (__GNUC__)
 #define uint64_type unsigned long long
 #define int64_type long long

-#define uint64_typeLOW(x) (unsigned long)(((x) & 0xffffffff))
-#define uint64_typeHIGH(x) (unsigned long)(((x) >> 32) & 0xffffffff)
+#endif
+#ifndef uint64_typeLOW
+#define uint64_typeLOW(x) ((unsigned long)(((x) & 0xffffffff)))
+#define uint64_typeHIGH(x) ((unsigned long)(((x) >> 32) & 0xffffffff))

 #endif
 
 #endif
 

-typedef unsigned HOST_64_BIT bfd_vma;
-typedef HOST_64_BIT bfd_signed_vma;
-typedef unsigned HOST_64_BIT bfd_size_type;
-typedef unsigned HOST_64_BIT symvalue;
+typedef unsigned BFD_HOST_64_BIT bfd_vma;
+typedef BFD_HOST_64_BIT bfd_signed_vma;
+typedef unsigned BFD_HOST_64_BIT bfd_size_type;
+typedef unsigned BFD_HOST_64_BIT symvalue;
+#ifndef fprintf_vma

 #define fprintf_vma(s,x) \
 #define fprintf_vma(s,x) \

-               fprintf(s,"%08x%08x", uint64_typeHIGH(x), uint64_typeLOW(x))
+               fprintf(s,"%08lx%08lx", uint64_typeHIGH(x), uint64_typeLOW(x))

 #define sprintf_vma(s,x) \
 #define sprintf_vma(s,x) \

-               sprintf(s,"%08x%08x", uint64_typeHIGH(x), uint64_typeLOW(x))
+               sprintf(s,"%08lx%08lx", uint64_typeHIGH(x), uint64_typeLOW(x))
+#endif

 #else /* not BFD64  */
 
 /* Represent a target address.  Also used as a generic unsigned type
 #else /* not BFD64  */
 
 /* Represent a target address.  Also used as a generic unsigned type


@@ -158,40 +170,61 @@ typedef enum bfd_format {
              bfd_type_end}     /* marks the end; don't use it! */
          bfd_format;
 
              bfd_type_end}     /* marks the end; don't use it! */
          bfd_format;
 

-/* Object file flag values */
+/* Values that may appear in the flags field of a BFD.  These also
+   appear in the object_flags field of the bfd_target structure, where
+   they indicate the set of flags used by that backend (not all flags
+   are meaningful for all object file formats) (FIXME: at the moment,
+   the object_flags values have mostly just been copied from backend
+   to another, and are not necessarily correct).  */
+
+/* No flags.  */

 #define NO_FLAGS       0x00
 #define NO_FLAGS       0x00

+
+/* BFD contains relocation entries.  */

 #define HAS_RELOC      0x01
 #define HAS_RELOC      0x01

+
+/* BFD is directly executable.  */

 #define EXEC_P         0x02
 #define EXEC_P         0x02

+
+/* BFD has line number information (basically used for F_LNNO in a
+   COFF header).  */

 #define HAS_LINENO     0x04
 #define HAS_LINENO     0x04

+
+/* BFD has debugging information.  */

 #define HAS_DEBUG      0x08
 #define HAS_DEBUG      0x08

+
+/* BFD has symbols.  */

 #define HAS_SYMS       0x10
 #define HAS_SYMS       0x10

+
+/* BFD has local symbols (basically used for F_LSYMS in a COFF
+   header).  */

 #define HAS_LOCALS     0x20
 #define HAS_LOCALS     0x20

+
+/* BFD is a dynamic object.  */

 #define DYNAMIC        0x40
 #define DYNAMIC        0x40

+
+/* Text section is write protected (if D_PAGED is not set, this is
+   like an a.out NMAGIC file) (the linker sets this by default, but
+   clears it for -r or -N).  */

 #define WP_TEXT        0x80
 #define WP_TEXT        0x80

+
+/* BFD is dynamically paged (this is like an a.out ZMAGIC file) (the
+   linker sets this by default, but clears it for -r or -n or -N).  */

 #define D_PAGED        0x100
 #define D_PAGED        0x100

+
+/* BFD is relaxable (this means that bfd_relax_section may be able to
+   do something).  */

 #define BFD_IS_RELAXABLE 0x200
 \f
 /* symbols and relocation */
 
 #define BFD_IS_RELAXABLE 0x200
 \f
 /* symbols and relocation */
 

+/* A count of carsyms (canonical archive symbols).  */

 typedef unsigned long symindex;
 
 #define BFD_NO_MORE_SYMBOLS ((symindex) ~0)
 
 typedef unsigned long symindex;
 
 #define BFD_NO_MORE_SYMBOLS ((symindex) ~0)
 

-typedef enum bfd_symclass {
-             bfd_symclass_unknown = 0,
-             bfd_symclass_fcommon, /* fortran common symbols */
-             bfd_symclass_global, /* global symbol, what a surprise */
-             bfd_symclass_debugger, /* some debugger symbol */
-             bfd_symclass_undefined /* none known */
-           } symclass;
-
-
-typedef int symtype;           /* Who knows, yet? */
-
-
-/* general purpose part of a symbol;
-   target specific parts will be found in libcoff.h, liba.out.h etc */
-
+/* General purpose part of a symbol X;
+   target specific parts are in libcoff.h, libaout.h, etc.  */

 
 #define bfd_get_section(x) ((x)->section)
 #define bfd_get_output_section(x) ((x)->section->output_section)
 
 #define bfd_get_section(x) ((x)->section)
 #define bfd_get_output_section(x) ((x)->section->output_section)


@@ -203,6 +236,7 @@ typedef int symtype;                /* Who knows, yet? */
 #define bfd_asymbol_bfd(x) ((x)->the_bfd)
 #define bfd_asymbol_flavour(x) (bfd_asymbol_bfd(x)->xvec->flavour)
 
 #define bfd_asymbol_bfd(x) ((x)->the_bfd)
 #define bfd_asymbol_flavour(x) (bfd_asymbol_bfd(x)->xvec->flavour)
 

+/* A canonical archive symbol.  */

 /* This is a type pun with struct ranlib on purpose! */
 typedef struct carsym {
   char *name;
 /* This is a type pun with struct ranlib on purpose! */
 typedef struct carsym {
   char *name;


@@ -210,7 +244,8 @@ typedef struct carsym {
 } carsym;                      /* to make these you call a carsymogen */
 
   
 } carsym;                      /* to make these you call a carsymogen */
 
   

-/* Used in generating armaps.  Perhaps just a forward definition would do? */
+/* Used in generating armaps (archive tables of contents).
+   Perhaps just a forward definition would do? */

 struct orl {                   /* output ranlib */
   char **name;                 /* symbol name */ 
   file_ptr pos;                        /* bfd* or file position */
 struct orl {                   /* output ranlib */
   char **name;                 /* symbol name */ 
   file_ptr pos;                        /* bfd* or file position */


@@ -223,7 +258,7 @@ struct orl {                        /* output ranlib */
 typedef struct lineno_cache_entry {
   unsigned int line_number;    /* Linenumber from start of function*/  
   union {
 typedef struct lineno_cache_entry {
   unsigned int line_number;    /* Linenumber from start of function*/  
   union {

- struct symbol_cache_entry *sym;               /* Function name */
+    struct symbol_cache_entry *sym; /* Function name */

     unsigned long offset;      /* Offset into section */
   } u;
 } alent;
     unsigned long offset;      /* Offset into section */
   } u;
 } alent;


@@ -254,46 +289,6 @@ typedef struct sec *sec_ptr;
 
 typedef struct stat stat_type; 
 \f
 
 typedef struct stat stat_type; 
 \f

-/** Error handling */
-
-typedef enum bfd_error {
-             no_error = 0, system_call_error, invalid_target,
-             wrong_format, invalid_operation, no_memory,
-             no_symbols, no_relocation_info,
-             no_more_archived_files, malformed_archive,
-             symbol_not_found, file_not_recognized,
-             file_ambiguously_recognized, no_contents,
-             bfd_error_nonrepresentable_section,
-             no_debug_section, bad_value,
-
-             /* An input file is shorter than expected.  */
-             file_truncated,
-             
-             invalid_error_code} bfd_ec;
-
-extern bfd_ec bfd_error;
-struct reloc_cache_entry;
-struct bfd_seclet;
-
-
-typedef struct bfd_error_vector {
-  void (* nonrepresentable_section ) PARAMS ((CONST bfd  *CONST abfd,
-                                             CONST char *CONST name));
-  void (* undefined_symbol) PARAMS ((CONST struct reloc_cache_entry *rel,
-                                    CONST struct bfd_seclet *sec));
-  void (* reloc_value_truncated) PARAMS ((CONST struct
-                                         reloc_cache_entry *rel,
-                                         struct bfd_seclet *sec));
-
-  void (* reloc_dangerous) PARAMS ((CONST struct reloc_cache_entry *rel,
-                                   CONST struct bfd_seclet *sec));
-  
-} bfd_error_vector_type;
-
-CONST char *bfd_errmsg PARAMS ((bfd_ec error_tag));
-void bfd_perror PARAMS ((CONST char *message));
-\f
-

 typedef enum bfd_print_symbol
 { 
   bfd_print_symbol_name,
 typedef enum bfd_print_symbol
 { 
   bfd_print_symbol_name,


@@ -301,24 +296,99 @@ typedef enum bfd_print_symbol
   bfd_print_symbol_all
 } bfd_print_symbol_type;
     
   bfd_print_symbol_all
 } bfd_print_symbol_type;
     

-\f

 /* Information about a symbol that nm needs.  */
 
 typedef struct _symbol_info
 {
   symvalue value;
 /* Information about a symbol that nm needs.  */
 
 typedef struct _symbol_info
 {
   symvalue value;

-  char type;                   /*  */
+  char type;

   CONST char *name;            /* Symbol name.  */
   char stab_other;             /* Unused. */
   short stab_desc;             /* Info for N_TYPE.  */
   CONST char *stab_name;
 } symbol_info;
 \f
   CONST char *name;            /* Symbol name.  */
   char stab_other;             /* Unused. */
   short stab_desc;             /* Info for N_TYPE.  */
   CONST char *stab_name;
 } symbol_info;
 \f

-/* The code that implements targets can initialize a jump table with this
-   macro.  It must name all its routines the same way (a prefix plus
-   the standard routine suffix), or it must #define the routines that
-   are not so named, before calling JUMP_TABLE in the initializer.  */
+/* Hash table routines.  There is no way to free up a hash table.  */
+
+/* An element in the hash table.  Most uses will actually use a larger
+   structure, and an instance of this will be the first field.  */
+
+struct bfd_hash_entry
+{
+  /* Next entry for this hash code.  */
+  struct bfd_hash_entry *next;
+  /* String being hashed.  */
+  const char *string;
+  /* Hash code.  This is the full hash code, not the index into the
+     table.  */
+  unsigned long hash;
+};
+
+/* A hash table.  */

 
 

+struct bfd_hash_table
+{
+  /* The hash array.  */
+  struct bfd_hash_entry **table;
+  /* The number of slots in the hash table.  */
+  unsigned int size;
+  /* A function used to create new elements in the hash table.  The
+     first entry is itself a pointer to an element.  When this
+     function is first invoked, this pointer will be NULL.  However,
+     having the pointer permits a hierarchy of method functions to be
+     built each of which calls the function in the superclass.  Thus
+     each function should be written to allocate a new block of memory
+     only if the argument is NULL.  */
+  struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
+                                            struct bfd_hash_table *,
+                                            const char *));
+  /* An obstack for this hash table.  */
+  struct obstack memory;
+};
+
+/* Initialize a hash table.  */
+extern boolean bfd_hash_table_init
+  PARAMS ((struct bfd_hash_table *,
+          struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+                                      struct bfd_hash_table *,
+                                      const char *)));
+
+/* Initialize a hash table specifying a size.  */
+extern boolean bfd_hash_table_init_n
+  PARAMS ((struct bfd_hash_table *,
+          struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+                                      struct bfd_hash_table *,
+                                      const char *),
+          unsigned int size));
+
+/* Free up a hash table.  */
+extern void bfd_hash_table_free PARAMS ((struct bfd_hash_table *));
+
+/* Look up a string in a hash table.  If CREATE is true, a new entry
+   will be created for this string if one does not already exist.  The
+   COPY argument must be true if this routine should copy the string
+   into newly allocated memory when adding an entry.  */
+extern struct bfd_hash_entry *bfd_hash_lookup
+  PARAMS ((struct bfd_hash_table *, const char *, boolean create,
+          boolean copy));
+
+/* Base method for creating a hash table entry.  */
+extern struct bfd_hash_entry *bfd_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
+          const char *));
+
+/* Grab some space for a hash table entry.  */
+extern PTR bfd_hash_allocate PARAMS ((struct bfd_hash_table *,
+                                     unsigned int));
+
+/* Traverse a hash table in a random order, calling a function on each
+   element.  If the function returns false, the traversal stops.  The
+   INFO argument is passed to the function.  */
+extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *,
+                                      boolean (*) (struct bfd_hash_entry *,
+                                                   PTR),
+                                      PTR info));
+\f

 /* Semi-portable string concatenation in cpp.
    The CAT4 hack is to avoid a problem with some strict ANSI C preprocessors.
    The problem is, "32_" is not a valid preprocessing token, and we don't
 /* Semi-portable string concatenation in cpp.
    The CAT4 hack is to avoid a problem with some strict ANSI C preprocessors.
    The problem is, "32_" is not a valid preprocessing token, and we don't


@@ -331,7 +401,7 @@ typedef struct _symbol_info
 #define CAT3(a,b,c)    a##b##c
 #define CAT4(a,b,c,d)  a##b##c##d
 #else
 #define CAT3(a,b,c)    a##b##c
 #define CAT4(a,b,c,d)  a##b##c##d
 #else

-#ifdef __STDC__
+#if defined(__STDC__) || defined(ALMOST_STDC)

 #define CAT(a,b) a##b
 #define CAT3(a,b,c) a##b##c
 #define XCAT2(a,b)     CAT(a,b)
 #define CAT(a,b) a##b
 #define CAT3(a,b,c) a##b##c
 #define XCAT2(a,b)     CAT(a,b)


@@ -344,63 +414,22 @@ typedef struct _symbol_info
 #endif
 #endif
 
 #endif
 #endif
 

-#define JUMP_TABLE(NAME)\
-CAT(NAME,_core_file_failing_command),\
-CAT(NAME,_core_file_failing_signal),\
-CAT(NAME,_core_file_matches_executable_p),\
-CAT(NAME,_slurp_armap),\
-CAT(NAME,_slurp_extended_name_table),\
-CAT(NAME,_truncate_arname),\
-CAT(NAME,_write_armap),\
-CAT(NAME,_close_and_cleanup),\
-CAT(NAME,_set_section_contents),\
-CAT(NAME,_get_section_contents),\
-CAT(NAME,_new_section_hook),\
-CAT(NAME,_get_symtab_upper_bound),\
-CAT(NAME,_get_symtab),\
-CAT(NAME,_get_reloc_upper_bound),\
-CAT(NAME,_canonicalize_reloc),\
-CAT(NAME,_make_empty_symbol),\
-CAT(NAME,_print_symbol),\
-CAT(NAME,_get_symbol_info),\
-CAT(NAME,_get_lineno),\
-CAT(NAME,_set_arch_mach),\
-CAT(NAME,_openr_next_archived_file),\
-CAT(NAME,_find_nearest_line),\
-CAT(NAME,_generic_stat_arch_elt),\
-CAT(NAME,_sizeof_headers),\
-CAT(NAME,_bfd_debug_info_start),\
-CAT(NAME,_bfd_debug_info_end),\
-CAT(NAME,_bfd_debug_info_accumulate),\
-CAT(NAME,_bfd_get_relocated_section_contents),\
-CAT(NAME,_bfd_relax_section),\
-CAT(NAME,_bfd_seclet_link),\
-CAT(NAME,_bfd_reloc_type_lookup),\
-CAT(NAME,_bfd_make_debug_symbol)
-

 #define COFF_SWAP_TABLE (PTR) &bfd_coff_std_swap_table
 #define COFF_SWAP_TABLE (PTR) &bfd_coff_std_swap_table

-

 \f
 /* User program access to BFD facilities */
 
 \f
 /* User program access to BFD facilities */
 

-extern CONST short _bfd_host_big_endian;
-#define HOST_BYTE_ORDER_BIG_P  (*(char *)&_bfd_host_big_endian)
-
-/* The bfd itself */
-

 /* Cast from const char * to char * so that caller can assign to
    a char * without a warning.  */
 #define bfd_get_filename(abfd) ((char *) (abfd)->filename)
 /* Cast from const char * to char * so that caller can assign to
    a char * without a warning.  */
 #define bfd_get_filename(abfd) ((char *) (abfd)->filename)

+#define bfd_get_cacheable(abfd) ((abfd)->cacheable)

 #define bfd_get_format(abfd) ((abfd)->format)
 #define bfd_get_target(abfd) ((abfd)->xvec->name)
 #define bfd_get_format(abfd) ((abfd)->format)
 #define bfd_get_target(abfd) ((abfd)->xvec->name)

+#define bfd_get_flavour(abfd) ((abfd)->xvec->flavour)

 #define bfd_get_file_flags(abfd) ((abfd)->flags)
 #define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
 #define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
 #define bfd_my_archive(abfd) ((abfd)->my_archive)
 #define bfd_has_map(abfd) ((abfd)->has_armap)
 #define bfd_get_file_flags(abfd) ((abfd)->flags)
 #define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
 #define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
 #define bfd_my_archive(abfd) ((abfd)->my_archive)
 #define bfd_has_map(abfd) ((abfd)->has_armap)

-#define bfd_header_twiddle_required(abfd) \
-        ((((abfd)->xvec->header_byteorder_big_p)               \
-         != (boolean)HOST_BYTE_ORDER_BIG_P) ? true:false)

 
 #define bfd_valid_reloc_types(abfd) ((abfd)->xvec->valid_reloc_types)
 #define bfd_usrdata(abfd) ((abfd)->usrdata)
 
 #define bfd_valid_reloc_types(abfd) ((abfd)->xvec->valid_reloc_types)
 #define bfd_usrdata(abfd) ((abfd)->usrdata)


@@ -409,21 +438,87 @@ extern CONST short _bfd_host_big_endian;
 #define bfd_get_symcount(abfd) ((abfd)->symcount)
 #define bfd_get_outsymbols(abfd) ((abfd)->outsymbols)
 #define bfd_count_sections(abfd) ((abfd)->section_count)
 #define bfd_get_symcount(abfd) ((abfd)->symcount)
 #define bfd_get_outsymbols(abfd) ((abfd)->outsymbols)
 #define bfd_count_sections(abfd) ((abfd)->section_count)

-#define bfd_get_architecture(abfd) ((abfd)->obj_arch)
-#define bfd_get_machine(abfd) ((abfd)->obj_machine)

 
 #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
 
 
 #define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
 

-#define BYTE_SIZE 1
-#define SHORT_SIZE 2
-#define LONG_SIZE 4
+#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = (bool)), true)
+
+/* Byte swapping routines.  */
+
+bfd_vma                bfd_getb64         PARAMS ((const unsigned char *));
+bfd_vma        bfd_getl64         PARAMS ((const unsigned char *));
+bfd_signed_vma bfd_getb_signed_64 PARAMS ((const unsigned char *));
+bfd_signed_vma bfd_getl_signed_64 PARAMS ((const unsigned char *));
+bfd_vma                bfd_getb32         PARAMS ((const unsigned char *));
+bfd_vma                bfd_getl32         PARAMS ((const unsigned char *));
+bfd_signed_vma bfd_getb_signed_32 PARAMS ((const unsigned char *));
+bfd_signed_vma bfd_getl_signed_32 PARAMS ((const unsigned char *));
+bfd_vma                bfd_getb16         PARAMS ((const unsigned char *));
+bfd_vma                bfd_getl16         PARAMS ((const unsigned char *));
+bfd_signed_vma bfd_getb_signed_16 PARAMS ((const unsigned char *));
+bfd_signed_vma bfd_getl_signed_16 PARAMS ((const unsigned char *));
+void           bfd_putb64         PARAMS ((bfd_vma, unsigned char *));
+void           bfd_putl64         PARAMS ((bfd_vma, unsigned char *));
+void           bfd_putb32         PARAMS ((bfd_vma, unsigned char *));
+void           bfd_putl32         PARAMS ((bfd_vma, unsigned char *));
+void           bfd_putb16         PARAMS ((bfd_vma, unsigned char *));
+void           bfd_putl16         PARAMS ((bfd_vma, unsigned char *));
+
+/* ECOFF linking routines.  */
+#if defined(__STDC__) || defined(ALMOST_STDC)
+struct ecoff_debug_info;
+struct ecoff_debug_swap;
+struct ecoff_extr;
+struct symbol_cache_entry;
+struct bfd_link_info;
+#endif
+extern PTR bfd_ecoff_debug_init
+  PARAMS ((bfd *output_bfd, struct ecoff_debug_info *output_debug,
+          const struct ecoff_debug_swap *output_swap,
+          struct bfd_link_info *));
+extern void bfd_ecoff_debug_free
+  PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
+          const struct ecoff_debug_swap *output_swap,
+          struct bfd_link_info *));
+extern boolean bfd_ecoff_debug_accumulate
+  PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
+          const struct ecoff_debug_swap *output_swap,
+          bfd *input_bfd, struct ecoff_debug_info *input_debug,
+          const struct ecoff_debug_swap *input_swap,
+          struct bfd_link_info *));
+extern boolean bfd_ecoff_debug_accumulate_other
+  PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
+          const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
+          struct bfd_link_info *));
+extern boolean bfd_ecoff_debug_externals
+  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
+          const struct ecoff_debug_swap *swap,
+          boolean relocateable,
+          boolean (*get_extr) (struct symbol_cache_entry *,
+                               struct ecoff_extr *),
+          void (*set_index) (struct symbol_cache_entry *,
+                             bfd_size_type)));
+extern boolean bfd_ecoff_debug_one_external
+  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
+          const struct ecoff_debug_swap *swap,
+          const char *name, struct ecoff_extr *esym));
+extern bfd_size_type bfd_ecoff_debug_size
+  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
+          const struct ecoff_debug_swap *swap));
+extern boolean bfd_ecoff_write_debug
+  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
+          const struct ecoff_debug_swap *swap, file_ptr where));
+extern boolean bfd_ecoff_write_accumulated_debug
+  PARAMS ((PTR handle, bfd *abfd, struct ecoff_debug_info *debug,
+          const struct ecoff_debug_swap *swap,
+          struct bfd_link_info *info, file_ptr where));

 
 /* And more from the source.  */
 void 
 bfd_init PARAMS ((void));
 
 bfd *
 
 /* And more from the source.  */
 void 
 bfd_init PARAMS ((void));
 
 bfd *

-bfd_openr PARAMS ((CONST char *filename, CONST char*target));
+bfd_openr PARAMS ((CONST char *filename, CONST char *target));

 
 bfd *
 bfd_fdopenr PARAMS ((CONST char *filename, CONST char *target, int fd));
 
 bfd *
 bfd_fdopenr PARAMS ((CONST char *filename, CONST char *target, int fd));


@@ -432,7 +527,7 @@ bfd *
 bfd_openw PARAMS ((CONST char *filename, CONST char *target));
 
 boolean 
 bfd_openw PARAMS ((CONST char *filename, CONST char *target));
 
 boolean 

-bfd_close PARAMS ((bfd *));
+bfd_close PARAMS ((bfd *abfd));

 
 boolean 
 bfd_close_all_done PARAMS ((bfd *));
 
 boolean 
 bfd_close_all_done PARAMS ((bfd *));


@@ -447,7 +542,7 @@ bfd_create PARAMS ((CONST char *filename, bfd *templ));
  /* Byte swapping macros for user section data.  */
 
 #define bfd_put_8(abfd, val, ptr) \
  /* Byte swapping macros for user section data.  */
 
 #define bfd_put_8(abfd, val, ptr) \

-                (*((unsigned char *)(ptr)) = (unsigned char)val)
+                (*((unsigned char *)(ptr)) = (unsigned char)(val))

 #define bfd_put_signed_8 \
                bfd_put_8
 #define bfd_get_8(abfd, ptr) \
 #define bfd_put_signed_8 \
                bfd_put_8
 #define bfd_get_8(abfd, ptr) \


@@ -521,138 +616,143 @@ bfd_create PARAMS ((CONST char *filename, bfd *templ));
 #define bfd_h_get_signed_64(abfd, ptr) \
                 BFD_SEND(abfd, bfd_h_getx_signed_64, (ptr))
 
 #define bfd_h_get_signed_64(abfd, ptr) \
                 BFD_SEND(abfd, bfd_h_getx_signed_64, (ptr))
 

-typedef struct sec 
+typedef struct sec

 {
 {

-         /* The name of the section, the name isn't a copy, the pointer is
+         /* The name of the section; the name isn't a copy, the pointer is

         the same as that passed to bfd_make_section. */
 
     CONST char *name;
 
         the same as that passed to bfd_make_section. */
 
     CONST char *name;
 

+         /* Which section is it; 0..nth.      */

 
 

-         /* Which section is it 0.nth      */
-
-   int index;                      
+   int index;

 
          /* The next section in the list belonging to the BFD, or NULL. */
 
     struct sec *next;
 
 
          /* The next section in the list belonging to the BFD, or NULL. */
 
     struct sec *next;
 

-         /* The field flags contains attributes of the section. Some of
+         /* The field flags contains attributes of the section. Some

            flags are read in from the object file, and some are
            flags are read in from the object file, and some are

-           synthesized from other information.  */         
+           synthesized from other information.  */

 
     flagword flags;
 
 #define SEC_NO_FLAGS   0x000
 
 
     flagword flags;
 
 #define SEC_NO_FLAGS   0x000
 

-         /* Tells the OS to allocate space for this section when loaded.
-           This would clear for a section containing debug information
+         /* Tells the OS to allocate space for this section when loading.
+           This is clear for a section containing debug information

            only. */
            only. */

-          
-

 #define SEC_ALLOC      0x001
 #define SEC_ALLOC      0x001

-         /* Tells the OS to load the section from the file when loading.
-           This would be clear for a .bss section */

 
 

+         /* Tells the OS to load the section from the file when loading.
+           This is clear for a .bss section. */

 #define SEC_LOAD       0x002
 #define SEC_LOAD       0x002

-         /* The section contains data still to be relocated, so there will
-           be some relocation information too. */

 
 

+         /* The section contains data still to be relocated, so there is
+           some relocation information too. */

 #define SEC_RELOC      0x004
 
 #define SEC_RELOC      0x004
 

-         /* Obsolete ? */
-
+#if 0    /* Obsolete ? */

 #define SEC_BALIGN     0x008
 #define SEC_BALIGN     0x008

+#endif

 
          /* A signal to the OS that the section contains read only
           data. */
 #define SEC_READONLY   0x010
 
          /* The section contains code only. */
 
          /* A signal to the OS that the section contains read only
           data. */
 #define SEC_READONLY   0x010
 
          /* The section contains code only. */

-

 #define SEC_CODE       0x020
 
          /* The section contains data only. */
 #define SEC_CODE       0x020
 
          /* The section contains data only. */

-
-#define SEC_DATA        0x040
+#define SEC_DATA       0x040

 
          /* The section will reside in ROM. */
 
          /* The section will reside in ROM. */

-

 #define SEC_ROM        0x080
 
          /* The section contains constructor information. This section
            type is used by the linker to create lists of constructors and
            destructors used by <<g++>>. When a back end sees a symbol
            which should be used in a constructor list, it creates a new
 #define SEC_ROM        0x080
 
          /* The section contains constructor information. This section
            type is used by the linker to create lists of constructors and
            destructors used by <<g++>>. When a back end sees a symbol
            which should be used in a constructor list, it creates a new

-           section for the type of name (eg <<__CTOR_LIST__>>), attaches
-           the symbol to it and builds a relocation. To build the lists
-           of constructors, all the linker has to to is catenate all the
-           sections called <<__CTOR_LIST__>> and relocte the data
+           section for the type of name (e.g., <<__CTOR_LIST__>>), attaches
+           the symbol to it, and builds a relocation. To build the lists
+           of constructors, all the linker has to do is catenate all the
+           sections called <<__CTOR_LIST__>> and relocate the data

            contained within - exactly the operations it would peform on
            standard data. */
            contained within - exactly the operations it would peform on
            standard data. */

-

 #define SEC_CONSTRUCTOR 0x100
 
          /* The section is a constuctor, and should be placed at the
 #define SEC_CONSTRUCTOR 0x100
 
          /* The section is a constuctor, and should be placed at the

-          end of the . */
-
+          end of the text, data, or bss section(?). */

 #define SEC_CONSTRUCTOR_TEXT 0x1100
 #define SEC_CONSTRUCTOR_TEXT 0x1100

-

 #define SEC_CONSTRUCTOR_DATA 0x2100
 #define SEC_CONSTRUCTOR_DATA 0x2100

-

 #define SEC_CONSTRUCTOR_BSS  0x3100
 
          /* The section has contents - a data section could be
 #define SEC_CONSTRUCTOR_BSS  0x3100
 
          /* The section has contents - a data section could be

-           <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>, a debug section could be
+           <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>; a debug section could be

            <<SEC_HAS_CONTENTS>> */
            <<SEC_HAS_CONTENTS>> */

-

 #define SEC_HAS_CONTENTS 0x200
 
 #define SEC_HAS_CONTENTS 0x200
 

-         /* An instruction to the linker not to output sections
-          containing this flag even if they have information which
-          would normally be written. */
-
+         /* An instruction to the linker to not output the section
+          even if it has information which would normally be written. */

 #define SEC_NEVER_LOAD 0x400
 
          /* The section is a shared library section.  The linker must leave
            these completely alone, as the vma and size are used when
            the executable is loaded. */
 #define SEC_NEVER_LOAD 0x400
 
          /* The section is a shared library section.  The linker must leave
            these completely alone, as the vma and size are used when
            the executable is loaded. */

-

 #define SEC_SHARED_LIBRARY 0x800
 
          /* The section is a common section (symbols may be defined
            multiple times, the value of a symbol is the amount of
            space it requires, and the largest symbol value is the one
 #define SEC_SHARED_LIBRARY 0x800
 
          /* The section is a common section (symbols may be defined
            multiple times, the value of a symbol is the amount of
            space it requires, and the largest symbol value is the one

-           used).  Most targets have exactly one of these (.bss), but
-           ECOFF has two. */
-
+           used).  Most targets have exactly one of these (which we
+           translate to bfd_com_section), but ECOFF has two. */

 #define SEC_IS_COMMON 0x8000
 
 #define SEC_IS_COMMON 0x8000
 

+         /* The section contains only debugging information.  For
+           example, this is set for ELF .debug and .stab sections.
+           strip tests this flag to see if a section can be
+           discarded. */
+#define SEC_DEBUGGING 0x10000
+
+         /* The contents of this section are held in memory pointed to
+           by the contents field.  This is checked by
+           bfd_get_section_contents, and the data is retrieved from
+           memory if appropriate.  */
+#define SEC_IN_MEMORY 0x20000
+
+        /*  End of section flags.  */
+

         /*  The virtual memory address of the section - where it will be
         /*  The virtual memory address of the section - where it will be

-           at run time - the symbols are relocated against this */
+           at run time.  The symbols are relocated against this.  The
+           user_set_vma flag is maintained by bfd; if it's not set, the
+           backend can assign addresses (for example, in <<a.out>>, where
+           the default address for <<.data>> is dependent on the specific
+           target and various flags).  */
+

    bfd_vma vma;
    bfd_vma vma;

+   boolean user_set_vma;

 
         /*  The load address of the section - where it would be in a
 
         /*  The load address of the section - where it would be in a

-           rom image, really only used for writing section header information */
-   bfd_vma lma;
+           rom image; really only used for writing section header
+           information. */

 
 

-   boolean user_set_vma;
+   bfd_vma lma;

 
          /* The size of the section in bytes, as it will be output.
 
          /* The size of the section in bytes, as it will be output.

-           contains a value even if the section has no contents (eg, the
+           contains a value even if the section has no contents (e.g., the

            size of <<.bss>>). This will be filled in after relocation */
 
            size of <<.bss>>). This will be filled in after relocation */
 

-   bfd_size_type _cooked_size;    
+   bfd_size_type _cooked_size;

 
 

-         /* The size on disk of the section in bytes originally.  Normally this
+         /* The original size on disk of the section, in bytes.  Normally this

            value is the same as the size, but if some relaxing has
            been done, then this value will be bigger.  */
 
            value is the same as the size, but if some relaxing has
            been done, then this value will be bigger.  */
 

-   bfd_size_type _raw_size;    
+   bfd_size_type _raw_size;

 
          /* If this section is going to be output, then this value is the
            offset into the output section of the first byte in the input
 
          /* If this section is going to be output, then this value is the
            offset into the output section of the first byte in the input

-           section. Eg, if this was going to start at the 100th byte in
+           section. E.g., if this was going to start at the 100th byte in

            the output section, this value would be 100. */
 
    bfd_vma output_offset;
            the output section, this value would be 100. */
 
    bfd_vma output_offset;


@@ -661,8 +761,8 @@ typedef struct sec
 
    struct sec *output_section;
 
 
    struct sec *output_section;
 

-         /* The alignment requirement of the section, as an exponent - eg
-           3 aligns to 2^3 (or 8) */
+         /* The alignment requirement of the section, as an exponent of 2 -
+           e.g., 3 aligns to 2^3 (or 8). */

 
    unsigned int alignment_power;
 
 
    unsigned int alignment_power;
 


@@ -681,12 +781,12 @@ typedef struct sec
    unsigned reloc_count;
 
          /* Information below is back end specific - and not always used
    unsigned reloc_count;
 
          /* Information below is back end specific - and not always used

-           or updated 
+           or updated.  */
+
+         /* File position of section data    */

 
 

-           File position of section data    */
+   file_ptr filepos;

 
 

-   file_ptr filepos;      
-        

          /* File position of relocation info */
 
    file_ptr rel_filepos;
          /* File position of relocation info */
 
    file_ptr rel_filepos;


@@ -699,12 +799,14 @@ typedef struct sec
 
    PTR userdata;
 
 
    PTR userdata;
 

-   struct lang_output_section *otheruserdata;
+         /* If the SEC_IN_MEMORY flag is set, this points to the actual
+           contents.  */
+   unsigned char *contents;

 
          /* Attached line number information */
 
    alent *lineno;
 
          /* Attached line number information */
 
    alent *lineno;

-        
+

          /* Number of line number records   */
 
    unsigned int lineno_count;
          /* Number of line number records   */
 
    unsigned int lineno_count;


@@ -714,7 +816,7 @@ typedef struct sec
 
    file_ptr moving_line_filepos;
 
 
    file_ptr moving_line_filepos;
 

-         /* what the section number is in the target world  */
+         /* What the section number is in the target world  */

 
    int target_index;
 
 
    int target_index;
 


@@ -731,31 +833,35 @@ typedef struct sec
 
    boolean reloc_done;
          /* A symbol which points at this section only */
 
    boolean reloc_done;
          /* A symbol which points at this section only */

-   struct symbol_cache_entry *symbol;  
+   struct symbol_cache_entry *symbol;

    struct symbol_cache_entry **symbol_ptr_ptr;
    struct symbol_cache_entry **symbol_ptr_ptr;

-   struct bfd_seclet *seclets_head;
-   struct bfd_seclet *seclets_tail;
+
+   struct bfd_link_order *link_order_head;
+   struct bfd_link_order *link_order_tail;

 } asection ;
 
 
 } asection ;
 
 

+     /* These sections are global, and are managed by BFD.  The application
+       and target back end are not permitted to change the values in
+       these sections.  */

 #define BFD_ABS_SECTION_NAME "*ABS*"
 #define BFD_UND_SECTION_NAME "*UND*"
 #define BFD_COM_SECTION_NAME "*COM*"
 #define BFD_IND_SECTION_NAME "*IND*"
 
      /* the absolute section */
 #define BFD_ABS_SECTION_NAME "*ABS*"
 #define BFD_UND_SECTION_NAME "*UND*"
 #define BFD_COM_SECTION_NAME "*COM*"
 #define BFD_IND_SECTION_NAME "*IND*"
 
      /* the absolute section */

- extern   asection bfd_abs_section;
+extern asection bfd_abs_section;

      /* Pointer to the undefined section */
      /* Pointer to the undefined section */

- extern   asection bfd_und_section;
+extern asection bfd_und_section;

      /* Pointer to the common section */
      /* Pointer to the common section */

- extern asection bfd_com_section;
+extern asection bfd_com_section;

      /* Pointer to the indirect section */
      /* Pointer to the indirect section */

- extern asection bfd_ind_section;
+extern asection bfd_ind_section;

 
 

- extern struct symbol_cache_entry *bfd_abs_symbol;
- extern struct symbol_cache_entry *bfd_com_symbol;
- extern struct symbol_cache_entry *bfd_und_symbol;
- extern struct symbol_cache_entry *bfd_ind_symbol;
+extern struct symbol_cache_entry *bfd_abs_symbol;
+extern struct symbol_cache_entry *bfd_com_symbol;
+extern struct symbol_cache_entry *bfd_und_symbol;
+extern struct symbol_cache_entry *bfd_ind_symbol;

 #define bfd_get_section_size_before_reloc(section) \
      (section->reloc_done ? (abort(),1): (section)->_raw_size)
 #define bfd_get_section_size_after_reloc(section) \
 #define bfd_get_section_size_before_reloc(section) \
      (section->reloc_done ? (abort(),1): (section)->_raw_size)
 #define bfd_get_section_size_after_reloc(section) \


@@ -764,13 +870,16 @@ asection *
 bfd_get_section_by_name PARAMS ((bfd *abfd, CONST char *name));
 
 asection *
 bfd_get_section_by_name PARAMS ((bfd *abfd, CONST char *name));
 
 asection *

-bfd_make_section_old_way PARAMS ((bfd *, CONST char *name));
+bfd_make_section_old_way PARAMS ((bfd *abfd, CONST char *name));

 
 

-asection * 
+asection *
+bfd_make_section_anyway PARAMS ((bfd *abfd, CONST char *name));
+
+asection *

 bfd_make_section PARAMS ((bfd *, CONST char *name));
 
 boolean 
 bfd_make_section PARAMS ((bfd *, CONST char *name));
 
 boolean 

-bfd_set_section_flags PARAMS ((bfd *, asection *, flagword));
+bfd_set_section_flags PARAMS ((bfd *abfd, asection *sec, flagword flags));

 
 void 
 bfd_map_over_sections PARAMS ((bfd *abfd,
 
 void 
 bfd_map_over_sections PARAMS ((bfd *abfd,


@@ -780,21 +889,27 @@ bfd_map_over_sections PARAMS ((bfd *abfd,
     PTR obj));
 
 boolean 
     PTR obj));
 
 boolean 

-bfd_set_section_size PARAMS ((bfd *, asection *, bfd_size_type val));
+bfd_set_section_size PARAMS ((bfd *abfd, asection *sec, bfd_size_type val));

 
 boolean 
 bfd_set_section_contents
 
 boolean 
 bfd_set_section_contents

- PARAMS ((bfd *abfd,        
+ PARAMS ((bfd *abfd,

     asection *section,
     PTR data,
     file_ptr offset,
     bfd_size_type count));
 
 boolean 
     asection *section,
     PTR data,
     file_ptr offset,
     bfd_size_type count));
 
 boolean 

-bfd_get_section_contents 
+bfd_get_section_contents

  PARAMS ((bfd *abfd, asection *section, PTR location,
     file_ptr offset, bfd_size_type count));
 
  PARAMS ((bfd *abfd, asection *section, PTR location,
     file_ptr offset, bfd_size_type count));
 

+boolean 
+bfd_copy_private_section_data PARAMS ((bfd *ibfd, asection *isec, bfd *obfd, asection *osec));
+
+#define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \
+     BFD_SEND (ibfd, _bfd_copy_private_section_data, \
+               (ibfd, isection, obfd, osection))

 enum bfd_architecture 
 {
   bfd_arch_unknown,    /* File arch not known */
 enum bfd_architecture 
 {
   bfd_arch_unknown,    /* File arch not known */


@@ -832,6 +947,7 @@ enum bfd_architecture
   bfd_arch_h8300,      /* Hitachi H8/300 */
 #define bfd_mach_h8300   1
 #define bfd_mach_h8300h  2
   bfd_arch_h8300,      /* Hitachi H8/300 */
 #define bfd_mach_h8300   1
 #define bfd_mach_h8300h  2

+  bfd_arch_powerpc,    /* PowerPC */

   bfd_arch_rs6000,     /* IBM RS/6000 */
   bfd_arch_hppa,       /* HP PA RISC */
   bfd_arch_z8k,        /* Zilog Z8000 */
   bfd_arch_rs6000,     /* IBM RS/6000 */
   bfd_arch_hppa,       /* HP PA RISC */
   bfd_arch_z8k,        /* Zilog Z8000 */


@@ -874,7 +990,7 @@ CONST char *
 bfd_printable_name PARAMS ((bfd *abfd));
 
 bfd_arch_info_type *
 bfd_printable_name PARAMS ((bfd *abfd));
 
 bfd_arch_info_type *

-bfd_scan_arch PARAMS ((CONST char *));
+bfd_scan_arch PARAMS ((CONST char *string));

 
 CONST bfd_arch_info_type *
 bfd_arch_get_compatible PARAMS ((
 
 CONST bfd_arch_info_type *
 bfd_arch_get_compatible PARAMS ((


@@ -882,7 +998,7 @@ bfd_arch_get_compatible PARAMS ((
     CONST bfd *bbfd));
 
 void 
     CONST bfd *bbfd));
 
 void 

-bfd_set_arch_info PARAMS ((bfd *, bfd_arch_info_type *));
+bfd_set_arch_info PARAMS ((bfd *abfd, bfd_arch_info_type *arg));

 
 enum bfd_architecture 
 bfd_get_arch PARAMS ((bfd *abfd));
 
 enum bfd_architecture 
 bfd_get_arch PARAMS ((bfd *abfd));


@@ -897,7 +1013,7 @@ unsigned int
 bfd_arch_bits_per_address PARAMS ((bfd *abfd));
 
 bfd_arch_info_type * 
 bfd_arch_bits_per_address PARAMS ((bfd *abfd));
 
 bfd_arch_info_type * 

-bfd_get_arch_info PARAMS ((bfd *));
+bfd_get_arch_info PARAMS ((bfd *abfd));

 
 bfd_arch_info_type *
 bfd_lookup_arch
 
 bfd_arch_info_type *
 bfd_lookup_arch


@@ -905,11 +1021,11 @@ bfd_lookup_arch
     arch,
     long machine));
 
     arch,
     long machine));
 

-CONST char * 
+CONST char *

 bfd_printable_arch_mach
  PARAMS ((enum bfd_architecture arch, unsigned long machine));
 
 bfd_printable_arch_mach
  PARAMS ((enum bfd_architecture arch, unsigned long machine));
 

-typedef enum bfd_reloc_status 
+typedef enum bfd_reloc_status

 {
         /* No errors detected */
   bfd_reloc_ok,
 {
         /* No errors detected */
   bfd_reloc_ok,


@@ -923,10 +1039,10 @@ typedef enum bfd_reloc_status
         /* Used by special functions */
   bfd_reloc_continue,
 
         /* Used by special functions */
   bfd_reloc_continue,
 

-        /* Unused */
+        /* Unsupported relocation size requested. */

   bfd_reloc_notsupported,
 
   bfd_reloc_notsupported,
 

-        /* Unsupported relocation size requested. */
+        /* Unused */

   bfd_reloc_other,
 
         /* The symbol to relocate against was undefined. */
   bfd_reloc_other,
 
         /* The symbol to relocate against was undefined. */


@@ -934,13 +1050,14 @@ typedef enum bfd_reloc_status
 
         /* The relocation was performed, but may not be ok - presently
           generated only when linking i960 coff files with i960 b.out
 
         /* The relocation was performed, but may not be ok - presently
           generated only when linking i960 coff files with i960 b.out

-          symbols. */
+          symbols.  If this type is returned, the error_message argument
+          to bfd_perform_relocation will be set.  */

   bfd_reloc_dangerous
  }
  bfd_reloc_status_type;
 
 
   bfd_reloc_dangerous
  }
  bfd_reloc_status_type;
 
 

-typedef struct reloc_cache_entry 
+typedef struct reloc_cache_entry

 {
         /* A pointer into the canonical table of pointers  */
   struct symbol_cache_entry **sym_ptr_ptr;
 {
         /* A pointer into the canonical table of pointers  */
   struct symbol_cache_entry **sym_ptr_ptr;


@@ -949,20 +1066,37 @@ typedef struct reloc_cache_entry
   bfd_size_type address;
 
         /* addend for relocation value */
   bfd_size_type address;
 
         /* addend for relocation value */

-  bfd_vma addend;    
+  bfd_vma addend;

 
         /* Pointer to how to perform the required relocation */
 
         /* Pointer to how to perform the required relocation */

-  CONST struct reloc_howto_struct *howto;
+  const struct reloc_howto_struct *howto;

 
 } arelent;
 
 } arelent;

+enum complain_overflow
+{
+        /* Do not complain on overflow. */
+  complain_overflow_dont,

 
 

-typedef CONST struct reloc_howto_struct 
-{ 
+        /* Complain if the bitfield overflows, whether it is considered
+          as signed or unsigned. */
+  complain_overflow_bitfield,
+
+        /* Complain if the value overflows when considered as signed
+          number. */
+  complain_overflow_signed,
+
+        /* Complain if the value overflows when considered as an
+          unsigned number. */
+  complain_overflow_unsigned
+};
+
+typedef struct reloc_howto_struct
+{

         /*  The type field has mainly a documetary use - the back end can
         /*  The type field has mainly a documetary use - the back end can

-           to what it wants with it, though the normally the back end's
-           external idea of what a reloc number would be would be stored
-           in this field. For example, the a PC relative word relocation
-           in a coff environment would have the type 023 - because that's
+           do what it wants with it, though normally the back end's
+           external idea of what a reloc number is stored
+           in this field. For example, a PC relative word relocation
+           in a coff environment has the type 023 - because that's

            what the outside world calls a R_PCRWORD reloc. */
   unsigned int type;
 
            what the outside world calls a R_PCRWORD reloc. */
   unsigned int type;
 


@@ -970,12 +1104,13 @@ typedef CONST struct reloc_howto_struct
            unwanted data from the relocation.  */
   unsigned int rightshift;
 
            unwanted data from the relocation.  */
   unsigned int rightshift;
 

-        /*  The size of the item to be relocated - 0, is one byte, 1 is 2
-           bytes, 2 is four bytes.  A negative value indicates that the
-           result is to be subtracted from the data.  */
+        /*  The size of the item to be relocated.  This is *not* a
+           power-of-two measure.  To get the number of bytes operated
+           on by a type of relocation, use bfd_get_reloc_size.  */

   int size;
 
   int size;
 

-        /*  Now obsolete?  But m68k-coff still uses it... */
+        /*  The number of bits in the item to be relocated.  This is used
+           when doing overflow checking.  */

   unsigned int bitsize;
 
         /*  Notes that the relocation is relative to the location in the
   unsigned int bitsize;
 
         /*  Notes that the relocation is relative to the location in the


@@ -984,26 +1119,26 @@ typedef CONST struct reloc_howto_struct
            being relocated. */
   boolean pc_relative;
 
            being relocated. */
   boolean pc_relative;
 

+        /*  The bit position of the reloc value in the destination.
+           The relocated value is left shifted by this amount. */

   unsigned int bitpos;
 
   unsigned int bitpos;
 

-        /*  Now obsolete */
-  boolean absolute;
-
-        /* Causes the relocation routine to return an error if overflow
-          is detected when relocating. */
-  boolean complain_on_overflow;
+        /* What type of overflow error should be checked for when
+          relocating. */
+  enum complain_overflow complain_on_overflow;

 
         /* If this field is non null, then the supplied function is
           called rather than the normal function. This allows really
           strange relocation methods to be accomodated (e.g., i960 callj
           instructions). */
 
         /* If this field is non null, then the supplied function is
           called rather than the normal function. This allows really
           strange relocation methods to be accomodated (e.g., i960 callj
           instructions). */

-  bfd_reloc_status_type (*special_function) 
+  bfd_reloc_status_type (*special_function)

                                    PARAMS ((bfd *abfd,
                                             arelent *reloc_entry,
                                             struct symbol_cache_entry *symbol,
                                             PTR data,
                                    PARAMS ((bfd *abfd,
                                             arelent *reloc_entry,
                                             struct symbol_cache_entry *symbol,
                                             PTR data,

-                                            asection *input_section, 
-                                            bfd *output_bfd));
+                                            asection *input_section,
+                                            bfd *output_bfd,
+                                            char **error_message));

 
         /* The textual name of the relocation type. */
   char *name;
 
         /* The textual name of the relocation type. */
   char *name;


@@ -1012,7 +1147,7 @@ typedef CONST struct reloc_howto_struct
           relocations rather than the data - this flag signals this.*/
   boolean partial_inplace;
 
           relocations rather than the data - this flag signals this.*/
   boolean partial_inplace;
 

-        /* The src_mask is used to select what parts of the read in data
+        /* The src_mask selects which parts of the read in data

           are to be used in the relocation sum.  E.g., if this was an 8 bit
           bit of data which we read and relocated, this would be
           0x000000ff. When we have relocs which have an addend, such as
           are to be used in the relocation sum.  E.g., if this was an 8 bit
           bit of data which we read and relocated, this would be
           0x000000ff. When we have relocs which have an addend, such as


@@ -1021,24 +1156,24 @@ typedef CONST struct reloc_howto_struct
           the mask would be 0x00000000. */
   bfd_vma src_mask;
 
           the mask would be 0x00000000. */
   bfd_vma src_mask;
 

-        /* The dst_mask is what parts of the instruction are replaced
+        /* The dst_mask selects which parts of the instruction are replaced

           into the instruction. In most cases src_mask == dst_mask,
           except in the above special case, where dst_mask would be
           0x000000ff, and src_mask would be 0x00000000.   */
           into the instruction. In most cases src_mask == dst_mask,
           except in the above special case, where dst_mask would be
           0x000000ff, and src_mask would be 0x00000000.   */

-  bfd_vma dst_mask;           
+  bfd_vma dst_mask;

 
         /* When some formats create PC relative instructions, they leave
           the value of the pc of the place being relocated in the offset
           slot of the instruction, so that a PC relative relocation can
           be made just by adding in an ordinary offset (e.g., sun3 a.out).
           Some formats leave the displacement part of an instruction
 
         /* When some formats create PC relative instructions, they leave
           the value of the pc of the place being relocated in the offset
           slot of the instruction, so that a PC relative relocation can
           be made just by adding in an ordinary offset (e.g., sun3 a.out).
           Some formats leave the displacement part of an instruction

-          empty (e.g., m88k bcs), this flag signals the fact.*/
+          empty (e.g., m88k bcs); this flag signals the fact.*/

   boolean pcrel_offset;
 
 } reloc_howto_type;
   boolean pcrel_offset;
 
 } reloc_howto_type;

-#define HOWTO(C, R,S,B, P, BI, ABS, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
-  {(unsigned)C,R,S,B, P, BI, ABS,O,SF,NAME,INPLACE,MASKSRC,MASKDST,PC}
-#define NEWHOWTO( FUNCTION, NAME,SIZE,REL,IN) HOWTO(0,0,SIZE,0,REL,0,false,false,FUNCTION, NAME,false,0,0,IN)
+#define HOWTO(C, R,S,B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
+  {(unsigned)C,R,S,B, P, BI, O,SF,NAME,INPLACE,MASKSRC,MASKDST,PC}
+#define NEWHOWTO( FUNCTION, NAME,SIZE,REL,IN) HOWTO(0,0,SIZE,0,REL,0,complain_overflow_dont,FUNCTION, NAME,false,0,0,IN)

 
 #define HOWTO_PREPARE(relocation, symbol)      \
   {                                            \
 
 #define HOWTO_PREPARE(relocation, symbol)      \
   {                                            \


@@ -1050,7 +1185,10 @@ typedef CONST struct reloc_howto_struct
       relocation = symbol->value;              \
     }                                          \
   }                                            \
       relocation = symbol->value;              \
     }                                          \
   }                                            \

-}                      
+}
+int 
+bfd_get_reloc_size  PARAMS ((const reloc_howto_type *));
+

 typedef unsigned char bfd_byte;
 
 typedef struct relent_chain {
 typedef unsigned char bfd_byte;
 
 typedef struct relent_chain {


@@ -1060,55 +1198,65 @@ typedef struct relent_chain {
 bfd_reloc_status_type
 
 bfd_perform_relocation
 bfd_reloc_status_type
 
 bfd_perform_relocation

- PARAMS ((bfd * abfd,
+ PARAMS ((bfd *abfd,

     arelent *reloc_entry,
     PTR data,
     asection *input_section,
     arelent *reloc_entry,
     PTR data,
     asection *input_section,

-    bfd *output_bfd));
-
-typedef enum bfd_reloc_code_real 
+    bfd *output_bfd,
+    char **error_message));

 
 

+typedef enum bfd_reloc_code_real

 {
 {

-        /* 64 bits wide, simple reloc */
+   /* Basic absolute relocations */

   BFD_RELOC_64,
   BFD_RELOC_64,

-        /* 64 bits, PC-relative */
-  BFD_RELOC_64_PCREL,
-
-        /* 32 bits wide, simple reloc */

   BFD_RELOC_32,
   BFD_RELOC_32,

-        /* 32 bits, PC-relative */
-  BFD_RELOC_32_PCREL,
+  BFD_RELOC_26,
+  BFD_RELOC_16,
+  BFD_RELOC_14,
+  BFD_RELOC_8,

 
 

-        /* 16 bits wide, simple reloc */
-  BFD_RELOC_16,        
-        /* 16 bits, PC-relative */
+   /* PC-relative relocations */
+  BFD_RELOC_64_PCREL,
+  BFD_RELOC_32_PCREL,
+  BFD_RELOC_24_PCREL,     /* used by i960 */

   BFD_RELOC_16_PCREL,
   BFD_RELOC_16_PCREL,

-
-        /* 8 bits wide, simple */
-  BFD_RELOC_8,
-        /* 8 bits wide, pc relative */

   BFD_RELOC_8_PCREL,
   BFD_RELOC_8_PCREL,

-        /* 8 bits wide, but used to form an address like 0xffnn */
-  BFD_RELOC_8_FFnn,

 
 

-        /* The type of reloc used to build a contructor table - at the
-          moment probably a 32 bit wide abs address, but the cpu can
-          choose. */
+   /* Linkage-table relative */
+  BFD_RELOC_32_BASEREL,
+  BFD_RELOC_16_BASEREL,
+  BFD_RELOC_8_BASEREL,

 
 

+   /* The type of reloc used to build a contructor table - at the moment
+     probably a 32 bit wide abs address, but the cpu can choose. */

   BFD_RELOC_CTOR,
 
   BFD_RELOC_CTOR,
 

-        /* High 22 bits of 32-bit value; simple reloc.  */
+   /* 8 bits wide, but used to form an address like 0xffnn */
+  BFD_RELOC_8_FFnn,
+
+   /* 32-bit pc-relative, shifted right 2 bits (i.e., 30-bit
+     word displacement, e.g. for SPARC) */
+  BFD_RELOC_32_PCREL_S2,
+   /* signed 16-bit pc-relative, shifted right 2 bits (e.g. for MIPS) */
+  BFD_RELOC_16_PCREL_S2,
+   /* this is used on the Alpha */
+  BFD_RELOC_23_PCREL_S2,
+
+   /* High 22 bits of 32-bit value, placed into lower 22 bits of
+     target word; simple reloc.  */

   BFD_RELOC_HI22,
   BFD_RELOC_HI22,

-        /* Low 10 bits.  */
+   /* Low 10 bits.  */

   BFD_RELOC_LO10,
 
   BFD_RELOC_LO10,
 

-        /* Reloc types used for i960/b.out.  */
-  BFD_RELOC_24_PCREL,
-  BFD_RELOC_I960_CALLJ,
+   /* For systems that allocate a Global Pointer register, these are
+     displacements off that register.  These relocation types are
+     handled specially, because the value the register will have is
+     decided relatively late.  */
+  BFD_RELOC_GPREL16,
+  BFD_RELOC_GPREL32,

 
 

-        /* 32-bit pc-relative, shifted right 2 bits (i.e., 30-bit
-          word displacement, e.g. for SPARC) */
-  BFD_RELOC_32_PCREL_S2,
+   /* Reloc types used for i960/b.out.  */
+  BFD_RELOC_I960_CALLJ,

 
    /* now for the sparc/elf codes */
   BFD_RELOC_NONE,               /* actually used */
 
    /* now for the sparc/elf codes */
   BFD_RELOC_NONE,               /* actually used */


@@ -1127,7 +1275,7 @@ typedef enum bfd_reloc_code_real
   BFD_RELOC_SPARC_RELATIVE,
   BFD_RELOC_SPARC_UA32,
 
   BFD_RELOC_SPARC_RELATIVE,
   BFD_RELOC_SPARC_UA32,
 

-   /* this one is a.out specific? */
+   /* these are a.out specific? */

   BFD_RELOC_SPARC_BASE13,
   BFD_RELOC_SPARC_BASE22,
 
   BFD_RELOC_SPARC_BASE13,
   BFD_RELOC_SPARC_BASE22,
 


@@ -1148,37 +1296,86 @@ typedef enum bfd_reloc_code_real
   BFD_RELOC_SPARC_LO7,
    /* end-sanitize-v9 */
 
   BFD_RELOC_SPARC_LO7,
    /* end-sanitize-v9 */
 

-        /* Bits 27..2 of the relocation address shifted right 2 bits;
-         simple reloc otherwise.  */
+   /* Alpha ECOFF relocations.  Some of these treat the symbol or "addend"
+     in some special way.  */
+   /* For GPDISP_HI16 ("gpdisp") relocations, the symbol is ignored when
+     writing; when reading, it will be the absolute section symbol.  The
+     addend is the displacement in bytes of the "lda" instruction from
+     the "ldah" instruction (which is at the address of this reloc).  */
+  BFD_RELOC_ALPHA_GPDISP_HI16,
+   /* For GPDISP_LO16 ("ignore") relocations, the symbol is handled as
+     with GPDISP_HI16 relocs.  The addend is ignored when writing the
+     relocations out, and is filled in with the file's GP value on
+     reading, for convenience.  */
+  BFD_RELOC_ALPHA_GPDISP_LO16,
+
+   /* The Alpha LITERAL/LITUSE relocs are produced by a symbol reference;
+     the assembler turns it into a LDQ instruction to load the address of
+     the symbol, and then fills in a register in the real instruction.
+
+     The LITERAL reloc, at the LDQ instruction, refers to the .lita
+     section symbol.  The addend is ignored when writing, but is filled
+     in with the file's GP value on reading, for convenience, as with the
+     GPDISP_LO16 reloc.
+
+     The LITUSE reloc, on the instruction using the loaded address, gives
+     information to the linker that it might be able to use to optimize
+     away some literal section references.  The symbol is ignored (read
+     as the absolute section symbol), and the "addend" indicates the type
+     of instruction using the register:
+              1 - "memory" fmt insn
+              2 - byte-manipulation (byte offset reg)
+              3 - jsr (target of branch)
+
+     The GNU linker currently doesn't do any of this optimizing.  */
+  BFD_RELOC_ALPHA_LITERAL,
+  BFD_RELOC_ALPHA_LITUSE,
+
+   /* The HINT relocation indicates a value that should be filled into the
+     "hint" field of a jmp/jsr/ret instruction, for possible branch-
+     prediction logic which may be provided on some processors.  */
+  BFD_RELOC_ALPHA_HINT,
+
+   /* Bits 27..2 of the relocation address shifted right 2 bits;
+     simple reloc otherwise.  */

   BFD_RELOC_MIPS_JMP,
 
   BFD_RELOC_MIPS_JMP,
 

-        /* signed 16-bit pc-relative, shifted right 2 bits (e.g. for MIPS) */
-  BFD_RELOC_16_PCREL_S2,
-
-        /* High 16 bits of 32-bit value; simple reloc.  */
+   /* High 16 bits of 32-bit value; simple reloc.  */

   BFD_RELOC_HI16,
   BFD_RELOC_HI16,

-        /* High 16 bits of 32-bit value but the low 16 bits will be sign
-          extended and added to form the final result.  If the low 16
-          bits form a negative number, we need to add one to the high value
-          to compensate for the borrow when the low bits are added.  */
+   /* High 16 bits of 32-bit value but the low 16 bits will be sign
+     extended and added to form the final result.  If the low 16
+     bits form a negative number, we need to add one to the high value
+     to compensate for the borrow when the low bits are added.  */

   BFD_RELOC_HI16_S,
   BFD_RELOC_HI16_S,

-        /* Low 16 bits.  */
+   /* Low 16 bits.  */

   BFD_RELOC_LO16,
   BFD_RELOC_LO16,

-
-        /* 16 bit relocation relative to the global pointer.  */
-  BFD_RELOC_MIPS_GPREL,
-
-        /* These are, so far, specific to HPPA processors.  I'm not sure that
-          some don't duplicate other reloc types, such as BFD_RELOC_32 and
-          _32_PCREL.  Also, many more were in the list I got that don't
-          fit in well in the model BFD uses, so I've omitted them for now.
-          If we do make this reloc type get used for code that really does
-          implement the funky reloc types, they'll have to be added to this
-          list.   */
+   /* Like BFD_RELOC_HI16_S, but PC relative.  */
+  BFD_RELOC_PCREL_HI16_S,
+   /* Like BFD_RELOC_LO16, but PC relative.  */
+  BFD_RELOC_PCREL_LO16,
+
+   /* relocation relative to the global pointer.  */
+#define BFD_RELOC_MIPS_GPREL BFD_RELOC_GPREL16
+
+   /* Relocation against a MIPS literal section.  */
+  BFD_RELOC_MIPS_LITERAL,
+
+   /* MIPS ELF relocations.  */
+  BFD_RELOC_MIPS_GOT16,
+  BFD_RELOC_MIPS_CALL16,
+#define BFD_RELOC_MIPS_GPREL32 BFD_RELOC_GPREL32
+
+   /* These are, so far, specific to HPPA processors.  I'm not sure that some
+     don't duplicate other reloc types, such as BFD_RELOC_32 and _32_PCREL.
+     Also, many more were in the list I got that don't fit in well in the
+     model BFD uses, so I've omitted them for now.  If we do make this reloc
+     type get used for code that really does implement the funky reloc types,
+     they'll have to be added to this list.  */

   BFD_RELOC_HPPA_32,
   BFD_RELOC_HPPA_11,
   BFD_RELOC_HPPA_14,
   BFD_RELOC_HPPA_17,
   BFD_RELOC_HPPA_32,
   BFD_RELOC_HPPA_11,
   BFD_RELOC_HPPA_14,
   BFD_RELOC_HPPA_17,

+

   BFD_RELOC_HPPA_L21,
   BFD_RELOC_HPPA_R11,
   BFD_RELOC_HPPA_R14,
   BFD_RELOC_HPPA_L21,
   BFD_RELOC_HPPA_R11,
   BFD_RELOC_HPPA_R14,


@@ -1194,6 +1391,7 @@ typedef enum bfd_reloc_code_real
   BFD_RELOC_HPPA_LR21,
   BFD_RELOC_HPPA_RR14,
   BFD_RELOC_HPPA_RR17,
   BFD_RELOC_HPPA_LR21,
   BFD_RELOC_HPPA_RR14,
   BFD_RELOC_HPPA_RR17,

+

   BFD_RELOC_HPPA_GOTOFF_11,
   BFD_RELOC_HPPA_GOTOFF_14,
   BFD_RELOC_HPPA_GOTOFF_L21,
   BFD_RELOC_HPPA_GOTOFF_11,
   BFD_RELOC_HPPA_GOTOFF_14,
   BFD_RELOC_HPPA_GOTOFF_L21,


@@ -1207,12 +1405,14 @@ typedef enum bfd_reloc_code_real
   BFD_RELOC_HPPA_GOTOFF_RD14,
   BFD_RELOC_HPPA_GOTOFF_LR21,
   BFD_RELOC_HPPA_GOTOFF_RR14,
   BFD_RELOC_HPPA_GOTOFF_RD14,
   BFD_RELOC_HPPA_GOTOFF_LR21,
   BFD_RELOC_HPPA_GOTOFF_RR14,

+

   BFD_RELOC_HPPA_DLT_32,
   BFD_RELOC_HPPA_DLT_11,
   BFD_RELOC_HPPA_DLT_14,
   BFD_RELOC_HPPA_DLT_L21,
   BFD_RELOC_HPPA_DLT_R11,
   BFD_RELOC_HPPA_DLT_R14,
   BFD_RELOC_HPPA_DLT_32,
   BFD_RELOC_HPPA_DLT_11,
   BFD_RELOC_HPPA_DLT_14,
   BFD_RELOC_HPPA_DLT_L21,
   BFD_RELOC_HPPA_DLT_R11,
   BFD_RELOC_HPPA_DLT_R14,

+

   BFD_RELOC_HPPA_ABS_CALL_11,
   BFD_RELOC_HPPA_ABS_CALL_14,
   BFD_RELOC_HPPA_ABS_CALL_17,
   BFD_RELOC_HPPA_ABS_CALL_11,
   BFD_RELOC_HPPA_ABS_CALL_14,
   BFD_RELOC_HPPA_ABS_CALL_17,


@@ -1231,6 +1431,7 @@ typedef enum bfd_reloc_code_real
   BFD_RELOC_HPPA_ABS_CALL_LR21,
   BFD_RELOC_HPPA_ABS_CALL_RR14,
   BFD_RELOC_HPPA_ABS_CALL_RR17,
   BFD_RELOC_HPPA_ABS_CALL_LR21,
   BFD_RELOC_HPPA_ABS_CALL_RR14,
   BFD_RELOC_HPPA_ABS_CALL_RR17,

+

   BFD_RELOC_HPPA_PCREL_CALL_11,
   BFD_RELOC_HPPA_PCREL_CALL_12,
   BFD_RELOC_HPPA_PCREL_CALL_14,
   BFD_RELOC_HPPA_PCREL_CALL_11,
   BFD_RELOC_HPPA_PCREL_CALL_12,
   BFD_RELOC_HPPA_PCREL_CALL_14,


@@ -1250,23 +1451,45 @@ typedef enum bfd_reloc_code_real
   BFD_RELOC_HPPA_PCREL_CALL_LR21,
   BFD_RELOC_HPPA_PCREL_CALL_RR14,
   BFD_RELOC_HPPA_PCREL_CALL_RR17,
   BFD_RELOC_HPPA_PCREL_CALL_LR21,
   BFD_RELOC_HPPA_PCREL_CALL_RR14,
   BFD_RELOC_HPPA_PCREL_CALL_RR17,

+

   BFD_RELOC_HPPA_PLABEL_32,
   BFD_RELOC_HPPA_PLABEL_11,
   BFD_RELOC_HPPA_PLABEL_14,
   BFD_RELOC_HPPA_PLABEL_L21,
   BFD_RELOC_HPPA_PLABEL_R11,
   BFD_RELOC_HPPA_PLABEL_R14,
   BFD_RELOC_HPPA_PLABEL_32,
   BFD_RELOC_HPPA_PLABEL_11,
   BFD_RELOC_HPPA_PLABEL_14,
   BFD_RELOC_HPPA_PLABEL_L21,
   BFD_RELOC_HPPA_PLABEL_R11,
   BFD_RELOC_HPPA_PLABEL_R14,

+

   BFD_RELOC_HPPA_UNWIND_ENTRY,
   BFD_RELOC_HPPA_UNWIND_ENTRIES,
 
   BFD_RELOC_HPPA_UNWIND_ENTRY,
   BFD_RELOC_HPPA_UNWIND_ENTRIES,
 

+   /* i386/elf relocations */
+  BFD_RELOC_386_GOT32,
+  BFD_RELOC_386_PLT32,
+  BFD_RELOC_386_COPY,
+  BFD_RELOC_386_GLOB_DAT,
+  BFD_RELOC_386_JUMP_SLOT,
+  BFD_RELOC_386_RELATIVE,
+  BFD_RELOC_386_GOTOFF,
+  BFD_RELOC_386_GOTPC,
+
+   /* PowerPC/POWER (RS/6000) relocs.  */
+   /* 26 bit relative branch.  Low two bits must be zero.  High 24
+     bits installed in bits 6 through 29 of instruction.  */
+  BFD_RELOC_PPC_B26,
+   /* 26 bit absolute branch, like BFD_RELOC_PPC_B26 but absolute.  */
+  BFD_RELOC_PPC_BA26,
+   /* 16 bit TOC relative reference.  */
+  BFD_RELOC_PPC_TOC16,
+

    /* this must be the highest numeric value */
   BFD_RELOC_UNUSED
  } bfd_reloc_code_real_type;
    /* this must be the highest numeric value */
   BFD_RELOC_UNUSED
  } bfd_reloc_code_real_type;

-CONST struct reloc_howto_struct *
+const struct reloc_howto_struct *

 
 bfd_reloc_type_lookup  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 
 
 bfd_reloc_type_lookup  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 

-typedef struct symbol_cache_entry 
+
+typedef struct symbol_cache_entry

 {
         /* A pointer to the BFD which owns the symbol. This information
           is necessary so that a back end can work out what additional
 {
         /* A pointer to the BFD which owns the symbol. This information
           is necessary so that a back end can work out what additional


@@ -1280,7 +1503,7 @@ typedef struct symbol_cache_entry
 
   struct _bfd *the_bfd;  /* Use bfd_asymbol_bfd(sym) to access this field. */
 
 
   struct _bfd *the_bfd;  /* Use bfd_asymbol_bfd(sym) to access this field. */
 

-        /* The text of the symbol. The name is left alone, and not copied - the
+        /* The text of the symbol. The name is left alone, and not copied; the

           application may not alter it. */
   CONST char *name;
 
           application may not alter it. */
   CONST char *name;
 


@@ -1301,13 +1524,13 @@ typedef struct symbol_cache_entry
           value is the offset into the section of the data. */
 #define BSF_GLOBAL     0x02
 
           value is the offset into the section of the data. */
 #define BSF_GLOBAL     0x02
 

-        /* The symbol has global scope, and is exported. The value is
+        /* The symbol has global scope and is exported. The value is

           the offset into the section of the data. */
           the offset into the section of the data. */

-#define BSF_EXPORT     0x04
+#define BSF_EXPORT     BSF_GLOBAL  /* no real difference */

 
         /* A normal C symbol would be one of:
           <<BSF_LOCAL>>, <<BSF_FORT_COMM>>,  <<BSF_UNDEFINED>> or
 
         /* A normal C symbol would be one of:
           <<BSF_LOCAL>>, <<BSF_FORT_COMM>>,  <<BSF_UNDEFINED>> or

-          <<BSF_EXPORT|BSD_GLOBAL>> */
+          <<BSF_GLOBAL>> */

 
         /* The symbol is a debugging record. The value has an arbitary
           meaning. */
 
         /* The symbol is a debugging record. The value has an arbitary
           meaning. */


@@ -1321,7 +1544,8 @@ typedef struct symbol_cache_entry
 #define BSF_KEEP        0x20
 #define BSF_KEEP_G      0x40
 
 #define BSF_KEEP        0x20
 #define BSF_KEEP_G      0x40
 

-        /* ... document me ... */
+        /* A weak global symbol, overridable without warnings by
+          a regular global symbol of the same name.  */

 #define BSF_WEAK        0x80
 
         /* This symbol was created to point to a section, e.g. ELF's
 #define BSF_WEAK        0x80
 
         /* This symbol was created to point to a section, e.g. ELF's


@@ -1361,9 +1585,12 @@ typedef struct symbol_cache_entry
           for ELF STT_FILE symbols.  */
 #define BSF_FILE          0x4000
 
           for ELF STT_FILE symbols.  */
 #define BSF_FILE          0x4000
 

+        /* Symbol is from dynamic linking information.  */
+#define BSF_DYNAMIC       0x8000
+

   flagword flags;
 
   flagword flags;
 

-        /* A pointer to the section to which this symbol is 
+        /* A pointer to the section to which this symbol is

           relative.  This will always be non NULL, there are special
           sections for undefined and absolute symbols */
   struct sec *section;
           relative.  This will always be non NULL, there are special
           sections for undefined and absolute symbols */
   struct sec *section;


@@ -1373,13 +1600,18 @@ typedef struct symbol_cache_entry
   PTR udata;
 
 } asymbol;
   PTR udata;
 
 } asymbol;

-#define get_symtab_upper_bound(abfd) \
-     BFD_SEND (abfd, _get_symtab_upper_bound, (abfd))
+#define bfd_get_symtab_upper_bound(abfd) \
+     BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd))
+boolean 
+bfd_is_local_label PARAMS ((bfd *abfd, asymbol *sym));
+
+#define bfd_is_local_label(abfd, sym) \
+     BFD_SEND (abfd, _bfd_is_local_label,(abfd, sym))

 #define bfd_canonicalize_symtab(abfd, location) \
      BFD_SEND (abfd, _bfd_canonicalize_symtab,\
                   (abfd, location))
 boolean 
 #define bfd_canonicalize_symtab(abfd, location) \
      BFD_SEND (abfd, _bfd_canonicalize_symtab,\
                   (abfd, location))
 boolean 

-bfd_set_symtab  PARAMS ((bfd *, asymbol **, unsigned int ));
+bfd_set_symtab  PARAMS ((bfd *abfd, asymbol **location, unsigned int count));

 
 void 
 bfd_print_symbol_vandf PARAMS ((PTR file, asymbol *symbol));
 
 void 
 bfd_print_symbol_vandf PARAMS ((PTR file, asymbol *symbol));


@@ -1409,13 +1641,14 @@ struct _bfd
        is the result of an fopen on the filename. */
     char *iostream;
 
        is the result of an fopen on the filename. */
     char *iostream;
 

-     /* Is the file being cached */
+     /* Is the file descriptor being cached?  That is, can it be closed as
+       needed, and re-opened when accessed later?  */

 
     boolean cacheable;
 
      /* Marks whether there was a default target specified when the
 
     boolean cacheable;
 
      /* Marks whether there was a default target specified when the

-       BFD was opened. This is used to select what matching algorithm
-       to use to chose the back end. */
+       BFD was opened. This is used to select which matching algorithm
+       to use to choose the back end. */

 
     boolean target_defaulted;
 
 
     boolean target_defaulted;
 


@@ -1425,12 +1658,11 @@ struct _bfd
     struct _bfd *lru_prev, *lru_next;
 
      /* When a file is closed by the caching routines, BFD retains
     struct _bfd *lru_prev, *lru_next;
 
      /* When a file is closed by the caching routines, BFD retains

-       state information on the file here: 
-     */
+       state information on the file here: */

 
     file_ptr where;              
 
 
     file_ptr where;              
 

-     /* and here:*/
+     /* and here: (``once'' means at least once) */

 
     boolean opened_once;
 
 
     boolean opened_once;
 


@@ -1447,7 +1679,7 @@ struct _bfd
 
     int ifd;
 
 
     int ifd;
 

-     /* The format which belongs to the BFD.*/
+     /* The format which belongs to the BFD. (object, core, etc.) */

 
     bfd_format format;
 
 
     bfd_format format;
 


@@ -1469,7 +1701,7 @@ struct _bfd
     file_ptr origin;             
 
      /* Remember when output has begun, to stop strange things
     file_ptr origin;             
 
      /* Remember when output has begun, to stop strange things

-       happening. */
+       from happening. */

     boolean output_has_begun;
 
      /* Pointer to linked list of sections*/
     boolean output_has_begun;
 
      /* Pointer to linked list of sections*/


@@ -1485,7 +1717,7 @@ struct _bfd
      /* Used for input and output*/
     unsigned int symcount;
 
      /* Used for input and output*/
     unsigned int symcount;
 

-     /* Symbol table for output BFD*/
+     /* Symbol table for output BFD (with symcount entries) */

     struct symbol_cache_entry  **outsymbols;             
 
      /* Pointer to structure which contains architecture information*/
     struct symbol_cache_entry  **outsymbols;             
 
      /* Pointer to structure which contains architecture information*/


@@ -1493,11 +1725,18 @@ struct _bfd
 
      /* Stuff only useful for archives:*/
     PTR arelt_data;              
 
      /* Stuff only useful for archives:*/
     PTR arelt_data;              

-    struct _bfd *my_archive;     
-    struct _bfd *next;           
-    struct _bfd *archive_head;   
+    struct _bfd *my_archive;      /* The containing archive BFD.  */
+    struct _bfd *next;            /* The next BFD in the archive.  */
+    struct _bfd *archive_head;    /* The first BFD in the archive.  */

     boolean has_armap;           
 
     boolean has_armap;           
 

+     /* A chain of BFD structures involved in a link.  */
+    struct _bfd *link_next;
+
+     /* A field used by _bfd_generic_link_add_archive_symbols.  This will
+       be used only for archive elements.  */
+    int archive_pass;
+

      /* Used by the back end to hold private data. */
 
     union 
      /* Used by the back end to hold private data. */
 
     union 


@@ -1517,9 +1756,13 @@ struct _bfd
       struct bout_data_struct *bout_data;
       struct sun_core_struct *sun_core_data;
       struct trad_core_struct *trad_core_data;
       struct bout_data_struct *bout_data;
       struct sun_core_struct *sun_core_data;
       struct trad_core_struct *trad_core_data;

-      struct hppa_data_struct *hppa_data;
-      struct hppa_core_struct *hppa_core_data;
+      struct som_data_struct *som_data;
+      struct hpux_core_struct *hpux_core_data;
+      struct hppabsd_core_struct *hppabsd_core_data;

       struct sgi_core_struct *sgi_core_data;
       struct sgi_core_struct *sgi_core_data;

+      struct lynx_core_struct *lynx_core_data;
+      struct osf_core_struct *osf_core_data;
+      struct cisco_core_struct *cisco_core_data;

       PTR any;
       } tdata;
   
       PTR any;
       } tdata;
   


@@ -1528,24 +1771,51 @@ struct _bfd
 
      /* Where all the allocated stuff under this BFD goes */
     struct obstack memory;
 
      /* Where all the allocated stuff under this BFD goes */
     struct obstack memory;

-
-     /* Is this really needed in addition to usrdata?  */
-    asymbol **ld_symbols;

 };
 
 };
 

-unsigned int 
+typedef enum bfd_error
+{
+  bfd_error_no_error = 0,
+  bfd_error_system_call,
+  bfd_error_invalid_target,
+  bfd_error_wrong_format,
+  bfd_error_invalid_operation,
+  bfd_error_no_memory,
+  bfd_error_no_symbols,
+  bfd_error_no_more_archived_files,
+  bfd_error_malformed_archive,
+  bfd_error_file_not_recognized,
+  bfd_error_file_ambiguously_recognized,
+  bfd_error_no_contents,
+  bfd_error_nonrepresentable_section,
+  bfd_error_no_debug_section,
+  bfd_error_bad_value,
+  bfd_error_file_truncated,
+  bfd_error_invalid_error_code
+} bfd_error_type;
+
+bfd_error_type 
+bfd_get_error  PARAMS ((void));
+
+void 
+bfd_set_error  PARAMS ((bfd_error_type error_tag));
+
+CONST char *
+bfd_errmsg  PARAMS ((bfd_error_type error_tag));
+
+void 
+bfd_perror  PARAMS ((CONST char *message));
+
+long 

 bfd_get_reloc_upper_bound PARAMS ((bfd *abfd, asection *sect));
 
 bfd_get_reloc_upper_bound PARAMS ((bfd *abfd, asection *sect));
 

-unsigned int 
+long 

 bfd_canonicalize_reloc
  PARAMS ((bfd *abfd,
     asection *sec,
     arelent **loc,
     asymbol    **syms));
 
 bfd_canonicalize_reloc
  PARAMS ((bfd *abfd,
     asection *sec,
     arelent **loc,
     asymbol    **syms));
 

-boolean 
-bfd_set_file_flags PARAMS ((bfd *abfd, flagword flags));
-

 void 
 bfd_set_reloc
  PARAMS ((bfd *abfd, asection *sec, arelent **rel, unsigned int count)
 void 
 bfd_set_reloc
  PARAMS ((bfd *abfd, asection *sec, arelent **rel, unsigned int count)


@@ -1553,20 +1823,32 @@ bfd_set_reloc
     );
 
 boolean 
     );
 
 boolean 

-bfd_set_start_address PARAMS ((bfd *, bfd_vma));
+bfd_set_file_flags PARAMS ((bfd *abfd, flagword flags));
+
+boolean 
+bfd_set_start_address PARAMS ((bfd *abfd, bfd_vma vma));

 
 long 
 
 long 

-bfd_get_mtime PARAMS ((bfd *));
+bfd_get_mtime PARAMS ((bfd *abfd));

 
 long 
 
 long 

-bfd_get_size PARAMS ((bfd *));
+bfd_get_size PARAMS ((bfd *abfd));

 
 int 
 
 int 

-bfd_get_gp_size PARAMS ((bfd *));
+bfd_get_gp_size PARAMS ((bfd *abfd));

 
 void 
 
 void 

-bfd_set_gp_size PARAMS ((bfd *, int));
+bfd_set_gp_size PARAMS ((bfd *abfd, int i));

 
 

+bfd_vma 
+bfd_scan_vma PARAMS ((CONST char *string, CONST char **end, int base));
+
+boolean 
+bfd_copy_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd));
+
+#define bfd_copy_private_bfd_data(ibfd, obfd) \
+     BFD_SEND (ibfd, _bfd_copy_private_bfd_data, \
+               (ibfd, obfd))

 #define bfd_sizeof_headers(abfd, reloc) \
      BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, reloc))
 
 #define bfd_sizeof_headers(abfd, reloc) \
      BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, reloc))
 


@@ -1590,31 +1872,54 @@ bfd_set_gp_size PARAMS ((bfd *, int));
 #define bfd_set_arch_mach(abfd, arch, mach)\
         BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach))
 
 #define bfd_set_arch_mach(abfd, arch, mach)\
         BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach))
 

-#define bfd_get_relocated_section_contents(abfd, seclet, data, relocateable) \
-       BFD_SEND (abfd, _bfd_get_relocated_section_contents, (abfd, seclet, data, relocateable))
+#define bfd_get_relocated_section_contents(abfd, link_info, link_order, data, relocateable, symbols) \
+       BFD_SEND (abfd, _bfd_get_relocated_section_contents, \
+                 (abfd, link_info, link_order, data, relocateable, symbols))

  
  

-#define bfd_relax_section(abfd, section, symbols) \
-       BFD_SEND (abfd, _bfd_relax_section, (abfd, section, symbols))
+#define bfd_relax_section(abfd, section, link_info, again) \
+       BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again))
+
+#define bfd_link_hash_table_create(abfd) \
+       BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
+
+#define bfd_link_add_symbols(abfd, info) \
+       BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
+
+#define bfd_final_link(abfd, info) \
+       BFD_SEND (abfd, _bfd_final_link, (abfd, info))
+
+#define bfd_free_cached_info(abfd) \
+       BFD_SEND (abfd, _bfd_free_cached_info, (abfd))
+
+#define bfd_get_dynamic_symtab_upper_bound(abfd) \
+       BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd))
+
+#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
+       BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
+
+#define bfd_get_dynamic_reloc_upper_bound(abfd) \
+       BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
+
+#define bfd_canonicalize_dynamic_reloc(abfd, arels, asyms) \
+       BFD_SEND (abfd, _bfd_canonicalize_dynamic_reloc, (abfd, arels, asyms))

 
 

-#define bfd_seclet_link(abfd, data, relocateable) \
-       BFD_SEND (abfd, _bfd_seclet_link, (abfd, data, relocateable))

 symindex 
 symindex 

-bfd_get_next_mapent PARAMS ((bfd *, symindex previous, carsym ** sym));
+bfd_get_next_mapent PARAMS ((bfd *abfd, symindex previous, carsym **sym));

 
 boolean 
 bfd_set_archive_head PARAMS ((bfd *output, bfd *new_head));
 
 bfd *
 
 boolean 
 bfd_set_archive_head PARAMS ((bfd *output, bfd *new_head));
 
 bfd *

-bfd_get_elt_at_index PARAMS ((bfd * archive, int index));
+bfd_get_elt_at_index PARAMS ((bfd *archive, int index));

 
 

-bfd* 
+bfd *

 bfd_openr_next_archived_file PARAMS ((bfd *archive, bfd *previous));
 
 CONST char *
 bfd_openr_next_archived_file PARAMS ((bfd *archive, bfd *previous));
 
 CONST char *

-bfd_core_file_failing_command PARAMS ((bfd *));
+bfd_core_file_failing_command PARAMS ((bfd *abfd));

 
 int 
 
 int 

-bfd_core_file_failing_signal PARAMS ((bfd *));
+bfd_core_file_failing_signal PARAMS ((bfd *abfd));

 
 boolean 
 core_file_matches_executable_p
 
 boolean 
 core_file_matches_executable_p


@@ -1622,23 +1927,45 @@ core_file_matches_executable_p
 
 #define BFD_SEND(bfd, message, arglist) \
                ((*((bfd)->xvec->message)) arglist)
 
 #define BFD_SEND(bfd, message, arglist) \
                ((*((bfd)->xvec->message)) arglist)

+
+#ifdef DEBUG_BFD_SEND
+#undef BFD_SEND
+#define BFD_SEND(bfd, message, arglist) \
+  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
+    ((*((bfd)->xvec->message)) arglist) : \
+    (bfd_assert (__FILE__,__LINE__), NULL))
+#endif

 #define BFD_SEND_FMT(bfd, message, arglist) \
             (((bfd)->xvec->message[(int)((bfd)->format)]) arglist)
 #define BFD_SEND_FMT(bfd, message, arglist) \
             (((bfd)->xvec->message[(int)((bfd)->format)]) arglist)

+
+#ifdef DEBUG_BFD_SEND
+#undef BFD_SEND_FMT
+#define BFD_SEND_FMT(bfd, message, arglist) \
+  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
+   (((bfd)->xvec->message[(int)((bfd)->format)]) arglist) : \
+   (bfd_assert (__FILE__,__LINE__), NULL))
+#endif
+enum bfd_flavour {
+  bfd_target_unknown_flavour,
+  bfd_target_aout_flavour,
+  bfd_target_coff_flavour,
+  bfd_target_ecoff_flavour,
+  bfd_target_elf_flavour,
+  bfd_target_ieee_flavour,
+  bfd_target_nlm_flavour,
+  bfd_target_oasys_flavour,
+  bfd_target_tekhex_flavour,
+  bfd_target_srec_flavour,
+  bfd_target_som_flavour,
+  bfd_target_os9k_flavour};
+
+ /* Forward declaration.  */
+typedef struct bfd_link_info _bfd_link_info;
+

 typedef struct bfd_target
 {
   char *name;
 typedef struct bfd_target
 {
   char *name;

-  enum target_flavour {
-    bfd_target_unknown_flavour,
-    bfd_target_aout_flavour,
-    bfd_target_coff_flavour,
-    bfd_target_ecoff_flavour,
-    bfd_target_elf_flavour,
-    bfd_target_ieee_flavour,
-    bfd_target_nlm_flavour,
-    bfd_target_oasys_flavour,
-    bfd_target_tekhex_flavour,
-    bfd_target_srec_flavour,
-    bfd_target_hppa_flavour} flavour;
+  enum bfd_flavour flavour;

   boolean byteorder_big_p;
   boolean header_byteorder_big_p;
   flagword object_flags;       
   boolean byteorder_big_p;
   boolean header_byteorder_big_p;
   flagword object_flags;       


@@ -1647,30 +1974,73 @@ typedef struct bfd_target
   char ar_pad_char;            
   unsigned short ar_max_namelen;
   unsigned int align_power_min;
   char ar_pad_char;            
   unsigned short ar_max_namelen;
   unsigned int align_power_min;

-  bfd_vma      (*bfd_getx64) PARAMS ((bfd_byte *));
-  bfd_signed_vma (*bfd_getx_signed_64) PARAMS ((bfd_byte *));
+  bfd_vma      (*bfd_getx64) PARAMS ((const bfd_byte *));
+  bfd_signed_vma (*bfd_getx_signed_64) PARAMS ((const bfd_byte *));

   void         (*bfd_putx64) PARAMS ((bfd_vma, bfd_byte *));
   void         (*bfd_putx64) PARAMS ((bfd_vma, bfd_byte *));

-  bfd_vma      (*bfd_getx32) PARAMS ((bfd_byte *));
-  bfd_signed_vma (*bfd_getx_signed_32) PARAMS ((bfd_byte *));
+  bfd_vma      (*bfd_getx32) PARAMS ((const bfd_byte *));
+  bfd_signed_vma (*bfd_getx_signed_32) PARAMS ((const bfd_byte *));

   void         (*bfd_putx32) PARAMS ((bfd_vma, bfd_byte *));
   void         (*bfd_putx32) PARAMS ((bfd_vma, bfd_byte *));

-  bfd_vma      (*bfd_getx16) PARAMS ((bfd_byte *));
-  bfd_signed_vma (*bfd_getx_signed_16) PARAMS ((bfd_byte *));
+  bfd_vma      (*bfd_getx16) PARAMS ((const bfd_byte *));
+  bfd_signed_vma (*bfd_getx_signed_16) PARAMS ((const bfd_byte *));

   void         (*bfd_putx16) PARAMS ((bfd_vma, bfd_byte *));
   void         (*bfd_putx16) PARAMS ((bfd_vma, bfd_byte *));

-  bfd_vma      (*bfd_h_getx64) PARAMS ((bfd_byte *));
-  bfd_signed_vma (*bfd_h_getx_signed_64) PARAMS ((bfd_byte *));
+  bfd_vma      (*bfd_h_getx64) PARAMS ((const bfd_byte *));
+  bfd_signed_vma (*bfd_h_getx_signed_64) PARAMS ((const bfd_byte *));

   void         (*bfd_h_putx64) PARAMS ((bfd_vma, bfd_byte *));
   void         (*bfd_h_putx64) PARAMS ((bfd_vma, bfd_byte *));

-  bfd_vma      (*bfd_h_getx32) PARAMS ((bfd_byte *));
-  bfd_signed_vma (*bfd_h_getx_signed_32) PARAMS ((bfd_byte *));
+  bfd_vma      (*bfd_h_getx32) PARAMS ((const bfd_byte *));
+  bfd_signed_vma (*bfd_h_getx_signed_32) PARAMS ((const bfd_byte *));

   void         (*bfd_h_putx32) PARAMS ((bfd_vma, bfd_byte *));
   void         (*bfd_h_putx32) PARAMS ((bfd_vma, bfd_byte *));

-  bfd_vma      (*bfd_h_getx16) PARAMS ((bfd_byte *));
-  bfd_signed_vma (*bfd_h_getx_signed_16) PARAMS ((bfd_byte *));
+  bfd_vma      (*bfd_h_getx16) PARAMS ((const bfd_byte *));
+  bfd_signed_vma (*bfd_h_getx_signed_16) PARAMS ((const bfd_byte *));

   void         (*bfd_h_putx16) PARAMS ((bfd_vma, bfd_byte *));
   struct bfd_target * (*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *));
   boolean             (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
   boolean             (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
   void         (*bfd_h_putx16) PARAMS ((bfd_vma, bfd_byte *));
   struct bfd_target * (*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *));
   boolean             (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
   boolean             (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));

+
+   /* Generic entry points.  */
+#define BFD_JUMP_TABLE_GENERIC(NAME)\
+CAT(NAME,_close_and_cleanup),\
+CAT(NAME,_bfd_free_cached_info),\
+CAT(NAME,_new_section_hook),\
+CAT(NAME,_get_section_contents)
+   /* Called when the BFD is being closed to do any necessary cleanup.  */
+  boolean       (*_close_and_cleanup) PARAMS ((bfd *));
+   /* Ask the BFD to free all cached information.  */
+  boolean (*_bfd_free_cached_info) PARAMS ((bfd *));
+   /* Called when a new section is created.  */
+  boolean       (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
+   /* Read the contents of a section.  */
+  boolean       (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, 
+                                            file_ptr, bfd_size_type));
+
+   /* Entry points to copy private data.  */
+#define BFD_JUMP_TABLE_COPY(NAME)\
+CAT(NAME,_bfd_copy_private_bfd_data),\
+CAT(NAME,_bfd_copy_private_section_data)
+   /* Called to copy BFD general private data from one object file
+     to another.  */
+  boolean       (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
+   /* Called to copy BFD private section data from one object file
+     to another.  */
+  boolean       (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr,
+                                                       bfd *, sec_ptr));
+
+   /* Core file entry points.  */
+#define BFD_JUMP_TABLE_CORE(NAME)\
+CAT(NAME,_core_file_failing_command),\
+CAT(NAME,_core_file_failing_signal),\
+CAT(NAME,_core_file_matches_executable_p)

   char *   (*_core_file_failing_command) PARAMS ((bfd *));
   int      (*_core_file_failing_signal) PARAMS ((bfd *));
   boolean  (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));
   char *   (*_core_file_failing_command) PARAMS ((bfd *));
   int      (*_core_file_failing_signal) PARAMS ((bfd *));
   boolean  (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));

+
+   /* Archive entry points.  */
+#define BFD_JUMP_TABLE_ARCHIVE(NAME)\
+CAT(NAME,_slurp_armap),\
+CAT(NAME,_slurp_extended_name_table),\
+CAT(NAME,_truncate_arname),\
+CAT(NAME,_write_armap),\
+CAT(NAME,_openr_next_archived_file),\
+CAT(NAME,_generic_stat_arch_elt)

   boolean  (*_bfd_slurp_armap) PARAMS ((bfd *));
   boolean  (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
   void     (*_bfd_truncate_arname) PARAMS ((bfd *, CONST char *, char *));
   boolean  (*_bfd_slurp_armap) PARAMS ((bfd *));
   boolean  (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
   void     (*_bfd_truncate_arname) PARAMS ((bfd *, CONST char *, char *));


@@ -1679,18 +2049,23 @@ typedef struct bfd_target
                               struct orl *map,
                               unsigned int orl_count, 
                               int stridx));
                               struct orl *map,
                               unsigned int orl_count, 
                               int stridx));

-  boolean       (*_close_and_cleanup) PARAMS ((bfd *));
-  boolean       (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
-                                            file_ptr, bfd_size_type));
-  boolean       (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, 
-                                            file_ptr, bfd_size_type));
-  boolean       (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
-  unsigned int  (*_get_symtab_upper_bound) PARAMS ((bfd *));
-  unsigned int  (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
-                                              struct symbol_cache_entry **));
-  unsigned int  (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
-  unsigned int  (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **,
-                                              struct symbol_cache_entry **));
+  bfd *      (*openr_next_archived_file) PARAMS ((bfd *arch, bfd *prev));
+  int        (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
+ 
+   /* Entry points used for symbols.  */
+#define BFD_JUMP_TABLE_SYMBOLS(NAME)\
+CAT(NAME,_get_symtab_upper_bound),\
+CAT(NAME,_get_symtab),\
+CAT(NAME,_make_empty_symbol),\
+CAT(NAME,_print_symbol),\
+CAT(NAME,_get_symbol_info),\
+CAT(NAME,_bfd_is_local_label),\
+CAT(NAME,_get_lineno),\
+CAT(NAME,_find_nearest_line),\
+CAT(NAME,_bfd_make_debug_symbol)
+  long  (*_bfd_get_symtab_upper_bound) PARAMS ((bfd *));
+  long  (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
+                                             struct symbol_cache_entry **));

   struct symbol_cache_entry  *
                 (*_bfd_make_empty_symbol) PARAMS ((bfd *));
   void          (*_bfd_print_symbol) PARAMS ((bfd *, PTR,
   struct symbol_cache_entry  *
                 (*_bfd_make_empty_symbol) PARAMS ((bfd *));
   void          (*_bfd_print_symbol) PARAMS ((bfd *, PTR,


@@ -1701,40 +2076,13 @@ typedef struct bfd_target
                                       struct symbol_cache_entry *,
                                       symbol_info *));
 #define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))
                                       struct symbol_cache_entry *,
                                       symbol_info *));
 #define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))

-  alent *    (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
-
-  boolean    (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture,
-                    unsigned long));
+  boolean       (*_bfd_is_local_label) PARAMS ((bfd *, asymbol *));

 
 

-  bfd *      (*openr_next_archived_file) PARAMS ((bfd *arch, bfd *prev));
- 
+  alent *    (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));

   boolean    (*_bfd_find_nearest_line) PARAMS ((bfd *abfd,
                     struct sec *section, struct symbol_cache_entry **symbols,
                     bfd_vma offset, CONST char **file, CONST char **func,
                     unsigned int *line));
   boolean    (*_bfd_find_nearest_line) PARAMS ((bfd *abfd,
                     struct sec *section, struct symbol_cache_entry **symbols,
                     bfd_vma offset, CONST char **file, CONST char **func,
                     unsigned int *line));

- 
-  int        (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
-
-  int        (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));
-
-  void       (*_bfd_debug_info_start) PARAMS ((bfd *));
-  void       (*_bfd_debug_info_end) PARAMS ((bfd *));
-  void       (*_bfd_debug_info_accumulate) PARAMS ((bfd *, struct sec *));
-
-  bfd_byte * (*_bfd_get_relocated_section_contents) PARAMS ((bfd *,
-                    struct bfd_seclet *, bfd_byte *data,
-                    boolean relocateable));
-
-  boolean    (*_bfd_relax_section) PARAMS ((bfd *, struct sec *,
-                    struct symbol_cache_entry **));
-
-  boolean    (*_bfd_seclet_link) PARAMS ((bfd *, PTR data,
-                     boolean relocateable));
-  /* See documentation on reloc types.  */
- CONST struct reloc_howto_struct *
-       (*reloc_type_lookup) PARAMS ((bfd *abfd,
-                                     bfd_reloc_code_real_type code));
-

   /* Back-door to allow format-aware applications to create debug symbols
     while using BFD for everything else.  Currently used by the assembler
     when creating COFF files.  */
   /* Back-door to allow format-aware applications to create debug symbols
     while using BFD for everything else.  Currently used by the assembler
     when creating COFF files.  */


@@ -1742,10 +2090,78 @@ typedef struct bfd_target
        bfd *abfd,
        void *ptr,
        unsigned long size));
        bfd *abfd,
        void *ptr,
        unsigned long size));

+
+   /* Routines for relocs.  */
+#define BFD_JUMP_TABLE_RELOCS(NAME)\
+CAT(NAME,_get_reloc_upper_bound),\
+CAT(NAME,_canonicalize_reloc),\
+CAT(NAME,_bfd_reloc_type_lookup)
+  long  (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
+  long  (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **,
+                                            struct symbol_cache_entry **));
+   /* See documentation on reloc types.  */
+  CONST struct reloc_howto_struct *
+       (*reloc_type_lookup) PARAMS ((bfd *abfd,
+                                     bfd_reloc_code_real_type code));
+
+   /* Routines used when writing an object file.  */
+#define BFD_JUMP_TABLE_WRITE(NAME)\
+CAT(NAME,_set_arch_mach),\
+CAT(NAME,_set_section_contents)
+  boolean    (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture,
+                    unsigned long));
+  boolean       (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
+                                            file_ptr, bfd_size_type));
+
+   /* Routines used by the linker.  */
+#define BFD_JUMP_TABLE_LINK(NAME)\
+CAT(NAME,_sizeof_headers),\
+CAT(NAME,_bfd_get_relocated_section_contents),\
+CAT(NAME,_bfd_relax_section),\
+CAT(NAME,_bfd_link_hash_table_create),\
+CAT(NAME,_bfd_link_add_symbols),\
+CAT(NAME,_bfd_final_link)
+  int        (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));
+  bfd_byte * (*_bfd_get_relocated_section_contents) PARAMS ((bfd *,
+                    struct bfd_link_info *, struct bfd_link_order *,
+                    bfd_byte *data, boolean relocateable,
+                    struct symbol_cache_entry **));
+
+  boolean    (*_bfd_relax_section) PARAMS ((bfd *, struct sec *,
+                    struct bfd_link_info *, boolean *again));
+
+   /* Create a hash table for the linker.  Different backends store
+     different information in this table.  */
+  struct bfd_link_hash_table *(*_bfd_link_hash_table_create) PARAMS ((bfd *));
+
+   /* Add symbols from this object file into the hash table.  */
+  boolean (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
+
+   /* Do a link based on the link_order structures attached to each
+     section of the BFD.  */
+  boolean (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
+
+  /* Routines to handle dynamic symbols and relocs.  */
+#define BFD_JUMP_TABLE_DYNAMIC(NAME)\
+CAT(NAME,_get_dynamic_symtab_upper_bound),\
+CAT(NAME,_canonicalize_dynamic_symtab),\
+CAT(NAME,_get_dynamic_reloc_upper_bound),\
+CAT(NAME,_canonicalize_dynamic_reloc)
+   /* Get the amount of memory required to hold the dynamic symbols. */
+  long  (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *));
+   /* Read in the dynamic symbols.  */
+  long  (*_bfd_canonicalize_dynamic_symtab)
+    PARAMS ((bfd *, struct symbol_cache_entry **));
+   /* Get the amount of memory required to hold the dynamic relocs.  */
+  long  (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
+   /* Read in the dynamic relocs.  */
+  long  (*_bfd_canonicalize_dynamic_reloc)
+    PARAMS ((bfd *, arelent **, struct symbol_cache_entry **));
+

  PTR backend_data;
 } bfd_target;
 bfd_target *
  PTR backend_data;
 } bfd_target;
 bfd_target *

-bfd_find_target PARAMS ((CONST char *, bfd *));
+bfd_find_target PARAMS ((CONST char *target_name, bfd *abfd));

 
 CONST char **
 bfd_target_list PARAMS ((void));
 
 CONST char **
 bfd_target_list PARAMS ((void));


@@ -1754,9 +2170,12 @@ boolean
 bfd_check_format PARAMS ((bfd *abfd, bfd_format format));
 
 boolean 
 bfd_check_format PARAMS ((bfd *abfd, bfd_format format));
 
 boolean 

-bfd_set_format PARAMS ((bfd *, bfd_format));
+bfd_check_format_matches PARAMS ((bfd *abfd, bfd_format format, char ***matching));
+
+boolean 
+bfd_set_format PARAMS ((bfd *abfd, bfd_format format));

 
 CONST char *
 
 CONST char *

-bfd_format_string PARAMS ((bfd_format));
+bfd_format_string PARAMS ((bfd_format format));

 
 #endif
 
 #endif