From: Nick Clifton Date: Wed, 13 May 2020 09:59:02 +0000 (+0100) Subject: Have the linker's help text include the default setting of the --hash-style option... X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=ba311c5b10ea387d68c63bf61de0885aa150cd69;p=deliverable%2Fbinutils-gdb.git Have the linker's help text include the default setting of the --hash-style option, if relevent. PR 25979 * lexsup.c (elf_shlib_list_options): Include the default value for the hash style in the output text. --- diff --git a/ld/ChangeLog b/ld/ChangeLog index 9ad0996a20..5923e4ca36 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2020-05-13 Nick Clifton + + PR 25979 + * lexsup.c (elf_shlib_list_options): Include the default value for + the hash style in the output text. + 2020-05-11 Alan Modra * testsuite/ld-powerpc/pcrelopt.s: Add lxvp and stxvp. diff --git a/ld/lexsup.c b/ld/lexsup.c index d1955b9afa..c02041d5f1 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -1775,7 +1775,24 @@ elf_shlib_list_options (FILE *file) fprintf (file, _("\ --exclude-libs=LIBS Make all symbols in LIBS hidden\n")); fprintf (file, _("\ - --hash-style=STYLE Set hash style to sysv, gnu or both\n")); + --hash-style=STYLE Set hash style to sysv/gnu/both. Default: ")); + if (DEFAULT_EMIT_SYSV_HASH) + { + /* Note - these strings are not translated as + they are keywords not descriptive text. */ + if (DEFAULT_EMIT_GNU_HASH) + fprintf (file, "both\n"); + else + fprintf (file, "sysv\n"); + } + else + { + if (DEFAULT_EMIT_GNU_HASH) + fprintf (file, "gnu\n"); + else + /* FIXME: Can this happen ? */ + fprintf (file, "none\n"); + } fprintf (file, _("\ -P AUDITLIB, --depaudit=AUDITLIB\n" "\ Specify a library to use for auditing dependencies\n"));