diff options
| author | Alan Modra <amodra@gmail.com> | 2020-12-16 00:42:21 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2020-12-16 15:17:53 +1030 |
| commit | c410035d37d8237c641155c4e51e7ccf53decb29 (patch) | |
| tree | f61182fd4ba33baefa14ea1cbe197dfb05d9204b /ld/ldemul.c | |
| parent | 3f75e1d67fe871db85d46618b95d0dc92291577d (diff) | |
| download | gdb-c410035d37d8237c641155c4e51e7ccf53decb29.zip gdb-c410035d37d8237c641155c4e51e7ccf53decb29.tar.gz gdb-c410035d37d8237c641155c4e51e7ccf53decb29.tar.bz2 | |
constify elfNN_bed
elfNN_bed was made writable as an expedient means of communicating
ld -z max-page-size and ld -z common-page-size values to BFD linker
code, and even for objcopy to communicate segment alignment between
copy_private_bfd_data, rewrite_elf_program_header and
assign_file_positions_for_load_sections. Some time later elfNN_bed
elf_osabi was written by gas. It turns out none of these
modifications to elfNN_bed was necessary, so make it const again.
include/
* bfdlink.h (struct bfd_link_info): Add maxpagesize and
commonpagesize.
bfd/
* elfxx-target.h (elfNN_bed): Constify.
* bfd.c (bfd_elf_set_pagesize): Delete.
(bfd_emul_set_maxpagesize, bfd_emul_set_commonpagesize): Delete.
* elf.c (get_program_header_size): Get commonpagesize from
link info.
(_bfd_elf_map_sections_to_segments): Get maxpagesize from link info.
(assign_file_positions_for_load_sections): Likewise.
(assign_file_positions_for_non_load_sections): Likewise.
(rewrite_elf_program_header): Add maxpagesize param. Set map_p_align.
(copy_private_bfd_data): Don't call bfd_elf_set_maxpagesize.
Instead pass maxpagesize to rewrite_elf_program_header.
* elf32-nds32.c (relax_range_measurement): Add link_info param.
Get maxpagesize from link_info. Adjust caller.
* bfd-in2.h: Regenerate.
gas/
* config/obj-elf.c (obj_elf_section): Don't set elf_osabi here.
(obj_elf_type): Likewise.
ld/
* ld.h (ld_config_type): Delete maxpagesize and commonpagesize.
* emultempl/elf.em: Use link_info rather than config
for maxpagesize and commonpagesize.
* emultempl/ppc32elf.em: Likewise.
* ldexp.c (fold_binary, fold_name): Likewise.
* ldemul.c (after_parse_default): Likewise.
(set_output_arch_default): Don't call bfd_emul_set_maxpagesize
or bfd_emul_set_commonpagesize.
Diffstat (limited to 'ld/ldemul.c')
| -rw-r--r-- | ld/ldemul.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ld/ldemul.c b/ld/ldemul.c index 920afc8..fc51493 100644 --- a/ld/ldemul.c +++ b/ld/ldemul.c @@ -232,11 +232,11 @@ after_parse_default (void) if (!is_vma) ldlang_add_undef (entry_symbol.name, entry_from_cmdline); } - if (config.maxpagesize == 0) - config.maxpagesize = bfd_emul_get_maxpagesize (default_target); - if (config.commonpagesize == 0) - config.commonpagesize = bfd_emul_get_commonpagesize (default_target, - link_info.relro); + if (link_info.maxpagesize == 0) + link_info.maxpagesize = bfd_emul_get_maxpagesize (default_target); + if (link_info.commonpagesize == 0) + link_info.commonpagesize = bfd_emul_get_commonpagesize (default_target, + link_info.relro); } void @@ -303,9 +303,6 @@ set_output_arch_default (void) /* Set the output architecture and machine if possible. */ bfd_set_arch_mach (link_info.output_bfd, ldfile_output_architecture, ldfile_output_machine); - - bfd_emul_set_maxpagesize (output_target, config.maxpagesize); - bfd_emul_set_commonpagesize (output_target, config.commonpagesize); } void |