Show choices of multiple-choice options in `ld.lld --help` message.

[ruiu]

Summary

This is the diff of ld.lld --help.

• --build-id=<value> Generate build ID note + --build-id=[fast,md5,sha,uuid,0x<hexstring>] + Generate build ID note
• --build-id Generate build ID note + --build-id Alias for --build-id=fast
• --color-diagnostics=<value>
• Use colors in diagnostics; one of 'always', 'never', 'auto' + --color-diagnostics=[auto,always,never] + Use colors in diagnostics
• --color-diagnostics Use colors in diagnostics + --color-diagnostics Alias for --color-diagnostics=always
• --compress-debug-sections=<value> + --compress-debug-sections=[none,zlib]
• --defsym=<value> Define a symbol alias + --defsym=<symbol>=<value> + Define a symbol alias
• --format=<input-format> Change the input format of the inputs following this option + --format=[default,elf,binary] + Change the input format of the inputs following this option
• --pack-dyn-relocs=<format>
• Pack dynamic relocations in the given format (none or android) + --pack-dyn-relocs=[none,android] + Pack dynamic relocations in the given format
• --rsp-quoting=<value> Quoting style for response files. Values supported: windows|posix + --rsp-quoting=[posix,windows] + Quoting style for response files
• --undefined=<value> Force undefined symbol during linking + --undefined=<symbol> Force undefined symbol during linking
• --wrap=<symbol> Use wrapper functions for symbol + --wrap=<symbol>=<symbol> + Use wrapper functions for symbol

[smeenai]

Formatted diff (I didn't wanna edit the summary itself):

-  --build-id=<value>      Generate build ID note
+  --build-id=[fast,md5,sha,uuid,0x<hexstring>]
+                          Generate build ID note

-  --build-id              Generate build ID note
+  --build-id              Alias for --build-id=fast

-  --color-diagnostics=<value>
-                          Use colors in diagnostics; one of 'always', 'never', 'auto'
+  --color-diagnostics=[auto,always,never]
+                          Use colors in diagnostics

-  --color-diagnostics     Use colors in diagnostics
+  --color-diagnostics     Alias for --color-diagnostics=always

-  --compress-debug-sections=<value>
+  --compress-debug-sections=[none,zlib]

-  --defsym=<value>        Define a symbol alias
+  --defsym=<symbol>=<value>
+                          Define a symbol alias

-  --format=<input-format> Change the input format of the inputs following this option
+  --format=[default,elf,binary]
+                          Change the input format of the inputs following this option

-  --pack-dyn-relocs=<format>
-                          Pack dynamic relocations in the given format (none or android)
+  --pack-dyn-relocs=[none,android]
+                          Pack dynamic relocations in the given format

-  --rsp-quoting=<value>   Quoting style for response files. Values supported: windows|posix
+  --rsp-quoting=[posix,windows]
+                          Quoting style for response files

-  --undefined=<value>     Force undefined symbol during linking
+  --undefined=<symbol>    Force undefined symbol during linking

-  --wrap=<symbol>         Use wrapper functions for symbol
+  --wrap=<symbol>=<symbol>
+                          Use wrapper functions for symbol

[ruiu]

Shoaib,

Thanks! I didn't know Phabricator interprets pluses and minuses as a list.

[pcc]

LGTM

[glandium]

ELF/Options.td

33

it's sha1, not sha.

ELF/Options.td

 
 def Bsymbolic_functions: F<"Bsymbolic-functions">,
   HelpText<"Bind defined function symbols locally">;
 
 def Bdynamic: F<"Bdynamic">, HelpText<"Link against shared libraries (default)">;
 
 def Bstatic: F<"Bstatic">, HelpText<"Do not link against shared libraries">;
 
-def build_id: F<"build-id">, HelpText<"Generate build ID note">;
+def build_id: F<"build-id">, HelpText<"Alias for --build-id=fast">;
 
-def build_id_eq: J<"build-id=">, HelpText<"Generate build ID note">;
+def build_id_eq: J<"build-id=">, HelpText<"Generate build ID note">,
+  MetaVarName<"[fast,md5,sha,uuid,0x<hexstring>]">;
 
 defm check_sections: B<"check-sections",
     "Check section addresses for overlaps (default)",
     "Do not check section addresses for overlaps">;
 
 defm compress_debug_sections:
-  Eq<"compress-debug-sections", "Compress DWARF debug sections">;
+  Eq<"compress-debug-sections", "Compress DWARF debug sections">,
+  MetaVarName<"[none,zlib]">;
 
-defm defsym: Eq<"defsym", "Define a symbol alias">;
+defm defsym: Eq<"defsym", "Define a symbol alias">, MetaVarName<"<symbol>=<value>">;
 
 defm library_path:
   Eq<"library-path", "Add a directory to the library search path">, MetaVarName<"<dir>">;
 
 def O: JoinedOrSeparate<["-"], "O">, HelpText<"Optimize output file size">;
 
 defm Tbss: Eq<"Tbss", "Same as --section-start with .bss as the sectionname">;
 

 
 defm call_graph_ordering_file:
   Eq<"call-graph-ordering-file", "Layout sections to optimize the given callgraph">;
 
 // -chroot doesn't have a help text because it is an internal option.
 def chroot: Separate<["--", "-"], "chroot">;
 
 def color_diagnostics: F<"color-diagnostics">,
-  HelpText<"Use colors in diagnostics">;
+  HelpText<"Alias for --color-diagnostics=always">;
 
 def color_diagnostics_eq: J<"color-diagnostics=">,
-  HelpText<"Use colors in diagnostics; one of 'always', 'never', 'auto'">;
+  HelpText<"Use colors in diagnostics">,
+  MetaVarName<"[auto,always,never]">;
 
 defm cref: B<"cref",
     "Output cross reference table",
     "Do not output cross reference table">;
 
 defm define_common: B<"define-common",
     "Assign space to common symbols",
     "Do not assign space to common symbols">;

 defm filter: Eq<"filter", "Set DT_FILTER field to the specified name">;
 
 defm fini: Eq<"fini", "Specify a finalizer function">, MetaVarName<"<symbol>">;
 
 def fix_cortex_a53_843419: F<"fix-cortex-a53-843419">,
   HelpText<"Apply fixes for AArch64 Cortex-A53 erratum 843419">;
 
 defm format: Eq<"format", "Change the input format of the inputs following this option">,
-  MetaVarName<"<input-format>">;
+  MetaVarName<"[default,elf,binary]">;
 
 defm gc_sections: B<"gc-sections",
     "Enable garbage collection of unused sections",
     "Disable garbage collection of unused sections (default)">;
 
 defm gdb_index: B<"gdb-index",
     "Generate .gdb_index section",
     "Do not generate .gdb_index section (default)">;

 
 def omagic: Flag<["--"], "omagic">, MetaVarName<"<magic>">,
   HelpText<"Set the text and data sections to be readable and writable">;
 
 defm orphan_handling:
   Eq<"orphan-handling", "Control how orphan sections are handled when linker script used">;
 
 defm pack_dyn_relocs:
-  Eq<"pack-dyn-relocs", "Pack dynamic relocations in the given format (none or android)">,
-  MetaVarName<"<format>">;
+  Eq<"pack-dyn-relocs", "Pack dynamic relocations in the given format">,
+  MetaVarName<"[none,android]">;
 
 defm pie: B<"pie",
     "Create a position independent executable",
     "Do not create a position independent executable (default)">;
 
 defm print_gc_sections: B<"print-gc-sections",
     "List removed unused sections",
     "Do not list removed unused sections (default)">;

 defm threads: B<"threads",
     "Run the linker multi-threaded (default)",
     "Do not run the linker multi-threaded">;
 
 def trace: F<"trace">, HelpText<"Print the names of the input files">;
 
 defm trace_symbol: Eq<"trace-symbol", "Trace references to symbols">;
 
-defm undefined: Eq<"undefined", "Force undefined symbol during linking">;
+defm undefined: Eq<"undefined", "Force undefined symbol during linking">,
+  MetaVarName<"<symbol>">;
 
 defm unresolved_symbols:
   Eq<"unresolved-symbols", "Determine how to handle unresolved symbols">;
 
 defm undefined_version: B<"undefined-version",
   "Allow unused version in version script (default)",
   "Report version scripts that refer undefined symbols">;
 
-defm rsp_quoting:
-  Eq<"rsp-quoting", "Quoting style for response files. Values supported: windows|posix">;
+defm rsp_quoting: Eq<"rsp-quoting", "Quoting style for response files">,
+  MetaVarName<"[posix,windows]">;
 
 def v: Flag<["-"], "v">, HelpText<"Display the version number">;
 
 def verbose: F<"verbose">, HelpText<"Verbose mode">;
 
 def version: F<"version">, HelpText<"Display the version number and exit">;
 
 defm version_script: Eq<"version-script", "Read a version script">;

 def warn_unresolved_symbols: F<"warn-unresolved-symbols">,
   HelpText<"Report unresolved symbols as warnings">;
 
 defm whole_archive: B<"whole-archive",
     "Force load of all members in a static library",
     "Do not force load of all members in a static library (default)">;
 
 defm wrap: Eq<"wrap", "Use wrapper functions for symbol">,
-  MetaVarName<"<symbol>">;
+  MetaVarName<"<symbol>=<symbol>">;
 
 def z: JoinedOrSeparate<["-"], "z">, MetaVarName<"<option>">,
   HelpText<"Linker option extensions">;
 
 // Aliases
 def: Separate<["-"], "f">, Alias<auxiliary>, HelpText<"Alias for --auxiliary">;
 def: F<"call_shared">, Alias<Bdynamic>, HelpText<"Alias for --Bdynamic">;
 def: F<"dy">, Alias<Bdynamic>, HelpText<"Alias for --Bdynamic">;