2001-08-24 H.J. Lu <hjl@gnu.org>
* elf.c (_bfd_elf_merge_sections): Fail if not using an ELF hash structure.
This commit is contained in:
parent
34f63668bf
commit
b0f35f365d
@ -1,3 +1,8 @@
|
||||
2001-08-24 H.J. Lu <hjl@gnu.org>
|
||||
|
||||
* elf.c (_bfd_elf_merge_sections): Fail if not using an ELF
|
||||
hash structure.
|
||||
|
||||
2001-08-24 Nick Clifton <nickc@cambridge.redhat.com>
|
||||
|
||||
* elf-bfd.h (elf_hash_table): Revert definition.
|
||||
|
11
bfd/elf.c
11
bfd/elf.c
@ -571,15 +571,10 @@ _bfd_elf_merge_sections (abfd, info)
|
||||
bfd *abfd;
|
||||
struct bfd_link_info *info;
|
||||
{
|
||||
struct elf_link_hash_table * hash_table;
|
||||
|
||||
hash_table = elf_hash_table (info);
|
||||
|
||||
if (hash_table == NULL)
|
||||
if (!is_elf_hash_table (info))
|
||||
return false;
|
||||
|
||||
if (hash_table->merge_info)
|
||||
_bfd_merge_sections (abfd, hash_table->merge_info);
|
||||
if (elf_hash_table (info)->merge_info)
|
||||
_bfd_merge_sections (abfd, elf_hash_table (info)->merge_info);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user