svn commit: r322474 - head/contrib/llvm/tools/lld/ELF

[Ed Maste]

Author: emaste
Date: Sun Aug 13 21:11:48 2017
New Revision: 322474
URL: https://svnweb.freebsd.org/changeset/base/322474

Log:
  lld: Add `-z muldefs` option.
  
  Obtained from:	LLVM r310757

Modified:
  head/contrib/llvm/tools/lld/ELF/Driver.cpp

Modified: head/contrib/llvm/tools/lld/ELF/Driver.cpp
==============================================================================
--- head/contrib/llvm/tools/lld/ELF/Driver.cpp	Sun Aug 13 21:02:40 2017	(r322473)
+++ head/contrib/llvm/tools/lld/ELF/Driver.cpp	Sun Aug 13 21:11:48 2017	(r322474)
@@ -615,7 +615,8 @@ static bool getCompressDebugSections(opt::InputArgList
 
 // Initializes Config members by the command line options.
 void LinkerDriver::readConfigs(opt::InputArgList &Args) {
-  Config->AllowMultipleDefinition = Args.hasArg(OPT_allow_multiple_definition);
+  Config->AllowMultipleDefinition =
+      Args.hasArg(OPT_allow_multiple_definition) || hasZOption(Args, "muldefs");
   Config->AuxiliaryList = getArgs(Args, OPT_auxiliary);
   Config->Bsymbolic = Args.hasArg(OPT_Bsymbolic);
   Config->BsymbolicFunctions = Args.hasArg(OPT_Bsymbolic_functions);