diff options
| author | Ian Lance Taylor <ian@airs.com> | 1995-07-03 17:57:25 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1995-07-03 17:57:25 +0000 |
| commit | 3004a68c469b847122e497e90d0d73dc8422e427 (patch) | |
| tree | c7c1d610ab0773c8e46b4cdf27fb918185396091 /bfd/elf32-i386.c | |
| parent | 6ff9c0519cc77f9007db0ecfea11a5c558b35f3a (diff) | |
| download | gdb-3004a68c469b847122e497e90d0d73dc8422e427.zip gdb-3004a68c469b847122e497e90d0d73dc8422e427.tar.gz gdb-3004a68c469b847122e497e90d0d73dc8422e427.tar.bz2 | |
* elfcode.h (elf_link_add_object_symbols): Permit common and
indirect symbols in weakdefs BFD_ASSERT.
* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Simplify
BFD_ASSERT to permit some legal, but odd, cases.
* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
Diffstat (limited to 'bfd/elf32-i386.c')
| -rw-r--r-- | bfd/elf32-i386.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 3d56995..1f8d4e9 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -607,22 +607,14 @@ elf_i386_adjust_dynamic_symbol (info, h) dynobj = elf_hash_table (info)->dynobj; /* Make sure we know what is going on here. */ - BFD_ASSERT (dynobj != NULL); - BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) - || ((h->elf_link_hash_flags - & ELF_LINK_HASH_DEF_DYNAMIC) != 0 - && (h->elf_link_hash_flags - & ELF_LINK_HASH_REF_REGULAR) != 0 - && (h->elf_link_hash_flags - & ELF_LINK_HASH_DEF_REGULAR) == 0 - && (h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak) - && (h->root.u.def.section->owner == NULL - || ((elf_elfheader (h->root.u.def.section->owner)->e_type - == ET_DYN) - && (bfd_get_flavour (h->root.u.def.section->owner) - == bfd_target_elf_flavour) - && h->root.u.def.section->output_section == NULL)))); + BFD_ASSERT (dynobj != NULL + && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) + || ((h->elf_link_hash_flags + & ELF_LINK_HASH_DEF_DYNAMIC) != 0 + && (h->elf_link_hash_flags + & ELF_LINK_HASH_REF_REGULAR) != 0 + && (h->elf_link_hash_flags + & ELF_LINK_HASH_DEF_REGULAR) == 0))); /* If this is a function, put it in the procedure linkage table. We will fill in the contents of the procedure linkage table later, |