From c0bd970d0e639d026705c11404efb984e4ea008d Mon Sep 17 00:00:00 2001 From: Yaron Keren Date: Wed, 17 Dec 2014 09:55:15 +0000 Subject: [PATCH] Teach lit.cfg to recognize -windows-gnu in addition to -mingw32. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224421 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/lit.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/lit.cfg b/test/lit.cfg index b9b4df12217..d628dfb76f2 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -176,7 +176,7 @@ lli = 'lli' # we don't support COFF in MCJIT well enough for the tests, force ELF format on # Windows. FIXME: the process target triple should be used here, but this is # difficult to obtain on Windows. -if re.search(r'cygwin|mingw32|win32', config.host_triple): +if re.search(r'cygwin|mingw32|windows-gnu|win32', config.host_triple): lli += ' -mtriple='+config.host_triple+'-elf' config.substitutions.append( ('%lli', lli ) ) @@ -309,7 +309,7 @@ else: # Direct object generation # Suppress x86_64-mingw32 while investigating since r219108. -if not 'hexagon' in config.target_triple and not re.match(r'^x86_64.*-(mingw32|win32)', config.target_triple): +if not 'hexagon' in config.target_triple and not re.match(r'^x86_64.*-(mingw32|windows-gnu|win32)', config.target_triple): config.available_features.add("object-emission") if config.have_zlib == "1": @@ -384,7 +384,7 @@ if 'darwin' == sys.platform: sysctl_cmd.wait() # .debug_frame is not emitted for targeting Windows x64. -if not re.match(r'^x86_64.*-(mingw32|win32)', config.target_triple): +if not re.match(r'^x86_64.*-(mingw32|windows-gnu|win32)', config.target_triple): config.available_features.add('debug_frame') # Check if we should use gmalloc. -- 2.34.1