aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog3
-rw-r--r--bfd/elfcode.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 206bdc0..a5fb0f6 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -4,6 +4,9 @@ Thu Jan 26 09:00:12 1995 Steve Chamberlain <sac@splat>
Thu Jan 26 11:39:21 1995 Ian Lance Taylor <ian@cygnus.com>
+ * elfcode.h (elf_link_add_object_symbols): Only examine weakdef if
+ we are using an ELF hash table.
+
* aoutx.h (NAME(aout,some_aout_object_p)): Always set EXEC_P if
the start address is in the .text section, even if STAT_FOR_EXEC
is set. Just use STAT_FOR_EXEC as an additional test.
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index a7e12f8..43a071c 100644
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -4339,6 +4339,7 @@ elf_link_add_object_symbols (abfd, info)
&& definition
&& (flags & BSF_WEAK) != 0
&& ELF_ST_TYPE (sym.st_info) != STT_FUNC
+ && info->hash->creator->flavour == bfd_target_elf_flavour
&& (*sym_hash)->weakdef == NULL)
{
/* Keep a list of all weak defined non function symbols from