diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2001-08-24 20:10:25 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2001-08-24 20:10:25 +0000 |
| commit | b0f35f365d39066062ec31eea2f62324b31b2e52 (patch) | |
| tree | 73de54e2a529302ba054e4fad2c930759a5e95f3 | |
| parent | 34f63668bfffb0bcdf86470a79b809d11335c1a2 (diff) | |
| download | gdb-b0f35f365d39066062ec31eea2f62324b31b2e52.zip gdb-b0f35f365d39066062ec31eea2f62324b31b2e52.tar.gz gdb-b0f35f365d39066062ec31eea2f62324b31b2e52.tar.bz2 | |
2001-08-24 H.J. Lu <hjl@gnu.org>
* elf.c (_bfd_elf_merge_sections): Fail if not using an ELF
hash structure.
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf.c | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 25896d5..8fdda37 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -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. @@ -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; } |