This is an archive of the discontinued LLVM Phabricator instance.

Differential D51840

[LLD] [MinGW] Hook up the --require-defined option to -include:
ClosedPublic

Authored by mstorsjo on Sep 9 2018, 1:24 PM.

Details

Reviewers
ruiu
rnk
pcc
Commits
rGdb62913f2850: [MinGW] Hook up the --require-defined option to -include:
rL341846: [MinGW] Hook up the --require-defined option to -include:
rLLD341846: [MinGW] Hook up the --require-defined option to -include:

Diff Detail

Event Timeline

mstorsjo created this revision.Sep 9 2018, 1:24 PM
ruiu accepted this revision.Sep 10 2018, 8:53 AM

LGTM

This revision is now accepted and ready to land.Sep 10 2018, 8:53 AM
Closed by commit rLLD341846: [MinGW] Hook up the --require-defined option to -include: (authored by mstorsjo). · Explain WhySep 10 2018, 10:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
MinGW/
3 lines
3 lines
test/
MinGW/
3 lines

Diff 164591

MinGW/Driver.cpp

Show First 20 Lines • Show All 206 Lines • ▼ Show 20 Linesbool mingw::link(ArrayRef<const char *> ArgsArr, raw_ostream &Diag) {
for (auto *A : Args.filtered(OPT_Xlink)) for (auto *A : Args.filtered(OPT_Xlink))
Add(A->getValue()); Add(A->getValue());
if (Args.getLastArgValue(OPT_m) == "i386pe") if (Args.getLastArgValue(OPT_m) == "i386pe")
Add("-alternatename:__image_base__=___ImageBase"); Add("-alternatename:__image_base__=___ImageBase");
else else
Add("-alternatename:__image_base__=__ImageBase"); Add("-alternatename:__image_base__=__ImageBase");
for (auto *A : Args.filtered(OPT_require_defined))
Add("-include:" + StringRef(A->getValue()));
std::vector<StringRef> SearchPaths; std::vector<StringRef> SearchPaths;
for (auto *A : Args.filtered(OPT_L)) for (auto *A : Args.filtered(OPT_L))
SearchPaths.push_back(A->getValue()); SearchPaths.push_back(A->getValue());
StringRef Prefix = ""; StringRef Prefix = "";
bool Static = false; bool Static = false;
for (auto *A : Args) { for (auto *A : Args) {
switch (A->getOption().getUnaliasedOption().getID()) { switch (A->getOption().getUnaliasedOption().getID()) {
Show All 36 Lines

MinGW/Options.td

Show All 34 Lines
def stack: S<"stack">; def stack: S<"stack">;
def strip_all: F<"strip-all">, def strip_all: F<"strip-all">,
HelpText<"Omit all symbol information from the output binary">; HelpText<"Omit all symbol information from the output binary">;
def strip_debug: F<"strip-debug">, def strip_debug: F<"strip-debug">,
HelpText<"Omit all debug information, but keep symbol information">; HelpText<"Omit all debug information, but keep symbol information">;
def whole_archive: F<"whole-archive">, def whole_archive: F<"whole-archive">,
HelpText<"Include all object files for following archives">; HelpText<"Include all object files for following archives">;
def verbose: F<"verbose">, HelpText<"Verbose mode">; def verbose: F<"verbose">, HelpText<"Verbose mode">;
def require_defined: S<"require-defined">,
HelpText<"Force symbol to be added to symbol table as an undefined one">;
def require_defined_eq: J<"require-defined=">, Alias<require_defined>;
// LLD specific options // LLD specific options
def _HASH_HASH_HASH : Flag<["-"], "###">, def _HASH_HASH_HASH : Flag<["-"], "###">,
HelpText<"Print (but do not run) the commands to run for this compilation">; HelpText<"Print (but do not run) the commands to run for this compilation">;
def mllvm: S<"mllvm">; def mllvm: S<"mllvm">;
def pdb: S<"pdb">, HelpText<"Specify output PDB debug information file">; def pdb: S<"pdb">, HelpText<"Specify output PDB debug information file">;
def Xlink : J<"Xlink=">, MetaVarName<"<arg>">, def Xlink : J<"Xlink=">, MetaVarName<"<arg>">,
HelpText<"Pass <arg> to the COFF linker">; HelpText<"Pass <arg> to the COFF linker">;
Show All 27 Lines

test/MinGW/driver.test

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines
RUN: ld.lld -### foo.o -m i386pe -shared -kill-at | FileCheck -check-prefix=KILL-AT %s RUN: ld.lld -### foo.o -m i386pe -shared -kill-at | FileCheck -check-prefix=KILL-AT %s
KILL-AT: -kill-at KILL-AT: -kill-at
RUN: ld.lld -### foo.o -m i386pep -Map bar.map | FileCheck -check-prefix=MAP %s RUN: ld.lld -### foo.o -m i386pep -Map bar.map | FileCheck -check-prefix=MAP %s
RUN: ld.lld -### foo.o -m i386pep --Map bar.map | FileCheck -check-prefix=MAP %s RUN: ld.lld -### foo.o -m i386pep --Map bar.map | FileCheck -check-prefix=MAP %s
RUN: ld.lld -### foo.o -m i386pep -Map=bar.map | FileCheck -check-prefix=MAP %s RUN: ld.lld -### foo.o -m i386pep -Map=bar.map | FileCheck -check-prefix=MAP %s
RUN: ld.lld -### foo.o -m i386pep --Map=bar.map | FileCheck -check-prefix=MAP %s RUN: ld.lld -### foo.o -m i386pep --Map=bar.map | FileCheck -check-prefix=MAP %s
MAP: -lldmap:bar.map MAP: -lldmap:bar.map
RUN: ld.lld -### foo.o -m i386pe -require-defined _foo --require-defined _bar -require-defined=_baz --require-defined=_foo2 | FileCheck -check-prefix=REQUIRE-DEFINED %s
REQUIRE-DEFINED: -include:_foo -include:_bar -include:_baz -include:_foo2