FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove sflag_info param from wild callback functions

Browse source 
* ldlang.h (callback_t): Remove flag_info function parameter.
	* ldlang.c (walk_wild_consider_section): Adjust to suit.
	(walk_wild_section_general): Likewise.
	(output_section_callback_fast, output_section_callback): Likewise.
	(check_section_callback, gc_section_callback): Likewise.
	(find_relro_section_callback): Likewise.
This commit is contained in:
Alan Modra 2021-01-13 15:17:56 +10:30
parent 2ce40d1a51
commit 8c4645b488
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ld/ChangeLog
View file

@ -1,3 +1,12 @@
2021-01-13 Alan Modra <amodra@gmail.com>
* ldlang.h (callback_t): Remove flag_info function parameter.
* ldlang.c (walk_wild_consider_section): Adjust to suit.
(walk_wild_section_general): Likewise.
(output_section_callback_fast, output_section_callback): Likewise.
(check_section_callback, gc_section_callback): Likewise.
(find_relro_section_callback): Likewise.
2021-01-12 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/26792

13
ld/ldlang.c
View file

@ -320,7 +320,7 @@ walk_wild_consider_section (lang_wild_statement_type *ptr,
if (walk_wild_file_in_exclude_list (sec->spec.exclude_name_list, file))
return;
(*callback) (ptr, sec, s, ptr->section_flag_list, file, data);
(*callback) (ptr, sec, s, file, data);
}
/* Lowest common denominator routine that can handle everything correctly,
@ -339,7 +339,7 @@ walk_wild_section_general (lang_wild_statement_type *ptr,
{
sec = ptr->section_list;
if (sec == NULL)
(*callback) (ptr, sec, s, ptr->section_flag_list, file, data);
(*callback) (ptr, sec, s, file, data);
while (sec != NULL)
{
@ -566,7 +566,6 @@ static void
output_section_callback_fast (lang_wild_statement_type *ptr,
struct wildcard_list *sec,
asection *section,
struct flag_info *sflag_list ATTRIBUTE_UNUSED,
lang_input_statement_type *file,
void *output)
{
@ -2823,7 +2822,6 @@ static void
output_section_callback (lang_wild_statement_type *ptr,
struct wildcard_list *sec,
asection *section,
struct flag_info *sflag_info,
lang_input_statement_type *file,
void *output)
{
@ -2844,14 +2842,14 @@ output_section_callback (lang_wild_statement_type *ptr,
of the current list. */
if (before == NULL)
lang_add_section (&ptr->children, section, sflag_info, os);
lang_add_section (&ptr->children, section, ptr->section_flag_list, os);
else
{
lang_statement_list_type list;
lang_statement_union_type **pp;
lang_list_init (&list);
lang_add_section (&list, section, sflag_info, os);
lang_add_section (&list, section, ptr->section_flag_list, os);
/* If we are discarding the section, LIST.HEAD will
be NULL. */
@ -2877,7 +2875,6 @@ static void
check_section_callback (lang_wild_statement_type *ptr ATTRIBUTE_UNUSED,
struct wildcard_list *sec ATTRIBUTE_UNUSED,
asection *section,
struct flag_info *sflag_info ATTRIBUTE_UNUSED,
lang_input_statement_type *file ATTRIBUTE_UNUSED,
void *output)
{
@ -7490,7 +7487,6 @@ static void
gc_section_callback (lang_wild_statement_type *ptr,
struct wildcard_list *sec,
asection *section,
struct flag_info *sflag_info ATTRIBUTE_UNUSED,
lang_input_statement_type *file ATTRIBUTE_UNUSED,
void *data ATTRIBUTE_UNUSED)
{
@ -7563,7 +7559,6 @@ static void
find_relro_section_callback (lang_wild_statement_type *ptr ATTRIBUTE_UNUSED,
struct wildcard_list *sec ATTRIBUTE_UNUSED,
asection *section,
struct flag_info *sflag_info ATTRIBUTE_UNUSED,
lang_input_statement_type *file ATTRIBUTE_UNUSED,
void *data)
{

3
ld/ldlang.h
View file

@ -349,8 +349,7 @@ bfd_input_just_syms (const bfd *abfd)
typedef struct lang_wild_statement_struct lang_wild_statement_type;
typedef void (*callback_t) (lang_wild_statement_type *, struct wildcard_list *,
asection *, struct flag_info *,
lang_input_statement_type *, void *);
asection *, lang_input_statement_type *, void *);
typedef void (*walk_wild_section_handler_t) (lang_wild_statement_type *,
lang_input_statement_type *,