commit 2e9f3aa4c4c4ba8ab85287a339f423c06179a181
author Nicholas Mosier <nh.mosier@gmail.com> Sun Jan 07 11:59:49 2024 -0800
committer Copybara-Service <copybara-worker@google.com> Sun Jan 07 12:00:36 2024 -0800
tree 1b30b98bfa2198d31b3dde99598de6bd7bfbca20
parent 305a39140dd2b8c7f44f76b18ea44c869032ad7e

[lld][ELF][X86] Add missing X86_64_TPOFF64 case in switches (#77208)

Close #77201. When linking code with a R_X86_64_TPOFF64 relocation, LLD
exits with an 'unknown reloaction' error message due to two missing
cases in relocation switch statements. This patch adds in those cases so
that LLD successfully links code R_X86_64_TPOFF64 relocations.

GitOrigin-RevId: c5e35986d8064775182b03a7e1a7e02f1cf7e4a9

ELF/Arch/X86_64.cpp

diff --git a/ELF/Arch/X86_64.cpp b/ELF/Arch/X86_64.cpp
index 2135ac2..c28e01e 100644
--- a/ELF/Arch/X86_64.cpp
+++ b/ELF/Arch/X86_64.cpp
@@ -358,6 +358,7 @@
   case R_X86_64_DTPOFF64:
     return R_DTPREL;
   case R_X86_64_TPOFF32:
+  case R_X86_64_TPOFF64:
     return R_TPREL;
   case R_X86_64_TLSDESC_CALL:
     return R_TLSDESC_CALL;
@@ -791,6 +792,7 @@
     write32le(loc, val);
     break;
   case R_X86_64_64:
+  case R_X86_64_TPOFF64:
   case R_X86_64_DTPOFF64:
   case R_X86_64_PC64:
   case R_X86_64_SIZE64:

test/ELF/x86-64-tls-pie.s

diff --git a/test/ELF/x86-64-tls-pie.s b/test/ELF/x86-64-tls-pie.s
index 5ef0f54..71caa0f 100644
--- a/test/ELF/x86-64-tls-pie.s
+++ b/test/ELF/x86-64-tls-pie.s
@@ -1,14 +1,23 @@
 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-cloudabi %s -o %t1.o
 # RUN: ld.lld -pie %t1.o -o %t
-# RUN: llvm-readobj -r %t | FileCheck %s
+# RUN: llvm-readobj -r %t | FileCheck --check-prefix=RELOCS %s
+# RUN: llvm-objdump -d --no-show-raw-insn --no-print-imm-hex --no-leading-addr %t1.o | FileCheck --check-prefix=DIS %s
 
 # Bug 27174: R_X86_64_TPOFF32 and R_X86_64_GOTTPOFF relocations should
 # be eliminated when building a PIE executable, as the static TLS layout
 # is fixed.
 #
-# CHECK:      Relocations [
-# CHECK-NEXT: ]
+# RELOCS:      Relocations [
+# RELOCS-NEXT: ]
+#
+# DIS: <_start>:
+# DIS-NEXT:                movq    %fs:0, %rax
+# DIS-NEXT:                movl    $3, (%rax)
+# DIS-NEXT:                movq    %fs:0, %rdx
+# DIS-NEXT:                movq    (%rip), %rcx
+# DIS-NEXT:                movl    $3, (%rdx,%rcx)
+# DIS-NEXT:                movabsq 0, %rax
 
 	.globl	_start
 _start:
@@ -19,6 +28,9 @@
 	movq	i@GOTTPOFF(%rip), %rcx
 	movl	$3, (%rdx,%rcx)
 
+	# This additionally tests support for R_X86_64_TPOFF64 relocations.
+	movabs  i@TPOFF, %rax
+
 	.section	.tbss.i,"awT",@nobits
 	.globl	i
 i: