intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-05 13:21:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[LLD][COFF] Add support for /noimplib

Browse Source 
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
This commit is contained in:
Tobias Hieta
2022-04-12 16:06:46 +02:00
parent 2978d02681
commit eb4eef9ec4
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lld/COFF/Config.h
View File

@@ -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;

8
lld/COFF/Driver.cpp
View File

@@ -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;
@@ -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;
}
@@ -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();
}

2
lld/COFF/Options.td
View File

@@ -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">;

20
lld/test/COFF/noimplib.test Normal file
View File

@@ -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