diff options
| author | Mark Mitchell <mark@codesourcery.com> | 1999-08-15 22:56:21 +0000 |
|---|---|---|
| committer | Mark Mitchell <mark@codesourcery.com> | 1999-08-15 22:56:21 +0000 |
| commit | 8535d39cc87f4c6690783ea979ad63e6192b34b8 (patch) | |
| tree | 570db093b198a9729a4c470507e46fb84ebb8151 /bfd | |
| parent | 276b1dc2a2663680f734c8603a40e3cb8250f318 (diff) | |
| download | gdb-8535d39cc87f4c6690783ea979ad63e6192b34b8.zip gdb-8535d39cc87f4c6690783ea979ad63e6192b34b8.tar.gz gdb-8535d39cc87f4c6690783ea979ad63e6192b34b8.tar.bz2 | |
* elf32-mips.c (mips_elf_calculate_relocation): Fix unfortunate
coincidence of variable names between old and new code.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-mips.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 06a28cf..d838a75 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 f152691..b7191b1 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 { |