aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-i386.c7
-rw-r--r--bfd/elf64-x86-64.c7
3 files changed, 18 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3307383..0f4a949 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-20 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR 1025:
+ * elf32-i386.c (elf_i386_check_relocs): Handle indirect symbol.
+ * elf64-x86-64.c (elf64_x86_64_check_relocs): Likewise.
+
2005-06-18 H.J. Lu <hongjiu.lu@intel.com>
* reloc.c: Add BFD_RELOC_X86_64_GOTOFF64 and
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 30270d3..ce2f229 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -911,7 +911,12 @@ elf_i386_check_relocs (bfd *abfd,
if (r_symndx < symtab_hdr->sh_info)
h = NULL;
else
- h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+ {
+ h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+ while (h->root.type == bfd_link_hash_indirect
+ || h->root.type == bfd_link_hash_warning)
+ h = (struct elf_link_hash_entry *) h->root.u.i.link;
+ }
r_type = elf_i386_tls_transition (info, r_type, h == NULL);
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index f63fd03..aaf1308 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -664,7 +664,12 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
if (r_symndx < symtab_hdr->sh_info)
h = NULL;
else
- h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+ {
+ h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+ while (h->root.type == bfd_link_hash_indirect
+ || h->root.type == bfd_link_hash_warning)
+ h = (struct elf_link_hash_entry *) h->root.u.i.link;
+ }
r_type = elf64_x86_64_tls_transition (info, r_type, h == NULL);
switch (r_type)