Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-22 11:15:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "[LLD] [COFF] Don't try to detect MSVC installations in mingw mode"

Browse Source 
This reverts commit 389bfbd66d6f78b5fc60e51e620e7f767fc867f0.

This commit broke the compiler-rt/test/profile/Windows/coverage-weak-lld.cpp
testcase. This testcase builds and links in an MSVC environment,
but explicitly passes -lldmingw to the linker, to opt in to
certain mingw-style behaviours regarding weak symbols, since
effb87dfa810a28e763f914fe3e6e984782cc846. This patch broke that
test, which now errored out with these errors:

    lld-link: error: could not open 'libuuid.a': no such file or directory
    lld-link: error: could not open 'libLIBCMT.a': no such file or directory
    lld-link: error: could not open 'libOLDNAMES.a': no such file or directory
This commit is contained in:
Martin Storsjö 2023-02-17 11:25:12 +02:00
parent bf91cd6ea9
commit eb14186771
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lld/COFF/Driver.cpp
View File

@ -1509,17 +1509,9 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
searchPaths.emplace_back(""); searchPaths.emplace_back("");
for (auto *arg : args.filtered(OPT_libpath)) for (auto *arg : args.filtered(OPT_libpath))
searchPaths.push_back(arg->getValue()); searchPaths.push_back(arg->getValue());
if (!config->mingw) { detectWinSysRoot(args);
// Don't automatically deduce the lib path from the environment or MSVC if (!args.hasArg(OPT_lldignoreenv) && !args.hasArg(OPT_winsysroot))
// installations when operating in mingw mode. (This also makes LLD ignore addLibSearchPaths();
// winsysroot and vctoolsdir arguments.)
detectWinSysRoot(args);
if (!args.hasArg(OPT_lldignoreenv) && !args.hasArg(OPT_winsysroot))
addLibSearchPaths();
} else {
if (args.hasArg(OPT_vctoolsdir, OPT_winsysroot))
warn("ignoring /vctoolsdir or /winsysroot flags in MinGW mode");
}
// Handle /ignore // Handle /ignore
for (auto *arg : args.filtered(OPT_ignore)) { for (auto *arg : args.filtered(OPT_ignore)) {

9
lld/test/COFF/winsysroot.test
View File

@ -13,12 +13,5 @@ Check the same for a 64-bit input .obj.
# RUN: /defaultlib:std64 /entry:main # RUN: /defaultlib:std64 /entry:main
Check that when /winsysroot is specified, %LIB% is ignored. Check that when /winsysroot is specified, %LIB% is ignored.
# RUN: env LIB=%t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x86 not lld-link %t.obj /winsysroot:%t.dir/doesnotexist /defaultlib:std32 2>&1 | FileCheck -check-prefix=LIBIGNORED %s # RUN: env LIB=foo.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x86 not lld-link %t.obj /winsysroot:%t.dir/doesnotexist /defaultlib:std32 2>&1 | FileCheck -check-prefix=LIBIGNORED %s
LIBIGNORED: could not open 'std32.lib' LIBIGNORED: could not open 'std32.lib'
Check that when -lldmingw is specified, %LIB% is ignored.
# RUN: env LIB=%t.dir/sysroot/VC/Tools/MSVC/1.1.1.1/lib/x86 not lld-link -lldmingw %t.obj /defaultlib:std32 2>&1 | FileCheck -check-prefix=LIBIGNORED_MINGW %s
LIBIGNORED_MINGW: could not open 'libstd32.a'
# RUN: not lld-link -lldmingw %t.obj /defaultlib:std32 /winsysroot:%t.dir/sysroot 2>&1 | FileCheck -check-prefix=IGNORED_ARG %s
IGNORED_ARG: warning: ignoring /vctoolsdir or /winsysroot flags in MinGW mode