Merge GDB 7.5.1

bfd/coff-x86_64.c

 /* BFD back-end for AMD 64 COFF files.
    Copyright 2006, 2007, 2008, 2009, 2010, 2011
    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.
@@ skipping 601 matching lines @@
     }
 
   if (rel->r_type == R_AMD64_IMAGEBASE
       && (bfd_get_flavour (sec->output_section->owner) == bfd_target_coff_flavour))
     *addendp -= pe_data (sec->output_section->owner)->pe_opthdr.ImageBase;
 
   if (rel->r_type == R_AMD64_SECREL)
     {
       bfd_vma osect_vma;
 
-      if (h && (h->type == bfd_link_hash_defined || h->type == bfd_link_hash_defweak))
+      if (h && (h->root.type == bfd_link_hash_defined
+                || h->root.type == bfd_link_hash_defweak))
         osect_vma = h->root.u.def.section->output_section->vma;
       else
         {
           asection *s;
           int i;
 
           /* Sigh, the only way to get the section to offset against
              is to find it the hard way.  */
           for (s = abfd->sections, i = 1; i < sym->n_scnum; i++)
             s = s->next;
@@ skipping 154 matching lines @@
   BFD_JUMP_TABLE_SYMBOLS (coff),
   BFD_JUMP_TABLE_RELOCS (coff),
   BFD_JUMP_TABLE_WRITE (coff),
   BFD_JUMP_TABLE_LINK (coff),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   NULL,
 
   COFF_SWAP_TABLE
 };