diff options
| author | Lang Hames <lhames@gmail.com> | 2020-10-22 23:21:29 -0700 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2020-10-22 23:21:29 -0700 |
| commit | 0f910387e610d6c3e0008da5f5305d42c546cb8c (patch) | |
| tree | 73aae1438ac7213b53d2f91b8ea8a196f1a972a5 | |
| parent | e2fceec2fd15b7b74617816ddd87f456c42bbc45 (diff) | |
| download | llvm-0f910387e610d6c3e0008da5f5305d42c546cb8c.zip llvm-0f910387e610d6c3e0008da5f5305d42c546cb8c.tar.gz llvm-0f910387e610d6c3e0008da5f5305d42c546cb8c.tar.bz2 | |
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.
| -rw-r--r-- | llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp | 1 | ||||
| -rw-r--r-- | llvm/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s | 19 |
2 files changed, 3 insertions, 17 deletions
diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp index c349893..40c7d04 100644 --- a/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp +++ b/llvm/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp @@ -232,7 +232,6 @@ private: 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 056bc3d..0eef111 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,@function -test_rex_gotpcrelx: - movq named_data@GOTPCREL(%rip), %rax -.Lend_test_rex_gotpcrelx: - .size test_rex_gotpcrelx, .Lend_test_gotpcrel-test_rex_gotpcrelx - .type named_data,@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 |