diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2005-03-01 00:38:52 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2005-03-01 00:38:52 +0000 |
| commit | 1f8badccd6614e7186de47c11cb6f1b1ac4a56ab (patch) | |
| tree | b1d537f192ccf53f200e7b5750d168d6a1e225dd /bfd/bout.c | |
| parent | f63089e679b93fac2f19a1a238b9a61773ac26e5 (diff) | |
| download | binutils-redhat-1f8badccd6614e7186de47c11cb6f1b1ac4a56ab.tar.gz | |
* bout.c (b_out_write_object_contents): Don't use sizeof on host
structs to size on-disk structures.
(b_out_set_section_contents): Size the external struct, not the
internal one for on-disk size.
(b_out_sizeof_headers): Likewise.
Diffstat (limited to 'bfd/bout.c')
| -rw-r--r-- | bfd/bout.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/bfd/bout.c b/bfd/bout.c index fe0c867fc5..e3ab1a6d7d 100644 --- a/bfd/bout.c +++ b/bfd/bout.c @@ -297,12 +297,10 @@ b_out_write_object_contents (abfd) exec_hdr (abfd)->a_text = obj_textsec (abfd)->size; exec_hdr (abfd)->a_data = obj_datasec (abfd)->size; exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->size; - exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * sizeof (struct nlist); + exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * 12; exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd); - exec_hdr (abfd)->a_trsize = ((obj_textsec (abfd)->reloc_count) * - sizeof (struct relocation_info)); - exec_hdr (abfd)->a_drsize = ((obj_datasec (abfd)->reloc_count) * - sizeof (struct relocation_info)); + exec_hdr (abfd)->a_trsize = (obj_textsec (abfd)->reloc_count) * 8; + exec_hdr (abfd)->a_drsize = (obj_datasec (abfd)->reloc_count) * 8; exec_hdr (abfd)->a_talign = obj_textsec (abfd)->alignment_power; exec_hdr (abfd)->a_dalign = obj_datasec (abfd)->alignment_power; @@ -993,7 +991,7 @@ b_out_set_section_contents (abfd, section, location, offset, count) if (! aout_32_make_sections (abfd)) return FALSE; - obj_textsec (abfd)->filepos = sizeof (struct internal_exec); + obj_textsec (abfd)->filepos = sizeof (struct external_exec); obj_datasec(abfd)->filepos = obj_textsec(abfd)->filepos + obj_textsec (abfd)->size; } @@ -1044,7 +1042,7 @@ b_out_sizeof_headers (ignore_abfd, ignore) bfd *ignore_abfd ATTRIBUTE_UNUSED; bfd_boolean ignore ATTRIBUTE_UNUSED; { - return sizeof (struct internal_exec); + return sizeof (struct external_exec); } |