From b4f6242e95340a31b0519187c5fc329056ddecfd Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 23 Jan 2018 14:51:22 +0000 Subject: [PATCH] MIPS/GAS: Correct `as --help' always reporting `o32' as the default ABI Remove an issue with `as --help' always reporting `o32' as the default ABI regardless of what the default actually is, originally caused by commit cac012d6d394 ("check mips abi x linker emulation compatibility"), missing an update here. gas/ * config/tc-mips.c (md_show_usage): Correctly indicate the configuration-specific default ABI. --- gas/ChangeLog | 5 +++++ gas/config/tc-mips.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index c3f32b2f8c..a881afc3a2 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2018-01-23 Maciej W. Rozycki + + * config/tc-mips.c (md_show_usage): Correctly indicate the + configuration-specific default ABI. + 2018-01-23 Maciej W. Rozycki * config/tc-mips.c (md_show_usage): Report `-mmips16e2' and diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 8653e88dbb..487ee78d90 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -20047,9 +20047,14 @@ MIPS options:\n\ fputc ('\n', stream); fprintf (stream, _("\ --32 create o32 ABI object file (default)\n\ --n32 create n32 ABI object file\n\ --64 create 64 ABI object file\n")); +-32 create o32 ABI object file%s\n"), + MIPS_DEFAULT_ABI == O32_ABI ? _(" (default)") : ""); + fprintf (stream, _("\ +-n32 create n32 ABI object file%s\n"), + MIPS_DEFAULT_ABI == N32_ABI ? _(" (default)") : ""); + fprintf (stream, _("\ +-64 create 64 ABI object file%s\n"), + MIPS_DEFAULT_ABI == N64_ABI ? _(" (default)") : ""); } #ifdef TE_IRIX