* aoutx.h (NAME(aout,swap_ext_reloc_in)): Cast bytes->r_index to

[deliverable/binutils-gdb.git] / bfd / bfd.c

diff --git a/bfd/bfd.c b/bfd/bfd.c
index c1135c817dd4296cd0c73931be5c86f259344413..bf4516216576e2234f6bac75e45e02dbf5cb49f6 100644 (file)
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -128,6 +128,9 @@ CODE_FRAGMENT
 .  {* Symbol table for output BFD (with symcount entries).  *}
 .  struct symbol_cache_entry  **outsymbols;
 .
 .  {* Symbol table for output BFD (with symcount entries).  *}
 .  struct symbol_cache_entry  **outsymbols;
 .

+.  {* Used for slurped dynamic symbol tables.  *}
+.  unsigned int dynsymcount;
+.

 .  {* Pointer to structure which contains architecture information.  *}
 .  const struct bfd_arch_info *arch_info;
 .
 .  {* Pointer to structure which contains architecture information.  *}
 .  const struct bfd_arch_info *arch_info;
 .


@@ -193,6 +196,7 @@ CODE_FRAGMENT
 */
 
 #include "bfd.h"
 */
 
 #include "bfd.h"

+#include "bfdver.h"

 #include "sysdep.h"
 
 #ifdef ANSI_PROTOTYPES
 #include "sysdep.h"
 
 #ifdef ANSI_PROTOTYPES


@@ -749,7 +753,6 @@ bfd_get_arch_size (abfd)
   if (abfd->xvec->flavour == bfd_target_elf_flavour)
     return (get_elf_backend_data (abfd))->s->arch_size;
 
   if (abfd->xvec->flavour == bfd_target_elf_flavour)
     return (get_elf_backend_data (abfd))->s->arch_size;
 

-  bfd_set_error (bfd_error_wrong_format);

   return -1;
 }
 
   return -1;
 }
 


@@ -1186,6 +1189,9 @@ DESCRIPTION
 .#define bfd_merge_sections(abfd, link_info) \
 .      BFD_SEND (abfd, _bfd_merge_sections, (abfd, link_info))
 .
 .#define bfd_merge_sections(abfd, link_info) \
 .      BFD_SEND (abfd, _bfd_merge_sections, (abfd, link_info))
 .

+.#define bfd_discard_group(abfd, sec) \
+.      BFD_SEND (abfd, _bfd_discard_group, (abfd, sec))
+.

 .#define bfd_link_hash_table_create(abfd) \
 .      BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
 .
 .#define bfd_link_hash_table_create(abfd) \
 .      BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
 .


@@ -1195,6 +1201,9 @@ DESCRIPTION
 .#define bfd_link_add_symbols(abfd, info) \
 .      BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
 .
 .#define bfd_link_add_symbols(abfd, info) \
 .      BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
 .

+.#define bfd_link_just_syms(sec, info) \
+.      BFD_SEND (abfd, _bfd_link_just_syms, (sec, info))
+.

 .#define bfd_final_link(abfd, info) \
 .      BFD_SEND (abfd, _bfd_final_link, (abfd, info))
 .
 .#define bfd_final_link(abfd, info) \
 .      BFD_SEND (abfd, _bfd_final_link, (abfd, info))
 .


@@ -1285,10 +1294,10 @@ bfd_record_phdr (abfd, type, flags_valid, flags, at_valid, at,
   m->p_type = type;
   m->p_flags = flags;
   m->p_paddr = at;
   m->p_type = type;
   m->p_flags = flags;
   m->p_paddr = at;

-  m->p_flags_valid = flags_valid;
-  m->p_paddr_valid = at_valid;
-  m->includes_filehdr = includes_filehdr;
-  m->includes_phdrs = includes_phdrs;
+  m->p_flags_valid = (unsigned int) flags_valid;
+  m->p_paddr_valid = (unsigned int) at_valid;
+  m->includes_filehdr = (unsigned int) includes_filehdr;
+  m->includes_phdrs = (unsigned int) includes_phdrs;

   m->count = count;
   if (count > 0)
     memcpy (m->sections, secs, count * sizeof (asection *));
   m->count = count;
   if (count > 0)
     memcpy (m->sections, secs, count * sizeof (asection *));


@@ -1329,27 +1338,27 @@ FUNCTION
        bfd_alt_mach_code
 
 SYNOPSIS
        bfd_alt_mach_code
 
 SYNOPSIS

-       boolean bfd_alt_mach_code(bfd *abfd, int index);
+       boolean bfd_alt_mach_code(bfd *abfd, int alternative);

 
 DESCRIPTION
 
        When more than one machine code number is available for the
        same machine type, this function can be used to switch between
 
 DESCRIPTION
 
        When more than one machine code number is available for the
        same machine type, this function can be used to switch between

-       the preferred one (index == 0) and any others.  Currently,
+       the preferred one (alternative == 0) and any others.  Currently,

        only ELF supports this feature, with up to two alternate
        machine codes.
 */
 
 boolean
        only ELF supports this feature, with up to two alternate
        machine codes.
 */
 
 boolean

-bfd_alt_mach_code (abfd, index)
+bfd_alt_mach_code (abfd, alternative)

      bfd *abfd;
      bfd *abfd;

-     int index;
+     int alternative;

 {
   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
     {
       int code;
 
 {
   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
     {
       int code;
 

-      switch (index)
+      switch (alternative)

        {
        case 0:
          code = get_elf_backend_data (abfd)->elf_machine_code;
        {
        case 0:
          code = get_elf_backend_data (abfd)->elf_machine_code;