2001-08-24 H.J. Lu <hjl@gnu.org>

	* elf.c (_bfd_elf_merge_sections): Fail if not using an ELF
	hash structure.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 25896d5bf000eb62193c0eb8e454d925b17651d5..8fdda3770acee477bcfde094f6c8521c12d46d90 100644 (file)
--- 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.

diff --git a/bfd/elf.c b/bfd/elf.c
index 60778115618b7e49ec6ef842faefa2de05b84f42..0ac2cec9c1e1a9fd9b202536024e79689d1dcf8e 100644 (file)
--- 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;
 }
 \f