summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/usr.bin/gas/Makefile5
-rw-r--r--gnu/usr.bin/gas/opcode/m88k.h4
-rw-r--r--gnu/usr.bin/gas/read.c6
3 files changed, 9 insertions, 6 deletions
diff --git a/gnu/usr.bin/gas/Makefile b/gnu/usr.bin/gas/Makefile
index 6ea5e63ff51..c53124c4151 100644
--- a/gnu/usr.bin/gas/Makefile
+++ b/gnu/usr.bin/gas/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1998/04/25 06:48:34 niklas Exp $
+# $OpenBSD: Makefile,v 1.5 1998/11/01 01:38:13 smurph Exp $
# $NetBSD: Makefile,v 1.25 1997/10/25 10:10:35 lukem Exp $
# @(#)Makefile 6.1 (Berkeley) 3/3/91
TARGET_MACHINE_ARCH?= $(MACHINE_ARCH)
@@ -7,7 +7,8 @@ TARGET_MACHINE_ARCH?= $(MACHINE_ARCH)
(${TARGET_MACHINE_ARCH} == "m68k") || \
(${TARGET_MACHINE_ARCH} == "ns32k") || \
(${TARGET_MACHINE_ARCH} == "sparc") || \
- (${TARGET_MACHINE_ARCH} == "vax")
+ (${TARGET_MACHINE_ARCH} == "vax") || \
+ (${TARGET_MACHINE_ARCH} == "mvme88k")
.if exists(config/Makefile.$(TARGET_MACHINE_ARCH))
.include "config/Makefile.$(TARGET_MACHINE_ARCH)"
.endif
diff --git a/gnu/usr.bin/gas/opcode/m88k.h b/gnu/usr.bin/gas/opcode/m88k.h
index 8eede94cd6e..ff04e89450b 100644
--- a/gnu/usr.bin/gas/opcode/m88k.h
+++ b/gnu/usr.bin/gas/opcode/m88k.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88k.h,v 1.3 1998/02/15 18:50:05 niklas Exp $ */
+/* $OpenBSD: m88k.h,v 1.4 1998/11/01 01:38:13 smurph Exp $ */
/* m88k-opcode.h -- Instruction information for the Motorola 88000
Contributed by Devon Bowen of Buffalo University
@@ -261,7 +261,7 @@ static struct m88k_opcode m88k_opcodes[] =
_MC88xxx(0xf000e800, "tcnd", "M,1,V")
_MC88xxx(0x84005880, "trnc.sd", "d,2")
_MC88xxx(0x84005800, "trnc.ss", "d,2")
- _MC88xxx(0x8000c000, "xcr", "d,1,c")
+ _MC88xxx(0x8000c000, "xcr", "d,3,c")
_MC88xxx(0xf4000600, "xmem", "d,1[2]")
_MC88xxx(0xf4000400, "xmem", "d,1,2")
_MC88100(0x04000000, "xmem", "?d,1,I")
diff --git a/gnu/usr.bin/gas/read.c b/gnu/usr.bin/gas/read.c
index df16b052a99..35ea5a00c46 100644
--- a/gnu/usr.bin/gas/read.c
+++ b/gnu/usr.bin/gas/read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: read.c,v 1.7 1998/02/28 00:51:57 niklas Exp $ */
+/* $OpenBSD: read.c,v 1.8 1998/11/01 01:38:13 smurph Exp $ */
/* read.c - read a source file -
@@ -21,7 +21,7 @@
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifndef lint
-static char rcsid[] = "$OpenBSD: read.c,v 1.7 1998/02/28 00:51:57 niklas Exp $";
+static char rcsid[] = "$OpenBSD: read.c,v 1.8 1998/11/01 01:38:13 smurph Exp $";
#endif
#define MASK_CHAR (0xFF) /* If your chars aren't 8 bits, you will
@@ -55,7 +55,9 @@ The following table is indexed by [ (char) ] and will break if
#endif
#ifdef ALLOW_ATSIGN
+#ifndef AT
#define AT 2
+#endif
#else
#define AT 0
#endif