This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Patch installed to convert bfd/*h8300* to C90


Installed as obvious.

Richard


	* elf32-h8300.c: Convert function prototypes and definitions
	to C90 syntax.
	* coff-h8300.c: Likewise.
	* cpu-h8300.c: Likewise.

Index: bfd/elf32-h8300.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-h8300.c,v
retrieving revision 1.29
diff -c -d -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.29 elf32-h8300.c
*** bfd/elf32-h8300.c	4 Jul 2003 10:25:14 -0000	1.29
--- bfd/elf32-h8300.c	11 Jul 2003 10:29:15 -0000
***************
*** 25,62 ****
  #include "elf/h8.h"
  
  static reloc_howto_type *elf32_h8_reloc_type_lookup
!   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
  static void elf32_h8_info_to_howto
!   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
  static void elf32_h8_info_to_howto_rel
!   PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
  static unsigned long elf32_h8_mach
!   PARAMS ((flagword));
  static void elf32_h8_final_write_processing
!   PARAMS ((bfd *, bfd_boolean));
  static bfd_boolean elf32_h8_object_p
!   PARAMS ((bfd *));
  static bfd_boolean elf32_h8_merge_private_bfd_data
!   PARAMS ((bfd *, bfd *));
  static bfd_boolean elf32_h8_relax_section
!   PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
  static bfd_boolean elf32_h8_relax_delete_bytes
!   PARAMS ((bfd *, asection *, bfd_vma, int));
  static bfd_boolean elf32_h8_symbol_address_p
!   PARAMS ((bfd *, asection *, bfd_vma));
  static bfd_byte *elf32_h8_get_relocated_section_contents
!   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
! 	   bfd_byte *, bfd_boolean, asymbol **));
  static bfd_reloc_status_type elf32_h8_final_link_relocate
!   PARAMS ((unsigned long, bfd *, bfd *, asection *,
! 	   bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
! 	   struct bfd_link_info *, asection *, int));
  static bfd_boolean elf32_h8_relocate_section
!   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
! 	   bfd_byte *, Elf_Internal_Rela *,
! 	   Elf_Internal_Sym *, asection **));
  static bfd_reloc_status_type special
!   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
  
  /* This does not include any relocation information, but should be
     good enough for GDB or objdump to read the file.  */
--- 25,62 ----
  #include "elf/h8.h"
  
  static reloc_howto_type *elf32_h8_reloc_type_lookup
!   (bfd *abfd, bfd_reloc_code_real_type code);
  static void elf32_h8_info_to_howto
!   (bfd *, arelent *, Elf_Internal_Rela *);
  static void elf32_h8_info_to_howto_rel
!   (bfd *, arelent *, Elf_Internal_Rela *);
  static unsigned long elf32_h8_mach
!   (flagword);
  static void elf32_h8_final_write_processing
!   (bfd *, bfd_boolean);
  static bfd_boolean elf32_h8_object_p
!   (bfd *);
  static bfd_boolean elf32_h8_merge_private_bfd_data
!   (bfd *, bfd *);
  static bfd_boolean elf32_h8_relax_section
!   (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
  static bfd_boolean elf32_h8_relax_delete_bytes
!   (bfd *, asection *, bfd_vma, int);
  static bfd_boolean elf32_h8_symbol_address_p
!   (bfd *, asection *, bfd_vma);
  static bfd_byte *elf32_h8_get_relocated_section_contents
!   (bfd *, struct bfd_link_info *, struct bfd_link_order *,
!    bfd_byte *, bfd_boolean, asymbol **);
  static bfd_reloc_status_type elf32_h8_final_link_relocate
!   (unsigned long, bfd *, bfd *, asection *,
!    bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
!    struct bfd_link_info *, asection *, int);
  static bfd_boolean elf32_h8_relocate_section
!   (bfd *, struct bfd_link_info *, bfd *, asection *,
!    bfd_byte *, Elf_Internal_Rela *,
!    Elf_Internal_Sym *, asection **);
  static bfd_reloc_status_type special
!   (bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **);
  
  /* This does not include any relocation information, but should be
     good enough for GDB or objdump to read the file.  */
*************** static const struct elf_reloc_map h8_rel
*** 243,251 ****
  
  
  static reloc_howto_type *
! elf32_h8_reloc_type_lookup (abfd, code)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      bfd_reloc_code_real_type code;
  {
    unsigned int i;
  
--- 243,250 ----
  
  
  static reloc_howto_type *
! elf32_h8_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
! 			    bfd_reloc_code_real_type code)
  {
    unsigned int i;
  
*************** elf32_h8_reloc_type_lookup (abfd, code)
*** 258,267 ****
  }
  
  static void
! elf32_h8_info_to_howto (abfd, bfd_reloc, elf_reloc)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      arelent *bfd_reloc;
!      Elf_Internal_Rela *elf_reloc;
  {
    unsigned int r;
    unsigned int i;
--- 257,264 ----
  }
  
  static void
! elf32_h8_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc,
! 			Elf_Internal_Rela *elf_reloc)
  {
    unsigned int r;
    unsigned int i;
*************** elf32_h8_info_to_howto (abfd, bfd_reloc,
*** 277,286 ****
  }
  
  static void
! elf32_h8_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      arelent *bfd_reloc;
!      Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED;
  {
    unsigned int r;
  
--- 274,281 ----
  }
  
  static void
! elf32_h8_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc,
! 			    Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED)
  {
    unsigned int r;
  
*************** elf32_h8_info_to_howto_rel (abfd, bfd_re
*** 294,308 ****
     When doing -r, we can't do any arithmetic for the pcrel stuff, because
     we support relaxing on the H8/300 series chips.  */
  static bfd_reloc_status_type
! special (abfd, reloc_entry, symbol, data, input_section, output_bfd,
! 	 error_message)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      arelent *reloc_entry ATTRIBUTE_UNUSED;
!      asymbol *symbol ATTRIBUTE_UNUSED;
!      PTR data ATTRIBUTE_UNUSED;
!      asection *input_section ATTRIBUTE_UNUSED;
!      bfd *output_bfd;
!      char **error_message ATTRIBUTE_UNUSED;
  {
    if (output_bfd == (bfd *) NULL)
      return bfd_reloc_continue;
--- 289,301 ----
     When doing -r, we can't do any arithmetic for the pcrel stuff, because
     we support relaxing on the H8/300 series chips.  */
  static bfd_reloc_status_type
! special (bfd *abfd ATTRIBUTE_UNUSED,
! 	 arelent *reloc_entry ATTRIBUTE_UNUSED,
! 	 asymbol *symbol ATTRIBUTE_UNUSED,
! 	 PTR data ATTRIBUTE_UNUSED,
! 	 asection *input_section ATTRIBUTE_UNUSED,
! 	 bfd *output_bfd,
! 	 char **error_message ATTRIBUTE_UNUSED)
  {
    if (output_bfd == (bfd *) NULL)
      return bfd_reloc_continue;
*************** special (abfd, reloc_entry, symbol, data
*** 314,339 ****
  
  /* Perform a relocation as part of a final link.  */
  static bfd_reloc_status_type
! elf32_h8_final_link_relocate (r_type, input_bfd, output_bfd,
! 			      input_section, contents, offset, value,
! 			      addend, info, sym_sec, is_local)
!      unsigned long r_type;
!      bfd *input_bfd;
!      bfd *output_bfd ATTRIBUTE_UNUSED;
!      asection *input_section ATTRIBUTE_UNUSED;
!      bfd_byte *contents;
!      bfd_vma offset;
!      bfd_vma value;
!      bfd_vma addend;
!      struct bfd_link_info *info ATTRIBUTE_UNUSED;
!      asection *sym_sec ATTRIBUTE_UNUSED;
!      int is_local ATTRIBUTE_UNUSED;
  {
    bfd_byte *hit_data = contents + offset;
  
    switch (r_type)
      {
- 
      case R_H8_NONE:
        return bfd_reloc_ok;
  
--- 307,325 ----
  
  /* Perform a relocation as part of a final link.  */
  static bfd_reloc_status_type
! elf32_h8_final_link_relocate (unsigned long r_type, bfd *input_bfd,
! 			      bfd *output_bfd ATTRIBUTE_UNUSED,
! 			      asection *input_section ATTRIBUTE_UNUSED,
! 			      bfd_byte *contents, bfd_vma offset,
! 			      bfd_vma value, bfd_vma addend,
! 			      struct bfd_link_info *info ATTRIBUTE_UNUSED,
! 			      asection *sym_sec ATTRIBUTE_UNUSED,
! 			      int is_local ATTRIBUTE_UNUSED)
  {
    bfd_byte *hit_data = contents + offset;
  
    switch (r_type)
      {
      case R_H8_NONE:
        return bfd_reloc_ok;
  
*************** elf32_h8_final_link_relocate (r_type, in
*** 411,426 ****
  
  /* Relocate an H8 ELF section.  */
  static bfd_boolean
! elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
! 			   contents, relocs, local_syms, local_sections)
!      bfd *output_bfd;
!      struct bfd_link_info *info;
!      bfd *input_bfd;
!      asection *input_section;
!      bfd_byte *contents;
!      Elf_Internal_Rela *relocs;
!      Elf_Internal_Sym *local_syms;
!      asection **local_sections;
  {
    Elf_Internal_Shdr *symtab_hdr;
    struct elf_link_hash_entry **sym_hashes;
--- 397,407 ----
  
  /* Relocate an H8 ELF section.  */
  static bfd_boolean
! elf32_h8_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
! 			   bfd *input_bfd, asection *input_section,
! 			   bfd_byte *contents, Elf_Internal_Rela *relocs,
! 			   Elf_Internal_Sym *local_syms,
! 			   asection **local_sections)
  {
    Elf_Internal_Shdr *symtab_hdr;
    struct elf_link_hash_entry **sym_hashes;
*************** elf32_h8_relocate_section (output_bfd, i
*** 559,566 ****
     Examine that field and return the proper BFD machine type for
     the object file.  */
  static unsigned long
! elf32_h8_mach (flags)
!      flagword flags;
  {
    switch (flags & EF_H8_MACH)
      {
--- 540,546 ----
     Examine that field and return the proper BFD machine type for
     the object file.  */
  static unsigned long
! elf32_h8_mach (flagword flags)
  {
    switch (flags & EF_H8_MACH)
      {
*************** elf32_h8_mach (flags)
*** 593,601 ****
     into the flags field in the object file.  */
  
  static void
! elf32_h8_final_write_processing (abfd, linker)
!      bfd *abfd;
!      bfd_boolean linker ATTRIBUTE_UNUSED;
  {
    unsigned long val;
  
--- 573,580 ----
     into the flags field in the object file.  */
  
  static void
! elf32_h8_final_write_processing (bfd *abfd,
! 				 bfd_boolean linker ATTRIBUTE_UNUSED)
  {
    unsigned long val;
  
*************** elf32_h8_final_write_processing (abfd, l
*** 639,646 ****
     record the encoded machine type found in the ELF flags.  */
  
  static bfd_boolean
! elf32_h8_object_p (abfd)
!      bfd *abfd;
  {
    bfd_default_set_arch_mach (abfd, bfd_arch_h8300,
  			     elf32_h8_mach (elf_elfheader (abfd)->e_flags));
--- 618,624 ----
     record the encoded machine type found in the ELF flags.  */
  
  static bfd_boolean
! elf32_h8_object_p (bfd *abfd)
  {
    bfd_default_set_arch_mach (abfd, bfd_arch_h8300,
  			     elf32_h8_mach (elf_elfheader (abfd)->e_flags));
*************** elf32_h8_object_p (abfd)
*** 652,660 ****
     time is the architecture/machine information.  */
  
  static bfd_boolean
! elf32_h8_merge_private_bfd_data (ibfd, obfd)
!      bfd *ibfd;
!      bfd *obfd;
  {
    if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
        || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
--- 630,636 ----
     time is the architecture/machine information.  */
  
  static bfd_boolean
! elf32_h8_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
  {
    if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
        || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
*************** elf32_h8_merge_private_bfd_data (ibfd, o
*** 689,699 ****
       mov.[bwl]:24/32 ->    mov.[bwl]:16           2 bytes */
  
  static bfd_boolean
! elf32_h8_relax_section (abfd, sec, link_info, again)
!      bfd *abfd;
!      asection *sec;
!      struct bfd_link_info *link_info;
!      bfd_boolean *again;
  {
    Elf_Internal_Shdr *symtab_hdr;
    Elf_Internal_Rela *internal_relocs;
--- 665,672 ----
       mov.[bwl]:24/32 ->    mov.[bwl]:16           2 bytes */
  
  static bfd_boolean
! elf32_h8_relax_section (bfd *abfd, asection *sec,
! 			struct bfd_link_info *link_info, bfd_boolean *again)
  {
    Elf_Internal_Shdr *symtab_hdr;
    Elf_Internal_Rela *internal_relocs;
*************** elf32_h8_relax_section (abfd, sec, link_
*** 1252,1262 ****
  /* Delete some bytes from a section while relaxing.  */
  
  static bfd_boolean
! elf32_h8_relax_delete_bytes (abfd, sec, addr, count)
!      bfd *abfd;
!      asection *sec;
!      bfd_vma addr;
!      int count;
  {
    Elf_Internal_Shdr *symtab_hdr;
    unsigned int sec_shndx;
--- 1225,1231 ----
  /* Delete some bytes from a section while relaxing.  */
  
  static bfd_boolean
! elf32_h8_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count)
  {
    Elf_Internal_Shdr *symtab_hdr;
    unsigned int sec_shndx;
*************** elf32_h8_relax_delete_bytes (abfd, sec, 
*** 1333,1342 ****
  /* Return TRUE if a symbol exists at the given address, else return
     FALSE.  */
  static bfd_boolean
! elf32_h8_symbol_address_p (abfd, sec, addr)
!      bfd *abfd;
!      asection *sec;
!      bfd_vma addr;
  {
    Elf_Internal_Shdr *symtab_hdr;
    unsigned int sec_shndx;
--- 1302,1308 ----
  /* Return TRUE if a symbol exists at the given address, else return
     FALSE.  */
  static bfd_boolean
! elf32_h8_symbol_address_p (bfd *abfd, asection *sec, bfd_vma addr)
  {
    Elf_Internal_Shdr *symtab_hdr;
    unsigned int sec_shndx;
*************** elf32_h8_symbol_address_p (abfd, sec, ad
*** 1380,1393 ****
     which uses elf32_h8_relocate_section.  */
  
  static bfd_byte *
! elf32_h8_get_relocated_section_contents (output_bfd, link_info, link_order,
! 					 data, relocatable, symbols)
!      bfd *output_bfd;
!      struct bfd_link_info *link_info;
!      struct bfd_link_order *link_order;
!      bfd_byte *data;
!      bfd_boolean relocatable;
!      asymbol **symbols;
  {
    Elf_Internal_Shdr *symtab_hdr;
    asection *input_section = link_order->u.indirect.section;
--- 1346,1357 ----
     which uses elf32_h8_relocate_section.  */
  
  static bfd_byte *
! elf32_h8_get_relocated_section_contents (bfd *output_bfd,
! 					 struct bfd_link_info *link_info,
! 					 struct bfd_link_order *link_order,
! 					 bfd_byte *data,
! 					 bfd_boolean relocatable,
! 					 asymbol **symbols)
  {
    Elf_Internal_Shdr *symtab_hdr;
    asection *input_section = link_order->u.indirect.section;
Index: bfd/coff-h8300.c
===================================================================
RCS file: /cvs/src/src/bfd/coff-h8300.c,v
retrieving revision 1.21
diff -c -d -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.21 coff-h8300.c
*** bfd/coff-h8300.c	4 Jun 2003 10:47:30 -0000	1.21
--- bfd/coff-h8300.c	11 Jul 2003 10:29:16 -0000
*************** struct funcvec_hash_table
*** 61,93 ****
  
  static struct bfd_hash_entry *
  funcvec_hash_newfunc
!   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
  
  static bfd_boolean
  funcvec_hash_table_init
!   PARAMS ((struct funcvec_hash_table *, bfd *,
! 	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
! 				       struct bfd_hash_table *,
! 				       const char *)));
  
  static bfd_reloc_status_type special
!   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
  static int select_reloc
!   PARAMS ((reloc_howto_type *));
  static void rtype2howto
!   PARAMS ((arelent *, struct internal_reloc *));
  static void reloc_processing
!   PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
  static bfd_boolean h8300_symbol_address_p
!   PARAMS ((bfd *, asection *, bfd_vma));
  static int h8300_reloc16_estimate
!   PARAMS ((bfd *, asection *, arelent *, unsigned int,
!     struct bfd_link_info *));
  static void h8300_reloc16_extra_cases
!   PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
!     bfd_byte *, unsigned int *, unsigned int *));
  static bfd_boolean h8300_bfd_link_add_symbols
!   PARAMS ((bfd *, struct bfd_link_info *));
  
  /* To lookup a value in the function vector hash table.  */
  #define funcvec_hash_lookup(table, string, create, copy) \
--- 61,93 ----
  
  static struct bfd_hash_entry *
  funcvec_hash_newfunc
!   (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
  
  static bfd_boolean
  funcvec_hash_table_init
!   (struct funcvec_hash_table *, bfd *,
!    struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
! 			       struct bfd_hash_table *,
! 			       const char *));
  
  static bfd_reloc_status_type special
!   (bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **);
  static int select_reloc
!   (reloc_howto_type *);
  static void rtype2howto
!   (arelent *, struct internal_reloc *);
  static void reloc_processing
!   (arelent *, struct internal_reloc *, asymbol **, bfd *, asection *);
  static bfd_boolean h8300_symbol_address_p
!   (bfd *, asection *, bfd_vma);
  static int h8300_reloc16_estimate
!   (bfd *, asection *, arelent *, unsigned int,
!    struct bfd_link_info *);
  static void h8300_reloc16_extra_cases
!   (bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
!    bfd_byte *, unsigned int *, unsigned int *);
  static bfd_boolean h8300_bfd_link_add_symbols
!   (bfd *, struct bfd_link_info *);
  
  /* To lookup a value in the function vector hash table.  */
  #define funcvec_hash_lookup(table, string, create, copy) \
*************** struct h8300_coff_link_hash_table {
*** 111,118 ****
    struct funcvec_hash_table *funcvec_hash_table;
  };
  
! static struct bfd_link_hash_table *h8300_coff_link_hash_table_create
!   PARAMS ((bfd *));
  
  /* Get the H8/300 COFF linker hash table from a link_info structure.  */
  
--- 111,117 ----
    struct funcvec_hash_table *funcvec_hash_table;
  };
  
! static struct bfd_link_hash_table *h8300_coff_link_hash_table_create (bfd *);
  
  /* Get the H8/300 COFF linker hash table from a link_info structure.  */
  
*************** #define h8300_coff_hash_table(p) \
*** 123,132 ****
     a new entry is added to the funcvec hash table.  */
  
  static struct bfd_hash_entry *
! funcvec_hash_newfunc (entry, gen_table, string)
!      struct bfd_hash_entry *entry;
!      struct bfd_hash_table *gen_table;
!      const char *string;
  {
    struct funcvec_hash_entry *ret;
    struct funcvec_hash_table *table;
--- 122,130 ----
     a new entry is added to the funcvec hash table.  */
  
  static struct bfd_hash_entry *
! funcvec_hash_newfunc (struct bfd_hash_entry *entry,
! 		      struct bfd_hash_table *gen_table,
! 		      const char *string)
  {
    struct funcvec_hash_entry *ret;
    struct funcvec_hash_table *table;
*************** funcvec_hash_newfunc (entry, gen_table, 
*** 171,182 ****
  /* Initialize the function vector hash table.  */
  
  static bfd_boolean
! funcvec_hash_table_init (table, abfd, newfunc)
!      struct funcvec_hash_table *table;
!      bfd *abfd;
!      struct bfd_hash_entry *(*newfunc)
!        PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
! 		const char *));
  {
    /* Initialize our local fields, then call the generic initialization
       routine.  */
--- 169,180 ----
  /* Initialize the function vector hash table.  */
  
  static bfd_boolean
! funcvec_hash_table_init (struct funcvec_hash_table *table,
! 			 bfd *abfd,
! 			 struct bfd_hash_entry *(*newfunc)
! 			   (struct bfd_hash_entry *,
! 			    struct bfd_hash_table *,
! 			    const char *))
  {
    /* Initialize our local fields, then call the generic initialization
       routine.  */
*************** funcvec_hash_table_init (table, abfd, ne
*** 190,197 ****
     without using static variables.  */
  
  static struct bfd_link_hash_table *
! h8300_coff_link_hash_table_create (abfd)
!      bfd *abfd;
  {
    struct h8300_coff_link_hash_table *ret;
    bfd_size_type amt = sizeof (struct h8300_coff_link_hash_table);
--- 188,194 ----
     without using static variables.  */
  
  static struct bfd_link_hash_table *
! h8300_coff_link_hash_table_create (bfd *abfd)
  {
    struct h8300_coff_link_hash_table *ret;
    bfd_size_type amt = sizeof (struct h8300_coff_link_hash_table);
*************** h8300_coff_link_hash_table_create (abfd)
*** 224,238 ****
     the addend until the final link.  */
  
  static bfd_reloc_status_type
! special (abfd, reloc_entry, symbol, data, input_section, output_bfd,
! 	 error_message)
!      bfd *abfd ATTRIBUTE_UNUSED;
!      arelent *reloc_entry ATTRIBUTE_UNUSED;
!      asymbol *symbol ATTRIBUTE_UNUSED;
!      PTR data ATTRIBUTE_UNUSED;
!      asection *input_section ATTRIBUTE_UNUSED;
!      bfd *output_bfd;
!      char **error_message ATTRIBUTE_UNUSED;
  {
    if (output_bfd == (bfd *) NULL)
      return bfd_reloc_continue;
--- 221,233 ----
     the addend until the final link.  */
  
  static bfd_reloc_status_type
! special (bfd *abfd ATTRIBUTE_UNUSED,
! 	 arelent *reloc_entry ATTRIBUTE_UNUSED,
! 	 asymbol *symbol ATTRIBUTE_UNUSED,
! 	 PTR data ATTRIBUTE_UNUSED,
! 	 asection *input_section ATTRIBUTE_UNUSED,
! 	 bfd *output_bfd,
! 	 char **error_message ATTRIBUTE_UNUSED)
  {
    if (output_bfd == (bfd *) NULL)
      return bfd_reloc_continue;
*************** #define SWAP_OUT_RELOC_EXTRA(abfd, src, 
*** 294,301 ****
    dst->r_stuff[1] = 'C';
  
  static int
! select_reloc (howto)
!      reloc_howto_type *howto;
  {
    return howto->type;
  }
--- 289,295 ----
    dst->r_stuff[1] = 'C';
  
  static int
! select_reloc (reloc_howto_type *howto)
  {
    return howto->type;
  }
*************** select_reloc (howto)
*** 303,311 ****
  /* Code to turn a r_type into a howto ptr, uses the above howto table.  */
  
  static void
! rtype2howto (internal, dst)
!      arelent *internal;
!      struct internal_reloc *dst;
  {
    switch (dst->r_type)
      {
--- 297,303 ----
  /* Code to turn a r_type into a howto ptr, uses the above howto table.  */
  
  static void
! rtype2howto (arelent *internal, struct internal_reloc *dst)
  {
    switch (dst->r_type)
      {
*************** #define RELOC_PROCESSING(relent,reloc,sy
*** 386,397 ****
   reloc_processing (relent, reloc, symbols, abfd, section)
  
  static void
! reloc_processing (relent, reloc, symbols, abfd, section)
!      arelent *relent;
!      struct internal_reloc *reloc;
!      asymbol **symbols;
!      bfd *abfd;
!      asection *section;
  {
    relent->address = reloc->r_vaddr;
    rtype2howto (relent, reloc);
--- 378,385 ----
   reloc_processing (relent, reloc, symbols, abfd, section)
  
  static void
! reloc_processing (arelent *relent, struct internal_reloc *reloc,
! 		  asymbol **symbols, bfd *abfd, asection *section)
  {
    relent->address = reloc->r_vaddr;
    rtype2howto (relent, reloc);
*************** reloc_processing (relent, reloc, symbols
*** 410,419 ****
  }
  
  static bfd_boolean
! h8300_symbol_address_p (abfd, input_section, address)
!      bfd *abfd;
!      asection *input_section;
!      bfd_vma address;
  {
    asymbol **s;
  
--- 398,404 ----
  }
  
  static bfd_boolean
! h8300_symbol_address_p (bfd *abfd, asection *input_section, bfd_vma address)
  {
    asymbol **s;
  
*************** h8300_symbol_address_p (abfd, input_sect
*** 445,456 ****
     in the howto table.  This needs to be fixed.  */
  
  static int
! h8300_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
!      bfd *abfd;
!      asection *input_section;
!      arelent *reloc;
!      unsigned int shrink;
!      struct bfd_link_info *link_info;
  {
    bfd_vma value;
    bfd_vma dot;
--- 430,437 ----
     in the howto table.  This needs to be fixed.  */
  
  static int
! h8300_reloc16_estimate (bfd *abfd, asection *input_section, arelent *reloc,
! 			unsigned int shrink, struct bfd_link_info *link_info)
  {
    bfd_vma value;
    bfd_vma dot;
*************** h8300_reloc16_estimate (abfd, input_sect
*** 676,690 ****
     FIXME: Not all relocations check for overflow!  */
  
  static void
! h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
! 			   dst_ptr)
!      bfd *abfd;
!      struct bfd_link_info *link_info;
!      struct bfd_link_order *link_order;
!      arelent *reloc;
!      bfd_byte *data;
!      unsigned int *src_ptr;
!      unsigned int *dst_ptr;
  {
    unsigned int src_address = *src_ptr;
    unsigned int dst_address = *dst_ptr;
--- 657,666 ----
     FIXME: Not all relocations check for overflow!  */
  
  static void
! h8300_reloc16_extra_cases (bfd *abfd, struct bfd_link_info *link_info,
! 			   struct bfd_link_order *link_order, arelent *reloc,
! 			   bfd_byte *data, unsigned int *src_ptr,
! 			   unsigned int *dst_ptr)
  {
    unsigned int src_address = *src_ptr;
    unsigned int dst_address = *dst_ptr;
*************** #define EXIT_FAILURE 1
*** 1221,1229 ****
     selected static symbols to the bfd linker hash table.  */
  
  static bfd_boolean
! h8300_bfd_link_add_symbols (abfd, info)
!      bfd *abfd;
!      struct bfd_link_info *info;
  {
    asection *sec;
    struct funcvec_hash_table *funcvec_hash_table;
--- 1197,1203 ----
     selected static symbols to the bfd linker hash table.  */
  
  static bfd_boolean
! h8300_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
  {
    asection *sec;
    struct funcvec_hash_table *funcvec_hash_table;
Index: bfd/cpu-h8300.c
===================================================================
RCS file: /cvs/src/src/bfd/cpu-h8300.c,v
retrieving revision 1.14
diff -c -d -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.14 cpu-h8300.c
*** bfd/cpu-h8300.c	10 Jun 2003 07:09:30 -0000	1.14
--- bfd/cpu-h8300.c	11 Jul 2003 10:29:16 -0000
***************
*** 24,37 ****
  #include "libbfd.h"
  
  static bfd_boolean h8300_scan
!   PARAMS ((const struct bfd_arch_info *, const char *));
  static const bfd_arch_info_type * compatible
!   PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
  
  static bfd_boolean
! h8300_scan (info, string)
!      const struct bfd_arch_info *info;
!      const char *string;
  {
    if (*string != 'h' && *string != 'H')
      return FALSE;
--- 24,35 ----
  #include "libbfd.h"
  
  static bfd_boolean h8300_scan
!   (const struct bfd_arch_info *, const char *);
  static const bfd_arch_info_type * compatible
!   (const bfd_arch_info_type *, const bfd_arch_info_type *);
  
  static bfd_boolean
! h8300_scan (const struct bfd_arch_info *info, const char *string)
  {
    if (*string != 'h' && *string != 'H')
      return FALSE;
*************** h8300_scan (info, string)
*** 101,109 ****
     info structure.  */
  
  static const bfd_arch_info_type *
! compatible (in, out)
!      const bfd_arch_info_type *in;
!      const bfd_arch_info_type *out;
  {
    /* It's really not a good idea to mix and match modes.  */
    if (in->arch != out->arch || in->mach != out->mach)
--- 99,105 ----
     info structure.  */
  
  static const bfd_arch_info_type *
! compatible (const bfd_arch_info_type *in, const bfd_arch_info_type *out)
  {
    /* It's really not a good idea to mix and match modes.  */
    if (in->arch != out->arch || in->mach != out->mach)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]