make it compile again

SCCS-vsn: old/dbx/ops.tahoe.c 5.9
SCCS-vsn: old/dbx/ops.vax.c 5.12
SCCS-vsn: old/dbx/Makefile 5.28
SCCS-vsn: old/dbx/pathnames.h 5.4

diff --git a/usr/src/old/dbx/Makefile b/usr/src/old/dbx/Makefile
index bb97cf4..ab157d7 100644 (file)
--- a/usr/src/old/dbx/Makefile
+++ b/usr/src/old/dbx/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    5.27 (Berkeley) %G%
+#      @(#)Makefile    5.28 (Berkeley) %G%

 
 PROG=  dbx
 CFLAGS+=-I. -I${.CURDIR}
 
 PROG=  dbx
 CFLAGS+=-I. -I${.CURDIR}


@@ -17,7 +17,8 @@ OBJS+=        cerror.${MACHINE}.o commands.o date.o
 LDADD= -lcompat
 DPADD= ${LIBCOMPAT}
 CLEANFILES+=mkdate makedefs makedefs.o date.c y.tab.h dbx.5.0 \
 LDADD= -lcompat
 DPADD= ${LIBCOMPAT}
 CLEANFILES+=mkdate makedefs makedefs.o date.c y.tab.h dbx.5.0 \

-       ${HDRS} ${MACHINE}.h runtime.${MACHINE}.h ops.${MACHINE}.h
+       ${HDRS} ${MACHINE}.h runtime.${MACHINE}.h ops.${MACHINE}.h \
+       instrs.adb instrs.h

 
 .c.h:
        ./makedefs -f ${.CURDIR}/$*.c $*.h
 
 .c.h:
        ./makedefs -f ${.CURDIR}/$*.c $*.h


@@ -39,10 +40,18 @@ ops.h: ops.${MACHINE}.h
 date.c: mkdate
        ./mkdate > date.c
 
 date.c: mkdate
        ./mkdate > date.c
 

+.if    ${MACHINE} == "tahoe"
+instrs.adb:
+       ln -s /usr/src/bin/adb/adb.tahoe/instrs.adb ${.TARGET}
+.elif  ${MACHINE} == "vax"

 INSTR= ${.CURDIR}/../as.vax/instrs
 instrs.adb: ${INSTR}
        (echo FLAVOR ADB; cat ${INSTR}) | awk -f ${INSTR} > ${.TARGET}
 
 INSTR= ${.CURDIR}/../as.vax/instrs
 instrs.adb: ${INSTR}
        (echo FLAVOR ADB; cat ${INSTR}) | awk -f ${INSTR} > ${.TARGET}
 

+instrs.h:
+       ln -s ${.CURDIR}/../as.vax/instrs.h ${.TARGET}
+.endif
+

 .depend: ${HDRS} commands.o
 ${HDRS}: instrs.adb makedefs
 makedefs: makedefs.c library.o cerror.${MACHINE}.o
 .depend: ${HDRS} commands.o
 ${HDRS}: instrs.adb makedefs
 makedefs: makedefs.c library.o cerror.${MACHINE}.o

diff --git a/usr/src/old/dbx/ops.tahoe.c b/usr/src/old/dbx/ops.tahoe.c
index 3f35d8a..7d3ff5c 100644 (file)
--- a/usr/src/old/dbx/ops.tahoe.c
+++ b/usr/src/old/dbx/ops.tahoe.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ops.tahoe.c        5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)ops.tahoe.c        5.9 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -119,7 +119,7 @@ typedef struct {
 
 public Optab optab[] = {
 #define OP(a,b,c,d,e,f,g,h,i) {a,b,c,d,e,f,g,h,i}
 
 public Optab optab[] = {
 #define OP(a,b,c,d,e,f,g,h,i) {a,b,c,d,e,f,g,h,i}

-#include _PATH_ADBINSTR
+#include "instrs.adb"

 0};
 
 /*
 0};
 
 /*

diff --git a/usr/src/old/dbx/ops.vax.c b/usr/src/old/dbx/ops.vax.c
index d48107a..e191648 100644 (file)
--- a/usr/src/old/dbx/ops.vax.c
+++ b/usr/src/old/dbx/ops.vax.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ops.vax.c  5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)ops.vax.c  5.12 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -315,7 +315,7 @@ typedef struct {
 } Optab;
 
 #ifndef ASINSTRS
 } Optab;
 
 #ifndef ASINSTRS

-#define ASINSTRS "../as.vax/instrs.h"
+#define ASINSTRS "instrs.h"

 #endif
 
 #ifndef ADBINSTRS
 #endif
 
 #ifndef ADBINSTRS

diff --git a/usr/src/old/dbx/pathnames.h b/usr/src/old/dbx/pathnames.h
index 601dced..d92ee40 100644 (file)
--- a/usr/src/old/dbx/pathnames.h
+++ b/usr/src/old/dbx/pathnames.h
@@ -4,11 +4,10 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)pathnames.h 5.3 (Berkeley) %G%
+ *     @(#)pathnames.h 5.4 (Berkeley) %G%

  */
 
 #include <paths.h>
 
 #undef _PATH_TMP
 #define        _PATH_TMP       "/tmp/dbxXXXXXX"
  */
 
 #include <paths.h>
 
 #undef _PATH_TMP
 #define        _PATH_TMP       "/tmp/dbxXXXXXX"

-#define        _PATH_ADBINSTR  "/usr/src/bin/adb/adb.tahoe/instrs.adb"