summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@debian.org>2005-04-19 18:37:25 +0000
committerDaniel Jacobowitz <dan@debian.org>2005-04-19 18:37:25 +0000
commit3d3689e53f94144064dfd94c69276b99dca5f77d (patch)
tree82507c743ea323c9034ba72498eed3a90c84ec54
parentd6598c53462db1033ad5307e13bfc471603b1221 (diff)
downloadgdb-3d3689e53f94144064dfd94c69276b99dca5f77d.tar.gz
* elfxx-mips.c (struct mips_elf_link_hash_entry): Update comment.
(mips_elf_create_local_got_entry): Check h->root.forced_local.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elfxx-mips.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fbb7e5a6e2f..beabf2ca3ee 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-19 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * elfxx-mips.c (struct mips_elf_link_hash_entry): Update comment.
+ (mips_elf_create_local_got_entry): Check h->root.forced_local.
+
2005-04-19 Alan Modra <amodra@bigpond.net.au>
* elf32-ppc.c (ppc_elf_check_relocs): Don't bother with
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index eaa927e3add..1f9cf8e54fa 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -242,7 +242,8 @@ struct mips_elf_link_hash_entry
being called returns a floating point value. */
asection *call_fp_stub;
- /* Are we forced local? .*/
+ /* Are we forced local? This will only be set if we have converted
+ the initial global GOT entry to a local GOT entry. */
bfd_boolean forced_local;
#define GOT_NORMAL 0
@@ -2463,7 +2464,7 @@ mips_elf_create_local_got_entry (bfd *abfd, bfd *ibfd,
global entry then. It doesn't matter whether an entry is local
or global for TLS, since the dynamic linker does not
automatically relocate TLS GOT entries. */
- BFD_ASSERT (h == NULL || h->forced_local);
+ BFD_ASSERT (h == NULL || h->root.forced_local);
if (TLS_RELOC_P (r_type))
{
struct mips_got_entry *p;