r199260 - Use i686 as the ISA in %microsoft_abi_triple on ARM

[Reid Kleckner]

Author: rnk
Date: Tue Jan 14 16:36:02 2014
New Revision: 199260

URL: http://llvm.org/viewvc/llvm-project?rev=199260&view=rev
Log:
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.

Modified:
    cfe/trunk/test/lit.cfg

Modified: cfe/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=199260&r1=199259&r2=199260&view=diff
==============================================================================
--- cfe/trunk/test/lit.cfg (original)
+++ cfe/trunk/test/lit.cfg Tue Jan 14 16:36:02 2014
@@ -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,