From f36b9bcd93570f658ebfe3c6946409eed2533e6d Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 27 Sep 2006 04:07:57 +0000 Subject: [PATCH] * elf32-score.c (_bfd_score_elf_relocate_section): Move assignment to "name" so that compiler realizes it is never uninitialized. Use bfd_elf_sym_name. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-score.c | 15 ++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a2a6470eb1e..e8bf78be22b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2006-09-27 Alan Modra + + * elf32-score.c (_bfd_score_elf_relocate_section): Move assignment + to "name" so that compiler realizes it is never uninitialized. + Use bfd_elf_sym_name. + 2006-09-26 H.J. Lu PR binutils/3262 diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c index c84763aa28b..779375416c6 100644 --- a/bfd/elf32-score.c +++ b/bfd/elf32-score.c @@ -2308,9 +2308,13 @@ _bfd_score_elf_relocate_section (bfd *output_bfd, { sym = local_syms + r_symndx; sec = local_sections[r_symndx]; - relocation = (sec->output_section->vma + sec->output_offset + sym->st_value); + relocation = (sec->output_section->vma + + sec->output_offset + + sym->st_value); + name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, sec); - if ((sec->flags & SEC_MERGE) && ELF_ST_TYPE (sym->st_info) == STT_SECTION) + if ((sec->flags & SEC_MERGE) + && ELF_ST_TYPE (sym->st_info) == STT_SECTION) { asection *msec; bfd_vma addend, value; @@ -2432,13 +2436,6 @@ _bfd_score_elf_relocate_section (bfd *output_bfd, } } - if (h == NULL) - { - name = (bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name)); - if (name == NULL || *name == '\0') - name = bfd_section_name (input_bfd, sec); - } - r = score_elf_final_link_relocate (howto, input_bfd, output_bfd, input_section, contents, rel, relocs, relocation, info, sec, name, -- 2.30.2