rui314/mold
1
1
Fork 0
mirror of https://github.com/rui314/mold.git synced 2024-11-12 23:48:51 +03:00
Code Issues Projects Releases Wiki Activity

[ELF] Honor section alignment when creating copy relocations

Browse Source
This commit is contained in:
Rui Ueyama 2022-10-24 06:46:57 +08:00
parent 4fa41e1ad4
commit 59ea52933d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
elf/input-files.cc
View File

@ -1488,11 +1488,10 @@ std::vector<Symbol<E> *> SharedFile<E>::find_aliases(Symbol<E> *sym) {
template <typename E>
i64 SharedFile<E>::get_alignment(Symbol<E> *sym) {
ElfShdr<E> &shdr = this->elf_sections[sym->esym().st_shndx];
i64 p2align = std::min(std::countr_zero<u64>(sym->value),
std::countr_zero<u64>(shdr.sh_addralign));
// We do not want a ridiculously large alignment. Cap it arbitrary at 64.
return std::min(64, 1 << p2align);
i64 align = std::max<i64>(1, shdr.sh_addralign);
if (sym->value)
align = std::min<i64>(align, 1LL << std::countr_zero(sym->value));
return align;
}
template <typename E>

2
test/elf/copyrel-alignment.sh
View File

@ -32,4 +32,4 @@ readelf -W --sections $t/exe2 | grep -q '\.copyrel.* 8$'
$CC -B. -o $t/exe3 $t/d.o $t/c.so -no-pie
$QEMU $t/exe3 > /dev/null
readelf -W --sections $t/exe3 | grep -q '\.copyrel.* 64$'
readelf -W --sections $t/exe3 | grep -q '\.copyrel.* 256$'