Merge pull request #9341 from bnbarham/revert-crel-revert

bnbarham · web-flow · commit db1d2169ff5a · 2024-09-26T10:46:56.000-07:00
Revert "Partially revert "[llvm][lld] Support R_AARCH64_GOTPCREL32 (llvm#72584)""
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
@@ -206,7 +206,10 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
     case FK_Data_2:
       return R_CLS(ABS16);
     case FK_Data_4:
-      return R_CLS(ABS32);
+      return (!IsILP32 &&
+              Target.getAccessVariant() == MCSymbolRefExpr::VK_GOTPCREL)
+                 ? ELF::R_AARCH64_GOTPCREL32
+                 : R_CLS(ABS32);
     case FK_Data_8: {
       bool IsAuth = (RefKind == AArch64MCExpr::VK_AUTH ||
                      RefKind == AArch64MCExpr::VK_AUTHADDR);
diff --git a/llvm/test/MC/AArch64/elf-reloc-gotpcrel32.s b/llvm/test/MC/AArch64/elf-reloc-gotpcrel32.s
@@ -1,5 +1,3 @@
-// XFAIL: !rdar135050296
-
 // RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r - | FileCheck %s
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// XFAIL: !rdar135050296`
`2`		`-`
`3`	`1`	`// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - \| \`
`4`	`2`	`// RUN: llvm-readobj -r - \| FileCheck %s`
`5`	`3`