diff options
| author | Alan Modra <amodra@gmail.com> | 2020-03-04 15:26:00 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2020-03-04 15:31:03 +1030 |
| commit | 233bf4f847b136705247e2f7f11bae41c72448a4 (patch) | |
| tree | 5bf74dab37da45fc4991e9808561bfa77579bbd6 /bfd | |
| parent | 1039fd9ac2a57b7634f60a66ea51e64f5ff69251 (diff) | |
| download | fsf-binutils-gdb-233bf4f847b136705247e2f7f11bae41c72448a4.zip fsf-binutils-gdb-233bf4f847b136705247e2f7f11bae41c72448a4.tar.gz fsf-binutils-gdb-233bf4f847b136705247e2f7f11bae41c72448a4.tar.bz2 | |
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.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6ed228d..821978c 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2020-03-04 Alan Modra <amodra@gmail.com> + * elf.c (elf_fake_sections): Ensure sh_addralign is such that + sh_addr mod sh_addalign is zero. + +2020-03-04 Alan Modra <amodra@gmail.com> + * format.c (bfd_check_format_matches): Call cleanup on error exit. 2020-03-03 Alan Modra <amodra@gmail.com> @@ -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. */ |