[llvm] 0f91038 - Revert "[JITLink][ELF] Add support for ELF::R_X86_64_REX_GOTPCRELX relocation."

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2020-10-22T23:21:29-07:00
New Revision: 0f910387e610d6c3e0008da5f5305d42c546cb8c

URL: https://github.com/llvm/llvm-project/commit/0f910387e610d6c3e0008da5f5305d42c546cb8c
DIFF: https://github.com/llvm/llvm-project/commit/0f910387e610d6c3e0008da5f5305d42c546cb8c.diff

LOG: Revert "[JITLink][ELF] Add support for ELF::R_X86_64_REX_GOTPCRELX relocation."

This reverts commit e2fceec2fd15b7b74617816ddd87f456c42bbc45.

This commit broke one of the bots. Reverting while I investigate.

Added: 
    

Modified: 
    llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
    llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s

Removed: 
    


################################################################################
diff  --git a/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
index c3498935bd2d..40c7d04378e5 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
@@ -232,7 +232,6 @@ class ELFLinkGraphBuilder_x86_64 {
     case ELF::R_X86_64_64:
       return ELF_x86_64_Edges::ELFX86RelocationKind::Pointer64;
     case ELF::R_X86_64_GOTPCREL:
-    case ELF::R_X86_64_REX_GOTPCRELX:
       return ELF_x86_64_Edges::ELFX86RelocationKind::PCRel32GOTLoad;
     }
     return make_error<JITLinkError>("Unsupported x86-64 relocation:" +

diff  --git a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s b/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s
index 056bc3d0ad1c..0eef11110264 100644
--- a/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s
+++ b/llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s
@@ -39,25 +39,12 @@ test_gotpcrel:
 .Lend_test_gotpcrel:
         .size   test_gotpcrel, .Lend_test_gotpcrel-test_gotpcrel
 
-# Test REX_GOTPCRELX handling. We want to check both the offset to the GOT entry and its
-# contents.
-# jitlink-check: decode_operand(test_rex_gotpcrelx, 4) = \
-# jitlink-check:   got_addr(elf_reloc.o, named_data) - next_pc(test_rex_gotpcrelx)
-
-        .globl test_rex_gotpcrelx
-        .p2align      4, 0x90
-        .type   test_rex_gotpcrelx, at function
-test_rex_gotpcrelx:
-	movq    named_data at GOTPCREL(%rip), %rax
-.Lend_test_rex_gotpcrelx:
-        .size   test_rex_gotpcrelx, .Lend_test_gotpcrel-test_rex_gotpcrelx
-
         .type   named_data, at object
         .data
-        .p2align        3
+        .p2align        2
 named_data:
-        .quad   42
-        .size   named_data, 8
+        .long   42
+        .size   named_data, 4
 
 # Test BSS / zero-fill section handling.
 # llvm-jitlink: *{4}bss_variable = 0