Merge GDB 7.5.1

bfd/coff-i960.c

 /* BFD back-end for Intel 960 COFF files.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005, 2007, 2008, 2009, 2011
+   2002, 2003, 2004, 2005, 2007, 2008, 2009, 2011, 2012
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
@@ skipping 15 matching lines @@
 #include "libbfd.h"
 #include "coff/i960.h"
 #include "coff/internal.h"
 
 #ifndef bfd_pe_print_pdata
 #define bfd_pe_print_pdata      NULL
 #endif
 
 #include "libcoff.h"            /* To allow easier abstraction-breaking.  */
 
-static bfd_boolean coff_i960_is_local_label_name
-  PARAMS ((bfd *, const char *));
-static bfd_reloc_status_type optcall_callback
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type coff_i960_relocate
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type *coff_i960_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static bfd_boolean coff_i960_start_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-static bfd_boolean coff_i960_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-           struct internal_reloc *, struct internal_syment *, asection **));
-static bfd_boolean coff_i960_adjust_symndx
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-           struct internal_reloc *, bfd_boolean *));
 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
 #define COFF_ALIGN_IN_SECTION_HEADER 1
 
 #define GET_SCNHDR_ALIGN H_GET_32
 #define PUT_SCNHDR_ALIGN H_PUT_32
 
 /* The i960 does not support an MMU, so COFF_PAGE_SIZE can be
    arbitrarily small.  */
 #define COFF_PAGE_SIZE 1
 
 #define COFF_LONG_FILENAMES
 
 /* This set of local label names is taken from gas.  */
 
 static bfd_boolean
-coff_i960_is_local_label_name (abfd, name)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     const char *name;
+coff_i960_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name)
 {
   return (name[0] == 'L'
           || (name[0] == '.'
               && (name[1] == 'C'
                   || name[1] == 'I'
                   || name[1] == '.')));
 }
 
 /* This is just like the usual CALC_ADDEND, but it includes the
    section VMA for PC relative relocs.  */
@@ skipping 17 matching lines @@
     if (ptr && (reloc.r_type == 25 || reloc.r_type == 27))      \
       cache_ptr->addend += asect->vma;                          \
   }
 #endif
 
 #define CALLS    0x66003800     /* Template for 'calls' instruction     */
 #define BAL      0x0b000000     /* Template for 'bal' instruction       */
 #define BAL_MASK 0x00ffffff
 
 static bfd_reloc_status_type
-optcall_callback (abfd, reloc_entry, symbol_in, data,
-                  input_section, ignore_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *ignore_bfd ATTRIBUTE_UNUSED;
-     char **error_message;
+optcall_callback (bfd *abfd,
+                  arelent *reloc_entry,
+                  asymbol *symbol_in,
+                  void * data,
+                  asection *input_section,
+                  bfd *ignore_bfd ATTRIBUTE_UNUSED,
+                  char **error_message)
 {
   /* This item has already been relocated correctly, but we may be
    * able to patch in yet better code - done by digging out the
    * correct info on this symbol */
   bfd_reloc_status_type result;
   coff_symbol_type *cs = coffsymbol(symbol_in);
 
   /* Don't do anything with symbols which aren't tied up yet,
      except move the reloc.  */
   if (bfd_is_und_section (cs->symbol.section)) {
@@ skipping 61 matching lines @@
    file.
 
    Note that this function is only called if we are not using the COFF
    specific backend linker.  It only does something when doing a
    relocatable link, which will almost certainly fail when not
    generating COFF i960 output, so this function is actually no longer
    useful.  It was used before this target was converted to use the
    COFF specific backend linker.  */
 
 static bfd_reloc_status_type
-coff_i960_relocate (abfd, reloc_entry, symbol, data, input_section,
-                    output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data ATTRIBUTE_UNUSED;
-     asection *input_section ATTRIBUTE_UNUSED;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
+coff_i960_relocate (bfd *abfd,
+                    arelent *reloc_entry,
+                    asymbol *symbol,
+                    void * data ATTRIBUTE_UNUSED,
+                    asection *input_section ATTRIBUTE_UNUSED,
+                    bfd *output_bfd,
+                    char **error_message ATTRIBUTE_UNUSED)
 {
   asection *osec;
 
   if (output_bfd == NULL)
     {
       /* Not generating relocatable output file.  */
       return bfd_reloc_continue;
     }
 
   if (bfd_is_und_section (bfd_get_section (symbol)))
@@ skipping 34 matching lines @@
         }
 
       if (syms >= sym_end)
         abort ();
 
       reloc_entry->sym_ptr_ptr = syms;
 
       if (coff_section_data (output_bfd, osec) == NULL)
         {
           bfd_size_type amt = sizeof (struct coff_section_tdata);
-          osec->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
+          osec->used_by_bfd = bfd_zalloc (abfd, amt);
           if (osec->used_by_bfd == NULL)
             return bfd_reloc_overflow;
         }
-      coff_section_data (output_bfd, osec)->tdata = (PTR) syms;
+      coff_section_data (output_bfd, osec)->tdata = syms;
     }
 
   /* Let bfd_perform_relocation do its thing, which will include
      stuffing the symbol addend into the object file.  */
   return bfd_reloc_continue;
 }
 
 static reloc_howto_type howto_rellong =
   HOWTO ((unsigned int) R_RELLONG, 0, 2, 32,FALSE, 0,
          complain_overflow_bitfield, coff_i960_relocate,"rellong", TRUE,
          0xffffffff, 0xffffffff, 0);
 static reloc_howto_type howto_iprmed =
   HOWTO (R_IPRMED, 0, 2, 24,TRUE,0, complain_overflow_signed,
          coff_i960_relocate, "iprmed ", TRUE, 0x00ffffff, 0x00ffffff, 0);
 static reloc_howto_type howto_optcall =
   HOWTO (R_OPTCALL, 0,2,24,TRUE,0, complain_overflow_signed,
          optcall_callback, "optcall", TRUE, 0x00ffffff, 0x00ffffff, 0);
 
 static reloc_howto_type *
-coff_i960_reloc_type_lookup (abfd, code)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_reloc_code_real_type code;
+coff_i960_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                             bfd_reloc_code_real_type code)
 {
   switch (code)
     {
     default:
       return 0;
     case BFD_RELOC_I960_CALLJ:
       return &howto_optcall;
     case BFD_RELOC_32:
     case BFD_RELOC_CTOR:
       return &howto_rellong;
@@ skipping 33 matching lines @@
 /* i960 COFF is used by VxWorks 5.1.  However, VxWorks 5.1 does not
    appear to correctly handle a reloc against a symbol defined in the
    same object file.  It appears to simply discard such relocs, rather
    than adding their values into the object file.  We handle this by
    converting all relocs against global symbols into relocs against
    internal symbols at the start of the section.  This routine is
    called at the start of the linking process, and it creates the
    necessary symbols.  */
 
 static bfd_boolean
-coff_i960_start_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
+coff_i960_start_final_link (bfd *abfd, struct bfd_link_info *info)
 {
   bfd_size_type symesz = bfd_coff_symesz (abfd);
   asection *o;
   bfd_byte *esym;
 
   if (! info->relocatable)
     return TRUE;
 
   esym = (bfd_byte *) bfd_malloc (symesz);
   if (esym == NULL)
     return FALSE;
 
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
     return FALSE;
 
   for (o = abfd->sections; o != NULL; o = o->next)
     {
       struct internal_syment isym;
 
       strncpy (isym._n._n_name, o->name, SYMNMLEN);
       isym.n_value = 0;
       isym.n_scnum = o->target_index;
       isym.n_type = T_NULL;
       isym.n_sclass = C_STAT;
       isym.n_numaux = 0;
 
-      bfd_coff_swap_sym_out (abfd, (PTR) &isym, (PTR) esym);
+      bfd_coff_swap_sym_out (abfd, &isym, esym);
 
       if (bfd_bwrite (esym, symesz, abfd) != symesz)
         {
           free (esym);
           return FALSE;
         }
 
       obj_raw_syment_count (abfd) += 1;
     }
 
   free (esym);
 
   return TRUE;
 }
 
 /* The reloc processing routine for the optimized COFF linker.  */
 
 static bfd_boolean
-coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
-                            contents, relocs, syms, sections)
-     bfd *output_bfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
+coff_i960_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
+                            struct bfd_link_info *info,
+                            bfd *input_bfd,
+                            asection *input_section,
+                            bfd_byte *contents,
+                            struct internal_reloc *relocs,
+                            struct internal_syment *syms,
+                            asection **sections)
 {
   struct internal_reloc *rel;
   struct internal_reloc *relend;
 
   rel = relocs;
   relend = rel + input_section->reloc_count;
   for (; rel < relend; rel++)
     {
       long symndx;
       struct coff_link_hash_entry *h;
@@ skipping 111 matching lines @@
                     olf = h->aux[1].x_bal.x_balntry;
                   }
                 else
                   {
                     bfd_byte *esyms;
                     union internal_auxent aux;
 
                     BFD_ASSERT (sym->n_numaux == 2);
                     esyms = (bfd_byte *) obj_coff_external_syms (input_bfd);
                     esyms += (symndx + 2) * bfd_coff_symesz (input_bfd);
-                    bfd_coff_swap_aux_in (input_bfd, (PTR) esyms, sym->n_type,
+                    bfd_coff_swap_aux_in (input_bfd, esyms, sym->n_type,
                                           sym->n_sclass, 1, sym->n_numaux,
-                                          (PTR) &aux);
+                                          &aux);
                     olf = aux.x_bal.x_balntry;
                   }
 
                 word = bfd_get_32 (input_bfd,
                                    (contents
                                     + (rel->r_vaddr - input_section->vma)));
                 word = ((word + olf - val) & BAL_MASK) | BAL;
                 bfd_put_32 (input_bfd,
                             (bfd_vma) word,
                             contents + (rel->r_vaddr - input_section->vma));
@@ skipping 48 matching lines @@
     }
 
   return TRUE;
 }
 
 /* Adjust the symbol index of any reloc against a global symbol to
    instead be a reloc against the internal symbol we created specially
    for the section.  */
 
 static bfd_boolean
-coff_i960_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
-     bfd *obfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     bfd *ibfd;
-     asection *sec ATTRIBUTE_UNUSED;
-     struct internal_reloc *irel;
-     bfd_boolean *adjustedp;
+coff_i960_adjust_symndx (bfd *obfd ATTRIBUTE_UNUSED,
+                         struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                         bfd *ibfd,
+                         asection *sec ATTRIBUTE_UNUSED,
+                         struct internal_reloc *irel,
+                         bfd_boolean *adjustedp)
 {
   struct coff_link_hash_entry *h;
 
   *adjustedp = FALSE;
 
   h = obj_coff_sym_hashes (ibfd)[irel->r_symndx];
   if (h == NULL
       || (h->root.type != bfd_link_hash_defined
           && h->root.type != bfd_link_hash_defweak))
     return TRUE;
@@ skipping 59 matching lines @@
      BFD_JUMP_TABLE_SYMBOLS (coff),
      BFD_JUMP_TABLE_RELOCS (coff),
      BFD_JUMP_TABLE_WRITE (coff),
      BFD_JUMP_TABLE_LINK (coff),
      BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   & icoff_little_vec,
 
   COFF_SWAP_TABLE
 };