summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/test/lit.cfg10
1 files changed, 8 insertions, 2 deletions
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
index 48b2fad1a9b..c2a991f298e 100644
--- a/clang/test/lit.cfg
+++ b/clang/test/lit.cfg
@@ -241,11 +241,17 @@ def makeMSABITriple(triple):
m = re.match(r'(\w+)-(\w+)-(\w+)', triple)
if not m:
lit_config.fatal("Could not turn '%s' into MS ABI triple" % triple)
- if m.group(3).lower() == 'win32':
+ isa = m.group(1)
+ vendor = m.group(2)
+ os = m.group(3)
+ if os.lower() == 'win32':
# If the OS is win32, we're done.
return triple
+ if "arm" in isa.lower():
+ # FIXME: Fix failures with arm*-*-win32.
+ isa = "i686"
# Otherwise, replace the OS part with Win32.
- return m.group(1) + '-' + m.group(2) + '-win32'
+ return isa + '-' + vendor + '-win32'
config.substitutions.append( ('%clang_cc1', '%s -cc1 -internal-isystem %s'
% (config.clang,
OpenPOWER on IntegriCloud