aboutsummaryrefslogtreecommitdiff
path: root/ld/ldelf.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2022-01-14 21:55:51 +1030
committerAlan Modra <amodra@gmail.com>2022-01-14 22:02:23 +1030
commitff66e8c5bee8a57b531515342e6126782ea9a651 (patch)
tree7c0905be058c529af36a0638796dadcb73dfab67 /ld/ldelf.c
parentfd47eb1a302753ddf8e37f5a4918c889cb8c929b (diff)
downloadbinutils-ff66e8c5bee8a57b531515342e6126782ea9a651.zip
binutils-ff66e8c5bee8a57b531515342e6126782ea9a651.tar.gz
binutils-ff66e8c5bee8a57b531515342e6126782ea9a651.tar.bz2
PR28751 mbind2a / mbind2b regressions on powerpc*-linux
include/ * bfdlink.h (struct bfd_link_info): Add commonpagesize_is_set. ld/ PR 28751 * emultempl/elf.em (handle_option): Set commonpagesize_is_set. * ldelf.c (ldelf_after_parse): Don't error when only one of -z max-page-size or -z common-page-size is given, correct the other value to make it sane. * testsuite/ld-elf/elf.exp (mbind2a, mbind2b): Do not pass -z max-page-size.
Diffstat (limited to 'ld/ldelf.c')
-rw-r--r--ld/ldelf.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/ld/ldelf.c b/ld/ldelf.c
index 7a1a553..799f779 100644
--- a/ld/ldelf.c
+++ b/ld/ldelf.c
@@ -82,8 +82,15 @@ ldelf_after_parse (void)
after_parse_default ();
if (link_info.commonpagesize > link_info.maxpagesize)
- einfo (_("%F%P: common page size (0x%v) > maximum page size (0x%v)\n"),
- link_info.commonpagesize, link_info.maxpagesize);
+ {
+ if (!link_info.commonpagesize_is_set)
+ link_info.commonpagesize = link_info.maxpagesize;
+ else if (!link_info.maxpagesize_is_set)
+ link_info.maxpagesize = link_info.commonpagesize;
+ else
+ einfo (_("%F%P: common page size (0x%v) > maximum page size (0x%v)\n"),
+ link_info.commonpagesize, link_info.maxpagesize);
+ }
}
/* Handle the generation of DT_NEEDED tags. */