summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@debian.org>2004-01-23 16:51:48 +0000
committerDaniel Jacobowitz <dan@debian.org>2004-01-23 16:51:48 +0000
commitadbcd38745e1bccb069592057134c7fea5173219 (patch)
treef5896827902d1ef2a4369417ae732c1b2aaf87bb
parentd0a80fd4ffe0a1f4ba1120ff834cfaa8da0b06c6 (diff)
downloadgdb-adbcd38745e1bccb069592057134c7fea5173219.tar.gz
* elf32-arm.h (elf32_arm_check_relocs): Revert part of 2004-01-13
change.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.h9
2 files changed, 10 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c1c024c5e4e..00748f33cc4 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-23 Daniel Jacobowitz <drow@mvista.com>
+
+ * elf32-arm.h (elf32_arm_check_relocs): Revert part of 2004-01-13
+ change.
+
2004-01-21 Tom Rix <tcrix@worldnet.att.net>
* reloc.c: New 5 bit reloc, BFD_RELOC_M68HC12_5B, for m68hc12 movb/movw.
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 369bbe32280..7c284c17474 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -2945,10 +2945,11 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
symbol local. */
if (ELF32_R_TYPE (rel->r_info) == R_ARM_PC24
|| ELF32_R_TYPE (rel->r_info) == R_ARM_PLT32)
- {
- h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
- h->plt.refcount += 1;
- }
+ h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
+
+ /* If we create a PLT entry, this relocation will reference
+ it, even if it's an ABS32 relocation. */
+ h->plt.refcount += 1;
}
/* If we are creating a shared library, and this is a reloc