diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2005-03-28 15:32:58 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2005-03-28 15:32:58 +0000 |
| commit | 1a178b20b211f5530789d8a72e0c373166ffc732 (patch) | |
| tree | 27a9e650b8c8ecd26061e9f928ec95f81b56f652 | |
| parent | f6f6c60a06c10845196044510e1fea9e82773cc2 (diff) | |
| download | binutils-redhat-1a178b20b211f5530789d8a72e0c373166ffc732.tar.gz | |
* elf32-arm.c (elf32_arm_check_relocs): Increment count for all
relocation types. Don't count relocations which will use a PLT.
| -rw-r--r-- | ChangeLog.csl | 5 | ||||
| -rw-r--r-- | bfd/elf32-arm.c | 19 |
2 files changed, 9 insertions, 15 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index daecaa7284..42be2bf0e8 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,8 @@ +2005-03-28 Daniel Jacobowitz <dan@codesourcery.com> + + * elf32-arm.c (elf32_arm_check_relocs): Increment count for all + relocation types. Don't count relocations which will use a PLT. + 2005-03-23 Jim Blandy <jimb@redhat.com> * config/tc-arm.c (arm_adjust_symtab): Fetch elf_sym's binding diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 63452ca57f..2c88fe4c87 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -4096,18 +4096,9 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info, relocs_copied field of the hash table entry. */ if ((info->shared || htab->root.is_relocatable_executable) && (sec->flags & SEC_ALLOC) != 0 - && ((r_type != R_ARM_PC24 - && r_type != R_ARM_PLT32 -#ifndef OLD_ARM_ABI - && r_type != R_ARM_CALL - && r_type != R_ARM_JUMP24 - && r_type != R_ARM_PREL31 -#endif - && r_type != R_ARM_REL32 - && r_type != R_ARM_THM_PC22) - || (h != NULL - && (! info->symbolic - || !h->def_regular)))) + && (r_type == R_ARM_ABS32 + || (h != NULL && ! h->needs_plt + && (! info->symbolic || ! h->def_regular)))) { struct elf32_arm_relocs_copied *p, **head; @@ -4187,9 +4178,7 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info, p->count = 0; } - if (r_type == R_ARM_ABS32 - || r_type == R_ARM_REL32) - p->count += 1; + p->count += 1; } break; |