Index: lld/trunk/MinGW/Driver.cpp =================================================================== --- lld/trunk/MinGW/Driver.cpp +++ lld/trunk/MinGW/Driver.cpp @@ -170,6 +170,9 @@ for (auto *A : Args.filtered(OPT_mllvm)) Add("-mllvm:" + StringRef(A->getValue())); + for (auto *A : Args.filtered(OPT_Xlink)) + Add(A->getValue()); + if (Args.getLastArgValue(OPT_m) == "i386pe") Add("-alternatename:__image_base__=___ImageBase"); else Index: lld/trunk/MinGW/Options.td =================================================================== --- lld/trunk/MinGW/Options.td +++ lld/trunk/MinGW/Options.td @@ -13,7 +13,6 @@ def l: JoinedOrSeparate<["-"], "l">, MetaVarName<"">, HelpText<"Root name of library to use">; def m: JoinedOrSeparate<["-"], "m">, HelpText<"Set target emulation">; -def mllvm: S<"mllvm">; def no_whole_archive: F<"no-whole-archive">, HelpText<"No longer include all object files for following archives">; def o: JoinedOrSeparate<["-"], "o">, MetaVarName<"">, @@ -31,6 +30,9 @@ // LLD specific options def _HASH_HASH_HASH : Flag<["-"], "###">, HelpText<"Print (but do not run) the commands to run for this compilation">; +def mllvm: S<"mllvm">; +def Xlink : J<"Xlink=">, MetaVarName<"">, + HelpText<"Pass to the COFF linker">; // Currently stubs to avoid errors def Bdynamic: F<"Bdynamic">, HelpText<"Link against shared libraries">; Index: lld/trunk/test/MinGW/driver.test =================================================================== --- lld/trunk/test/MinGW/driver.test +++ lld/trunk/test/MinGW/driver.test @@ -79,3 +79,6 @@ RUN: ld.lld -### -m i386pep foo.o --output-def out.def | FileCheck -check-prefix OUTPUT-DEF %s OUTPUT-DEF: -output-def:out.def + +RUN: ld.lld -### -m i386pep foo.o -Xlink=-lldmap | FileCheck -check-prefix XLINK %s +XLINK: -lldmap