Index: compiler-rt/trunk/test/asan/lit.cfg
===================================================================
--- compiler-rt/trunk/test/asan/lit.cfg
+++ compiler-rt/trunk/test/asan/lit.cfg
@@ -213,7 +213,7 @@
   config.available_features.add('stable-runtime')
 
 # Fast unwinder doesn't work with Thumb
-if not re.match('-mthumb', config.target_cflags):
+if re.search('mthumb', config.target_cflags) is not None:
   config.available_features.add('fast-unwinder-works')
 
 # Turn on leak detection on 64-bit Linux.
Index: compiler-rt/trunk/test/lsan/lit.common.cfg
===================================================================
--- compiler-rt/trunk/test/lsan/lit.common.cfg
+++ compiler-rt/trunk/test/lsan/lit.common.cfg
@@ -53,12 +53,11 @@
 config.substitutions.append( ("%clangxx_lsan ", build_invocation(clang_lsan_cxxflags)) )
 
 # LeakSanitizer tests are currently supported on x86-64 Linux, arm Linux and mips64 Linux only.
-# LSAN breaks on Thumb, so disabling from all ARM targets until we sort this out. PR32636.
-if config.host_os not in ['Linux'] or config.host_arch not in ['x86_64', 'mips64']:
+if config.host_os not in ['Linux'] or config.host_arch not in ['x86_64', 'mips64', 'arm', 'armhf', 'armv7l']:
   config.unsupported = True
 
 # Don't support Thumb due to broken fast unwinder
-if re.match('-mthumb', config.target_cflags):
+if re.search('mthumb', config.target_cflags) is not None:
   config.unsupported = True
 
 config.suffixes = ['.c', '.cc', '.cpp']