[lld] r240077 - COFF: Add /nodefaultlib and /merge for .drectve.
Rui Ueyama
ruiu at google.com
Thu Jun 18 16:22:40 PDT 2015
Author: ruiu
Date: Thu Jun 18 18:22:39 2015
New Revision: 240077
URL: http://llvm.org/viewvc/llvm-project?rev=240077&view=rev
Log:
COFF: Add /nodefaultlib and /merge for .drectve.
Modified:
lld/trunk/COFF/Driver.cpp
Modified: lld/trunk/COFF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.cpp?rev=240077&r1=240076&r2=240077&view=diff
==============================================================================
--- lld/trunk/COFF/Driver.cpp (original)
+++ lld/trunk/COFF/Driver.cpp Thu Jun 18 18:22:39 2015
@@ -121,6 +121,12 @@ LinkerDriver::parseDirectives(StringRef
case OPT_incl:
Config->Includes.insert(Arg->getValue());
break;
+ case OPT_merge:
+ // Ignore /merge for now.
+ break;
+ case OPT_nodefaultlib:
+ Config->NoDefaultLibs.insert(doFindLib(Arg->getValue()));
+ break;
default:
llvm::errs() << Arg->getSpelling() << " is not allowed in .drectve\n";
return make_error_code(LLDError::InvalidOption);
More information about the llvm-commits
mailing list