From 9cc4d9e124ff2639201ad67a292e5c1cbc084869 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Fri, 3 Aug 2018 10:12:24 +0000 Subject: [PATCH] Merging r338703 and r338709: ------------------------------------------------------------------------ r338703 | bd1976llvm | 2018-08-02 13:27:38 +0200 (Thu, 02 Aug 2018) | 8 lines [llvm-ar] Correct help text Corrected and simplified the help text. It was clearly too difficult to maintain before (see e.g. @227296) making it simpler and more consistent it should help people keep it up to date. Differential Revision: https://reviews.llvm.org/D48577 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r338709 | bd1976llvm | 2018-08-02 14:27:01 +0200 (Thu, 02 Aug 2018) | 3 lines [llvm-ar] Fix help text test. NFC. Missed from @338703 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_70@338840 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tools/llvm-ar/invalid-command-line.test | 2 +- tools/llvm-ar/llvm-ar.cpp | 56 ++++++++++---------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/test/tools/llvm-ar/invalid-command-line.test b/test/tools/llvm-ar/invalid-command-line.test index e13f54c07bd..2bfcc1a457d 100644 --- a/test/tools/llvm-ar/invalid-command-line.test +++ b/test/tools/llvm-ar/invalid-command-line.test @@ -2,4 +2,4 @@ Test that llvm-ar exits with 1 when there is an error. RUN: not llvm-ar e 2>&1 | FileCheck %s CHECK: unknown option e. -CHECK: OVERVIEW: LLVM Archiver (llvm-ar) +CHECK: OVERVIEW: LLVM Archiver diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 9023bdd1a0d..64be08ff946 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -63,46 +63,44 @@ OPTIONS: )"; const char ArHelp[] = R"( -OVERVIEW: LLVM Archiver (llvm-ar) +OVERVIEW: LLVM Archiver - This program archives bitcode files into single libraries - -USAGE: llvm-ar [options] [relpos] [count] [members]... +USAGE: llvm-ar [options] [-][modifiers] [relpos] [files] + llvm-ar -M [ - plugin (ignored for compatibility - -help - Display available options - -version - Display the version of this program + --format - Archive format to create + =default - default + =gnu - gnu + =darwin - darwin + =bsd - bsd + --plugin= - Ignored for compatibility + --help - Display available options + --version - Display the version of this program OPERATIONS: - d[NsS] - delete file(s) from the archive - m[abiSs] - move file(s) in the archive - p[kN] - print file(s) found in the archive - q[ufsS] - quick append file(s) to the archive - r[abfiuRsS] - replace or insert file(s) into the archive - t - display contents of archive - x[No] - extract file(s) from the archive - -MODIFIERS (operation specific): - [a] - put file(s) after [relpos] - [b] - put file(s) before [relpos] (same as [i]) + d - delete [files] from the archive + m - move [files] in the archive + p - print [files] found in the archive + q - quick append [files] to the archive + r - replace or insert [files] into the archive + s - act as ranlib + t - display contents of archive + x - extract [files] from the archive + +MODIFIERS: + [a] - put [files] after [relpos] + [b] - put [files] before [relpos] (same as [i]) + [c] - do not warn if archive had to be created [D] - use zero for timestamps and uids/gids (default) - [i] - put file(s) before [relpos] (same as [b]) + [i] - put [files] before [relpos] (same as [b]) + [l] - ignored for compatibility [o] - preserve original dates [s] - create an archive index (cf. ranlib) [S] - do not build a symbol table [T] - create a thin archive - [u] - update only files newer than archive contents + [u] - update only [files] newer than archive contents [U] - use actual timestamps and uids/gids - -MODIFIERS (generic): - [c] - do not warn if the library had to be created [v] - be verbose about actions taken )"; -- 2.40.0