From a5aae5087ca50f14e361cffe155ad3886afb56cb Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 24 Jun 2020 14:17:38 +0930 Subject: [PATCH] ld --help output It's best if help message output does not contain tabs, since we don't know tab stop settings or even if tabs are handled by the output device. This reverts some 2020-06-23 changes and fixes the csky help message. * lexsup.c (elf_shlib_list_options): Properly format help message. (elf_plt_unwind_list_options): Likewise. * emultempl/cskyelf.em (PARSE_AND_LIST_OPTIONS): Likewise. --- ld/ChangeLog | 6 ++++++ ld/emultempl/cskyelf.em | 14 ++++++++------ ld/lexsup.c | 14 +++++++------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 791795661a0..9f465b224d5 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2020-06-24 Alan Modra + + * lexsup.c (elf_shlib_list_options): Properly format help message. + (elf_plt_unwind_list_options): Likewise. + * emultempl/cskyelf.em (PARSE_AND_LIST_OPTIONS): Likewise. + 2020-06-23 Roland McGrath PR 22843 diff --git a/ld/emultempl/cskyelf.em b/ld/emultempl/cskyelf.em index e84ddb68dbd..f8f80662617 100644 --- a/ld/emultempl/cskyelf.em +++ b/ld/emultempl/cskyelf.em @@ -300,12 +300,14 @@ PARSE_AND_LIST_LONGOPTS=' {"stub-group-size", required_argument, NULL, OPTION_STUBGROUP_SIZE}, ' PARSE_AND_LIST_OPTIONS=' - fprintf (file, _(" --[no-]branch-stub\n")); - fprintf (file, _("\t\t\tDisable/enable use of stubs to expand branch " - "instructions that cannot reach the target.\n")); - fprintf (file, _(" --stub-group-size=N\n")); - fprintf (file, _("\t\t\tMaximum size of a group of input sections " - "handled by one stub section.")); + fprintf (file, _(" --[no-]branch-stub " + "Disable/enable use of stubs to expand branch\n" + " " + " instructions that cannot reach the target.\n")); + fprintf (file, _(" --stub-group-size=N " + "Maximum size of a group of input sections\n" + " " + " handled by one stub section.\n")); ' PARSE_AND_LIST_ARGS_CASES=' diff --git a/ld/lexsup.c b/ld/lexsup.c index 48c6eca99fd..d6e9367e9f7 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -1912,14 +1912,14 @@ elf_shlib_list_options (FILE *file) } fprintf (file, _("\ -P AUDITLIB, --depaudit=AUDITLIB\n" "\ - Specify a library to use for auditing dependencies\n")); + Specify a library to use for auditing dependencies\n")); fprintf (file, _("\ -z combreloc Merge dynamic relocs into one section and sort\n")); fprintf (file, _("\ -z nocombreloc Don't merge dynamic relocs into one section\n")); fprintf (file, _("\ -z global Make symbols in DSO available for subsequently\n\ - loaded objects\n")); + loaded objects\n")); fprintf (file, _("\ -z initfirst Mark DSO to be initialized first at runtime\n")); fprintf (file, _("\ @@ -1942,7 +1942,7 @@ elf_shlib_list_options (FILE *file) -z now Mark object non-lazy runtime binding\n")); fprintf (file, _("\ -z origin Mark object requiring immediate $ORIGIN\n\ - processing at runtime\n")); + processing at runtime\n")); #if DEFAULT_LD_Z_RELRO fprintf (file, _("\ -z relro Create RELRO program header (default)\n")); @@ -2000,13 +2000,13 @@ elf_static_list_options (FILE *file) --build-id[=STYLE] Generate build ID note\n")); fprintf (file, _("\ --compress-debug-sections=[none|zlib|zlib-gnu|zlib-gabi]\n\ - Compress DWARF debug sections using zlib\n")); + Compress DWARF debug sections using zlib\n")); #ifdef DEFAULT_FLAG_COMPRESS_DEBUG fprintf (file, _("\ - Default: zlib-gabi\n")); + Default: zlib-gabi\n")); #else fprintf (file, _("\ - Default: none\n")); + Default: none\n")); #endif fprintf (file, _("\ -z common-page-size=SIZE Set common page size to SIZE\n")); @@ -2031,7 +2031,7 @@ elf_plt_unwind_list_options (FILE *file) --ld-generated-unwind-info Generate exception handling info for PLT\n")); fprintf (file, _("\ --no-ld-generated-unwind-info\n\ - Don't generate exception handling info for PLT\n")); + Don't generate exception handling info for PLT\n")); } static void -- 2.30.2