diff --git a/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp b/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
index 40c7d04378e..c3498935bd2 100644
--- a/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
+++ b/lib/ExecutionEngine/JITLink/ELF_x86_64.cpp
@@ -232,6 +232,7 @@ 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/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s b/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s
index 0eef1111026..2814dd2b4c8 100644
--- a/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s
+++ b/test/ExecutionEngine/JITLink/X86/ELF_x86-64_relocations.s
@@ -1,6 +1,7 @@
 # RUN: rm -rf %t && mkdir -p %t
 # RUN: llvm-mc -triple=x86_64-unknown-linux -position-independent -filetype=obj -o %t/elf_reloc.o %s
-# RUN: llvm-jitlink -noexec -check %s %t/elf_reloc.o
+# RUN: llvm-jitlink -noexec -slab-allocate 100Kb -slab-address 0xfff00000 \
+# RUN:   -define-abs external_data=0x1 -check %s %t/elf_reloc.o
 #
 # Test standard ELF relocations.
 
@@ -39,12 +40,25 @@ 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, external_data) - next_pc(test_rex_gotpcrelx)
+
+        .globl test_rex_gotpcrelx
+        .p2align      4, 0x90
+        .type   test_rex_gotpcrelx,@function
+test_rex_gotpcrelx:
+	movq    external_data@GOTPCREL(%rip), %rax
+.Lend_test_rex_gotpcrelx:
+        .size   test_rex_gotpcrelx, .Lend_test_rex_gotpcrelx-test_rex_gotpcrelx
+
         .type   named_data,@object
         .data
-        .p2align        2
+        .p2align        3
 named_data:
-        .long   42
-        .size   named_data, 4
+        .quad   42
+        .size   named_data, 8
 
 # Test BSS / zero-fill section handling.
 # llvm-jitlink: *{4}bss_variable = 0