Merge GDB 7.5.1

bfd/elf32-i960.c

 /* Intel 960 specific support for 32-bit ELF
-   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2007
+   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2007, 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 27 matching lines @@
    change anything about the way the reloc is handled, since it will
    all be done at final link time.  Rather than put special case code
    into bfd_perform_relocation, all the reloc types use this howto
    function.  It just short circuits the reloc if producing
    relocatable output against an external symbol.  */
 
 static bfd_reloc_status_type
 elf32_i960_relocate (bfd *abfd ATTRIBUTE_UNUSED,
                      arelent *reloc_entry,
                      asymbol *symbol,
-                     PTR data ATTRIBUTE_UNUSED,
+                     void * data ATTRIBUTE_UNUSED,
                      asection *input_section,
                      bfd *output_bfd,
                      char **error_message ATTRIBUTE_UNUSED)
 {
   /* HACK: I think this first condition is necessary when producing
      relocatable output.  After the end of HACK, the code is identical
      to bfd_elf_generic_reloc().  I would _guess_ the first change
      belongs there rather than here.  martindo 1998-10-23.  */
   if (output_bfd != (bfd *) NULL
       && reloc_entry->howto->pc_relative
@@ skipping 98 matching lines @@
   return NULL;
 }
 
 #define TARGET_LITTLE_SYM       bfd_elf32_i960_vec
 #define TARGET_LITTLE_NAME      "elf32-i960"
 #define ELF_ARCH                bfd_arch_i960
 #define ELF_MACHINE_CODE        EM_960
 #define ELF_MAXPAGESIZE         1 /* FIXME: This number is wrong,  It should be the page size in bytes.  */
 
 #include "elf32-target.h"