maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[LLD] [MinGW] Look for other library patterns with -l 

GNU ld looks for a number of other patterns than just lib<name>.dll.a
and lib<name>.a.

GNU ld does support linking directly against a DLL without using an
import library. If that's the only match for a -l argument, point out
that the user needs to use an import library, instead of leaving the
user with a puzzling message about the -l argument not being found
at all.

Also convert an existing case of fatal() into error().

Differential Revision: https://reviews.llvm.org/D68689

llvm-svn: 374292
This commit is contained in:
Martin Storsjo 2019-10-10 08:52:39 +00:00
parent e742794ffa
commit 0226c35262
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lld/MinGW/Driver.cpp
View File

@ -125,17 +125,36 @@ searchLibrary(StringRef name, ArrayRef<StringRef> searchPaths, bool bStatic) {
for (StringRef dir : searchPaths) for (StringRef dir : searchPaths)
if (Optional<std::string> s = findFile(dir, name.substr(1))) if (Optional<std::string> s = findFile(dir, name.substr(1)))
return *s; return *s;
fatal("unable to find library -l" + name); error("unable to find library -l" + name);
return "";
} }
for (StringRef dir : searchPaths) { for (StringRef dir : searchPaths) {
if (!bStatic) if (!bStatic) {
if (Optional<std::string> s = findFile(dir, "lib" + name + ".dll.a")) if (Optional<std::string> s = findFile(dir, "lib" + name + ".dll.a"))
return *s; return *s;
if (Optional<std::string> s = findFile(dir, name + ".dll.a"))
return *s;
}
if (Optional<std::string> s = findFile(dir, "lib" + name + ".a")) if (Optional<std::string> s = findFile(dir, "lib" + name + ".a"))
return *s; return *s;
if (!bStatic) {
if (Optional<std::string> s = findFile(dir, name + ".lib"))
return *s;
if (Optional<std::string> s = findFile(dir, "lib" + name + ".dll")) {
error("lld doesn't support linking directly against " + *s +
", use an import library");
return "";
}
if (Optional<std::string> s = findFile(dir, name + ".dll")) {
error("lld doesn't support linking directly against " + *s +
", use an import library");
return "";
}
}
} }
fatal("unable to find library -l" + name); error("unable to find library -l" + name);
return "";
} }
// Convert Unix-ish command line arguments to Windows-ish ones and // Convert Unix-ish command line arguments to Windows-ish ones and
@ -342,6 +361,9 @@ bool mingw::link(ArrayRef<const char *> argsArr, raw_ostream &diag) {
} }
} }
if (errorCount())
return false;
if (args.hasArg(OPT_verbose) || args.hasArg(OPT__HASH_HASH_HASH)) if (args.hasArg(OPT_verbose) || args.hasArg(OPT__HASH_HASH_HASH))
outs() << llvm::join(linkArgs, " ") << "\n"; outs() << llvm::join(linkArgs, " ") << "\n";

13
lld/test/MinGW/lib.test
View File

@ -26,3 +26,16 @@ RUN: echo > %t/lib/libbar.a
RUN: ld.lld -### -m i386pep -Bstatic -lfoo -Bdynamic -lbar -L%t/lib | FileCheck -check-prefix=LIB5 %s RUN: ld.lld -### -m i386pep -Bstatic -lfoo -Bdynamic -lbar -L%t/lib | FileCheck -check-prefix=LIB5 %s
LIB5: libfoo.a LIB5: libfoo.a
LIB5-SAME: libbar.dll.a LIB5-SAME: libbar.dll.a
RUN: echo > %t/lib/noprefix.dll.a
RUN: echo > %t/lib/msvcstyle.lib
RUN: ld.lld -### -m i386pep -L%t/lib -lnoprefix -lmsvcstyle | FileCheck -check-prefix=OTHERSTYLES %s
OTHERSTYLES: noprefix.dll.a
OTHERSTYLES-SAME: msvcstyle.lib
RUN: echo > %t/lib/libnoimplib.dll
RUN: echo > %t/lib/noprefix_noimplib.dll
RUN: not ld.lld -### -m i386pep -L%t/lib -lnoimplib 2>&1 | FileCheck -check-prefix=UNSUPPORTED-DLL1 %s
RUN: not ld.lld -### -m i386pep -L%t/lib -lnoprefix_noimplib 2>&1 | FileCheck -check-prefix=UNSUPPORTED-DLL2 %s
UNSUPPORTED-DLL1: lld doesn't support linking directly against {{.*}}libnoimplib.dll, use an import library
UNSUPPORTED-DLL2: lld doesn't support linking directly against {{.*}}noprefix_noimplib.dll, use an import library