diff options
| -rw-r--r-- | test/tools/dsymutil/cmdline.test | 2 | ||||
| -rw-r--r-- | tools/dsymutil/dsymutil.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/tools/dsymutil/cmdline.test b/test/tools/dsymutil/cmdline.test index 959074290f05..dea28cf3d908 100644 --- a/test/tools/dsymutil/cmdline.test +++ b/test/tools/dsymutil/cmdline.test @@ -9,10 +9,10 @@ HELP: -flat HELP: -no-odr HELP: -no-output HELP: -no-swiftmodule-timestamp +HELP: -num-threads=<n> HELP: -o=<filename> HELP: -oso-prepend-path=<path> HELP: -symtab -HELP: -threads=<n> HELP: -verbose HELP: -y HELP-NOT: -reverse-iterate diff --git a/tools/dsymutil/dsymutil.cpp b/tools/dsymutil/dsymutil.cpp index 5f224b6bb8a1..ef21677e895c 100644 --- a/tools/dsymutil/dsymutil.cpp +++ b/tools/dsymutil/dsymutil.cpp @@ -62,12 +62,13 @@ static opt<bool> FlatOut("flat", init(false), cat(DsymCategory)); static alias FlatOutA("f", desc("Alias for --flat"), aliasopt(FlatOut)); -static opt<unsigned> Threads( - "threads", +static opt<unsigned> NumThreads( + "num-threads", desc("Specifies the maximum number (n) of simultaneous threads to use\n" "when linking multiple architectures."), value_desc("n"), init(0), cat(DsymCategory)); -static alias ThreadsA("t", desc("Alias for --threads"), aliasopt(Threads)); +static alias NumThreadsA("j", desc("Alias for --num-threads"), + aliasopt(NumThreads)); static opt<bool> Verbose("verbose", desc("Verbosity level"), init(false), cat(DsymCategory)); @@ -324,12 +325,11 @@ int main(int argc, char **argv) { exitDsymutil(1); } - unsigned NumThreads = Threads; - if (!NumThreads) + if (NumThreads == 0) NumThreads = llvm::thread::hardware_concurrency(); if (DumpDebugMap || Verbose) NumThreads = 1; - NumThreads = std::min(NumThreads, (unsigned)DebugMapPtrsOrErr->size()); + NumThreads = std::min<unsigned>(NumThreads, DebugMapPtrsOrErr->size()); llvm::ThreadPool Threads(NumThreads); |