This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] MIPS/GAS: Correct `as --help' always reporting `o32' as the default ABI


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b4f6242e95340a31b0519187c5fc329056ddecfd

commit b4f6242e95340a31b0519187c5fc329056ddecfd
Author: Maciej W. Rozycki <macro@mips.com>
Date:   Tue Jan 23 14:51:22 2018 +0000

    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:
---
 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 c3f32b2..a881afc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 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
 	`-mno-mips16e2' options.
 
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 8653e88..487ee78 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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]