From 233bf4f847b136705247e2f7f11bae41c72448a4 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 4 Mar 2020 15:26:00 +1030 Subject: [PATCH] sh_addralign inconsistent with sh_addr The ELF gABI says in part of sh_addralign: "The value of sh_addr must be congruent to 0, modulo the value of sh_addralign." * elf.c (elf_fake_sections): Ensure sh_addralign is such that sh_addr mod sh_addalign is zero. --- bfd/ChangeLog | 5 +++++ bfd/elf.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6ed228d713b..821978cf6a8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2020-03-04 Alan Modra + + * elf.c (elf_fake_sections): Ensure sh_addralign is such that + sh_addr mod sh_addalign is zero. + 2020-03-04 Alan Modra * format.c (bfd_check_format_matches): Call cleanup on error exit. diff --git a/bfd/elf.c b/bfd/elf.c index fcd84d2d17b..c4d6718aaa0 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -3192,6 +3192,7 @@ elf_fake_sections (bfd *abfd, asection *asect, void *fsarg) unsigned int sh_type; const char *name = asect->name; bfd_boolean delay_st_name_p = FALSE; + bfd_vma mask; if (arg->failed) { @@ -3291,7 +3292,10 @@ elf_fake_sections (bfd *abfd, asection *asect, void *fsarg) arg->failed = TRUE; return; } - this_hdr->sh_addralign = (bfd_vma) 1 << asect->alignment_power; + /* Set sh_addralign to the highest power of two given by alignment + consistent with the section VMA. Linker scripts can force VMA. */ + mask = ((bfd_vma) 1 << asect->alignment_power) | this_hdr->sh_addr; + this_hdr->sh_addralign = mask & -mask; /* The sh_entsize and sh_info fields may have been set already by copy_private_section_data. */ -- 2.30.2