Merge GDB 7.5.1

bfd/elf32-cr16c.c

 /* BFD back-end for National Semiconductor's CR16C ELF
-   Copyright 2004, 2005, 2006, 2007, 2009, 2010
+   Copyright 2004, 2005, 2006, 2007, 2009, 2010, 2012
    Free Software Foundation, Inc.
 
    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.
 
    This program is distributed in the hope that it will be useful,
@@ skipping 703 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)
         {
           /* This is a relocatable link.  We don't have to change
              anything, unless the reloc is against a section symbol,
              in which case we have to adjust according to where the
              section symbol winds up in the output section.  */
           if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
             rel->r_addend += sec->output_offset;
           continue;
@@ skipping 214 matching lines @@
 #define elf_info_to_howto_rel                   elf_cr16c_info_to_howto_rel
 #define elf_backend_relocate_section            elf32_cr16c_relocate_section
 #define elf_backend_symbol_processing           elf32_cr16c_symbol_processing
 #define elf_backend_section_from_bfd_section    elf32_cr16c_section_from_bfd_section
 #define elf_backend_add_symbol_hook             elf32_cr16c_add_symbol_hook
 #define elf_backend_link_output_symbol_hook     elf32_cr16c_link_output_symbol_hook
 
 #define elf_backend_can_gc_sections     1
 
 #include "elf32-target.h"