summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>1999-08-15 22:56:21 +0000
committerMark Mitchell <mark@codesourcery.com>1999-08-15 22:56:21 +0000
commitd0482ec9625080530383d3eea542b4bce80408a3 (patch)
tree32afb3baa0bd413c141f03aeb63ead75e8fca4fc
parentb0101804dbc408e153e6b199fc34776b38d3d339 (diff)
downloadgdb-d0482ec9625080530383d3eea542b4bce80408a3.tar.gz
* elf32-mips.c (mips_elf_calculate_relocation): Fix unfortunate
coincidence of variable names between old and new code.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-mips.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 06a28cf13f5..d838a75ec12 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-15 Mark Mitchell <mark@codesourcery.com>
+
+ * elf32-mips.c (mips_elf_calculate_relocation): Fix unfortunate
+ coincidence of variable names between old and new code.
+
1999-08-12 Nick Clifton <nickc@cygnus.com>
* elf32-arm.h (elf32_arm_to_thumb_stub): Make 'offset' parameter
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index f1526918a95..b7191b15e8f 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -5947,7 +5947,7 @@ mips_elf_calculate_relocation (abfd,
addresses. */
symbol = 0;
else if (info->shared && !info->symbolic && !info->no_undefined)
- relocation = 0;
+ symbol = 0;
else if (strcmp (h->root.root.root.string, "_DYNAMIC_LINK") == 0)
{
/* If this is a dynamic link, we should have created a
@@ -5957,7 +5957,7 @@ mips_elf_calculate_relocation (abfd,
somehow as well. */
BFD_ASSERT (! info->shared);
BFD_ASSERT (bfd_get_section_by_name (abfd, ".dynamic") == NULL);
- relocation = 0;
+ symbol = 0;
}
else
{