diff options
| author | David Carlton <carlton@bactrian.org> | 2003-06-27 21:50:37 +0000 |
|---|---|---|
| committer | David Carlton <carlton@bactrian.org> | 2003-06-27 21:50:37 +0000 |
| commit | 3abe3bc90be798445086f45d9c3723165cc6c893 (patch) | |
| tree | 20de3690d32dbb68a1e4266dfd13575be97ea40e /bfd/elf-m10200.c | |
| parent | c8a2fad7b41a8264964233608ae10c35918243fb (diff) | |
| download | gdb-3abe3bc90be798445086f45d9c3723165cc6c893.zip gdb-3abe3bc90be798445086f45d9c3723165cc6c893.tar.gz gdb-3abe3bc90be798445086f45d9c3723165cc6c893.tar.bz2 | |
2003-06-27 David Carlton <carlton@kealia.com>
* Merge with mainline; tag is carlton_dictionary-20030627-merge.
Diffstat (limited to 'bfd/elf-m10200.c')
| -rw-r--r-- | bfd/elf-m10200.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bfd/elf-m10200.c b/bfd/elf-m10200.c index c35adcb..09d7d99 100644 --- a/bfd/elf-m10200.c +++ b/bfd/elf-m10200.c @@ -343,7 +343,7 @@ mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section, struct elf_link_hash_entry **sym_hashes; Elf_Internal_Rela *rel, *relend; - if (info->relocateable) + if (info->relocatable) return TRUE; symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; @@ -512,10 +512,10 @@ mn10200_elf_relax_section (abfd, sec, link_info, again) /* Assume nothing changes. */ *again = FALSE; - /* We don't have to do anything for a relocateable link, if + /* We don't have to do anything for a relocatable link, if this section does not have relocs, or if this is not a code section. */ - if (link_info->relocateable + if (link_info->relocatable || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 || (sec->flags & SEC_CODE) == 0) @@ -1305,12 +1305,12 @@ mn10200_elf_symbol_address_p (abfd, sec, isym, addr) static bfd_byte * mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order, - data, relocateable, symbols) + data, relocatable, symbols) bfd *output_bfd; struct bfd_link_info *link_info; struct bfd_link_order *link_order; bfd_byte *data; - bfd_boolean relocateable; + bfd_boolean relocatable; asymbol **symbols; { Elf_Internal_Shdr *symtab_hdr; @@ -1322,11 +1322,11 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order, /* We only need to handle the case of relaxing, or of having a particular set of section contents, specially. */ - if (relocateable + if (relocatable || elf_section_data (input_section)->this_hdr.contents == NULL) return bfd_generic_get_relocated_section_contents (output_bfd, link_info, link_order, data, - relocateable, + relocatable, symbols); symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; |