Skip to content

Commit

Permalink
[LLD][COFF] Add support for /noimplib
Browse files Browse the repository at this point in the history
Mostly for compatibility reasons with link.exe this flag
makes sure we don't write a implib - not even when /implib
is also passed, that's how link.exe works.

Reviewed By: mstorsjo

Differential Revision: https://reviews.llvm.org/D123591
  • Loading branch information
tru committed Apr 13, 2022
1 parent 2978d02 commit eb4eef9
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 2 deletions.
1 change: 1 addition & 0 deletions lld/COFF/Config.h
Expand Up @@ -140,6 +140,7 @@ struct Configuration {
// True if we are creating a DLL.
bool dll = false;
StringRef implib;
bool noimplib = false;
std::vector<Export> exports;
bool hadExplicitExports;
std::set<std::string> delayLoads;
Expand Down
8 changes: 6 additions & 2 deletions lld/COFF/Driver.cpp
Expand Up @@ -1673,6 +1673,9 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
if (auto *arg = args.getLastArg(OPT_implib))
config->implib = arg->getValue();

if (auto *arg = args.getLastArg(OPT_noimplib))
config->noimplib = true;

// Handle /opt.
bool doGC = debug == DebugKind::None || args.hasArg(OPT_profile);
Optional<ICFLevel> icfLevel = None;
Expand Down Expand Up @@ -2022,7 +2025,8 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
// Handle generation of import library from a def file.
if (!args.hasArg(OPT_INPUT, OPT_wholearchive_file)) {
fixupExports();
createImportLibrary(/*asLib=*/true);
if (!config->noimplib)
createImportLibrary(/*asLib=*/true);
return;
}

Expand Down Expand Up @@ -2281,7 +2285,7 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
// -implib option is given explicitly, for compatibility with GNU ld.
if (!config->exports.empty() || config->dll) {
fixupExports();
if (!config->mingw || !config->implib.empty())
if (!config->noimplib && (!config->mingw || !config->implib.empty()))
createImportLibrary(/*asLib=*/false);
assignExportOrdinals();
}
Expand Down
2 changes: 2 additions & 0 deletions lld/COFF/Options.td
Expand Up @@ -56,6 +56,8 @@ def guard : P<"guard", "Control flow guard">;
def heap : P<"heap", "Size of the heap">;
def ignore : P<"ignore", "Specify warning codes to ignore">;
def implib : P<"implib", "Import library name">;
def noimplib : F<"noimplib">,
HelpText<"Don't output an import lib">;
def lib : F<"lib">,
HelpText<"Act like lib.exe; must be first argument if present">;
def libpath : P<"libpath", "Additional library search path">;
Expand Down
20 changes: 20 additions & 0 deletions lld/test/COFF/noimplib.test
@@ -0,0 +1,20 @@
REQUIRES: x86
RUN: mkdir -p %t-out
RUN: llvm-mc -triple x86_64-windows-msvc -filetype obj -o %t-out/object.obj %S/Inputs/object.s

Test that /noimplib writes no .lib file

RUN: rm -f %t-out/library.lib
RUN: lld-link -dll -machine:x64 -def:%S/Inputs/named.def -out:%t-out/library.dll %t-out/object.obj -entry:f -subsystem:console /noimplib
RUN: not test -f %t-out/library.lib

Just make sure the normal stuff works and then we just add /noimplib

RUN: lld-link -dll -machine:x64 -def:%S/Inputs/named.def -out:%t-out/library.dll %t-out/object.obj -entry:f -subsystem:console /implib:%t-out/nolibrary.lib
RUN: test -f %t-out/nolibrary.lib

Test that it overrides /implib as well. This is how link.exe works

RUN: rm -f %t-out/nolibrary.lib
RUN: lld-link -dll -machine:x64 -def:%S/Inputs/named.def -out:%t-out/library.dll %t-out/object.obj -entry:f -subsystem:console /implib:%t-out/nolibrary.lib /noimplib
RUN: not test -f %t-out/nolibrary.lib

0 comments on commit eb4eef9

Please sign in to comment.