Skip to content

Commit e75c87f

Browse files
committed
[LLD] [MinGW] Look for libs named "<libname>.lib" even with -static
This matches how ld.bfd works in practice; this fixes mstorsjo/llvm-mingw#305. Adding a test for the new lib name combination that this allows, but also adding a few negative tests for combinations that aren't matched when -static is specified (because this change in itself didn't break any of the existing tests either). The logic in how ld.bfd looks for various libraries based on an -l<libname> argument is rather complex; the ldemul_open_dynamic_archive function looks for various combinations: https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=ld/emultempl/pep.em;h=e68d1e69f17ad73af065b6bed19ae89ded913172;hb=b51c2fec1da205ea3e7354cbb3e253018d64873c#l2066 This function is only called if looking for dynamic libraries (i.e. if -static wasn't specified): https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=ld/ldfile.c;h=731ae5f7aedcf921bd36a1b32a3e0f5bfa189071;hb=b51c2fec1da205ea3e7354cbb3e253018d64873c#l365 However even this function is skipped, it still looks for libraries in the form of "lib<libname>.a" (this is what lld did before): https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=ld/ldfile.c;h=731ae5f7aedcf921bd36a1b32a3e0f5bfa189071;hb=b51c2fec1da205ea3e7354cbb3e253018d64873c#l440 But it also calls a format specific function called ldemul_find_potential_libraries, which for PE targets looks for files named "<libname>.lib": https://sourceware.org/git/?p=binutils-gdb.git;a=blob;f=ld/emultempl/pep.em;h=e68d1e69f17ad73af065b6bed19ae89ded913172;hb=b51c2fec1da205ea3e7354cbb3e253018d64873c#l2175 Differential Revision: https://reviews.llvm.org/D135651
1 parent afa6bb6 commit e75c87f

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

lld/MinGW/Driver.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ searchLibrary(StringRef name, ArrayRef<StringRef> searchPaths, bool bStatic) {
139139
}
140140
if (Optional<std::string> s = findFile(dir, "lib" + name + ".a"))
141141
return *s;
142+
if (Optional<std::string> s = findFile(dir, name + ".lib"))
143+
return *s;
142144
if (!bStatic) {
143-
if (Optional<std::string> s = findFile(dir, name + ".lib"))
144-
return *s;
145145
if (Optional<std::string> s = findFile(dir, "lib" + name + ".dll"))
146146
return *s;
147147
if (Optional<std::string> s = findFile(dir, name + ".dll"))

lld/test/MinGW/lib.test

+11
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,20 @@ RUN: ld.lld -### -m i386pep -L%t/lib -lnoprefix -lmsvcstyle 2>&1 | FileCheck -ch
3838
OTHERSTYLES: noprefix.dll.a
3939
OTHERSTYLES-SAME: msvcstyle.lib
4040

41+
RUN: not ld.lld -### -m i386pep -L%t/lib -static -lnoprefix 2>&1 | FileCheck -check-prefix=ERROR-NOPREFIX %s
42+
ERROR-NOPREFIX: unable to find library -lnoprefix
43+
44+
RUN: ld.lld -### -m i386pep -L%t/lib -static -lmsvcstyle 2>&1 | FileCheck -check-prefix=MSVCSTYLE %s
45+
MSVCSTYLE: msvcstyle.lib
46+
4147
RUN: echo > %t/lib/libnoimplib.dll
4248
RUN: echo > %t/lib/noprefix_noimplib.dll
4349
RUN: ld.lld -### -m i386pep -L%t/lib -lnoimplib 2>&1 | FileCheck -check-prefix=DLL1 %s
4450
RUN: ld.lld -### -m i386pep -L%t/lib -lnoprefix_noimplib 2>&1 | FileCheck -check-prefix=DLL2 %s
4551
DLL1: libnoimplib.dll
4652
DLL2: noprefix_noimplib.dll
53+
54+
RUN: not ld.lld -### -m i386pep -L%t/lib -static -lnoimplib 2>&1 | FileCheck -check-prefix=ERROR-NOIMPLIB %s
55+
RUN: not ld.lld -### -m i386pep -L%t/lib -static -lnoprefix_noimplib 2>&1 | FileCheck -check-prefix=ERROR-NOPREFIX-NOIMPLIB %s
56+
ERROR-NOIMPLIB: unable to find library -lnoimplib
57+
ERROR-NOPREFIX-NOIMPLIB: unable to find library -lnoprefix_noimplib

0 commit comments

Comments
 (0)