(ARCHITECTURES_CONFLICT_P): Add ChangeLog entry for v9a addition and fix typo

in macro.

diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 92369cdd17e744c0f178c731a15ea25fa85440a6..fb00ffe11aa60f095c17021a0d3242f06ce9ea89 100644 (file)
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,6 +1,7 @@
 Mon Jan 22 08:24:32 1996  Doug Evans  <dje@charmed.cygnus.com>
 
        * sparc.h (enum sparc_architecture): Add v9a.
+       (ARCHITECTURES_CONFLICT_P): Update.
 
 Thu Dec 28 13:27:53 1995  John Hassey  <hassey@rtp.dg.com>
 

diff --git a/include/opcode/sparc.h b/include/opcode/sparc.h
index 15c3bd3e93b92f45270d2ecdedc90adc7df0bf61..04df2d87c291bae0474e676a6eabc00169bd3981 100644 (file)
--- a/include/opcode/sparc.h
+++ b/include/opcode/sparc.h
@@ -51,7 +51,7 @@ extern const char *architecture_pname[];
 /* Sparclite and v9 are both supersets of v8; we can't bump between them.  */
 
 #define ARCHITECTURES_CONFLICT_P(ARCH1, ARCH2) \
-((ARCH1) == sparclite && ((ARCH2) == v9 || (ARCH2) == v9vis))
+((ARCH1) == sparclite && ((ARCH2) == v9 || (ARCH2) == v9a))
 
 struct sparc_opcode {
        const char *name;