From 37897db02caa2a3a99ca6dc873c4fb72d468dd1d Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 13 Mar 1997 19:24:20 +0000 Subject: [PATCH] * elflink.h (elf_link_add_object_symbols): Don't warn about type or size changes because of a weak symbol. PR 11827. --- bfd/ChangeLog | 3 +++ bfd/elflink.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5597d4a740..97ce5f866c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,8 @@ Thu Mar 13 14:08:53 1997 Ian Lance Taylor + * elflink.h (elf_link_add_object_symbols): Don't warn about type + or size changes because of a weak symbol. + * cisco-core.c (SIGEMT): Define if not defined. Wed Mar 12 21:36:05 1997 Ian Lance Taylor diff --git a/bfd/elflink.h b/bfd/elflink.h index b6a5d580a3..dee5a8a66f 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -861,9 +861,11 @@ elf_link_add_object_symbols (abfd, info) h = (struct elf_link_hash_entry *) h->root.u.i.link; /* It's OK to change the type if it used to be a weak - definition. */ + definition, or if the current definition is weak (and + hence might be ignored). */ if (h->root.type == bfd_link_hash_defweak - || h->root.type == bfd_link_hash_undefweak) + || h->root.type == bfd_link_hash_undefweak + || bind == STB_WEAK) type_change_ok = true; /* It's OK to change the size if it used to be a weak