This is an archive of the discontinued LLVM Phabricator instance.

Differential D119991

[RuntimeDyld] Fix building on OpenBSD
ClosedPublic

Authored by brad on Feb 16 2022, 4:29 PM.

Details

Reviewers
MoritzS
lhames
Commits
rG7db1d4d8da4d: [RuntimeDyld] Fix building on OpenBSD
Summary

With https://reviews.llvm.org/D105466 the tree does not build on OpenBSD/amd64. Moritz suggested only building this code on Linux.

Diff Detail

Event Timeline

brad created this revision.Feb 16 2022, 4:29 PM
Herald added a subscriber: krytarowski. · View Herald TranscriptFeb 16 2022, 4:29 PM
brad requested review of this revision.Feb 16 2022, 4:29 PM
Harbormaster completed remote builds in B150106: Diff 409447.Feb 16 2022, 5:38 PM
MoritzS accepted this revision.Feb 17 2022, 2:57 AM

The test failures all seem to be unrelated to this change, lgtm.

This revision is now accepted and ready to land.Feb 17 2022, 2:57 AM
This revision was landed with ongoing or failed builds.Feb 17 2022, 9:17 AM
Closed by commit rG7db1d4d8da4d: [RuntimeDyld] Fix building on OpenBSD (authored by brad). · Explain Why
This revision was automatically updated to reflect the committed changes.
brad added a commit: rG7db1d4d8da4d: [RuntimeDyld] Fix building on OpenBSD.

Revision Contents

PathSize
llvm/
tools/
llvm-rtdyld/
6 lines

Diff 409688

llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp

Show First 20 Lines • Show All 280 Lines • ▼ Show 20 Lines
private: private:
std::map<std::string, uint64_t> DummyExterns; std::map<std::string, uint64_t> DummyExterns;
sys::MemoryBlock PreallocSlab; sys::MemoryBlock PreallocSlab;
bool UsePreallocation = false; bool UsePreallocation = false;
uintptr_t SlabSize = 0; uintptr_t SlabSize = 0;
uintptr_t CurrentSlabOffset = 0; uintptr_t CurrentSlabOffset = 0;
SectionIDMap *SecIDMap = nullptr; SectionIDMap *SecIDMap = nullptr;
#if defined(__x86_64__) && defined(__ELF__) #if defined(__x86_64__) && defined(__ELF__) && defined(__linux__)
unsigned UsedTLSStorage = 0; unsigned UsedTLSStorage = 0;
#endif #endif
}; };
uint8_t *TrivialMemoryManager::allocateCodeSection(uintptr_t Size, uint8_t *TrivialMemoryManager::allocateCodeSection(uintptr_t Size,
unsigned Alignment, unsigned Alignment,
unsigned SectionID, unsigned SectionID,
StringRef SectionName) { StringRef SectionName) {
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines if (!MB.base())
report_fatal_error(Twine("MemoryManager allocation failed: ") + report_fatal_error(Twine("MemoryManager allocation failed: ") +
EC.message()); EC.message());
DataMemory.push_back(SectionInfo(SectionName, MB, SectionID)); DataMemory.push_back(SectionInfo(SectionName, MB, SectionID));
return (uint8_t*)MB.base(); return (uint8_t*)MB.base();
} }
// In case the execution needs TLS storage, we define a very small TLS memory // In case the execution needs TLS storage, we define a very small TLS memory
// area here that will be used in allocateTLSSection(). // area here that will be used in allocateTLSSection().
#if defined(__x86_64__) && defined(__ELF__) #if defined(__x86_64__) && defined(__ELF__) && defined(__linux__)
extern "C" { extern "C" {
alignas(16) __attribute__((visibility("hidden"), tls_model("initial-exec"), alignas(16) __attribute__((visibility("hidden"), tls_model("initial-exec"),
used)) thread_local char LLVMRTDyldTLSSpace[16]; used)) thread_local char LLVMRTDyldTLSSpace[16];
} }
#endif #endif
TrivialMemoryManager::TLSSection TrivialMemoryManager::TLSSection
TrivialMemoryManager::allocateTLSSection(uintptr_t Size, unsigned Alignment, TrivialMemoryManager::allocateTLSSection(uintptr_t Size, unsigned Alignment,
unsigned SectionID, unsigned SectionID,
StringRef SectionName) { StringRef SectionName) {
#if defined(__x86_64__) && defined(__ELF__) #if defined(__x86_64__) && defined(__ELF__) && defined(__linux__)
if (Size + UsedTLSStorage > sizeof(LLVMRTDyldTLSSpace)) { if (Size + UsedTLSStorage > sizeof(LLVMRTDyldTLSSpace)) {
return {}; return {};
} }
// Get the offset of the TLSSpace in the TLS block by using a tpoff // Get the offset of the TLSSpace in the TLS block by using a tpoff
// relocation here. // relocation here.
int64_t TLSOffset; int64_t TLSOffset;
asm("leaq LLVMRTDyldTLSSpace@tpoff, %0" : "=r"(TLSOffset)); asm("leaq LLVMRTDyldTLSSpace@tpoff, %0" : "=r"(TLSOffset));
▲ Show 20 Lines • Show All 677 Lines • Show Last 20 Lines