Use i686 as the ISA in %microsoft_abi_triple on ARM

Long term we should make -triple arm7l-*-win32 do something sensible,
but for now it's broken and untested.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199260 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/lit.cfg b/test/lit.cfg
index 48b2fad1a9ba86e982a23d26897b877989f5de3d..c2a991f298eaee5759f70d3eb27493c4259b1ccf 100644 (file)
--- a/test/lit.cfg
+++ b/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,