Index: bolt/test/X86/asm-dump.c
===================================================================
--- bolt/test/X86/asm-dump.c
+++ bolt/test/X86/asm-dump.c
@@ -2,6 +2,7 @@
  * Test for asm-dump functionality.
  *
  * REQUIRES: x86_64-linux,bolt-runtime
+ * UNSUPPORTED: target=aarch64{{.*}}
  *
  * Compile the source
  * RUN: %clang -fPIC %s -o %t.exe -Wl,-q
Index: bolt/test/X86/bolt-address-translation-internal-call.test
===================================================================
--- bolt/test/X86/bolt-address-translation-internal-call.test
+++ bolt/test/X86/bolt-address-translation-internal-call.test
@@ -9,7 +9,7 @@
 # RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o
 # Delete our BB symbols so BOLT doesn't mark them as entry points
 # RUN: llvm-strip --strip-unneeded %t.o
-# RUN: %clang %t.o -o %t.exe -Wl,-q
+# RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
 
 # RUN: llvm-bolt --enable-bat %t.exe --relocs -o %t.out | FileCheck %s
 # CHECK: BOLT-INFO: Wrote {{.*}} BAT maps
@@ -29,6 +29,7 @@
   push   %rbx
   sub    $0x120,%rsp
   mov    $0x3,%rbx
+  movq   rel(%rip), %rdi
 .J1:
   cmp    $0x0,%rbx
   je     .J2
@@ -49,4 +50,8 @@
 .J4:
   pop    %rbp
   retq
+end:
   .size main, .-main
+
+  .data
+rel: .quad end
Index: bolt/test/X86/instrumentation-eh_frame_hdr.cpp
===================================================================
--- bolt/test/X86/instrumentation-eh_frame_hdr.cpp
+++ bolt/test/X86/instrumentation-eh_frame_hdr.cpp
@@ -2,6 +2,7 @@
 // end address i.e. the section address is smaller then the LOAD end address.
 
 // REQUIRES: system-linux,bolt-runtime
+// UNSUPPORTED: target=aarch64{{.*}}
 
 // RUN: %clangxx %cxxflags -static -Wl,-q %s -o %t.exe -Wl,--entry=_start
 // RUN: llvm-bolt %t.exe -o %t.instr -instrument \
Index: bolt/test/X86/internal-call-instrument.s
===================================================================
--- bolt/test/X86/internal-call-instrument.s
+++ bolt/test/X86/internal-call-instrument.s
@@ -1,6 +1,7 @@
 # This reproduces a bug with instrumentation crashes on internal call
 
 # REQUIRES: x86_64-linux,bolt-runtime
+# UNSUPPORTED: target=aarch64{{.*}}
 
 # RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o
 # Delete our BB symbols so BOLT doesn't mark them as entry points