提交: b4f6242e95340a31b0519187c5fc329056ddecfd - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• 修訂: b4f6242e95340a31b0519187c5fc329056ddecfd (tree)
• 時間: 2018-01-23 23:51:22
• 作者: Maciej W. Rozycki <macro@mips...>
• Commiter: Maciej W. Rozycki

Log Message

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.

Change Summary

• modified: gas/ChangeLog
• modified: gas/config/tc-mips.c

差異

--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 2018-01-23  Maciej W. Rozycki  <[e-mail]>
 
+	* config/tc-mips.c (md_show_usage): Correctly indicate the
+	configuration-specific default ABI.
+
[phone]  Maciej W. Rozycki  <[e-mail]>
+
 	* config/tc-mips.c (md_show_usage): Report `-mmips16e2' and
 	`-mno-mips16e2' options.
 

--- 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