PR ld/13491

	* coff-i386.c (coff_i386_rtype_to_howto <R_SECREL32>): Test
	h->root.type not h->type.
	* coff-x86_64.c (coff_amd64_rtype_to_howto <R_AMD64_SECREL>): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7b569678ec22535d901f5fdc2458f5f764c7addd..15e217167fd2e3fa9f417c7236eb36d44ffea0a6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,7 +1,14 @@
+2012-01-16  Daniel Green  <venix1@gmail.com>
+
+       PR ld/13491
+       * coff-i386.c (coff_i386_rtype_to_howto <R_SECREL32>): Test
+       h->root.type not h->type.
+       * coff-x86_64.c (coff_amd64_rtype_to_howto <R_AMD64_SECREL>): Likewise.
+
 2012-01-13  Iain Sandoe  <idsandoe@googlemail.com>
 
-       * mach-o.c (bfd_mach_o_build_dysymtab_command): Handle absolute 
-       indirect symbols.  
+       * mach-o.c (bfd_mach_o_build_dysymtab_command): Handle absolute
+       indirect symbols.
 
 2012-01-13  Iain Sandoe  <idsandoe@googlemail.com>
 

diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c
index 2f17a556505e08b1c87db9b6bea58dbad7f7a8b0..adc343329b02e4370c189bc39e3c1d7b28a776f4 100644 (file)
--- a/bfd/coff-i386.c
+++ b/bfd/coff-i386.c
@@ -528,8 +528,8 @@ coff_i386_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
     {
       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
        {

diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c
index d8a8a2e6c604dcb75d43e05130646188f2ab8844..4f00b78d413d3a3bd8c37c51fb71392a10eff10b 100644 (file)
--- a/bfd/coff-x86_64.c
+++ b/bfd/coff-x86_64.c
@@ -619,7 +619,8 @@ coff_amd64_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
     {
       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
        {