This is an archive of the discontinued LLVM Phabricator instance.

Differential D64456

ELF: Add support for R_AARCH64_ADR_PREL_PG_HI21_NC relocation.
ClosedPublic

Authored by pcc on Jul 9 2019, 5:08 PM.

Details

Reviewers
peter.smith
ruiu
• espindola
MaskRay
Commits
rGd37edd0c7946: ELF: Add support for R_AARCH64_ADR_PREL_PG_HI21_NC relocation.
rL365662: ELF: Add support for R_AARCH64_ADR_PREL_PG_HI21_NC relocation.
rLLD365662: ELF: Add support for R_AARCH64_ADR_PREL_PG_HI21_NC relocation.
Summary

Depends on D64455

Diff Detail

Event Timeline

pcc created this revision.Jul 9 2019, 5:08 PM
Herald added a reviewer: • espindola. · View Herald TranscriptJul 9 2019, 5:08 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: MaskRay, kristof.beyls, arichardson and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B34658: Diff 208844.Jul 9 2019, 5:09 PM
MaskRay added a comment.Jul 9 2019, 7:02 PM

Might be worth adding another test to aarch64-fpic-adr_prel_pg_hi21.s

pcc updated this revision to Diff 208866.Jul 9 2019, 7:35 PM
  • Address review comments
pcc added a comment.Jul 9 2019, 7:35 PM
In D64456#1577531, @MaskRay wrote:

Might be worth adding another test to aarch64-fpic-adr_prel_pg_hi21.s

Makes sense, done.

Harbormaster completed remote builds in B34666: Diff 208866.Jul 9 2019, 7:35 PM
MaskRay accepted this revision.Jul 9 2019, 7:39 PM
This revision is now accepted and ready to land.Jul 9 2019, 7:39 PM
peter.smith added a comment.Jul 10 2019, 1:08 AM

I've accepted D64455, looks good to me too.

ruiu accepted this revision.Jul 10 2019, 4:39 AM

LGTM

Closed by commit rL365662: ELF: Add support for R_AARCH64_ADR_PREL_PG_HI21_NC relocation. (authored by pcc). · Explain WhyJul 10 2019, 9:43 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
ELF/
Arch/
3 lines
test/
ELF/
8 lines

Diff 208844

lld/ELF/Arch/AArch64.cpp

Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Lines case R_AARCH64_TSTBR14:
return R_PLT_PC; return R_PLT_PC;
case R_AARCH64_PREL16: case R_AARCH64_PREL16:
case R_AARCH64_PREL32: case R_AARCH64_PREL32:
case R_AARCH64_PREL64: case R_AARCH64_PREL64:
case R_AARCH64_ADR_PREL_LO21: case R_AARCH64_ADR_PREL_LO21:
case R_AARCH64_LD_PREL_LO19: case R_AARCH64_LD_PREL_LO19:
return R_PC; return R_PC;
case R_AARCH64_ADR_PREL_PG_HI21: case R_AARCH64_ADR_PREL_PG_HI21:
case R_AARCH64_ADR_PREL_PG_HI21_NC:
return R_AARCH64_PAGE_PC; return R_AARCH64_PAGE_PC;
case R_AARCH64_LD64_GOT_LO12_NC: case R_AARCH64_LD64_GOT_LO12_NC:
case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
return R_GOT; return R_GOT;
case R_AARCH64_ADR_GOT_PAGE: case R_AARCH64_ADR_GOT_PAGE:
case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
return R_AARCH64_GOT_PAGE_PC; return R_AARCH64_GOT_PAGE_PC;
case R_AARCH64_NONE: case R_AARCH64_NONE:
▲ Show 20 Lines • Show All 151 Lines • ▼ Show 20 Linesvoid AArch64::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
case R_AARCH64_ADD_ABS_LO12_NC: case R_AARCH64_ADD_ABS_LO12_NC:
or32AArch64Imm(Loc, Val); or32AArch64Imm(Loc, Val);
break; break;
case R_AARCH64_ADR_GOT_PAGE: case R_AARCH64_ADR_GOT_PAGE:
case R_AARCH64_ADR_PREL_PG_HI21: case R_AARCH64_ADR_PREL_PG_HI21:
case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
case R_AARCH64_TLSDESC_ADR_PAGE21: case R_AARCH64_TLSDESC_ADR_PAGE21:
checkInt(Loc, Val, 33, Type); checkInt(Loc, Val, 33, Type);
LLVM_FALLTHROUGH;
case R_AARCH64_ADR_PREL_PG_HI21_NC:
write32AArch64Addr(Loc, Val >> 12); write32AArch64Addr(Loc, Val >> 12);
break; break;
case R_AARCH64_ADR_PREL_LO21: case R_AARCH64_ADR_PREL_LO21:
checkInt(Loc, Val, 21, Type); checkInt(Loc, Val, 21, Type);
write32AArch64Addr(Loc, Val); write32AArch64Addr(Loc, Val);
break; break;
case R_AARCH64_JUMP26: case R_AARCH64_JUMP26:
// Normally we would just write the bits of the immediate field, however // Normally we would just write the bits of the immediate field, however
▲ Show 20 Lines • Show All 307 Lines • Show Last 20 Lines

lld/test/ELF/aarch64-hi21-nc.s

  • This file was added.
// REQUIRES: aarch64
// RUN: llvm-mc -filetype=obj -triple=aarch64-unknown-linux %s -o %t.o
// RUN: ld.lld %t.o -o %t
// RUN: llvm-objdump -d %t | FileCheck %s
foo = . + 0x1100000000000000
// CHECK: adrp x0, #0
adrp x0, :pg_hi21_nc:foo