maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lld-macho] Force higher alignment for __thread_vars 

`__thread_vars` contains pointers to `__tlv_bootstrap`, which are fixed
up by dyld; however the section's alignment is not specified. This means
that the relocations might end up on odd addresses, which is not
representable by the soon to be added chained fixups.

This is arguably a bug in MC, but this behavior has been there since TLV
support was originally added.

This patch forces the `__thread_vars` sections to be aligned to the
target's pointer size. This is done by ld64 as well.

Differential Revision: https://reviews.llvm.org/D134594
This commit is contained in:
Daniel Bertalan 2022-09-24 21:10:31 +02:00
parent 67a04edd4e
commit d2f3d7bad2
No known key found for this signature in database
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/MachO/Writer.cpp
View File

@ -960,6 +960,12 @@ template <class LP> void Writer::createOutputSections() {
segname == segment_names::text)
osec->align = target->wordSize;
// MC keeps the default 1-byte alignment for __thread_vars, even though it
// contains pointers that are fixed up by dyld, which requires proper
// alignment.
if (isThreadLocalVariables(osec->flags))
osec->align = std::max<uint32_t>(osec->align, target->wordSize);
getOrCreateOutputSegment(segname)->addOutputSection(osec);
}
}

2
lld/test/MachO/tlv-dylib.s
View File

@ -43,7 +43,7 @@
# FLAGS-NEXT: addr
# FLAGS-NEXT: size 0x0000000000000030
# FLAGS-NEXT: offset
# FLAGS-NEXT: align
# FLAGS-NEXT: align 2^3 (8)
# FLAGS-NEXT: reloff 0
# FLAGS-NEXT: nreloc 0
# FLAGS-NEXT: type S_THREAD_LOCAL_VARIABLES