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/emultempl | |
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/emultempl')
-rw-r--r-- | ld/emultempl/elf.em | 9 | ||||
-rw-r--r-- | ld/emultempl/ppc32elf.em | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em index aa40c78..b915ad5 100644 --- a/ld/emultempl/elf.em +++ b/ld/emultempl/elf.em @@ -716,17 +716,18 @@ fragment <<EOF { char *end; - config.maxpagesize = strtoul (optarg + 14, &end, 0); - if (*end || (config.maxpagesize & (config.maxpagesize - 1)) != 0) + link_info.maxpagesize = strtoul (optarg + 14, &end, 0); + if (*end + || (link_info.maxpagesize & (link_info.maxpagesize - 1)) != 0) einfo (_("%F%P: invalid maximum page size \`%s'\n"), optarg + 14); } else if (CONST_STRNEQ (optarg, "common-page-size=")) { char *end; - config.commonpagesize = strtoul (optarg + 17, &end, 0); + link_info.commonpagesize = strtoul (optarg + 17, &end, 0); if (*end - || (config.commonpagesize & (config.commonpagesize - 1)) != 0) + || (link_info.commonpagesize & (link_info.commonpagesize - 1)) != 0) einfo (_("%F%P: invalid common page size \`%s'\n"), optarg + 17); } diff --git a/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em index 0402ffb..9d8e933 100644 --- a/ld/emultempl/ppc32elf.em +++ b/ld/emultempl/ppc32elf.em @@ -51,7 +51,7 @@ ppc_after_open_output (void) params.emit_stub_syms = (link_info.emitrelocations || bfd_link_pic (&link_info)); if (params.pagesize == 0) - params.pagesize = config.commonpagesize; + params.pagesize = link_info.commonpagesize; ppc_elf_link_params (&link_info, ¶ms); } |