From: Jose E. Marchesi <jose.marchesi@oracle.com>
Date: Wed, 14 Sep 2016 14:15:24 +0000 (-0700)
Subject: gas: improve architecture mismatch diagnostics in sparc
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fc7514d6f2784390b7e6c65c0c9603ede0203f58;p=deliverable%2Fbinutils-gdb.git

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 --git a/gas/ChangeLog b/gas/ChangeLog
index 7ee260e35e..cde5c661ef 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 2fb3c5ac9e..70f5bfb4dd 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);