Merge GDB 7.5.1

bfd/elf32-crx.c

 /* BFD back-end for National Semiconductor's CRX ELF
-   Copyright 2004, 2005, 2006, 2007, 2009, 2010
+   Copyright 2004, 2005, 2006, 2007, 2009, 2010, 2012
    Free Software Foundation, Inc.
    Written by Tomer Levi, NSC, Israel.
 
    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 734 matching lines @@
 
   if ((input_section->flags & SEC_RELOC) != 0
       && input_section->reloc_count > 0)
     {
       Elf_Internal_Sym *isym;
       Elf_Internal_Sym *isymend;
       asection **secpp;
       bfd_size_type amt;
 
       internal_relocs = (_bfd_elf_link_read_relocs
-                         (input_bfd, input_section, (PTR) NULL,
+                         (input_bfd, input_section, NULL,
                           (Elf_Internal_Rela *) NULL, FALSE));
       if (internal_relocs == NULL)
         goto error_return;
 
       if (symtab_hdr->sh_info != 0)
         {
           isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
           if (isymbuf == NULL)
             isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
                                             symtab_hdr->sh_info, 0,
@@ skipping 98 matching lines @@
       else
         {
           bfd_boolean unresolved_reloc, warned;
 
           RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
                                    r_symndx, symtab_hdr, sym_hashes,
                                    h, sec, relocation,
                                    unresolved_reloc, warned);
         }
 
-      if (sec != NULL && elf_discarded_section (sec))
+      if (sec != NULL && discarded_section (sec))
         RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
-                                         rel, relend, howto, contents);
+                                         rel, 1, relend, howto, 0, contents);
 
       if (info->relocatable)
         continue;
 
       r = crx_elf_final_link_relocate (howto, input_bfd, output_bfd,
                                         input_section,
                                         contents, rel->r_offset,
                                         relocation, rel->r_addend,
                                         info, sec, h == NULL);
 
@@ skipping 88 matching lines @@
   if (link_info->relocatable
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0
       || (sec->flags & SEC_CODE) == 0)
     return TRUE;
 
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
 
   /* Get a copy of the native relocations.  */
   internal_relocs = (_bfd_elf_link_read_relocs
-                     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+                     (abfd, sec, NULL, (Elf_Internal_Rela *) NULL,
                       link_info->keep_memory));
   if (internal_relocs == NULL)
     goto error_return;
 
   /* Walk through them looking for relaxing opportunities.  */
   irelend = internal_relocs + sec->reloc_count;
   for (irel = internal_relocs; irel < irelend; irel++)
     {
       bfd_vma symval;
 
@@ skipping 324 matching lines @@
 #define elf_info_to_howto               elf_crx_info_to_howto
 #define elf_info_to_howto_rel           0
 #define elf_backend_relocate_section    elf32_crx_relocate_section
 #define bfd_elf32_bfd_relax_section     elf32_crx_relax_section
 #define bfd_elf32_bfd_get_relocated_section_contents \
                                 elf32_crx_get_relocated_section_contents
 #define elf_backend_can_gc_sections     1
 #define elf_backend_rela_normal         1
 
 #include "elf32-target.h"