Merge GDB 7.5.1

bfd/coff-sh.c

 /* BFD back-end for Renesas Super-H COFF binaries.
    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
+   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
    Free Software Foundation, Inc.
    Contributed by Cygnus Support.
    Written by Steve Chamberlain, <sac@cygnus.com>.
    Relaxing code written by Ian Lance Taylor, <ian@cygnus.com>.
 
    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
@@ skipping 17 matching lines @@
 #include "coff/sh.h"
 #include "coff/internal.h"
 
 #undef  bfd_pe_print_pdata
 
 #ifdef COFF_WITH_PE
 #include "coff/pe.h"
 
 #ifndef COFF_IMAGE_WITH_PE
 static bfd_boolean sh_align_load_span
-  PARAMS ((bfd *, asection *, bfd_byte *,
-           bfd_boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
-           PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, bfd_boolean *));
+  (bfd *, asection *, bfd_byte *,
+   bfd_boolean (*) (bfd *, asection *, void *, bfd_byte *, bfd_vma),
+   void *, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, bfd_boolean *);
 
 #define _bfd_sh_align_load_span sh_align_load_span
 #endif
 
 #define bfd_pe_print_pdata   _bfd_pe_print_ce_compressed_pdata
 
 #else
 
 #define bfd_pe_print_pdata   NULL
 
 #endif /* COFF_WITH_PE.  */
 
 #include "libcoff.h"
 
 /* Internal functions.  */
-static bfd_reloc_status_type sh_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static long get_symbol_value PARAMS ((asymbol *));
-static bfd_boolean sh_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
-static bfd_boolean sh_relax_delete_bytes
-  PARAMS ((bfd *, asection *, bfd_vma, int));
-#ifndef COFF_IMAGE_WITH_PE
-static const struct sh_opcode *sh_insn_info PARAMS ((unsigned int));
-#endif
-static bfd_boolean sh_align_loads
-  PARAMS ((bfd *, asection *, struct internal_reloc *, bfd_byte *,
-           bfd_boolean *));
-static bfd_boolean sh_swap_insns
-  PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
-static bfd_boolean sh_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-           struct internal_reloc *, struct internal_syment *, asection **));
-static bfd_byte *sh_coff_get_relocated_section_contents
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-           bfd_byte *, bfd_boolean, asymbol **));
-static reloc_howto_type * sh_coff_reloc_type_lookup PARAMS ((bfd *, bfd_reloc_code_real_type));
 
 #ifdef COFF_WITH_PE
 /* Can't build import tables with 2**4 alignment.  */
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER    2
 #else
 /* Default section alignment to 2**4.  */
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER    4
 #endif
 
 #ifdef COFF_IMAGE_WITH_PE
 /* Align PE executables.  */
 #define COFF_PAGE_SIZE 0x1000
 #endif
 
 /* Generate long file names.  */
 #define COFF_LONG_FILENAMES
 
 #ifdef COFF_WITH_PE
-static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));
 /* Return TRUE if this relocation should
    appear in the output .reloc section.  */
-static bfd_boolean in_reloc_p (abfd, howto)
-     bfd * abfd ATTRIBUTE_UNUSED;
-     reloc_howto_type * howto;
+
+static bfd_boolean
+in_reloc_p (bfd * abfd ATTRIBUTE_UNUSED,
+            reloc_howto_type * howto)
 {
   return ! howto->pc_relative && howto->type != R_SH_IMAGEBASE;
 }
 #endif
 
+static bfd_reloc_status_type
+sh_reloc (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_boolean
+sh_relocate_section (bfd *, struct bfd_link_info *, bfd *, asection *,
+                     bfd_byte *, struct internal_reloc *,
+                     struct internal_syment *, asection **);
+static bfd_boolean
+sh_align_loads (bfd *, asection *, struct internal_reloc *,
+                bfd_byte *, bfd_boolean *);
+
 /* The supported relocations.  There are a lot of relocations defined
    in coff/internal.h which we do not expect to ever see.  */
 static reloc_howto_type sh_coff_howtos[] =
 {
   EMPTY_HOWTO (0),
   EMPTY_HOWTO (1),
 #ifdef COFF_WITH_PE
   /* Windows CE */
   HOWTO (R_SH_IMM32CE,          /* type */
          0,                     /* rightshift */
@@ skipping 280 matching lines @@
     {                                           \
       dst->r_stuff[0] = 'S';                    \
       dst->r_stuff[1] = 'C';                    \
     }                                           \
   while (0)
 #endif
 
 /* Get the value of a symbol, when performing a relocation.  */
 
 static long
-get_symbol_value (symbol)
-     asymbol *symbol;
+get_symbol_value (asymbol *symbol)
 {
   bfd_vma relocation;
 
   if (bfd_is_com_section (symbol->section))
     relocation = 0;
   else
     relocation = (symbol->value +
                   symbol->section->output_section->vma +
                   symbol->section->output_offset);
 
   return relocation;
 }
 
 #ifdef COFF_WITH_PE
 /* Convert an rtype to howto for the COFF backend linker.
    Copied from coff-i386.  */
 #define coff_rtype_to_howto coff_sh_rtype_to_howto
-static reloc_howto_type * coff_sh_rtype_to_howto PARAMS ((bfd *, asection *, struct internal_reloc *, struct coff_link_hash_entry *, struct internal_syment *, bfd_vma *));
+
 
 static reloc_howto_type *
-coff_sh_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd * abfd ATTRIBUTE_UNUSED;
-     asection * sec;
-     struct internal_reloc * rel;
-     struct coff_link_hash_entry * h;
-     struct internal_syment * sym;
-     bfd_vma * addendp;
+coff_sh_rtype_to_howto (bfd * abfd ATTRIBUTE_UNUSED,
+                        asection * sec,
+                        struct internal_reloc * rel,
+                        struct coff_link_hash_entry * h,
+                        struct internal_syment * sym,
+                        bfd_vma * addendp)
 {
   reloc_howto_type * howto;
 
   howto = sh_coff_howtos + rel->r_type;
 
   *addendp = 0;
 
   if (howto->pc_relative)
     *addendp += sec->vma;
 
@@ skipping 52 matching lines @@
   { BFD_RELOC_CTOR, R_SH_IMM32 },
 };
 #endif
 
 /* Given a BFD reloc code, return the howto structure for the
    corresponding SH PE reloc.  */
 #define coff_bfd_reloc_type_lookup      sh_coff_reloc_type_lookup
 #define coff_bfd_reloc_name_lookup sh_coff_reloc_name_lookup
 
 static reloc_howto_type *
-sh_coff_reloc_type_lookup (abfd, code)
-     bfd * abfd ATTRIBUTE_UNUSED;
-     bfd_reloc_code_real_type code;
+sh_coff_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED,
+                           bfd_reloc_code_real_type code)
 {
   unsigned int i;
 
   for (i = ARRAY_SIZE (sh_reloc_map); i--;)
     if (sh_reloc_map[i].bfd_reloc_val == code)
       return &sh_coff_howtos[(int) sh_reloc_map[i].shcoff_reloc_val];
 
   (*_bfd_error_handler) (_("SH Error: unknown reloc type %d"), code);
   return NULL;
 }
@@ skipping 44 matching lines @@
         || (reloc).r_type == R_SH_SWITCH32                      \
         || (reloc).r_type == R_SH_USES                          \
         || (reloc).r_type == R_SH_COUNT                         \
         || (reloc).r_type == R_SH_ALIGN)                        \
       cache_ptr->addend = (reloc).r_offset;                     \
   }
 
 /* This is the howto function for the SH relocations.  */
 
 static bfd_reloc_status_type
-sh_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-          error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
+sh_reloc (bfd *      abfd,
+          arelent *  reloc_entry,
+          asymbol *  symbol_in,
+          void *     data,
+          asection * input_section,
+          bfd *      output_bfd,
+          char **    error_message ATTRIBUTE_UNUSED)
 {
   unsigned long insn;
   bfd_vma sym_value;
   unsigned short r_type;
   bfd_vma addr = reloc_entry->address;
   bfd_byte *hit_data = addr + (bfd_byte *) data;
 
   r_type = reloc_entry->howto->type;
 
   if (output_bfd != NULL)
@@ skipping 66 matching lines @@
 /* We can do relaxing.  */
 #define coff_bfd_relax_section sh_relax_section
 
 /* We use the special COFF backend linker.  */
 #define coff_relocate_section sh_relocate_section
 
 /* When relaxing, we need to use special code to get the relocated
    section contents.  */
 #define coff_bfd_get_relocated_section_contents \
   sh_coff_get_relocated_section_contents