From: Alexandre Oliva <aoliva@redhat.com>
Date: Wed, 29 Jan 2003 08:29:34 +0000 (+0000)
Subject: * elfxx-mips.c (mips_elf_got_entry_hash): Don't dereference
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=38985a1cb4890f44601f781654c6d79485634120;p=deliverable%2Fbinutils-gdb.git

* 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 d75b0ee35b..53e6b0733e 100644
--- 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 12d898e313..22cc8a2ce6 100644
--- 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