Merge GDB 7.5.1

bfd/elf32-xc16x.c

 /* Infineon XC16X-specific support for 16-bit ELF.
-   Copyright 2006, 2007, 2009, 2010  Free Software Foundation, Inc.
+   Copyright 2006, 2007, 2009, 2010, 2012 Free Software Foundation, Inc.
    Contributed by KPIT Cummins Infosystems 
 
    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 361 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))
         {
           /* For relocs against symbols from removed linkonce sections,
              or sections discarded by a linker script, we just want the
              section contents cleared.  Avoid any special processing.  */
           reloc_howto_type *howto;
           howto = xc16x_reloc_type_lookup (input_bfd, r_type);
           RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
-                                           rel, relend, howto, contents);
+                                           rel, 1, relend, howto, 0, contents);
         }
 
       if (info->relocatable)
         continue;
 
       elf32_xc16x_final_link_relocate (r_type, input_bfd, output_bfd,
                                        input_section,
                                        contents, rel->r_offset,
                                        relocation, rel->r_addend,
                                        info, sec, h == NULL);
@@ skipping 65 matching lines @@
 #define elf_backend_object_p            elf32_xc16x_object_p
 #define elf_backend_can_gc_sections     1
 #define bfd_elf32_bfd_reloc_type_lookup xc16x_reloc_type_lookup
 #define bfd_elf32_bfd_reloc_name_lookup xc16x_reloc_name_lookup
 #define elf_info_to_howto               elf32_xc16x_info_to_howto
 #define elf_info_to_howto_rel           elf32_xc16x_info_to_howto
 #define elf_backend_relocate_section    elf32_xc16x_relocate_section
 #define elf_backend_rela_normal         1
 
 #include "elf32-target.h"