This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
minor tidy of elf64-ppc.c
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: binutils at sources dot redhat dot com
- Date: Tue, 18 Feb 2003 09:27:02 +1030
- Subject: minor tidy of elf64-ppc.c
bfd/ChangeLog
* elf64-ppc.c (ppc64_elf_relocate_section): Don't init "r". Don't
rebuild sym name when reporting errors.
Index: bfd/elf64-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-ppc.c,v
retrieving revision 1.86
diff -u -p -d -r1.86 elf64-ppc.c
--- bfd/elf64-ppc.c 17 Feb 2003 18:24:40 -0000 1.86
+++ bfd/elf64-ppc.c 17 Feb 2003 22:30:57 -0000
@@ -7011,7 +7011,6 @@ ppc64_elf_relocate_section (output_bfd,
r_type = (enum elf_ppc64_reloc_type) ELF64_R_TYPE (rel->r_info);
r_symndx = ELF64_R_SYM (rel->r_info);
- r = bfd_reloc_other;
sym = (Elf_Internal_Sym *) 0;
sec = (asection *) 0;
h = (struct elf_link_hash_entry *) 0;
@@ -8105,11 +8104,14 @@ ppc64_elf_relocate_section (output_bfd,
if (r != bfd_reloc_ok)
{
- const char *name;
-
- if (h != NULL)
+ if (sym_name == NULL)
+ sym_name = "(null)";
+ if (r == bfd_reloc_overflow)
{
- if (h->root.type == bfd_link_hash_undefweak
+ if (warned)
+ continue;
+ if (h != NULL
+ && h->root.type == bfd_link_hash_undefweak
&& ppc64_elf_howto_table[(int) r_type]->pc_relative)
{
/* Assume this is a call protected by other code that
@@ -8121,21 +8123,8 @@ ppc64_elf_relocate_section (output_bfd,
continue;
}
- name = h->root.root.string;
- }
- else
- {
- name = bfd_elf_local_sym_name (input_bfd, sym);
- if (name == NULL)
- continue;
- }
-
- if (r == bfd_reloc_overflow)
- {
- if (warned)
- continue;
if (!((*info->callbacks->reloc_overflow)
- (info, name, ppc64_elf_howto_table[(int) r_type]->name,
+ (info, sym_name, ppc64_elf_howto_table[(int) r_type]->name,
rel->r_addend, input_bfd, input_section, rel->r_offset)))
return FALSE;
}
@@ -8145,7 +8134,7 @@ ppc64_elf_relocate_section (output_bfd,
(_("%s(%s+0x%lx): reloc against `%s': error %d"),
bfd_archive_filename (input_bfd),
bfd_get_section_name (input_bfd, input_section),
- (long) rel->r_offset, name, (int) r);
+ (long) rel->r_offset, sym_name, (int) r);
ret = FALSE;
}
}
--
Alan Modra
IBM OzLabs - Linux Technology Centre