aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2000-10-23 09:19:21 +0000
committerPhil Blundell <philb@gnu.org>2000-10-23 09:19:21 +0000
commit19b13c9868445495745423fbce18050d1155eaa9 (patch)
tree159e61f1a646543ec2e759a865e19cb68394f62e
parentMerge from mainline. (diff)
downloadbinutils-gdb-19b13c9868445495745423fbce18050d1155eaa9.tar.gz
binutils-gdb-19b13c9868445495745423fbce18050d1155eaa9.tar.bz2
binutils-gdb-19b13c9868445495745423fbce18050d1155eaa9.zip
Undo accidental commit
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.h7
2 files changed, 5 insertions, 7 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0ce64e9fdc5..2fc0258636c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-23 Philip Blundell <pb@futuretv.com>
+
+ * elf32-arm.h (elf32_arm_finish_dynamic_symbol): Undo previous
+ accidental checkin.
+
2000-10-22 Philip Blundell <philb@gnu.org>
* elf32-arm.h (elf32_arm_finish_dynamic_symbol): Don't make
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 74fb5bbaa4d..fd099b0db63 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -3015,13 +3015,6 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
/* Mark the symbol as undefined, rather than as defined in
the .plt section. Leave the value alone. */
sym->st_shndx = SHN_UNDEF;
- /* If the symbol is weak, we do need to clear the value.
- Otherwise, the PLT entry would provide a definition for
- the symbol even if the symbol wasn't defined anywhere,
- and so the symbol would never be NULL. */
- if ((h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR_NONWEAK)
- == 0)
- sym->st_value = 0;
}
}