Merge GDB 7.5.1

bfd/elfxx-sparc.c

 /* SPARC-specific support for ELF
-   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 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 33 matching lines @@
 /* Utility for performing the standard initial work of an instruction
    relocation.
    *PRELOCATION will contain the relocated item.
    *PINSN will contain the instruction from the input stream.
    If the result is `bfd_reloc_other' the caller can continue with
    performing the relocation.  Otherwise it must stop and return the
    value to its caller.  */
 
 static bfd_reloc_status_type
 init_insn_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
-                 PTR data, asection *input_section, bfd *output_bfd,
+                 void * data, asection *input_section, bfd *output_bfd,
                  bfd_vma *prelocation, bfd_vma *pinsn)
 {
   bfd_vma relocation;
   reloc_howto_type *howto = reloc_entry->howto;
 
   if (output_bfd != (bfd *) NULL
       && (symbol->flags & BSF_SECTION_SYM) == 0
       && (! howto->partial_inplace
           || reloc_entry->addend == 0))
     {
@@ skipping 23 matching lines @@
   *pinsn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
   return bfd_reloc_other;
 }
 
 /* For unsupported relocs.  */
 
 static bfd_reloc_status_type
 sparc_elf_notsup_reloc (bfd *abfd ATTRIBUTE_UNUSED,
                         arelent *reloc_entry ATTRIBUTE_UNUSED,
                         asymbol *symbol ATTRIBUTE_UNUSED,
-                        PTR data ATTRIBUTE_UNUSED,
+                        void * data ATTRIBUTE_UNUSED,
                         asection *input_section ATTRIBUTE_UNUSED,
                         bfd *output_bfd ATTRIBUTE_UNUSED,
                         char **error_message ATTRIBUTE_UNUSED)
 {
   return bfd_reloc_notsupported;
 }
 
 /* Handle the WDISP16 reloc.  */
 
 static bfd_reloc_status_type
 sparc_elf_wdisp16_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
-                         PTR data, asection *input_section, bfd *output_bfd,
+                         void * data, asection *input_section, bfd *output_bfd,
                          char **error_message ATTRIBUTE_UNUSED)
 {
   bfd_vma relocation;
   bfd_vma insn;
   bfd_reloc_status_type status;
 
   status = init_insn_reloc (abfd, reloc_entry, symbol, data,
                             input_section, output_bfd, &relocation, &insn);
   if (status != bfd_reloc_other)
     return status;
 
   insn &= ~ (bfd_vma) 0x303fff;
   insn |= (((relocation >> 2) & 0xc000) << 6) | ((relocation >> 2) & 0x3fff);
   bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
 
   if ((bfd_signed_vma) relocation < - 0x40000
       || (bfd_signed_vma) relocation > 0x3ffff)
     return bfd_reloc_overflow;
   else
     return bfd_reloc_ok;
 }
 
+/* Handle the WDISP10 reloc.  */
+
+static bfd_reloc_status_type
+sparc_elf_wdisp10_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
+                         void * data, asection *input_section, bfd *output_bfd,
+                         char **error_message ATTRIBUTE_UNUSED)
+{
+  bfd_vma relocation;
+  bfd_vma insn;
+  bfd_reloc_status_type status;
+
+  status = init_insn_reloc (abfd, reloc_entry, symbol, data,
+                            input_section, output_bfd, &relocation, &insn);
+  if (status != bfd_reloc_other)
+    return status;
+
+  insn &= ~ (bfd_vma) 0x181fe0;
+  insn |= (((relocation >> 2) & 0x300) << 11)
+          | (((relocation >> 2) & 0xff) << 5);
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
+
+  if ((bfd_signed_vma) relocation < - 0x1000
+      || (bfd_signed_vma) relocation > 0xfff)
+    return bfd_reloc_overflow;
+  else
+    return bfd_reloc_ok;
+}
+
 /* Handle the HIX22 reloc.  */
 
 static bfd_reloc_status_type
 sparc_elf_hix22_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
-                       PTR data, asection *input_section, bfd *output_bfd,
+                       void * data, asection *input_section, bfd *output_bfd,
                        char **error_message ATTRIBUTE_UNUSED)
 {
   bfd_vma relocation;
   bfd_vma insn;
   bfd_reloc_status_type status;
 
   status = init_insn_reloc (abfd, reloc_entry, symbol, data,
                             input_section, output_bfd, &relocation, &insn);
   if (status != bfd_reloc_other)
     return status;
 
   relocation ^= MINUS_ONE;
   insn = (insn &~ (bfd_vma) 0x3fffff) | ((relocation >> 10) & 0x3fffff);
   bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
 
   if ((relocation & ~ (bfd_vma) 0xffffffff) != 0)
     return bfd_reloc_overflow;
   else
     return bfd_reloc_ok;
 }
 
 /* Handle the LOX10 reloc.  */
 
 static bfd_reloc_status_type
 sparc_elf_lox10_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
-                       PTR data, asection *input_section, bfd *output_bfd,
+                       void * data, asection *input_section, bfd *output_bfd,
                        char **error_message ATTRIBUTE_UNUSED)
 {
   bfd_vma relocation;
   bfd_vma insn;
   bfd_reloc_status_type status;
 
   status = init_insn_reloc (abfd, reloc_entry, symbol, data,
                             input_section, output_bfd, &relocation, &insn);
   if (status != bfd_reloc_other)
     return status;
@@ skipping 84 matching lines @@
   HOWTO(R_SPARC_TLS_DTPMOD64,0,0, 0,FALSE,0,complain_overflow_dont,  bfd_elf_generic_reloc,  "R_SPARC_TLS_DTPMOD64",FALSE,0,0x00000000,TRUE),
   HOWTO(R_SPARC_TLS_DTPOFF32,0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,"R_SPARC_TLS_DTPOFF32",FALSE,0,0xffffffff,TRUE),
   HOWTO(R_SPARC_TLS_DTPOFF64,0,4,64,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,"R_SPARC_TLS_DTPOFF64",FALSE,0,MINUS_ONE,TRUE),
   HOWTO(R_SPARC_TLS_TPOFF32,0,0, 0,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_TLS_TPOFF32",FALSE,0,0x00000000,TRUE),
   HOWTO(R_SPARC_TLS_TPOFF64,0,0, 0,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_TLS_TPOFF64",FALSE,0,0x00000000,TRUE),
   HOWTO(R_SPARC_GOTDATA_HIX22,0,2,0,FALSE,0,complain_overflow_bitfield,sparc_elf_hix22_reloc,"R_SPARC_GOTDATA_HIX22",FALSE,0,0x003fffff, FALSE),
   HOWTO(R_SPARC_GOTDATA_LOX10,0,2,0,FALSE,0,complain_overflow_dont,  sparc_elf_lox10_reloc,  "R_SPARC_GOTDATA_LOX10",FALSE,0,0x000003ff, FALSE),
   HOWTO(R_SPARC_GOTDATA_OP_HIX22,0,2,0,FALSE,0,complain_overflow_bitfield,sparc_elf_hix22_reloc,"R_SPARC_GOTDATA_OP_HIX22",FALSE,0,0x003fffff, FALSE),
   HOWTO(R_SPARC_GOTDATA_OP_LOX10,0,2,0,FALSE,0,complain_overflow_dont,  sparc_elf_lox10_reloc,  "R_SPARC_GOTDATA_OP_LOX10",FALSE,0,0x000003ff, FALSE),
   HOWTO(R_SPARC_GOTDATA_OP,0,0, 0,FALSE,0,complain_overflow_dont,   bfd_elf_generic_reloc,  "R_SPARC_GOTDATA_OP",FALSE,0,0x00000000,TRUE),
+  HOWTO(R_SPARC_H34,12,2,22,FALSE,0,complain_overflow_unsigned,bfd_elf_generic_reloc,"R_SPARC_H34",FALSE,0,0x003fffff,FALSE),
+  HOWTO(R_SPARC_SIZE32,0,2,32,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,"R_SPARC_SIZE32",FALSE,0,0xffffffff,TRUE),
+  HOWTO(R_SPARC_SIZE64,0,4,64,FALSE,0,complain_overflow_bitfield,bfd_elf_generic_reloc,"R_SPARC_SIZE64",FALSE,0,MINUS_ONE, TRUE),
+  HOWTO(R_SPARC_WDISP10,2,2,10,TRUE, 0,complain_overflow_signed,sparc_elf_wdisp10_reloc,"R_SPARC_WDISP10",FALSE,0,0x00000000,TRUE),
 };
 static reloc_howto_type sparc_jmp_irel_howto =
   HOWTO(R_SPARC_JMP_IREL,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_JMP_IREL",FALSE,0,0x00000000,TRUE);
 static reloc_howto_type sparc_irelative_howto =
   HOWTO(R_SPARC_IRELATIVE,  0,0,00,FALSE,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_IRELATIVE",FALSE,0,0x00000000,TRUE);
 static reloc_howto_type sparc_vtinherit_howto =
   HOWTO (R_SPARC_GNU_VTINHERIT, 0,2,0,FALSE,0,complain_overflow_dont, NULL, "R_SPARC_GNU_VTINHERIT", FALSE,0, 0, FALSE);
 static reloc_howto_type sparc_vtentry_howto =
   HOWTO (R_SPARC_GNU_VTENTRY, 0,2,0,FALSE,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_SPARC_GNU_VTENTRY", FALSE,0,0, FALSE);
 static reloc_howto_type sparc_rev32_howto =
@@ skipping 237 matching lines @@
 
     case BFD_RELOC_SPARC_GOTDATA_OP_HIX22:
       return &_bfd_sparc_elf_howto_table[R_SPARC_GOTDATA_OP_HIX22];
 
     case BFD_RELOC_SPARC_GOTDATA_OP_LOX10:
       return &_bfd_sparc_elf_howto_table[R_SPARC_GOTDATA_OP_LOX10];
 
     case BFD_RELOC_SPARC_GOTDATA_OP:
       return &_bfd_sparc_elf_howto_table[R_SPARC_GOTDATA_OP];
 
+    case BFD_RELOC_SPARC_H34:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_H34];
+
+    case BFD_RELOC_SPARC_SIZE32:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_SIZE32];
+
+    case BFD_RELOC_SPARC_SIZE64:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_SIZE64];
+
+    case BFD_RELOC_SPARC_WDISP10:
+      return &_bfd_sparc_elf_howto_table[R_SPARC_WDISP10];
+
     case BFD_RELOC_SPARC_JMP_IREL:
       return &sparc_jmp_irel_howto;
 
     case BFD_RELOC_SPARC_IRELATIVE:
       return &sparc_irelative_howto;
 
     case BFD_RELOC_VTABLE_INHERIT:
       return &sparc_vtinherit_howto;
 
     case BFD_RELOC_VTABLE_ENTRY:
@@ skipping 616 matching lines @@
    hash table.  */
 
 bfd_boolean
 _bfd_sparc_elf_create_dynamic_sections (bfd *dynobj,
                                         struct bfd_link_info *info)
 {
   struct _bfd_sparc_elf_link_hash_table *htab;
 
   htab = _bfd_sparc_elf_hash_table (info);
   BFD_ASSERT (htab != NULL);