[PATCH] D64456: ELF: Add support for R_AARCH64_ADR_PREL_PG_HI21_NC relocation.

[Peter Collingbourne via Phabricator via llvm-commits]

pcc updated this revision to Diff 208866.
pcc added a comment.

- Address review comments


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D64456/new/

https://reviews.llvm.org/D64456

Files:
  lld/ELF/Arch/AArch64.cpp
  lld/test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
  lld/test/ELF/aarch64-hi21-nc.s


Index: lld/test/ELF/aarch64-hi21-nc.s
===================================================================
--- /dev/null
+++ lld/test/ELF/aarch64-hi21-nc.s
@@ -0,0 +1,8 @@
+// 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
Index: lld/test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
===================================================================
--- lld/test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
+++ lld/test/ELF/aarch64-fpic-adr_prel_pg_hi21.s
@@ -4,8 +4,10 @@
 // CHECK: relocation R_AARCH64_ADR_PREL_PG_HI21 cannot be used against symbol dat; recompile with -fPIC
 // CHECK: >>> defined in {{.*}}.o
 // CHECK: >>> referenced by {{.*}}.o:(.text+0x0)
+// CHECK: relocation R_AARCH64_ADR_PREL_PG_HI21_NC cannot be used against symbol dat; recompile with -fPIC
 
   adrp x0, dat
+  adrp x0, :pg_hi21_nc:dat
 .data
 .globl dat
 dat:
Index: lld/ELF/Arch/AArch64.cpp
===================================================================
--- lld/ELF/Arch/AArch64.cpp
+++ lld/ELF/Arch/AArch64.cpp
@@ -103,6 +103,7 @@
   case R_AARCH64_LD_PREL_LO19:
     return R_PC;
   case R_AARCH64_ADR_PREL_PG_HI21:
+  case R_AARCH64_ADR_PREL_PG_HI21_NC:
     return R_AARCH64_PAGE_PC;
   case R_AARCH64_LD64_GOT_LO12_NC:
   case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
@@ -270,6 +271,8 @@
   case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
   case R_AARCH64_TLSDESC_ADR_PAGE21:
     checkInt(Loc, Val, 33, Type);
+    LLVM_FALLTHROUGH;
+  case R_AARCH64_ADR_PREL_PG_HI21_NC:
     write32AArch64Addr(Loc, Val >> 12);
     break;
   case R_AARCH64_ADR_PREL_LO21:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64456.208866.patch
Type: text/x-patch
Size: 1723 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190710/1379ecc0/attachment.bin>