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"),
<https://sourceware.org/ml/binutils/2003-05/msg00187.html> missing an
update here.

	gas/
	* config/tc-mips.c (md_show_usage): Correctly indicate the
	configuration-specific default ABI.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c3f32b2f8c0ece599307fd05d0591db0841576ba..a881afc3a256afe5823a2ede81664750267d12b7 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-23  Maciej W. Rozycki  <macro@mips.com>
+
+       * config/tc-mips.c (md_show_usage): Correctly indicate the
+       configuration-specific default ABI.
+
 2018-01-23  Maciej W. Rozycki  <macro@mips.com>
 
        * 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 8653e88dbb573ed050e9b34ebc7fcbc958e7884f..487ee78d90294d0d9521d5299052375110f32351 100644 (file)
--- 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