diff options
| author | Ian Lance Taylor <ian@airs.com> | 1994-06-20 15:51:28 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1994-06-20 15:51:28 +0000 |
| commit | 6c8fa8e62cd3a5872fd98269ccd4d7da6e26a459 (patch) | |
| tree | 9a7a000643d3ec91847747ead7250a372d6ab191 /bfd | |
| parent | aa91350c626e1d890c18914161ad34805e198420 (diff) | |
| download | gdb-6c8fa8e62cd3a5872fd98269ccd4d7da6e26a459.zip gdb-6c8fa8e62cd3a5872fd98269ccd4d7da6e26a459.tar.gz gdb-6c8fa8e62cd3a5872fd98269ccd4d7da6e26a459.tar.bz2 | |
* aoutx.h (NAME(aout,final_link)): Check flavour of sub, not abfd,
when computing reloc sizes. From Eric Youngdale
<ericy@cais.cais.com>.
* elfcode.h (elf_bfd_final_link): Don't try to compute maximum
reloc count or size for a non-ELF file.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/aoutx.h | 2 | ||||
| -rw-r--r-- | bfd/elfcode.h | 18 |
3 files changed, 16 insertions, 10 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 14d7bb1..c114c43 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,11 @@ Mon Jun 20 11:06:27 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + * aoutx.h (NAME(aout,final_link)): Check flavour of sub, not abfd, + when computing reloc sizes. From Eric Youngdale + <ericy@cais.cais.com>. + * elfcode.h (elf_bfd_final_link): Don't try to compute maximum + reloc count or size for a non-ELF file. + * mipsbsd.c (MY_final_link_callback): Define to avoid warning. * hp300hpux.c (MY_final_link_callback): Define to avoid warning. diff --git a/bfd/aoutx.h b/bfd/aoutx.h index 0e5a4d8..da0fa74 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -3291,7 +3291,7 @@ NAME(aout,final_link) (abfd, info, callback) drsize = 0; for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next) { - if (bfd_get_flavour (abfd) == bfd_target_aout_flavour) + if (bfd_get_flavour (sub) == bfd_target_aout_flavour) { trsize += exec_hdr (sub)->a_trsize; drsize += exec_hdr (sub)->a_drsize; diff --git a/bfd/elfcode.h b/bfd/elfcode.h index 26b666e..54d4bbd 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -5115,17 +5115,17 @@ elf_bfd_final_link (abfd, info) if (sym_count > max_sym_count) max_sym_count = sym_count; - } - if ((sec->flags & SEC_RELOC) != 0) - { - size_t ext_size; + if ((sec->flags & SEC_RELOC) != 0) + { + size_t ext_size; - ext_size = elf_section_data (sec)->rel_hdr.sh_size; - if (ext_size > max_external_reloc_size) - max_external_reloc_size = ext_size; - if (sec->reloc_count > max_internal_reloc_count) - max_internal_reloc_count = sec->reloc_count; + ext_size = elf_section_data (sec)->rel_hdr.sh_size; + if (ext_size > max_external_reloc_size) + max_external_reloc_size = ext_size; + if (sec->reloc_count > max_internal_reloc_count) + max_internal_reloc_count = sec->reloc_count; + } } } } |