* elf32-mips.c (mips_elf_calculate_relocation): Fix unfortunate

	coincidence of variable names between old and new code.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 06a28cf13f5a3988183a3348de3dbcfe04d91645..d838a75ec122395958afc5d92ed612284feca329 100644 (file)
--- 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 f1526918a958139878e3fe1fb6623c46d364910d..b7191b15e8f8be28e8fc8e754c58f6e91e0bc095 100644 (file)
--- 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
        {