From 23f441d3ace2a0717f78cda08b8c340c33aa4783 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Wed, 16 Nov 2016 01:39:50 +0000 Subject: Add -no-threads option that negates the effect of -threads. llvm-svn: 287072 --- lld/ELF/Driver.cpp | 2 +- lld/ELF/Options.td | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 2b1f7467293..03ed1c60243 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -496,7 +496,7 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) { 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); diff --git a/lld/ELF/Options.td b/lld/ELF/Options.td index 9c40a80783e..d3c5dd07cbd 100644 --- a/lld/ELF/Options.td +++ b/lld/ELF/Options.td @@ -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">, HelpText<"Interpret R_ARM_TARGET1 as R_ARM_AB def target2: J<"target2=">, MetaVarName<"">, HelpText<"Interpret R_ARM_TARGET2 as , where 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">; -- cgit v1.2.3