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.

llvm-svn: 199260
This commit is contained in:
Reid Kleckner 2014-01-14 22:36:02 +00:00
parent 010b37691d
commit 9e6e67c2ef
1 changed files with 8 additions and 2 deletions

View File

@ -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,