Index: compiler-rt/trunk/test/cfi/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/test/cfi/CMakeLists.txt
+++ compiler-rt/trunk/test/cfi/CMakeLists.txt
@@ -36,11 +36,13 @@
   # FIXME: enable ThinLTO tests after fixing http://llvm.org/pr32770
   add_cfi_test_suites(True False)
 else()
-  add_cfi_test_suites(False False)
-  add_cfi_test_suites(False True)
-  if (COMPILER_RT_HAS_LLD)
-    add_cfi_test_suites(True False)
-    add_cfi_test_suites(True True)
+  if (CFI_SUPPORTED_ARCH)
+    add_cfi_test_suites(False False)
+    add_cfi_test_suites(False True)
+    if (COMPILER_RT_HAS_LLD)
+      add_cfi_test_suites(True False)
+      add_cfi_test_suites(True True)
+    endif()
   endif()
 endif()