From eb46c95c3e7aeba4d183ca614fe238067eddf97f Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Thu, 9 Aug 2018 02:16:18 +0000 Subject: [CMake] Use normalized Windows target triples Changes the default Windows target triple returned by GetHostTriple.cmake from the old environment names (which we wanted to move away from) to newer, normalized ones. This also requires updating all tests to use the new systems names in constraints. Differential Revision: https://reviews.llvm.org/D47381 llvm-svn: 339307 --- llvm/test/lit.cfg.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'llvm/test/lit.cfg.py') diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py index 2c466645a51..f6080df7485 100644 --- a/llvm/test/lit.cfg.py +++ b/llvm/test/lit.cfg.py @@ -98,15 +98,15 @@ lli_args = [] # 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|windows-gnu|windows-msvc|win32', config.host_triple): +if re.search(r'cygwin|windows-gnu|windows-msvc', config.host_triple): lli_args = ['-mtriple=' + config.host_triple + '-elf'] llc_args = [] -# Similarly, have a macro to use llc with DWARF even when the host is win32. -if re.search(r'win32', config.target_triple): +# Similarly, have a macro to use llc with DWARF even when the host is Windows +if re.search(r'windows-msvc', config.target_triple): llc_args = [' -mtriple=' + - config.target_triple.replace('-win32', '-mingw32')] + config.target_triple.replace('-msvc', '-gnu')] # Provide the path to asan runtime lib if available. On darwin, this lib needs # to be loaded via DYLD_INSERT_LIBRARIES before libLTO.dylib in case the files @@ -312,7 +312,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|windows-gnu|win32)', config.target_triple): +if not re.match(r'^x86_64.*-(windows-gnu|windows-msvc)', config.target_triple): config.available_features.add('debug_frame') if config.have_libxar: -- cgit v1.2.3