[binutils-gdb] gas: improve architecture mismatch diagnostics in sparc

[Jose E.Marchesi <jemarch at sourceware dot org>]

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

commit fc7514d6f2784390b7e6c65c0c9603ede0203f58
Author: Jose E. Marchesi <jose.marchesi@oracle.com>
Date:   Wed Sep 14 07:15:24 2016 -0700

    gas: improve architecture mismatch diagnostics in sparc
    
    Merely dumping the mnemonic name in "architecture mismatch" errors may
    not provide enough information to determine what went wrong, as the same
    mnemonic can be used for different variants of an instruction pertaining
    to different architecture levels.
    
    This little patch makes the assembler to include the instruction
    arguments in the error message.
    
    gas/ChangeLog:
    
    2016-09-14  Jose E. Marchesi  <jose.marchesi@oracle.com>
    
    	* config/tc-sparc.c (sparc_ip): Print the instruction arguments
    	in "architecture mismatch" error messages.

Diff:
---
 gas/ChangeLog         | 5 +++++
 gas/config/tc-sparc.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7ee260e..cde5c66 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 2016-09-14  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
+	* config/tc-sparc.c (sparc_ip): Print the instruction arguments
+	in "architecture mismatch" error messages.
+
+2016-09-14  Jose E. Marchesi  <jose.marchesi@oracle.com>
+
 	* config/tc-sparc.c (md_assemble): Detect and warning on
 	unpredictable DCTI couples in certain arches.
 	(dcti_couples_detect): New global.
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 2fb3c5a..70f5bfb 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -3224,7 +3224,7 @@ sparc_ip (char *str, const struct sparc_opcode **pinsn)
 		  ++arch;
 		}
 
-	      as_bad (_("Architecture mismatch on \"%s\"."), str);
+	      as_bad (_("Architecture mismatch on \"%s %s\"."), str, argsStart);
 	      as_tsktsk (_(" (Requires %s; requested architecture is %s.)"),
 			 required_archs,
 			 sparc_opcode_archs[max_architecture].name);