This is an archive of the discontinued LLVM Phabricator instance.

Differential D86642

[lld-macho] Support GOT relocations to __dso_handle
ClosedPublic

Authored by int3 on Aug 26 2020, 10:05 AM.

Details

Reviewers
smeenai
Group Reviewers
Restricted Project
Commits
rG0407197711f1: [lld-macho] Support GOT relocations to __dso_handle
Summary

Found such a relocation while testing some real world programs.

Diff Detail

Unit TestsFailed

TimeTest
50 mslinux > lld.MachO::dso-handle.s
100 mswindows > lld.MachO::dso-handle.s

Event Timeline

int3 created this revision.Aug 26 2020, 10:05 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 26 2020, 10:05 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
int3 requested review of this revision.Aug 26 2020, 10:05 AM
Harbormaster completed remote builds in B69629: Diff 288022.Aug 26 2020, 10:33 AM
int3 added a parent revision: D86641: [lld-macho] Implement GOT_LOAD relaxation.Aug 26 2020, 1:24 PM
int3 updated this revision to Diff 288100.Aug 26 2020, 1:25 PM

rebase

Harbormaster completed remote builds in B69672: Diff 288100.Aug 26 2020, 1:50 PM
smeenai accepted this revision.Aug 26 2020, 10:01 PM
smeenai added a subscriber: smeenai.
smeenai added inline comments.
lld/MachO/Symbols.h
176

Oops™

This revision is now accepted and ready to land.Aug 26 2020, 10:01 PM
int3 added inline comments.Aug 26 2020, 10:50 PM
lld/MachO/Symbols.h
176

🙃

This revision was landed with ongoing or failed builds.Aug 27 2020, 5:44 PM
Closed by commit rG0407197711f1: [lld-macho] Support GOT relocations to __dso_handle (authored by int3). · Explain Why
This revision was automatically updated to reflect the committed changes.
int3 added a commit: rG0407197711f1: [lld-macho] Support GOT relocations to __dso_handle.

Revision Contents

PathSize
lld/
MachO/
6 lines
test/
MachO/
7 lines

Diff 288022

lld/MachO/Symbols.h

Show First 20 Lines • Show All 161 Lines • ▼ Show 20 Lines DSOHandle(const MachHeaderSection *header)
: Symbol(DSOHandleKind, name), header(header) {} : Symbol(DSOHandleKind, name), header(header) {}
const MachHeaderSection *header; const MachHeaderSection *header;
uint64_t getVA() const override; uint64_t getVA() const override;
uint64_t getFileOffset() const override; uint64_t getFileOffset() const override;
bool isWeakDef() const override { return false; }
bool isTlv() const override { return false; }
static constexpr StringRef name = "___dso_handle"; static constexpr StringRef name = "___dso_handle";
static bool classof(const Symbol *s) { return s->kind() == DefinedKind; } static bool classof(const Symbol *s) { return s->kind() == DSOHandleKind; }
smeenaiUnsubmitted
Not Done
ReplyInline Actions

Oops™

smeenai: Oops™
int3AuthorUnsubmitted
Done
ReplyInline Actions

🙃

int3: 🙃
}; };
union SymbolUnion { union SymbolUnion {
alignas(Defined) char a[sizeof(Defined)]; alignas(Defined) char a[sizeof(Defined)];
alignas(Undefined) char b[sizeof(Undefined)]; alignas(Undefined) char b[sizeof(Undefined)];
alignas(DylibSymbol) char c[sizeof(DylibSymbol)]; alignas(DylibSymbol) char c[sizeof(DylibSymbol)];
alignas(LazySymbol) char d[sizeof(LazySymbol)]; alignas(LazySymbol) char d[sizeof(LazySymbol)];
}; };
Show All 18 Lines

lld/test/MachO/dso-handle.s

# REQUIRES: x86 # REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
# RUN: lld -flavor darwinnew %t.o -o %t # RUN: lld -flavor darwinnew %t.o -o %t
# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s # RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
# CHECK: leaq {{.*}} # 100000000 # CHECK: leaq {{.*}} # 100000000
# CHECK-NEXT: leaq {{.*}} # 100000000
# RUN: lld -flavor darwinnew -dylib %t.o -o %t.dylib # RUN: lld -flavor darwinnew -dylib %t.o -o %t.dylib
# RUN: llvm-objdump -d --no-show-raw-insn %t.dylib | FileCheck %s --check-prefix=DYLIB-CHECK # RUN: llvm-objdump -d --no-show-raw-insn %t.dylib | FileCheck %s --check-prefix=DYLIB-CHECK
# DYLIB-CHECK: leaq {{.*}} # 0 # DYLIB-CHECK: leaq {{.*}} # 0
# DYLIB-CHECK-NEXT: leaq {{.*}} # 0
.globl _main .globl _main
.text .text
_main: _main:
leaq ___dso_handle(%rip), %rdx leaq ___dso_handle(%rip), %rdx
movq ___dso_handle@GOTPCREL(%rip), %rdx
ret ret