From 8a5dcf532efc4f76188250a159e52134687681b1 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 16 Jan 2012 08:30:18 +0000 Subject: [PATCH] PR ld/13491 * coff-i386.c (coff_i386_rtype_to_howto ): Test h->root.type not h->type. * coff-x86_64.c (coff_amd64_rtype_to_howto ): Likewise. --- bfd/ChangeLog | 11 +++++++++-- bfd/coff-i386.c | 4 ++-- bfd/coff-x86_64.c | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7b569678ec..15e217167f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,7 +1,14 @@ +2012-01-16 Daniel Green + + PR ld/13491 + * coff-i386.c (coff_i386_rtype_to_howto ): Test + h->root.type not h->type. + * coff-x86_64.c (coff_amd64_rtype_to_howto ): Likewise. + 2012-01-13 Iain Sandoe - * 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 diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c index 2f17a55650..adc343329b 100644 --- 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 d8a8a2e6c6..4f00b78d41 100644 --- 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 {