diff options
| author | David Carlton <carlton@bactrian.org> | 2003-11-11 23:51:22 +0000 |
|---|---|---|
| committer | David Carlton <carlton@bactrian.org> | 2003-11-11 23:51:22 +0000 |
| commit | 7c27792d1bb9f44a9d2af04d57796d08cdc683ee (patch) | |
| tree | 3c24bd0c46542b052307c376aacd1f853ba124ac /bfd/elf32-i370.c | |
| parent | 268f0da1a4cafdff391f1c140a62ad7e750b6863 (diff) | |
| download | gdb-7c27792d1bb9f44a9d2af04d57796d08cdc683ee.tar.gz | |
2003-11-11 David Carlton <carlton@kealia.com>
* Merge with mainline; tag is carlton-dictionary-20031111-merge.
Diffstat (limited to 'bfd/elf32-i370.c')
| -rw-r--r-- | bfd/elf32-i370.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/bfd/elf32-i370.c b/bfd/elf32-i370.c index 4a06ac08fae..83783ae888b 100644 --- a/bfd/elf32-i370.c +++ b/bfd/elf32-i370.c @@ -653,7 +653,7 @@ i370_elf_size_dynamic_sections (output_bfd, info) if (elf_hash_table (info)->dynamic_sections_created) { /* Set the contents of the .interp section to the interpreter. */ - if (! info->shared) + if (info->executable) { s = bfd_get_section_by_name (dynobj, ".interp"); BFD_ASSERT (s != NULL); @@ -1210,7 +1210,7 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section, sec = local_sections[r_symndx]; sym_name = "<local symbol>"; - relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sec, rel); + relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel); addend = rel->r_addend; } else @@ -1363,16 +1363,7 @@ i370_elf_relocate_section (output_bfd, info, input_bfd, input_section, { long indx; - if (h == NULL) - sec = local_sections[r_symndx]; - else - { - BFD_ASSERT (h->root.type == bfd_link_hash_defined - || (h->root.type - == bfd_link_hash_defweak)); - sec = h->root.u.def.section; - } - if (sec != NULL && bfd_is_abs_section (sec)) + if (bfd_is_abs_section (sec)) indx = 0; else if (sec == NULL || sec->owner == NULL) { |