From b0f35f365d39066062ec31eea2f62324b31b2e52 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 24 Aug 2001 20:10:25 +0000 Subject: [PATCH] 2001-08-24 H.J. Lu * elf.c (_bfd_elf_merge_sections): Fail if not using an ELF hash structure. --- bfd/ChangeLog | 5 +++++ bfd/elf.c | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 25896d5bf0..8fdda3770a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2001-08-24 H.J. Lu + + * elf.c (_bfd_elf_merge_sections): Fail if not using an ELF + hash structure. + 2001-08-24 Nick Clifton * elf-bfd.h (elf_hash_table): Revert definition. diff --git a/bfd/elf.c b/bfd/elf.c index 6077811561..0ac2cec9c1 100644 --- a/bfd/elf.c +++ b/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; } -- 2.34.1