From 3a8c4a5b428c1babd941606c2bbe9cf8a041d9d9 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 1 Dec 2015 13:56:09 +1030 Subject: [PATCH] Trim unused params from aout adjust_sizes_and_vmas * aoutx.h (adjust_sizes_and_vmas): Remove unused text_size and text_end parameters. Update callers. * aout-tic30.c: Update adjust_sizes_and_vmas callers. * hp300hpux.c: Likewise. * i386lynx.c: Likewise. * libaout.h: Likewise. * netbsd.h: Likewise. * pdp11.c: Likewise. * riscix.c: Likewise. --- bfd/ChangeLog | 12 ++++++++++++ bfd/aout-tic30.c | 5 +---- bfd/aoutx.h | 14 +++----------- bfd/hp300hpux.c | 4 +--- bfd/i386lynx.c | 4 +--- bfd/libaout.h | 7 ++----- bfd/netbsd.h | 7 +------ bfd/pdp11.c | 25 +++++-------------------- bfd/riscix.c | 5 +---- 9 files changed, 27 insertions(+), 56 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0fbdd64d6d..ca4f130a00 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,15 @@ +2015-12-01 Alan Modra + + * aoutx.h (adjust_sizes_and_vmas): Remove unused text_size and + text_end parameters. Update callers. + * aout-tic30.c: Update adjust_sizes_and_vmas callers. + * hp300hpux.c: Likewise. + * i386lynx.c: Likewise. + * libaout.h: Likewise. + * netbsd.h: Likewise. + * pdp11.c: Likewise. + * riscix.c: Likewise. + 2015-12-01 Alan Modra * aout-adobe.c: Invoke aout N_* macros with pointer to diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c index 6852c85556..6ada4c1354 100644 --- a/bfd/aout-tic30.c +++ b/bfd/aout-tic30.c @@ -636,11 +636,8 @@ tic30_aout_write_object_contents (bfd *abfd) obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; { - bfd_size_type text_size; /* Dummy vars. */ - file_ptr text_end; - if (adata (abfd).magic == undecided_magic) - NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end); + NAME (aout, adjust_sizes_and_vmas) (abfd); execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE; execp->a_entry = bfd_get_start_address (abfd); diff --git a/bfd/aoutx.h b/bfd/aoutx.h index cca386af78..51956d901e 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -1111,9 +1111,7 @@ adjust_n_magic (bfd *abfd, struct internal_exec *execp) } bfd_boolean -NAME (aout, adjust_sizes_and_vmas) (bfd *abfd, - bfd_size_type *text_size, - file_ptr *text_end ATTRIBUTE_UNUSED) +NAME (aout, adjust_sizes_and_vmas) (bfd *abfd) { struct internal_exec *execp = exec_hdr (abfd); @@ -1127,7 +1125,6 @@ NAME (aout, adjust_sizes_and_vmas) (bfd *abfd, align_power (obj_textsec (abfd)->size, obj_textsec (abfd)->alignment_power); - *text_size = obj_textsec (abfd)->size; /* Rule (heuristic) for when to pad to a new page. Note that there are (at least) two ways demand-paged (ZMAGIC) files have been handled. Most Berkeley-based systems start the text segment at @@ -1250,12 +1247,9 @@ NAME (aout, set_section_contents) (bfd *abfd, file_ptr offset, bfd_size_type count) { - file_ptr text_end; - bfd_size_type text_size; - if (! abfd->output_has_begun) { - if (! NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end)) + if (! NAME (aout, adjust_sizes_and_vmas) (abfd)) return FALSE; } @@ -5329,8 +5323,6 @@ NAME (aout, final_link) (bfd *abfd, bfd_size_type max_contents_size; bfd_size_type max_relocs_size; bfd_size_type max_sym_count; - bfd_size_type text_size; - file_ptr text_end; struct bfd_link_order *p; asection *o; bfd_boolean have_link_order_relocs; @@ -5427,7 +5419,7 @@ NAME (aout, final_link) (bfd *abfd, /* Adjust the section sizes and vmas according to the magic number. This sets a_text, a_data and a_bss in the exec_hdr and sets the filepos for each section. */ - if (! NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end)) + if (! NAME (aout, adjust_sizes_and_vmas) (abfd)) goto error_return; /* The relocation and symbol file positions differ among a.out diff --git a/bfd/hp300hpux.c b/bfd/hp300hpux.c index 564cdc2807..281b50fb1f 100644 --- a/bfd/hp300hpux.c +++ b/bfd/hp300hpux.c @@ -280,15 +280,13 @@ MY (write_object_contents) (bfd * abfd) { struct external_exec exec_bytes; struct internal_exec *execp = exec_hdr (abfd); - bfd_size_type text_size; /* dummy vars */ - file_ptr text_end; memset (&exec_bytes, 0, sizeof (exec_bytes)); obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; if (adata (abfd).magic == undecided_magic) - NAME (aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end); + NAME (aout,adjust_sizes_and_vmas) (abfd); execp->a_syms = 0; execp->a_entry = bfd_get_start_address (abfd); diff --git a/bfd/i386lynx.c b/bfd/i386lynx.c index 91cac43c2c..2c8b3b4e06 100644 --- a/bfd/i386lynx.c +++ b/bfd/i386lynx.c @@ -36,10 +36,8 @@ #ifndef WRITE_HEADERS #define WRITE_HEADERS(abfd, execp) \ { \ - bfd_size_type text_size; /* dummy vars */ \ - file_ptr text_end; \ if (adata(abfd).magic == undecided_magic) \ - NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end); \ + NAME(aout,adjust_sizes_and_vmas) (abfd); \ \ execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE; \ execp->a_entry = bfd_get_start_address (abfd); \ diff --git a/bfd/libaout.h b/bfd/libaout.h index 9f32cc8d09..5c76f3a309 100644 --- a/bfd/libaout.h +++ b/bfd/libaout.h @@ -564,7 +564,7 @@ extern int NAME (aout, sizeof_headers) (bfd *, struct bfd_link_info *); extern bfd_boolean NAME (aout, adjust_sizes_and_vmas) - (bfd *, bfd_size_type *, file_ptr *); + (bfd *); extern void NAME (aout, swap_exec_header_in) (bfd *, struct external_exec *, struct internal_exec *); @@ -624,11 +624,8 @@ extern bfd_boolean NAME (aout, bfd_free_cached_info) #ifndef WRITE_HEADERS #define WRITE_HEADERS(abfd, execp) \ { \ - bfd_size_type text_size; /* Dummy vars. */ \ - file_ptr text_end; \ - \ if (adata(abfd).magic == undecided_magic) \ - NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end); \ + NAME (aout, adjust_sizes_and_vmas) (abfd); \ \ execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE; \ execp->a_entry = bfd_get_start_address (abfd); \ diff --git a/bfd/netbsd.h b/bfd/netbsd.h index abd5fe7ba5..a696b9821d 100644 --- a/bfd/netbsd.h +++ b/bfd/netbsd.h @@ -84,12 +84,7 @@ MY (write_object_contents) (bfd *abfd) will normally have been done by set_section_contents, but only if there actually are some section contents. */ if (! abfd->output_has_begun) - { - bfd_size_type text_size; - file_ptr text_end; - - NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end); - } + NAME (aout, adjust_sizes_and_vmas) (abfd); obj_reloc_entry_size (abfd) = RELOC_STD_SIZE; diff --git a/bfd/pdp11.c b/bfd/pdp11.c index f6a7c3830e..e3317bc6dc 100644 --- a/bfd/pdp11.c +++ b/bfd/pdp11.c @@ -292,11 +292,9 @@ static int pdp11_aout_write_headers (bfd *abfd, struct internal_exec *execp) { struct external_exec exec_bytes; - bfd_size_type text_size; - file_ptr text_end; if (adata(abfd).magic == undecided_magic) - NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end); + NAME (aout, adjust_sizes_and_vmas) (abfd); execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE; execp->a_entry = bfd_get_start_address (abfd); @@ -359,12 +357,7 @@ MY(write_object_contents) (bfd *abfd) will normally have been done by set_section_contents, but only if there actually are some section contents. */ if (! abfd->output_has_begun) - { - bfd_size_type text_size; - file_ptr text_end; - - NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end); - } + NAME (aout, adjust_sizes_and_vmas) (abfd); obj_reloc_entry_size (abfd) = RELOC_SIZE; @@ -1015,9 +1008,7 @@ adjust_n_magic (bfd *abfd, struct internal_exec *execp) } bfd_boolean -NAME (aout, adjust_sizes_and_vmas) (bfd *abfd, - bfd_size_type *text_size, - file_ptr * text_end ATTRIBUTE_UNUSED) +NAME (aout, adjust_sizes_and_vmas) (bfd *abfd) { struct internal_exec *execp = exec_hdr (abfd); @@ -1031,7 +1022,6 @@ NAME (aout, adjust_sizes_and_vmas) (bfd *abfd, align_power(obj_textsec(abfd)->size, obj_textsec(abfd)->alignment_power); - *text_size = obj_textsec (abfd)->size; /* Rule (heuristic) for when to pad to a new page. Note that there are (at least) two ways demand-paged (ZMAGIC) files have been handled. Most Berkeley-based systems start the text segment at @@ -1142,12 +1132,9 @@ NAME (aout, set_section_contents) (bfd *abfd, file_ptr offset, bfd_size_type count) { - file_ptr text_end; - bfd_size_type text_size; - if (! abfd->output_has_begun) { - if (! NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end)) + if (! NAME (aout, adjust_sizes_and_vmas) (abfd)) return FALSE; } @@ -3676,8 +3663,6 @@ NAME (aout, final_link) (bfd *abfd, bfd_size_type max_contents_size; bfd_size_type max_relocs_size; bfd_size_type max_sym_count; - bfd_size_type text_size; - file_ptr text_end; struct bfd_link_order *p; asection *o; bfd_boolean have_link_order_relocs; @@ -3773,7 +3758,7 @@ NAME (aout, final_link) (bfd *abfd, /* Adjust the section sizes and vmas according to the magic number. This sets a_text, a_data and a_bss in the exec_hdr and sets the filepos for each section. */ - if (! NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end)) + if (! NAME (aout, adjust_sizes_and_vmas) (abfd)) goto error_return; /* The relocation and symbol file positions differ among a.out diff --git a/bfd/riscix.c b/bfd/riscix.c index a1f6401426..fb780e2e76 100644 --- a/bfd/riscix.c +++ b/bfd/riscix.c @@ -110,11 +110,8 @@ #define WRITE_HEADERS(abfd, execp) \ { \ - bfd_size_type text_size; /* Dummy vars. */ \ - file_ptr text_end; \ - \ if (adata (abfd).magic == undecided_magic) \ - NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end); \ + NAME (aout, adjust_sizes_and_vmas) (abfd); \ \ execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE; \ execp->a_entry = bfd_get_start_address (abfd); \ -- 2.34.1