forked from OSchip/llvm-project
[BOLT] Handle ifuncs trampolines for aarch64
The aarch64 uses the trampolines located in .iplt section, which contains plt-like trampolines on the value stored in .got. In this case we don't have JUMP_SLOT relocation, but we have a symbol that belongs to ifunc trampoline, so use it and set set plt symbol for such functions. Vladislav Khmelevsky, Advanced Software Technology Lab, Huawei Differential Revision: https://reviews.llvm.org/D120850
This commit is contained in:
parent
16823adf2a
commit
8bdbcfe7d8
|
@ -498,7 +498,8 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
/// AArch64 PLT sections.
|
/// AArch64 PLT sections.
|
||||||
const PLTSectionInfo AArch64_PLTSections[2] = {{".plt"}, {nullptr}};
|
const PLTSectionInfo AArch64_PLTSections[3] = {
|
||||||
|
{".plt"}, {".iplt"}, {nullptr}};
|
||||||
|
|
||||||
/// Return PLT information for a section with \p SectionName or nullptr
|
/// Return PLT information for a section with \p SectionName or nullptr
|
||||||
/// if the section is not PLT.
|
/// if the section is not PLT.
|
||||||
|
|
|
@ -1251,19 +1251,30 @@ void RewriteInstance::createPLTBinaryFunction(uint64_t TargetAddress,
|
||||||
if (!TargetAddress)
|
if (!TargetAddress)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
auto setPLTSymbol = [&](BinaryFunction *BF, StringRef Name) {
|
||||||
|
const unsigned PtrSize = BC->AsmInfo->getCodePointerSize();
|
||||||
|
MCSymbol *TargetSymbol = BC->registerNameAtAddress(
|
||||||
|
Name.str() + "@GOT", TargetAddress, PtrSize, PtrSize);
|
||||||
|
BF->setPLTSymbol(TargetSymbol);
|
||||||
|
};
|
||||||
|
|
||||||
|
BinaryFunction *BF = BC->getBinaryFunctionAtAddress(EntryAddress);
|
||||||
|
if (BF && BC->isAArch64()) {
|
||||||
|
// Handle IFUNC trampoline
|
||||||
|
setPLTSymbol(BF, BF->getOneName());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const Relocation *Rel = BC->getDynamicRelocationAt(TargetAddress);
|
const Relocation *Rel = BC->getDynamicRelocationAt(TargetAddress);
|
||||||
if (!Rel || !Rel->Symbol)
|
if (!Rel || !Rel->Symbol)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const unsigned PtrSize = BC->AsmInfo->getCodePointerSize();
|
|
||||||
ErrorOr<BinarySection &> Section = BC->getSectionForAddress(EntryAddress);
|
ErrorOr<BinarySection &> Section = BC->getSectionForAddress(EntryAddress);
|
||||||
assert(Section && "cannot get section for address");
|
assert(Section && "cannot get section for address");
|
||||||
BinaryFunction *BF = BC->createBinaryFunction(
|
BF = BC->createBinaryFunction(Rel->Symbol->getName().str() + "@PLT", *Section,
|
||||||
Rel->Symbol->getName().str() + "@PLT", *Section, EntryAddress, 0,
|
EntryAddress, 0, EntrySize,
|
||||||
EntrySize, Section->getAlignment());
|
Section->getAlignment());
|
||||||
MCSymbol *TargetSymbol = BC->registerNameAtAddress(
|
setPLTSymbol(BF, Rel->Symbol->getName());
|
||||||
Rel->Symbol->getName().str() + "@GOT", TargetAddress, PtrSize, PtrSize);
|
|
||||||
BF->setPLTSymbol(TargetSymbol);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void RewriteInstance::disassemblePLTSectionAArch64(BinarySection &Section) {
|
void RewriteInstance::disassemblePLTSectionAArch64(BinarySection &Section) {
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
// This test checks that the ifuncs works after bolt.
|
||||||
|
|
||||||
|
// RUN: %clang %cflags %s -fuse-ld=lld \
|
||||||
|
// RUN: -o %t.exe -Wl,-q
|
||||||
|
// RUN: llvm-bolt %t.exe -o %t.bolt.exe -use-old-text=0 -lite=0
|
||||||
|
// RUN: %t.bolt.exe | FileCheck %s
|
||||||
|
|
||||||
|
// CHECK: foo
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
static void foo() { printf("foo\n"); }
|
||||||
|
|
||||||
|
static void *resolver_foo(void) { return foo; }
|
||||||
|
|
||||||
|
__attribute__((ifunc("resolver_foo"))) void ifoo();
|
||||||
|
|
||||||
|
static void *resolver_memcpy(void) { return memcpy; }
|
||||||
|
|
||||||
|
__attribute__((ifunc("resolver_memcpy"))) void *
|
||||||
|
imemcpy(void *dest, const void *src, size_t n);
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
int a = 0xdeadbeef, b = 0;
|
||||||
|
ifoo();
|
||||||
|
imemcpy(&b, &a, sizeof(b));
|
||||||
|
return a != b;
|
||||||
|
}
|
Loading…
Reference in New Issue