replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ELF] Simplify getAArch64UndefinedRelativeWeakVA. NFC

This commit is contained in:
Fangrui Song 2021-06-10 13:30:16 -07:00
parent c03b6305d8
commit 0995bbdb66
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lld/ELF/InputSection.cpp
View File

@ -547,8 +547,7 @@ static uint32_t getARMUndefinedRelativeWeakVA(RelType type, uint32_t a,
} }
// The comment above getARMUndefinedRelativeWeakVA applies to this function. // The comment above getARMUndefinedRelativeWeakVA applies to this function.
static uint64_t getAArch64UndefinedRelativeWeakVA(uint64_t type, uint64_t a, static uint64_t getAArch64UndefinedRelativeWeakVA(uint64_t type, uint64_t p) {
uint64_t p) {
switch (type) { switch (type) {
// Unresolved branch relocations to weak references resolve to next // Unresolved branch relocations to weak references resolve to next
// instruction, this is 4 bytes on from P. // instruction, this is 4 bytes on from P.
@ -556,7 +555,7 @@ static uint64_t getAArch64UndefinedRelativeWeakVA(uint64_t type, uint64_t a,
case R_AARCH64_CONDBR19: case R_AARCH64_CONDBR19:
case R_AARCH64_JUMP26: case R_AARCH64_JUMP26:
case R_AARCH64_TSTBR14: case R_AARCH64_TSTBR14:
return p + 4 + a; return p + 4;
// Unresolved non branch pc-relative relocations // Unresolved non branch pc-relative relocations
case R_AARCH64_PREL16: case R_AARCH64_PREL16:
case R_AARCH64_PREL32: case R_AARCH64_PREL32:
@ -564,7 +563,7 @@ static uint64_t getAArch64UndefinedRelativeWeakVA(uint64_t type, uint64_t a,
case R_AARCH64_ADR_PREL_LO21: case R_AARCH64_ADR_PREL_LO21:
case R_AARCH64_LD_PREL_LO19: case R_AARCH64_LD_PREL_LO19:
case R_AARCH64_PLT32: case R_AARCH64_PLT32:
return p + a; return p;
} }
llvm_unreachable("AArch64 pc-relative relocation expected\n"); llvm_unreachable("AArch64 pc-relative relocation expected\n");
} }
@ -786,7 +785,7 @@ uint64_t InputSectionBase::getRelocTargetVA(const InputFile *file, RelType type,
if (config->emachine == EM_ARM) if (config->emachine == EM_ARM)
dest = getARMUndefinedRelativeWeakVA(type, a, p); dest = getARMUndefinedRelativeWeakVA(type, a, p);
else if (config->emachine == EM_AARCH64) else if (config->emachine == EM_AARCH64)
dest = getAArch64UndefinedRelativeWeakVA(type, a, p); dest = getAArch64UndefinedRelativeWeakVA(type, p) + a;
else if (config->emachine == EM_PPC) else if (config->emachine == EM_PPC)
dest = p; dest = p;
else if (config->emachine == EM_RISCV) else if (config->emachine == EM_RISCV)