Vendor import of lld trunk r290819:vendor/lld/lld-trunk-r290819

https://llvm.org/svn/llvm-project/lld/trunk@290819

1 files changed, 14 insertions, 3 deletions

diff --git a/test/lit.cfg b/test/lit.cfg
index 5ff4fc4edcf2..a4105b34e122 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -150,15 +150,19 @@ if config.test_exec_root is None:
 NoPreJunk = r"(?<!(-|\.|/))"
 NoPostJunk = r"(?!(-|\.))"
 
+config.substitutions.append( (r"\bld.lld\b", 'ld.lld --full-shutdown') )
+
 tool_patterns = [r"\bFileCheck\b",
                  r"\bnot\b",
                  NoPreJunk + r"\blld\b" + NoPostJunk,
                  r"\bld.lld\b",
                  r"\blld-link\b",
+                 r"\bllvm-as\b",
                  r"\bllvm-mc\b",
                  r"\bllvm-nm\b",
                  r"\bllvm-objdump\b",
                  r"\bllvm-readobj\b",
+                 r"\bobj2yaml\b",
                  r"\byaml2obj\b"]
 
 for pattern in tool_patterns:
@@ -203,6 +207,10 @@ if platform.system() in ['Darwin']:
 if platform.system() in ['FreeBSD', 'Linux']:
     config.available_features.add('system-linker-elf')
 
+# Running on Windows
+if platform.system() in ['Windows']:
+    config.available_features.add('system-windows')
+
 # Set if host-cxxabi's demangler can handle target's symbols.
 if platform.system() not in ['Windows']:
     config.available_features.add('demangler')
@@ -242,12 +250,15 @@ if re.search(r'AMDGPU', archs):
     config.available_features.add('amdgpu')
 llvm_config_cmd.wait()
 
+# Set a fake constant version so that we get consitent output.
+config.environment['LLD_VERSION'] = 'LLD 1.0'
+
 # Check if Windows resource file compiler exists.
 cvtres = lit.util.which('cvtres', config.environment['PATH'])
 rc = lit.util.which('rc', config.environment['PATH'])
 if cvtres and rc:
     config.available_features.add('winres')
 
-# Check if "lib.exe" command exists.
-if lit.util.which('lib', config.environment['PATH']):
-    config.available_features.add('winlib')
+# Check if "cpio" command exists.
+if lit.util.which('cpio', config.environment['PATH']):
+    config.available_features.add('cpio')