[ubsan-minimal] Filter targets to test by host arch on Darwin

This reverts r313189, and adds a use of darwin_filter_host_archs() for
ubsan-minimal.

llvm-svn: 313206

compiler-rt/test/ubsan_minimal/CMakeLists.txt

@@ -1,6 +1,9 @@
 set(UBSAN_LIT_TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 set(UBSAN_TEST_ARCH ${UBSAN_SUPPORTED_ARCH})
+if(APPLE)
+  darwin_filter_host_archs(UBSAN_SUPPORTED_ARCH UBSAN_TEST_ARCH)
+endif()
 
 set(UBSAN_TESTSUITES)
 set(UBSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})

compiler-rt/test/ubsan_minimal/lit.common.cfg

@@ -37,9 +37,4 @@ if config.host_os not in ['Linux', 'FreeBSD', 'NetBSD', 'Darwin']: # TODO: Windo
 if '-arch x86_64h' in target_cflags and 'x86_64h' not in config.available_features:
   config.unsupported = True
 
-# Temporarily disable all x86_64h testing on Darwin to unblock the public bots,
-# while we investigate rdar://problem/34409349
-if config.host_os == 'Darwin' and 'x86_64h' in target_cflags:
-  config.unsupported = True
-
 config.available_features.add('arch=' + config.target_arch)