From 2d422c42341b356ed0a04e22060fca59dedfcf03 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Mon, 22 Jan 1996 16:41:31 +0000 Subject: [PATCH 1/1] (ARCHITECTURES_CONFLICT_P): Add ChangeLog entry for v9a addition and fix typo in macro. --- include/opcode/ChangeLog | 1 + include/opcode/sparc.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 92369cdd17..fb00ffe11a 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,6 +1,7 @@ Mon Jan 22 08:24:32 1996 Doug Evans * sparc.h (enum sparc_architecture): Add v9a. + (ARCHITECTURES_CONFLICT_P): Update. Thu Dec 28 13:27:53 1995 John Hassey diff --git a/include/opcode/sparc.h b/include/opcode/sparc.h index 15c3bd3e93..04df2d87c2 100644 --- 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; -- 2.34.1