diff options
Diffstat (limited to 'test/lit.cfg')
| -rw-r--r-- | test/lit.cfg | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index 372e091..7b7a269 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 ) ) @@ -187,6 +187,7 @@ if re.search(r'win32', config.target_triple): config.substitutions.append( ('%llc_dwarf', llc_dwarf) ) # Add site-specific substitutions. +config.substitutions.append( ('%gold', config.gold_executable) ) config.substitutions.append( ('%go', config.go_executable) ) config.substitutions.append( ('%llvmshlibdir', config.llvm_shlib_dir) ) config.substitutions.append( ('%shlibext', config.llvm_shlib_ext) ) @@ -196,7 +197,8 @@ config.substitutions.append( ('%python', config.python_executable) ) # OCaml substitutions. # Support tests for both native and bytecode builds. config.substitutions.append( ('%ocamlc', - "%s ocamlc %s" % (config.ocamlfind_executable, config.ocaml_flags)) ) + "%s ocamlc -cclib -L%s %s" % + (config.ocamlfind_executable, llvm_lib_dir, config.ocaml_flags)) ) if config.have_ocamlopt in ('1', 'TRUE'): config.substitutions.append( ('%ocamlopt', "%s ocamlopt -cclib -L%s -cclib -Wl,-rpath,%s %s" % @@ -228,6 +230,7 @@ for pattern in [r"\bbugpoint\b(?!-)", r"\bllvm-cov\b", r"\bllvm-diff\b", r"\bllvm-dis\b", + r"\bllvm-dsymutil\b", r"\bllvm-dwarfdump\b", r"\bllvm-extract\b", r"\bllvm-go\b", @@ -268,6 +271,10 @@ for pattern in [r"\bbugpoint\b(?!-)", # Warn, but still provide a substitution. lit_config.note('Did not find ' + tool_name + ' in ' + llvm_tools_dir) tool_path = llvm_tools_dir + '/' + tool_name + if (tool_name == "llc" and + 'LLVM_ENABLE_MACHINE_VERIFIER' in os.environ and + os.environ['LLVM_ENABLE_MACHINE_VERIFIER'] == "1"): + tool_path += " -verify-machineinstrs" config.substitutions.append((pattern, tool_pipe + tool_path)) ### Targets @@ -307,7 +314,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": @@ -327,8 +334,8 @@ def have_ld_plugin_support(): if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')): return False - ld_cmd = subprocess.Popen(['ld', '--help'], stdout = subprocess.PIPE) - ld_out = ld_cmd.stdout.read() + ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE) + ld_out = ld_cmd.stdout.read().decode() ld_cmd.wait() if not '-plugin' in ld_out: @@ -346,8 +353,8 @@ def have_ld_plugin_support(): if 'elf32ppc' not in emulations or 'elf_x86_64' not in emulations: return False - ld_version = subprocess.Popen(['ld', '--version'], stdout = subprocess.PIPE) - if not 'GNU gold' in ld_version.stdout.read(): + ld_version = subprocess.Popen([config.gold_executable, '--version'], stdout = subprocess.PIPE) + if not 'GNU gold' in ld_version.stdout.read().decode(): return False ld_version.wait() @@ -382,7 +389,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. |