Merge pull request #9288 from bnbarham/revert-gotpcrel32

bnbarham · web-flow · commit e4b1c45b1ce7 · 2024-09-24T19:05:24.000-07:00
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,10 +206,7 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
     case FK_Data_2:
       return R_CLS(ABS16);
     case FK_Data_4:
-      return (!IsILP32 &&
-              Target.getAccessVariant() == MCSymbolRefExpr::VK_GOTPCREL)
-                 ? ELF::R_AARCH64_GOTPCREL32
-                 : R_CLS(ABS32);
+      return 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,3 +1,5 @@
+// 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,3 +1,5 @@`
	`1`	`+// XFAIL: !rdar135050296`
	`2`	`+`
`1`	`3`	`// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - \| \`
`2`	`4`	`// RUN: llvm-readobj -r - \| FileCheck %s`
`3`	`5`