Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-13 19:24:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert r336609: Fix direct calls to __wrap_sym when it is relocated.

Browse Source 
This reverts commit r336609 as it doesn't seem to work with AArch64
thunk creation when used with ASan.

llvm-svn: 337413
This commit is contained in:
Rui Ueyama 2018-07-18 18:24:46 +00:00
parent f3bc17cb57
commit f43fba739c
5 changed files with 1 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/Relocations.cpp
View File

@ -1010,7 +1010,7 @@ static void scanReloc(InputSectionBase &Sec, OffsetGetter &GetOffset, RelTy *&I,
}
// If a relocation needs PLT, we create PLT and GOTPLT slots for the symbol.
if (needsPlt(Expr) && !Sym.isInPlt() && Sym.IsUsedInRegularObj) {
if (needsPlt(Expr) && !Sym.isInPlt()) {
if (Sym.isGnuIFunc() && !Sym.IsPreemptible)
addPltEntry<ELFT>(InX::Iplt, InX::IgotPlt, InX::RelaIplt,
Target->IRelativeRel, Sym);

11
lld/ELF/SymbolTable.cpp
View File

@ -212,17 +212,6 @@ void SymbolTable::applySymbolWrap() {
}
}
// Apply changes caused by relocations to wrapped symbols
// This is needed for direct calls to __wrap_sym
void SymbolTable::applySymbolWrapReloc() {
for (WrappedSymbol &W : WrappedSymbols) {
memcpy(W.Wrap, W.Sym, sizeof(SymbolUnion));
// Keep this so that this copy of the symbol remains dropped
W.Wrap->IsUsedInRegularObj = false;
}
}
static uint8_t getMinVisibility(uint8_t VA, uint8_t VB) {
if (VA == STV_DEFAULT)
return VB;

1
lld/ELF/SymbolTable.h
View File

@ -39,7 +39,6 @@ public:
template <class ELFT> void addCombinedLTOObject();
template <class ELFT> void addSymbolWrap(StringRef Name);
void applySymbolWrap();
void applySymbolWrapReloc();
ArrayRef<Symbol *> getSymbols() const { return SymVector; }

3
lld/ELF/Writer.cpp
View File

@ -1567,9 +1567,6 @@ template <class ELFT> void Writer<ELFT>::finalizeSections() {
if (!Config->Relocatable)
forEachRelSec(scanRelocations<ELFT>);
// Apply changes caused by relocations to wrapped symbols
Symtab->applySymbolWrapReloc();
if (InX::Plt && !InX::Plt->empty())
InX::Plt->addSymbols();
if (InX::Iplt && !InX::Iplt->empty())

45
lld/test/ELF/wrap-plt.s
View File

@ -1,45 +0,0 @@
// REQUIRES: x86
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
// RUN: ld.lld -o %t2 %t -wrap foo -shared
// RUN: llvm-readobj -s -r %t2 | FileCheck %s
// RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM %s
// CHECK: Name: .plt
// CHECK-NEXT: Type: SHT_PROGBITS
// CHECK-NEXT: Flags [
// CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: SHF_EXECINSTR
// CHECK-NEXT: ]
// CHECK-NEXT: Address: 0x1020
// CHECK-NEXT: Offset:
// CHECK-NEXT: Size: 48
// CHECK-NEXT: Link: 0
// CHECK-NEXT: Info: 0
// CHECK-NEXT: AddressAlignment: 16
// CHECK: Relocations [
// CHECK-NEXT: Section ({{.*}}) .rela.plt {
// CHECK-NEXT: 0x2018 R_X86_64_JUMP_SLOT __wrap_foo 0x0
// CHECK-NEXT: 0x2020 R_X86_64_JUMP_SLOT _start 0x0
// CHECK-NEXT: }
// CHECK-NEXT: ]
// DISASM: _start:
// DISASM-NEXT: jmp 41
// DISASM-NEXT: jmp 36
// DISASM-NEXT: jmp 47
.global foo
foo:
nop
.global __wrap_foo
__wrap_foo:
nop
.global _start
_start:
jmp foo@plt
jmp __wrap_foo@plt
jmp _start@plt