aboutsummaryrefslogtreecommitdiff
path: root/ld/ldexp.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2020-12-16 00:42:21 +1030
committerAlan Modra <amodra@gmail.com>2020-12-16 15:17:53 +1030
commitc410035d37d8237c641155c4e51e7ccf53decb29 (patch)
treef61182fd4ba33baefa14ea1cbe197dfb05d9204b /ld/ldexp.c
parent3f75e1d67fe871db85d46618b95d0dc92291577d (diff)
downloadgdb-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/ldexp.c')
-rw-r--r--ld/ldexp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ld/ldexp.c b/ld/ldexp.c
index b4e7c41..905055a 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -547,8 +547,8 @@ fold_binary (etree_type *tree)
{
if (!seg->used
&& config.magic_demand_paged
- && config.maxpagesize != 0
- && (seg->value % config.maxpagesize) != 0)
+ && link_info.maxpagesize != 0
+ && (seg->value % link_info.maxpagesize) != 0)
einfo (_("%P: warning: address of `%s' "
"isn't multiple of maximum page size\n"),
segment_name);
@@ -898,9 +898,9 @@ fold_name (etree_type *tree)
case CONSTANT:
if (strcmp (tree->name.name, "MAXPAGESIZE") == 0)
- new_number (config.maxpagesize);
+ new_number (link_info.maxpagesize);
else if (strcmp (tree->name.name, "COMMONPAGESIZE") == 0)
- new_number (config.commonpagesize);
+ new_number (link_info.commonpagesize);
else
einfo (_("%F%P:%pS: unknown constant `%s' referenced in expression\n"),
tree, tree->name.name);