[llvm] Revert "[X86] Improve @gotpcrel on local symbol tests" (PR #141021)

[via llvm-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lto

Author: Mariusz Sikora (mariusz-sikora-at-amd)

<details>
<summary>Changes</summary>

This reverts commit de095230d4c16ac36ec75caaebfe84ac7efd34e5.

This test is failing:
```
llvm/test/LTO/X86/cfi_jt_aliases.ll:30:23: error: CHECK-FULL-OD-NEXT: expected string not found in input
; CHECK-FULL-OD-NEXT: jmp {{.*}} <a>
                      ^
<stdin>:26:29: note: scanning from here
0000000000000040 <a.cfi_jt>:
                            ^
<stdin>:27:21: note: possible intended match here
 40: e9 00 00 00 00 jmp 0x45 <a.cfi_jt+0x5>
```

---
Full diff: https://github.com/llvm/llvm-project/pull/141021.diff


2 Files Affected:

- (modified) llvm/test/LTO/X86/cfi_jt_aliases.ll (+6-6) 
- (modified) llvm/test/MC/X86/gotpcrelx.s (+5-5) 


``````````diff
diff --git a/llvm/test/LTO/X86/cfi_jt_aliases.ll b/llvm/test/LTO/X86/cfi_jt_aliases.ll
index e544602c35660..c58d2cc020872 100644
--- a/llvm/test/LTO/X86/cfi_jt_aliases.ll
+++ b/llvm/test/LTO/X86/cfi_jt_aliases.ll
@@ -27,14 +27,14 @@
 ; CHECK-THIN-RE-NEXT: FUNC GLOBAL HIDDEN {{[0-9]+}} c.cfi_jt
 
 ; CHECK-FULL-OD:      a.cfi_jt>:
-; CHECK-FULL-OD-NEXT: jmp {{.*}} <a>
-; CHECK-FULL-OD-NEXT: int3
+; CHECK-FULL-OD:      jmp {{.*}} <a.cfi_jt
+; CHECK-FULL-OD-NEXT: R_X86_64_PLT32 .La$local
 ; CHECK-FULL-OD:      b.cfi_jt>:
-; CHECK-FULL-OD-NEXT: jmp {{.*}} <b>
-; CHECK-FULL-OD-NEXT: int3
+; CHECK-FULL-OD:      jmp {{.*}} <b.cfi_jt
+; CHECK-FULL-OD-NEXT: R_X86_64_PLT32 .Lb$local
 ; CHECK-FULL-OD:      c.cfi_jt>:
-; CHECK-FULL-OD-NEXT: jmp {{.*}} <c>
-; CHECK-FULL-OD-NEXT: int3
+; CHECK-FULL-OD:      jmp {{.*}} <c.cfi_jt
+; CHECK-FULL-OD-NEXT: R_X86_64_PLT32 .Lc$local
 
 ; CHECK-THIN-OD:      a.cfi_jt>:
 ; CHECK-THIN-OD:      jmp {{.*}} <a.cfi_jt
diff --git a/llvm/test/MC/X86/gotpcrelx.s b/llvm/test/MC/X86/gotpcrelx.s
index 0de0c919458db..e88c514b22690 100644
--- a/llvm/test/MC/X86/gotpcrelx.s
+++ b/llvm/test/MC/X86/gotpcrelx.s
@@ -5,8 +5,8 @@
 
 # COMMON:     Relocations [
 # COMMON-NEXT:  Section ({{.*}}) .rela.text {
-# CHECK-NEXT:     R_X86_64_GOTPCRELX .text 0xFFFFFFFFFFFFFFFC
-# CHECK-NEXT:     R_X86_64_GOTPCRELX test 0xFFFFFFFFFFFFFFFC
+# CHECK-NEXT:     R_X86_64_GOTPCRELX mov
+# CHECK-NEXT:     R_X86_64_GOTPCRELX test
 # CHECK-NEXT:     R_X86_64_GOTPCRELX adc
 # CHECK-NEXT:     R_X86_64_GOTPCRELX add
 # CHECK-NEXT:     R_X86_64_GOTPCRELX and
@@ -49,8 +49,8 @@
 # CHECK-NEXT:     R_X86_64_CODE_4_GOTPCRELX xor
 # CHECK-NEXT:   }
 
-# NORELAX-NEXT:     R_X86_64_GOTPCREL .text 0xFFFFFFFFFFFFFFFC
-# NORELAX-NEXT:     R_X86_64_GOTPCREL test 0xFFFFFFFFFFFFFFFC
+# NORELAX-NEXT:     R_X86_64_GOTPCREL mov
+# NORELAX-NEXT:     R_X86_64_GOTPCREL test
 # NORELAX-NEXT:     R_X86_64_GOTPCREL adc
 # NORELAX-NEXT:     R_X86_64_GOTPCREL add
 # NORELAX-NEXT:     R_X86_64_GOTPCREL and
@@ -93,7 +93,7 @@
 # NORELAX-NEXT:     R_X86_64_GOTPCREL xor
 # NORELAX-NEXT:   }
 
-movl .text at GOTPCREL(%rip), %eax
+movl mov at GOTPCREL(%rip), %eax
 test %eax, test at GOTPCREL(%rip)
 adc adc at GOTPCREL(%rip), %eax
 add add at GOTPCREL(%rip), %eax

``````````

</details>


https://github.com/llvm/llvm-project/pull/141021