* elfxx-mips.c (mips_elf_got_entry_hash): Don't dereference

entry->abfd when it's NULL.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d75b0ee35bb8416bc45cac46d25a5253ae750d9a..53e6b0733e5ad7ae3c12a51a1018b8cf30c420ac 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-29  Alexandre Oliva  <aoliva@redhat.com>
+
+       * elfxx-mips.c (mips_elf_got_entry_hash): Don't dereference
+       entry->abfd when it's NULL.
+
 2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
 
        * elfxx-mips.c (mips_elf_create_dynamic_relocation): Handle

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 12d898e313b1b29922b2e184909615069bf876b4..22cc8a2ce68b9516804fec8e5b03e2e7f3244783 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -1584,10 +1584,11 @@ mips_elf_got_entry_hash (entry_)
 {
   const struct mips_got_entry *entry = (struct mips_got_entry *)entry_;
 
-  return entry->abfd->id + entry->symndx
+  return entry->symndx
     + (! entry->abfd ? mips_elf_hash_bfd_vma (entry->d.address)
-       : entry->symndx >= 0 ? mips_elf_hash_bfd_vma (entry->d.addend)
-       : entry->d.h->root.root.root.hash);
+       : entry->abfd->id
+         + (entry->symndx >= 0 ? mips_elf_hash_bfd_vma (entry->d.addend)
+           : entry->d.h->root.root.root.hash));
 }
 
 static int