[lld] r287072 - Add -no-threads option that negates the effect of -threads.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Tue Nov 15 19:39:50 2016
New Revision: 287072

URL: http://llvm.org/viewvc/llvm-project?rev=287072&view=rev
Log:
Add -no-threads option that negates the effect of -threads.

Modified:
    lld/trunk/ELF/Driver.cpp
    lld/trunk/ELF/Options.td

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=287072&r1=287071&r2=287072&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Tue Nov 15 19:39:50 2016
@@ -496,7 +496,7 @@ void LinkerDriver::readConfigs(opt::Inpu
   Config->SaveTemps = Args.hasArg(OPT_save_temps);
   Config->Shared = Args.hasArg(OPT_shared);
   Config->Target1Rel = getArg(Args, OPT_target1_rel, OPT_target1_abs, false);
-  Config->Threads = Args.hasArg(OPT_threads);
+  Config->Threads = getArg(Args, OPT_threads, OPT_no_threads, false);
   Config->Trace = Args.hasArg(OPT_trace);
   Config->Verbose = Args.hasArg(OPT_verbose);
   Config->WarnCommon = Args.hasArg(OPT_warn_common);

Modified: lld/trunk/ELF/Options.td
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Options.td?rev=287072&r1=287071&r2=287072&view=diff
==============================================================================
--- lld/trunk/ELF/Options.td (original)
+++ lld/trunk/ELF/Options.td Tue Nov 15 19:39:50 2016
@@ -127,6 +127,9 @@ def no_gc_sections: F<"no-gc-sections">,
 def no_gnu_unique: F<"no-gnu-unique">,
   HelpText<"Disable STB_GNU_UNIQUE symbol binding">;
 
+def no_threads: F<"no-threads">,
+  HelpText<"Do not run the linker multi-threaded">;
+
 def no_whole_archive: F<"no-whole-archive">,
   HelpText<"Restores the default behavior of loading archive members">;
 
@@ -188,7 +191,7 @@ def target1_abs: F<"target1-abs">, HelpT
 
 def target2: J<"target2=">, MetaVarName<"<type>">, HelpText<"Interpret R_ARM_TARGET2 as <type>, where <type> is one of rel, abs, or got-rel.">;
 
-def threads: F<"threads">, HelpText<"Enable use of threads">;
+def threads: F<"threads">, HelpText<"Run the linker multi-threaded">;
 
 def trace: F<"trace">, HelpText<"Print the names of the input files">;