Skip to content

[LLD][Cygwin] Implement --dll-search-prefix #143263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 13, 2025
Merged

[LLD][Cygwin] Implement --dll-search-prefix #143263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5db2f3f
[LLD][Cygwin] Implement --dll-search-prefix
kikairoya May 30, 2025
7a36b4e
Update lld/MinGW/Driver.cpp
kikairoya Jun 7, 2025
2b2c04b
Update lld/MinGW/Driver.cpp
kikairoya Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions lld/MinGW/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,9 @@ static std::optional<std::string> findFile(StringRef path1,
}

// This is for -lfoo. We'll look for libfoo.dll.a or libfoo.a from search paths.
static std::string
searchLibrary(StringRef name, ArrayRef<StringRef> searchPaths, bool bStatic) {
static std::string searchLibrary(StringRef name,
ArrayRef<StringRef> searchPaths, bool bStatic,
StringRef prefix) {
if (name.starts_with(":")) {
for (StringRef dir : searchPaths)
if (std::optional<std::string> s = findFile(dir, name.substr(1)))
Expand All @@ -160,7 +161,7 @@ searchLibrary(StringRef name, ArrayRef<StringRef> searchPaths, bool bStatic) {
if (std::optional<std::string> s = findFile(dir, name + ".lib"))
return *s;
if (!bStatic) {
if (std::optional<std::string> s = findFile(dir, "lib" + name + ".dll"))
if (std::optional<std::string> s = findFile(dir, prefix + name + ".dll"))
return *s;
if (std::optional<std::string> s = findFile(dir, name + ".dll"))
return *s;
Expand Down Expand Up @@ -554,6 +555,10 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
add("-libpath:" + StringRef(a->getValue()));
}

StringRef dllPrefix = "lib";
if (auto *arg = args.getLastArg(OPT_dll_search_prefix))
dllPrefix = arg->getValue();

StringRef prefix = "";
bool isStatic = false;
for (auto *a : args) {
Expand All @@ -565,7 +570,8 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
add(prefix + StringRef(a->getValue()));
break;
case OPT_l:
add(prefix + searchLibrary(a->getValue(), searchPaths, isStatic));
add(prefix +
searchLibrary(a->getValue(), searchPaths, isStatic, dllPrefix));
break;
case OPT_whole_archive:
prefix = "-wholearchive:";
Expand Down
2 changes: 2 additions & 0 deletions lld/MinGW/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ defm exclude_symbols: Eq<"exclude-symbols",
"Exclude symbols from automatic export">, MetaVarName<"<symbol[,symbol,...]>">;
def export_all_symbols: F<"export-all-symbols">,
HelpText<"Export all symbols even if a def file or dllexport attributes are used">;
defm dll_search_prefix:Eq<"dll-search-prefix", "Specify DLL prefix instead of 'lib'">,
MetaVarName<"<dll_search_prefix>">;
defm fatal_warnings: B<"fatal-warnings",
"Treat warnings as errors",
"Do not treat warnings as errors (default)">;
Expand Down
7 changes: 7 additions & 0 deletions lld/test/MinGW/lib.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ LIB1: unable to find library -lfoo

RUN: echo > %t/lib/libfoo.dll.a
RUN: ld.lld -### -m i386pep -lfoo -L%t/lib 2>&1 | FileCheck -check-prefix=LIB2 %s
RUN: ld.lld -### -m i386pep -lfoo --dll-search-prefix=cyg -L%t/lib 2>&1 | FileCheck -check-prefix=LIB2 %s
LIB2: libfoo.dll.a

RUN: not ld.lld -### -m i386pep -l:barefilename -L%t/lib 2>&1 | FileCheck -check-prefix=LIB-LITERAL-FAIL %s
Expand All @@ -22,6 +23,7 @@ LIB3: unable to find library -lfoo

RUN: echo > %t/lib/libfoo.a
RUN: ld.lld -### -m i386pep -Bstatic -lfoo -L%t/lib 2>&1 | FileCheck -check-prefix=LIB4 %s
RUN: ld.lld -### -m i386pep -Bstatic -lfoo --dll-search-prefix=cyg -L%t/lib 2>&1 | FileCheck -check-prefix=LIB4 %s
LIB4: libfoo.a

RUN: echo > %t/lib/libbar.dll.a
Expand All @@ -46,12 +48,17 @@ MSVCSTYLE: msvcstyle.lib

RUN: echo > %t/lib/libnoimplib.dll
RUN: echo > %t/lib/noprefix_noimplib.dll
RUN: echo > %t/lib/cygnoimplib2.dll
RUN: ld.lld -### -m i386pep -L%t/lib -lnoimplib 2>&1 | FileCheck -check-prefix=DLL1 %s
RUN: ld.lld -### -m i386pep -L%t/lib -lnoprefix_noimplib 2>&1 | FileCheck -check-prefix=DLL2 %s
RUN: ld.lld -### -m i386pep -L%t/lib -lnoimplib2 --dll-search-prefix=cyg 2>&1 | FileCheck -check-prefix=DLL3 %s
DLL1: libnoimplib.dll
DLL2: noprefix_noimplib.dll
DLL3: cygnoimplib2.dll

RUN: not ld.lld -### -m i386pep -L%t/lib -static -lnoimplib 2>&1 | FileCheck -check-prefix=ERROR-NOIMPLIB %s
RUN: not ld.lld -### -m i386pep -L%t/lib -static -lnoprefix_noimplib 2>&1 | FileCheck -check-prefix=ERROR-NOPREFIX-NOIMPLIB %s
RUN: not ld.lld -### -m i386pep -L%t/lib -static -lnoimplib2 --dll-search-prefix=cyg 2>&1 | FileCheck -check-prefix=ERROR-CYG-NOIMPLIB %s
ERROR-NOIMPLIB: unable to find library -lnoimplib
ERROR-NOPREFIX-NOIMPLIB: unable to find library -lnoprefix_noimplib
ERROR-CYG-NOIMPLIB: unable to find library -lnoimplib2
Loading