MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Trim unused params from aout adjust_sizes_and_vmas

Browse Source 
* 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.
This commit is contained in:
Alan Modra 2015-12-01 13:56:09 +10:30
parent bbb1afc89b
commit 3a8c4a5b42
9 changed files with 27 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bfd/ChangeLog
View File

@ -1,3 +1,15 @@
2015-12-01 Alan Modra <amodra@gmail.com>
* 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 <amodra@gmail.com>
* aout-adobe.c: Invoke aout N_* macros with pointer to

5
bfd/aout-tic30.c
View File

@ -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);

14
bfd/aoutx.h
View File

@ -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

4
bfd/hp300hpux.c
View File

@ -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);

4
bfd/i386lynx.c
View File

@ -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); \

7
bfd/libaout.h
View File

@ -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); \

7
bfd/netbsd.h
View File

@ -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;

25
bfd/pdp11.c
View File

@ -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

5
bfd/riscix.c
View File

@ -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); \