This is an archive of the discontinued LLVM Phabricator instance.

Differential D86512

[LLD][MinGW] Handle allow-multiple-definition flag
ClosedPublic

Authored by mati865 on Aug 25 2020, 1:42 AM.

Details

Reviewers
mstorsjo
Commits
rGc82078b5d761: [LLD][MinGW] Handle allow-multiple-definition flag
Summary

Basically copied from ELF driver.

Diff Detail

Event Timeline

mati865 created this revision.Aug 25 2020, 1:42 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 25 2020, 1:42 AM
Herald added subscribers: llvm-commits, dang. · View Herald Transcript
mati865 requested review of this revision.Aug 25 2020, 1:42 AM
Harbormaster completed remote builds in B69415: Diff 287592.Aug 25 2020, 1:51 AM
mstorsjo accepted this revision.Aug 25 2020, 12:17 PM

LGTM

This revision is now accepted and ready to land.Aug 25 2020, 12:17 PM
This revision was landed with ongoing or failed builds.Aug 25 2020, 11:38 PM
Closed by commit rGc82078b5d761: [LLD][MinGW] Handle allow-multiple-definition flag (authored by mati865, committed by mstorsjo). · Explain Why
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rGc82078b5d761: [LLD][MinGW] Handle allow-multiple-definition flag.

Revision Contents

PathSize
lld/
MinGW/
4 lines
3 lines
test/
MinGW/
8 lines

Diff 287840

lld/MinGW/Driver.cpp

Show First 20 Lines • Show All 307 Lines • ▼ Show 20 Linesbool mingw::link(ArrayRef<const char *> argsArr, bool canExitEarly,
else else
add("-auto-import:no"); add("-auto-import:no");
if (args.hasFlag(OPT_enable_runtime_pseudo_reloc, if (args.hasFlag(OPT_enable_runtime_pseudo_reloc,
OPT_disable_runtime_pseudo_reloc, true)) OPT_disable_runtime_pseudo_reloc, true))
add("-runtime-pseudo-reloc"); add("-runtime-pseudo-reloc");
else else
add("-runtime-pseudo-reloc:no"); add("-runtime-pseudo-reloc:no");
if (args.hasFlag(OPT_allow_multiple_definition,
OPT_no_allow_multiple_definition, false))
add("-force:multiple");
if (auto *a = args.getLastArg(OPT_icf)) { if (auto *a = args.getLastArg(OPT_icf)) {
StringRef s = a->getValue(); StringRef s = a->getValue();
if (s == "all") if (s == "all")
add("-opt:icf"); add("-opt:icf");
else if (s == "safe" || s == "none") else if (s == "safe" || s == "none")
add("-opt:noicf"); add("-opt:noicf");
else else
error("unknown parameter: --icf=" + s); error("unknown parameter: --icf=" + s);
▲ Show 20 Lines • Show All 85 Lines • Show Last 20 Lines

lld/MinGW/Options.td

Show All 17 Lines
multiclass B<string name, string help1, string help2> { multiclass B<string name, string help1, string help2> {
def NAME: Flag<["--", "-"], name>, HelpText<help1>; def NAME: Flag<["--", "-"], name>, HelpText<help1>;
def no_ # NAME: Flag<["--", "-"], "no-" # name>, HelpText<help2>; def no_ # NAME: Flag<["--", "-"], "no-" # name>, HelpText<help2>;
} }
def L: JoinedOrSeparate<["-"], "L">, MetaVarName<"<dir>">, def L: JoinedOrSeparate<["-"], "L">, MetaVarName<"<dir>">,
HelpText<"Add a directory to the library search path">; HelpText<"Add a directory to the library search path">;
defm allow_multiple_definition: B<"allow-multiple-definition",
"Allow multiple definitions",
"Do not allow multiple definitions (default)">;
def Bdynamic: F<"Bdynamic">, HelpText<"Link against shared libraries">; def Bdynamic: F<"Bdynamic">, HelpText<"Link against shared libraries">;
def Bstatic: F<"Bstatic">, HelpText<"Do not link against shared libraries">; def Bstatic: F<"Bstatic">, HelpText<"Do not link against shared libraries">;
def disable_auto_import: F<"disable-auto-import">, def disable_auto_import: F<"disable-auto-import">,
HelpText<"Don't automatically import data symbols from other DLLs without dllimport">; HelpText<"Don't automatically import data symbols from other DLLs without dllimport">;
def disable_runtime_pseudo_reloc: F<"disable-runtime-pseudo-reloc">, def disable_runtime_pseudo_reloc: F<"disable-runtime-pseudo-reloc">,
HelpText<"Don't do automatic imports that require runtime fixups">; HelpText<"Don't do automatic imports that require runtime fixups">;
def dynamicbase: F<"dynamicbase">, HelpText<"Enable ASLR">; def dynamicbase: F<"dynamicbase">, HelpText<"Enable ASLR">;
def enable_auto_import: F<"enable-auto-import">, def enable_auto_import: F<"enable-auto-import">,
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines

lld/test/MinGW/driver.test

Show First 20 Lines • Show All 254 Lines • ▼ Show 20 Lines
RUN: ld.lld -### -m i386pep foo.o -section-alignment 0x2000 | FileCheck -check-prefix ALIGN %s RUN: ld.lld -### -m i386pep foo.o -section-alignment 0x2000 | FileCheck -check-prefix ALIGN %s
RUN: ld.lld -### -m i386pep foo.o --section-alignment=0x2000 | FileCheck -check-prefix ALIGN %s RUN: ld.lld -### -m i386pep foo.o --section-alignment=0x2000 | FileCheck -check-prefix ALIGN %s
RUN: ld.lld -### -m i386pep foo.o -section-alignment=0x2000 | FileCheck -check-prefix ALIGN %s RUN: ld.lld -### -m i386pep foo.o -section-alignment=0x2000 | FileCheck -check-prefix ALIGN %s
ALIGN: -align:0x2000 ALIGN: -align:0x2000
RUN: ld.lld -### -m i386pe foo.o -no-seh | FileCheck -check-prefix NOSEH %s RUN: ld.lld -### -m i386pe foo.o -no-seh | FileCheck -check-prefix NOSEH %s
RUN: ld.lld -### -m i386pe foo.o --no-seh | FileCheck -check-prefix NOSEH %s RUN: ld.lld -### -m i386pe foo.o --no-seh | FileCheck -check-prefix NOSEH %s
NOSEH: -noseh NOSEH: -noseh
RUN: ld.lld -### -m i386pep foo.o --no-allow-multiple-definition --allow-multiple-definition | FileCheck -check-prefix ALLOW_MULTIPLE_DEFINITION %s
RUN: ld.lld -### -m i386pep foo.o -no-allow-multiple-definition -allow-multiple-definition | FileCheck -check-prefix ALLOW_MULTIPLE_DEFINITION %s
ALLOW_MULTIPLE_DEFINITION: -force:multiple
RUN: ld.lld -### -m i386pep foo.o --allow-multiple-definition --no-allow-multiple-definition | FileCheck -check-prefix NO_ALLOW_MULTIPLE_DEFINITION %s
RUN: ld.lld -### -m i386pep foo.o -allow-multiple-definition -no-allow-multiple-definition | FileCheck -check-prefix NO_ALLOW_MULTIPLE_DEFINITION %s
NO_ALLOW_MULTIPLE_DEFINITION-NOT: -force:multiple