aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2001-11-15 09:31:25 +0000
committerAlan Modra <amodra@gmail.com>2001-11-15 09:31:25 +0000
commitf9f32305f762f5680c12948d85444aff09f0cbe6 (patch)
treeae5c45962bd00f8c5974ccc7da1674d078b9594b
parent33861b119a1f85c55f704b331eac3f45247d526b (diff)
downloadgdb-f9f32305f762f5680c12948d85444aff09f0cbe6.zip
gdb-f9f32305f762f5680c12948d85444aff09f0cbe6.tar.gz
gdb-f9f32305f762f5680c12948d85444aff09f0cbe6.tar.bz2
* elflink.h (elf_link_input_bfd): Complain about all relocs
against local syms from discarded sections. (elf_reloc_symbol_deleted_p): Don't try to swap in external syms.
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/elflink.h92
2 files changed, 50 insertions, 49 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0c3a54c..c7dc97a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-15 Alan Modra <amodra@bigpond.net.au>
+
+ * elflink.h (elf_link_input_bfd): Complain about all relocs
+ against local syms from discarded sections. K&R fixes.
+ (elf_reloc_symbol_deleted_p): Don't try to swap in external syms.
+ K&R fixes.
+
2001-11-15 Alexandre Oliva <aoliva@redhat.com>
* elf64-sparc.c (sparc64_elf_relocate_section): Disregard
diff --git a/bfd/elflink.h b/bfd/elflink.h
index 4455f01..da0021c 100644
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -6343,53 +6343,49 @@ elf_link_input_bfd (finfo, input_bfd)
}
else
{
- isym = finfo->internal_syms + r_symndx;
- if (ELF_ST_TYPE (isym->st_info) == STT_SECTION)
- {
- asection *sec = finfo->sections[r_symndx];
+ asection *sec = finfo->sections[r_symndx];
- if (sec != NULL
- && ! bfd_is_abs_section (sec)
- && bfd_is_abs_section (sec->output_section))
- {
+ if (sec != NULL
+ && ! bfd_is_abs_section (sec)
+ && bfd_is_abs_section (sec->output_section))
+ {
#if BFD_VERSION_DATE < 20031005
- if ((o->flags & SEC_DEBUGGING) != 0
- || (sec->flags & SEC_LINK_ONCE) != 0)
- {
+ if ((o->flags & SEC_DEBUGGING) != 0
+ || (sec->flags & SEC_LINK_ONCE) != 0)
+ {
#if BFD_VERSION_DATE > 20021005
- (*finfo->info->callbacks->warning)
- (finfo->info,
- _("warning: relocation against removed section"),
- NULL, input_bfd, o, rel->r_offset);
+ (*finfo->info->callbacks->warning)
+ (finfo->info,
+ _("warning: relocation against removed section"),
+ NULL, input_bfd, o, rel->r_offset);
#endif
- rel->r_info
- = ELF_R_INFO (0, ELF_R_TYPE (rel->r_info));
- rel->r_addend = 0;
- }
- else
+ rel->r_info
+ = ELF_R_INFO (0, ELF_R_TYPE (rel->r_info));
+ rel->r_addend = 0;
+ }
+ else
#endif
- {
- boolean ok;
- const char *msg
- = _("local symbols in discarded section %s");
- bfd_size_type amt
- = strlen (sec->name) + strlen (msg) - 1;
- char *buf = (char *) bfd_malloc (amt);
-
- if (buf != NULL)
- sprintf (buf, msg, sec->name);
- else
- buf = (char *) sec->name;
- ok = (*finfo->info->callbacks
- ->undefined_symbol) (finfo->info, buf,
- input_bfd, o,
- rel->r_offset,
- true);
- if (buf != sec->name)
- free (buf);
- if (!ok)
- return false;
- }
+ {
+ boolean ok;
+ const char *msg
+ = _("local symbols in discarded section %s");
+ bfd_size_type amt
+ = strlen (sec->name) + strlen (msg) - 1;
+ char *buf = (char *) bfd_malloc (amt);
+
+ if (buf != NULL)
+ sprintf (buf, msg, sec->name);
+ else
+ buf = (char *) sec->name;
+ ok = (*finfo->info->callbacks
+ ->undefined_symbol) (finfo->info, buf,
+ input_bfd, o,
+ rel->r_offset,
+ true);
+ if (buf != sec->name)
+ free (buf);
+ if (!ok)
+ return false;
}
}
}
@@ -6595,7 +6591,7 @@ elf_link_input_bfd (finfo, input_bfd)
/* Write out the modified section contents. */
if (bed->elf_backend_write_section
- && bed->elf_backend_write_section (output_bfd, o, contents))
+ && (*bed->elf_backend_write_section) (output_bfd, o, contents))
{
/* Section written out. */
}
@@ -7786,9 +7782,9 @@ elf_reloc_symbol_deleted_p (offset, cookie)
if (rcookie->rel->r_offset != offset)
continue;
- if (rcookie->locsyms)
+ if (rcookie->locsyms && r_symndx < rcookie->locsymcount)
elf_swap_symbol_in (rcookie->abfd,
- ((Elf_External_Sym *)rcookie->locsyms) + r_symndx,
+ (Elf_External_Sym *) rcookie->locsyms + r_symndx,
&isym);
if (r_symndx >= rcookie->locsymcount
@@ -7953,11 +7949,9 @@ elf_section_ignore_discarded_relocs (sec)
return true;
else if ((get_elf_backend_data (sec->owner)
->elf_backend_ignore_discarded_relocs != NULL)
- && (get_elf_backend_data (sec->owner)
- ->elf_backend_ignore_discarded_relocs (sec)))
+ && (*get_elf_backend_data (sec->owner)
+ ->elf_backend_ignore_discarded_relocs) (sec))
return true;
else
return false;
}
-
-