9 files changed, 6 insertions, 32 deletions
diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg
index ad4e6a49d69..6a4044a4416 100644
--- a/compiler-rt/test/asan/lit.cfg
+++ b/compiler-rt/test/asan/lit.cfg
@@ -168,11 +168,6 @@ config.substitutions.append( ("%libdl", libdl_flag) )
 
 config.available_features.add("asan-" + config.bits + "-bits")
 
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# because the test hangs. Adding armhf as we now have two modes.
-if config.target_arch != 'arm' and config.target_arch != 'armhf' and config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
-
 # Fast unwinder doesn't work with Thumb
 if re.search('mthumb', config.target_cflags) is not None:
   config.available_features.add('fast-unwinder-works')
diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg
index 9636f9211c9..67f6daa4754 100644
--- a/compiler-rt/test/lit.common.cfg
+++ b/compiler-rt/test/lit.common.cfg
@@ -303,3 +303,8 @@ if config.host_os == 'Darwin':
   config.default_sanitizer_opts += ['log_to_syslog=0']
 elif config.android:
   config.default_sanitizer_opts += ['abort_on_error=0']
+
+# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
+# because the test hangs or fails on one configuration and not the other.
+if config.android or (config.target_arch not in ['arm', 'armhf', 'aarch64']):
+  config.available_features.add('stable-runtime')
diff --git a/compiler-rt/test/msan/Linux/mallinfo.cc b/compiler-rt/test/msan/Linux/mallinfo.cc
index 545ae934a61..b2021c5df3c 100644
--- a/compiler-rt/test/msan/Linux/mallinfo.cc
+++ b/compiler-rt/test/msan/Linux/mallinfo.cc
@@ -1,5 +1,5 @@
 // RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
-// REQUIRES: stable-runtime
+// UNSUPPORTED: aarch64-target-arch
 
 #include <assert.h>
 #include <malloc.h>
diff --git a/compiler-rt/test/msan/lit.cfg b/compiler-rt/test/msan/lit.cfg
index eb0ed43897c..c6a384120dd 100644
--- a/compiler-rt/test/msan/lit.cfg
+++ b/compiler-rt/test/msan/lit.cfg
@@ -33,9 +33,6 @@ config.suffixes = ['.c', '.cc', '.cpp']
 if config.host_os not in ['Linux']:
   config.unsupported = True
 
-if config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
-
 # For mips64, mips64el we have forced store_context_size to 1 because these
 # archs use slow unwinder which is not async signal safe. Therefore we only
 # check the first frame since store_context size is 1.
diff --git a/compiler-rt/test/safestack/lit.cfg b/compiler-rt/test/safestack/lit.cfg
index 87b6783201c..10cd8a5a513 100644
--- a/compiler-rt/test/safestack/lit.cfg
+++ b/compiler-rt/test/safestack/lit.cfg
@@ -20,8 +20,3 @@ if config.lto_supported:
 
 if config.host_os not in ['Linux', 'FreeBSD', 'Darwin', 'NetBSD']:
    config.unsupported = True
-
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# because the test fail due some runtime issue.
-if config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg b/compiler-rt/test/sanitizer_common/lit.common.cfg
index be9a5c4a13c..a4a5d4e85ad 100644
--- a/compiler-rt/test/sanitizer_common/lit.common.cfg
+++ b/compiler-rt/test/sanitizer_common/lit.common.cfg
@@ -26,9 +26,6 @@ else:
 
 config.available_features.add(config.tool_name)
 
-if config.target_arch not in ['arm', 'armhf', 'aarch64']:
-  config.available_features.add('stable-runtime')
-
 if config.host_os == 'Linux' and config.tool_name == "lsan" and config.target_arch == 'i386':
   config.available_features.add("lsan-x86")
 
diff --git a/compiler-rt/test/tsan/lit.cfg b/compiler-rt/test/tsan/lit.cfg
index 0ab62db0907..10f31b06ecc 100644
--- a/compiler-rt/test/tsan/lit.cfg
+++ b/compiler-rt/test/tsan/lit.cfg
@@ -83,10 +83,5 @@ config.suffixes = ['.c', '.cc', '.cpp', '.m', '.mm']
 if config.host_os not in ['FreeBSD', 'Linux', 'Darwin']:
   config.unsupported = True
 
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# because the test hangs.
-if config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
-
 if config.host_os == 'Darwin' and config.target_arch in ["x86_64", "x86_64h"]:
   config.parallelism_group = "darwin-64bit-sanitizer"
diff --git a/compiler-rt/test/ubsan/lit.common.cfg b/compiler-rt/test/ubsan/lit.common.cfg
index 8c6801e2c12..f34d5867de3 100644
--- a/compiler-rt/test/ubsan/lit.common.cfg
+++ b/compiler-rt/test/ubsan/lit.common.cfg
@@ -73,9 +73,4 @@ config.suffixes = ['.c', '.cc', '.cpp']
 if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'Windows', 'NetBSD']:
   config.unsupported = True
 
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# because the test hangs or fails on one configuration and not the other.
-if config.target_arch.startswith('arm') == False and config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
-
 config.available_features.add('arch=' + config.target_arch)
diff --git a/compiler-rt/test/xray/lit.cfg b/compiler-rt/test/xray/lit.cfg
index 2852bdb743c..d5e40975da5 100644
--- a/compiler-rt/test/xray/lit.cfg
+++ b/compiler-rt/test/xray/lit.cfg
@@ -48,8 +48,3 @@ elif '64' not in config.host_arch:
       config.unsupported = True
   else:
     config.unsupported = True
-
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# e.g. because the test sometimes passes, sometimes fails.
-if config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')