uefi-ref/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2026-08-27 00:26:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

BFD: Rename *_set_reloc' to *_finalize_section_relocs'

Browse source 
The `*_set_reloc' interface is to be called at the conclusion of section
relocation processing, however its name reflects a particular action to
take rather than the context of invocation.  Implementation is already
backend-specific.

Rename the interface such as not to make its name artificially limit the
intended purpose.  Update the callers and documentation accordingly.  No
functional change.
This commit is contained in:
Maciej W. Rozycki 2026-01-14 22:28:43 +00:00
parent b45e8563ca
commit e9499dfeb3
28 changed files with 77 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bfd/aout-target.h
View file

@ -444,8 +444,8 @@ MY_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
#ifndef MY_canonicalize_reloc
#define MY_canonicalize_reloc NAME (aout, canonicalize_reloc)
#endif
#ifndef MY_set_reloc
#define MY_set_reloc _bfd_generic_set_reloc
#ifndef MY_finalize_section_relocs
#define MY_finalize_section_relocs _bfd_generic_finalize_section_relocs
#endif
#ifndef MY_make_empty_symbol
#define MY_make_empty_symbol NAME (aout, make_empty_symbol)

12
bfd/bfd-in2.h
View file

@ -2613,11 +2613,12 @@ long bfd_get_reloc_upper_bound (bfd *abfd, asection *sect);
long bfd_canonicalize_reloc
(bfd *abfd, asection *sec, arelent **loc, asymbol **syms);
void bfd_set_reloc
void bfd_finalize_section_relocs
(bfd *abfd, asection *sec, arelent **rel, unsigned int count);
#define bfd_set_reloc(abfd, asect, location, count) \
BFD_SEND (abfd, _bfd_set_reloc, (abfd, asect, location, count))
#define bfd_finalize_section_relocs(abfd, asect, location, count) \
BFD_SEND (abfd, _bfd_finalize_section_relocs, \
(abfd, asect, location, count))
bool bfd_set_file_flags (bfd *abfd, flagword flags);
int bfd_get_arch_size (bfd *abfd);
@ -7656,14 +7657,15 @@ typedef struct bfd_target
#define BFD_JUMP_TABLE_RELOCS(NAME) \
NAME##_get_reloc_upper_bound, \
NAME##_canonicalize_reloc, \
NAME##_set_reloc, \
NAME##_finalize_section_relocs, \
NAME##_bfd_reloc_type_lookup, \
NAME##_bfd_reloc_name_lookup
long (*_get_reloc_upper_bound) (bfd *, sec_ptr);
long (*_bfd_canonicalize_reloc) (bfd *, sec_ptr, arelent **,
struct bfd_symbol **);
void (*_bfd_set_reloc) (bfd *, sec_ptr, arelent **, unsigned int);
void (*_bfd_finalize_section_relocs) (bfd *, sec_ptr, arelent **,
unsigned int);
/* See documentation on reloc types. */
reloc_howto_type *
(*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);

16
bfd/bfd.c
View file

@ -2199,19 +2199,21 @@ bfd_canonicalize_reloc (bfd *abfd,
/*
FUNCTION
bfd_set_reloc
bfd_finalize_section_relocs
SYNOPSIS
void bfd_set_reloc
void bfd_finalize_section_relocs
(bfd *abfd, asection *sec, arelent **rel, unsigned int count);
DESCRIPTION
Set the relocation pointer and count within
section @var{sec} to the values @var{rel} and @var{count}.
The argument @var{abfd} is ignored.
Set the relocation pointer and count within section @var{sec}
to the values @var{rel} and @var{count}, and take any other
actions required at the conclusion of section relocation
processing.
.#define bfd_set_reloc(abfd, asect, location, count) \
. BFD_SEND (abfd, _bfd_set_reloc, (abfd, asect, location, count))
.#define bfd_finalize_section_relocs(abfd, asect, location, count) \
. BFD_SEND (abfd, _bfd_finalize_section_relocs, \
. (abfd, asect, location, count))
*/
/*

2
bfd/coff-alpha.c
View file

@ -2423,7 +2423,7 @@ static const struct ecoff_backend_data alpha_ecoff_backend_data =
#define _bfd_ecoff_bfd_link_check_relocs _bfd_generic_link_check_relocs
/* Installing internal relocations in a section is also generic. */
#define _bfd_ecoff_set_reloc _bfd_generic_set_reloc
#define _bfd_ecoff_finalize_section_relocs _bfd_generic_finalize_section_relocs
const bfd_target alpha_ecoff_le_vec =
{

2
bfd/coff-mips.c
View file

@ -1412,7 +1412,7 @@ static const struct ecoff_backend_data mips_ecoff_backend_data =
#define _bfd_ecoff_bfd_define_common_symbol bfd_generic_define_common_symbol
#define _bfd_ecoff_bfd_link_hide_symbol _bfd_generic_link_hide_symbol
#define _bfd_ecoff_bfd_define_start_stop bfd_generic_define_start_stop
#define _bfd_ecoff_set_reloc _bfd_generic_set_reloc
#define _bfd_ecoff_finalize_section_relocs _bfd_generic_finalize_section_relocs
extern const bfd_target mips_ecoff_be_vec;

2
bfd/coff-rs6000.c
View file

@ -4506,7 +4506,7 @@ coff_find_nearest_line_with_alt
/* For reloc entry points. */
#define _bfd_xcoff_get_reloc_upper_bound coff_get_reloc_upper_bound
#define _bfd_xcoff_canonicalize_reloc coff_canonicalize_reloc
#define _bfd_xcoff_set_reloc _bfd_generic_set_reloc
#define _bfd_xcoff_finalize_section_relocs _bfd_generic_finalize_section_relocs
#define _bfd_xcoff_bfd_reloc_type_lookup _bfd_xcoff_reloc_type_lookup
#define _bfd_xcoff_bfd_reloc_name_lookup _bfd_xcoff_reloc_name_lookup

4
bfd/coff64-rs6000.c
View file

@ -2665,7 +2665,7 @@ const bfd_target rs6000_xcoff64_vec =
/* Reloc */
coff_get_reloc_upper_bound,
coff_canonicalize_reloc,
_bfd_generic_set_reloc,
_bfd_generic_finalize_section_relocs,
xcoff64_reloc_type_lookup,
xcoff64_reloc_name_lookup,
@ -2935,7 +2935,7 @@ const bfd_target rs6000_xcoff64_aix_vec =
/* Reloc */
coff_get_reloc_upper_bound,
coff_canonicalize_reloc,
_bfd_generic_set_reloc,
_bfd_generic_finalize_section_relocs,
xcoff64_reloc_type_lookup,
xcoff64_reloc_name_lookup,

4
bfd/coffcode.h
View file

@ -5431,8 +5431,8 @@ coff_canonicalize_reloc (bfd * abfd,
return section->reloc_count;
}
#ifndef coff_set_reloc
#define coff_set_reloc _bfd_generic_set_reloc
#ifndef coff_finalize_section_relocs
#define coff_finalize_section_relocs _bfd_generic_finalize_section_relocs
#endif
#ifndef coff_reloc16_estimate

12
bfd/elf64-sparc.c
View file

@ -315,10 +315,10 @@ elf64_sparc_canonicalize_dynamic_reloc (bfd *abfd, arelent **storage,
/* Install a new set of internal relocs. */
static void
elf64_sparc_set_reloc (bfd *abfd ATTRIBUTE_UNUSED,
asection *asect,
arelent **location,
unsigned int count)
elf64_sparc_finalize_section_relocs (bfd *abfd ATTRIBUTE_UNUSED,
asection *asect,
arelent **location,
unsigned int count)
{
asect->orelocation = location;
canon_reloc_count (asect) = count;
@ -908,8 +908,8 @@ static const struct elf_size_info elf64_sparc_size_info =
elf64_sparc_canonicalize_reloc
#define bfd_elf64_canonicalize_dynamic_reloc \
elf64_sparc_canonicalize_dynamic_reloc
#define bfd_elf64_set_reloc \
elf64_sparc_set_reloc
#define bfd_elf64_finalize_section_relocs \
elf64_sparc_finalize_section_relocs
#define elf_backend_add_symbol_hook \
elf64_sparc_add_symbol_hook
#define elf_backend_get_symbol_type \

4
bfd/elfxx-target.h
View file

@ -46,8 +46,8 @@
#ifndef bfd_elfNN_canonicalize_reloc
#define bfd_elfNN_canonicalize_reloc _bfd_elf_canonicalize_reloc
#endif
#ifndef bfd_elfNN_set_reloc
#define bfd_elfNN_set_reloc _bfd_generic_set_reloc
#ifndef bfd_elfNN_finalize_section_relocs
#define bfd_elfNN_finalize_section_relocs _bfd_generic_finalize_section_relocs
#endif
#ifndef bfd_elfNN_find_nearest_line
#define bfd_elfNN_find_nearest_line _bfd_elf_find_nearest_line

2
bfd/i386msdos.c
View file

@ -260,7 +260,7 @@ msdos_set_section_contents (bfd *abfd,
#define msdos_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
#define msdos_canonicalize_reloc _bfd_norelocs_canonicalize_reloc
#define msdos_set_reloc _bfd_norelocs_set_reloc
#define msdos_finalize_section_relocs _bfd_norelocs_finalize_section_relocs
#define msdos_get_reloc_upper_bound _bfd_norelocs_get_reloc_upper_bound
#define msdos_32_bfd_link_split_section _bfd_generic_link_split_section

2
bfd/libbfd-in.h
View file

@ -447,7 +447,7 @@ extern long _bfd_norelocs_get_reloc_upper_bound
(bfd *, asection *) ATTRIBUTE_HIDDEN;
extern long _bfd_norelocs_canonicalize_reloc
(bfd *, asection *, arelent **, asymbol **) ATTRIBUTE_HIDDEN;
extern void _bfd_norelocs_set_reloc
extern void _bfd_norelocs_finalize_section_relocs
(bfd *, asection *, arelent **, unsigned int) ATTRIBUTE_HIDDEN;
extern reloc_howto_type *_bfd_norelocs_bfd_reloc_type_lookup
(bfd *, bfd_reloc_code_real_type) ATTRIBUTE_HIDDEN;

8
bfd/libbfd.c
View file

@ -200,10 +200,10 @@ _bfd_norelocs_canonicalize_reloc (bfd *abfd ATTRIBUTE_UNUSED,
}
void
_bfd_norelocs_set_reloc (bfd *abfd ATTRIBUTE_UNUSED,
asection *sec ATTRIBUTE_UNUSED,
arelent **relptr ATTRIBUTE_UNUSED,
unsigned int count ATTRIBUTE_UNUSED)
_bfd_norelocs_finalize_section_relocs (bfd *abfd ATTRIBUTE_UNUSED,
asection *sec ATTRIBUTE_UNUSED,
arelent **relptr ATTRIBUTE_UNUSED,
unsigned int count ATTRIBUTE_UNUSED)
{
/* Do nothing. */
}

4
bfd/libbfd.h
View file

@ -453,7 +453,7 @@ extern long _bfd_norelocs_get_reloc_upper_bound
(bfd *, asection *) ATTRIBUTE_HIDDEN;
extern long _bfd_norelocs_canonicalize_reloc
(bfd *, asection *, arelent **, asymbol **) ATTRIBUTE_HIDDEN;
extern void _bfd_norelocs_set_reloc
extern void _bfd_norelocs_finalize_section_relocs
(bfd *, asection *, arelent **, unsigned int) ATTRIBUTE_HIDDEN;
extern reloc_howto_type *_bfd_norelocs_bfd_reloc_type_lookup
(bfd *, bfd_reloc_code_real_type) ATTRIBUTE_HIDDEN;
@ -3530,7 +3530,7 @@ bfd_byte *bfd_generic_get_relocated_section_contents
bool relocatable,
asymbol **symbols) ATTRIBUTE_HIDDEN;
void _bfd_generic_set_reloc
void _bfd_generic_finalize_section_relocs
(bfd *abfd,
sec_ptr section,
arelent **relptr,

2
bfd/mach-o-target.c
View file

@ -58,7 +58,7 @@
#define bfd_mach_o_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
#define bfd_mach_o_core_file_matches_executable_p generic_core_file_matches_executable_p
#define bfd_mach_o_core_file_pid _bfd_nocore_core_file_pid
#define bfd_mach_o_set_reloc _bfd_generic_set_reloc
#define bfd_mach_o_finalize_section_relocs _bfd_generic_finalize_section_relocs
#define bfd_mach_o_get_dynamic_symtab_upper_bound bfd_mach_o_get_symtab_upper_bound
#define bfd_mach_o_canonicalize_dynamic_symtab bfd_mach_o_canonicalize_symtab

12
bfd/reloc.c
View file

@ -8362,10 +8362,10 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
/*
INTERNAL_FUNCTION
_bfd_generic_set_reloc
_bfd_generic_finalize_section_relocs
SYNOPSIS
void _bfd_generic_set_reloc
void _bfd_generic_finalize_section_relocs
(bfd *abfd,
sec_ptr section,
arelent **relptr,
@ -8376,10 +8376,10 @@ DESCRIPTION
*/
void
_bfd_generic_set_reloc (bfd *abfd ATTRIBUTE_UNUSED,
sec_ptr section,
arelent **relptr,
unsigned int count)
_bfd_generic_finalize_section_relocs (bfd *abfd ATTRIBUTE_UNUSED,
sec_ptr section,
arelent **relptr,
unsigned int count)
{
section->orelocation = relptr;
section->reloc_count = count;

2
bfd/som.c
View file

@ -6789,7 +6789,7 @@ som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec)
#define som_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
#define som_find_inliner_info _bfd_nosymbols_find_inliner_info
#define som_bfd_link_check_relocs _bfd_generic_link_check_relocs
#define som_set_reloc _bfd_generic_set_reloc
#define som_finalize_section_relocs _bfd_generic_finalize_section_relocs
const bfd_target hppa_som_vec =
{

5
bfd/targets.c
View file

@ -431,14 +431,15 @@ BFD_JUMP_TABLE macros.
.#define BFD_JUMP_TABLE_RELOCS(NAME) \
. NAME##_get_reloc_upper_bound, \
. NAME##_canonicalize_reloc, \
. NAME##_set_reloc, \
. NAME##_finalize_section_relocs, \
. NAME##_bfd_reloc_type_lookup, \
. NAME##_bfd_reloc_name_lookup
.
. long (*_get_reloc_upper_bound) (bfd *, sec_ptr);
. long (*_bfd_canonicalize_reloc) (bfd *, sec_ptr, arelent **,
. struct bfd_symbol **);
. void (*_bfd_set_reloc) (bfd *, sec_ptr, arelent **, unsigned int);
. void (*_bfd_finalize_section_relocs) (bfd *, sec_ptr, arelent **,
. unsigned int);
. {* See documentation on reloc types. *}
. reloc_howto_type *
. (*reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);

2
bfd/vms-alpha.c
View file

@ -5652,7 +5652,7 @@ alpha_vms_canonicalize_reloc (bfd *abfd, asection *section, arelent **relptr,
/* Install a new set of internal relocs. */
#define alpha_vms_set_reloc _bfd_generic_set_reloc
#define alpha_vms_finalize_section_relocs _bfd_generic_finalize_section_relocs
/* This is just copied from ecoff-alpha, needs to be fixed probably. */

5
binutils/objcopy.c
View file

@ -4555,7 +4555,7 @@ copy_relocations_in_section (bfd *ibfd, sec_ptr isection, bfd *obfd)
}
if (relsize == 0)
bfd_set_reloc (obfd, osection, NULL, 0);
bfd_finalize_section_relocs (obfd, osection, NULL, 0);
else
{
if (isection->orelocation != NULL)
@ -4596,7 +4596,8 @@ copy_relocations_in_section (bfd *ibfd, sec_ptr isection, bfd *obfd)
*w_relpp = 0;
}
bfd_set_reloc (obfd, osection, relcount == 0 ? NULL : relpp, relcount);
bfd_finalize_section_relocs (obfd, osection,
relcount == 0 ? NULL : relpp, relcount);
}
return true;
}

2
binutils/rescoff.c
View file

@ -685,7 +685,7 @@ write_coff_file (const char *filename, const char *target,
return false;
}
bfd_set_reloc (abfd, sec, cwi.relocs, cwi.reloc_count);
bfd_finalize_section_relocs (abfd, sec, cwi.relocs, cwi.reloc_count);
offset = 0;
for (d = cwi.dirs.d; d != NULL; d = d->next)

7
gas/config/obj-coff.c
View file

@ -1493,7 +1493,7 @@ coff_adjust_section_syms (bfd *abfd ATTRIBUTE_UNUSED,
secsym = section_symbol (sec);
/* This is an estimate; we'll plug in the real value using
SET_SECTION_RELOCS later */
FINALIZE_SECTION_RELOCS later */
#ifdef OBJ_XCOFF
if (S_GET_STORAGE_CLASS (secsym) == C_DWARF)
SA_SET_SECT_NRELOC (secsym, nrelocs);
@ -1518,11 +1518,12 @@ coff_frob_file_after_relocs (void)
in its aux entry. */
void
obj_coff_set_section_relocs (asection *sec, arelent **relocs, unsigned int n)
obj_coff_finalize_section_relocs (asection *sec, arelent **relocs,
unsigned int n)
{
symbolS *sect_sym;
bfd_set_reloc (stdoutput, sec, n ? relocs : NULL, n);
bfd_finalize_section_relocs (stdoutput, sec, n ? relocs : NULL, n);
sect_sym = section_symbol (sec);
#ifdef OBJ_XCOFF
if (S_GET_STORAGE_CLASS (sect_sym) == C_DWARF)

7
gas/config/obj-coff.h
View file

@ -294,9 +294,10 @@ extern void coff_pop_insert (void);
#define INIT_STAB_SECTION(stab, str) obj_coff_init_stab_section (stab, str)
/* We need to store the number of relocations in the section aux entry. */
#define SET_SECTION_RELOCS(sec, relocs, n) \
obj_coff_set_section_relocs (sec, relocs, n)
extern void obj_coff_set_section_relocs (asection *, arelent **, unsigned int);
#define FINALIZE_SECTION_RELOCS(sec, relocs, n) \
obj_coff_finalize_section_relocs (sec, relocs, n)
extern void obj_coff_finalize_section_relocs (asection *, arelent **,
unsigned int);
extern int S_SET_DATA_TYPE (symbolS *, int);
extern int S_SET_STORAGE_CLASS (symbolS *, int);

2
gas/config/obj-macho.c
View file

@ -1891,7 +1891,7 @@ obj_mach_o_reorder_section_relocs (asection *sec, arelent **rels, unsigned int n
rels[i] = rels[n - i - 1];
rels[n - i - 1] = r;
}
bfd_set_reloc (stdoutput, sec, rels, n);
bfd_finalize_section_relocs (stdoutput, sec, rels, n);
}
/* Relocation rules are different in frame sections. */

2
gas/config/obj-macho.h
View file

@ -99,7 +99,7 @@ extern void obj_mach_o_post_relax_hook (void);
#define obj_frob_file_after_relocs obj_mach_o_frob_file_after_relocs
extern void obj_mach_o_frob_file_after_relocs (void);
#define SET_SECTION_RELOCS(sec, relocs, n) \
#define FINALIZE_SECTION_RELOCS(sec, relocs, n) \
obj_mach_o_reorder_section_relocs (sec, relocs, n)
extern void obj_mach_o_reorder_section_relocs (asection *, arelent **,
unsigned int);

6
gas/doc/internals.texi
View file

@ -1697,9 +1697,9 @@ completed, but before the relocations have been generated.
If you define this macro, GAS will call it after the relocs have been
generated.
@item SET_SECTION_RELOCS (@var{sec}, @var{relocs}, @var{n})
@cindex SET_SECTION_RELOCS
If you define this, it will be called to set relocations for the section
@item FINALIZE_SECTION_RELOCS (@var{sec}, @var{relocs}, @var{n})
@cindex FINALIZE_SECTION_RELOCS
If you define this, it will be called to finalize relocations for the section
@var{sec}. The list of relocations is in @var{relocs}, and the number of
relocations is in @var{n}.
@end table

8
gas/write.c
View file

@ -28,9 +28,9 @@
#include "compress-debug.h"
#include "codeview.h"
#ifndef SET_SECTION_RELOCS
#define SET_SECTION_RELOCS(sec, relocs, n) \
bfd_set_reloc (stdoutput, sec, n ? relocs : NULL, n)
#ifndef FINALIZE_SECTION_RELOCS
#define FINALIZE_SECTION_RELOCS(sec, relocs, n) \
bfd_finalize_section_relocs (stdoutput, sec, n ? relocs : NULL, n)
#endif
#ifndef TC_FORCE_RELOCATION
@ -1419,7 +1419,7 @@ write_relocs (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
}
#endif
SET_SECTION_RELOCS (sec, relocs, n);
FINALIZE_SECTION_RELOCS (sec, relocs, n);
#ifdef DEBUG3
{

6
ld/ldlang.c
View file

@ -10640,7 +10640,7 @@ copy_section (bfd *ibfd, sec_ptr isection, void *p)
}
if (relsize == 0)
bfd_set_reloc (obfd, osection, NULL, 0);
bfd_finalize_section_relocs (obfd, osection, NULL, 0);
else
{
relpp = (arelent **) xmalloc (relsize);
@ -10651,8 +10651,8 @@ copy_section (bfd *ibfd, sec_ptr isection, void *p)
goto loser;
}
bfd_set_reloc (obfd, osection,
relcount == 0 ? NULL : relpp, relcount);
bfd_finalize_section_relocs (obfd, osection,
relcount == 0 ? NULL : relpp, relcount);
if (relcount == 0)
free (relpp);
}