Can now build kernel, not tested
authorNick Downing <downing.nick@gmail.com>
Wed, 4 Jan 2017 02:18:48 +0000 (13:18 +1100)
committerNick Downing <downing.nick@gmail.com>
Wed, 4 Jan 2017 02:18:48 +0000 (13:18 +1100)
76 files changed:
.gitignore
bin/ar/Makefile
bin/ar/n.sh
bin/as/n.sh
bin/cc/n.sh
bin/include/a.out.h [new symlink]
bin/include/nlist.h [new symlink]
bin/include/sys/exec.h [new symlink]
bin/ld/Makefile
bin/ld/n.sh
bin/n.sh [new file with mode: 0755]
bin/nm/Makefile
bin/nm/n.sh
bin/size.c
include/a.out.h
lib/c2/n.sh
lib/ccom/n.sh
lib/cpp/n.sh
lib/libc/gen/Makefile
lib/libc/gen/nlist.c
lib/libc/n.sh
lib/libkern/Makefile
lib/libkern/n.sh [new file with mode: 0755]
n.sh
sys/GENERIC/Make.pdp
sys/GENERIC/Make.pdpmba
sys/GENERIC/Make.pdpuba
sys/GENERIC/Make.sys
sys/GENERIC/Makefile
sys/GENERIC/include/a.out.h [new symlink]
sys/GENERIC/include/machine/machparam.h [new symlink]
sys/GENERIC/include/nlist.h [new symlink]
sys/GENERIC/include/sys/exec.h [new symlink]
sys/GENERIC/n.sh [new file with mode: 0755]
sys/GENERIC/vers.c
sys/GENERIC/version
sys/conf/checksys.c
sys/h/param.h
sys/pdp/genassym.c
sys/pdp/gencsym.c [new file with mode: 0644]
sys/pdp/machparam.h
sys/pdp/seg.h
ucb/Makefile
ucb/strcompact/Makefile [new file with mode: 0644]
ucb/strcompact/include/a.out.h [new symlink]
ucb/strcompact/include/nlist.h [new symlink]
ucb/strcompact/include/sys/exec.h [new symlink]
ucb/strcompact/krcompat.h [new file with mode: 0644]
ucb/strcompact/n.sh [new file with mode: 0755]
ucb/strcompact/strcompact.c [moved from ucb/strcompact.c with 52% similarity]
ucb/symcompact/Makefile [new file with mode: 0644]
ucb/symcompact/include/a.out.h [new symlink]
ucb/symcompact/include/nlist.h [new symlink]
ucb/symcompact/include/sys/exec.h [new symlink]
ucb/symcompact/krcompat.h [new file with mode: 0644]
ucb/symcompact/n.sh [new file with mode: 0755]
ucb/symcompact/symcompact.c [moved from ucb/symcompact.c with 64% similarity]
ucb/symdump.c [deleted file]
ucb/symdump/Makefile [new file with mode: 0644]
ucb/symdump/include/a.out.h [new symlink]
ucb/symdump/include/nlist.h [new symlink]
ucb/symdump/include/sys/exec.h [new symlink]
ucb/symdump/krcompat.h [new file with mode: 0644]
ucb/symdump/n.sh [new file with mode: 0755]
ucb/symdump/symdump.c [new file with mode: 0644]
ucb/symorder/Makefile [new file with mode: 0644]
ucb/symorder/include/a.out.h [new symlink]
ucb/symorder/include/nlist.h [new symlink]
ucb/symorder/include/sys/exec.h [new symlink]
ucb/symorder/krcompat.h [new file with mode: 0644]
ucb/symorder/n.sh [new file with mode: 0755]
ucb/symorder/symorder.c [moved from ucb/symorder.c with 59% similarity]
usr.bin/n.sh
usr.bin/ranlib/Makefile
usr.bin/ranlib/n.sh
usr.lib/libvmf/n.sh

index a690c4a..92e491e 100644 (file)
@@ -1,6 +1,7 @@
 *.[0-9]
 *.a
 *.o
+Makefile.bak
 cross
 bin/cc/cc
 bin/ar/ar
@@ -45,7 +46,14 @@ lib/libc/stdlib/stdliblib
 lib/libc/stdlib/stdliblib_p
 lib/libc/string/stringlib
 lib/libc/string/stringlib_p
+lib/libkern/*.s
 stage
+sys/GENERIC/assym.h
+sys/GENERIC/checksys
+sys/GENERIC/csym.h
+sys/GENERIC/genassym
+sys/GENERIC/gencsym
+sys/GENERIC/unix
 test/hello
 test/hello.i
 test/hello.s
index 01d2fe0..5354078 100644 (file)
@@ -1,6 +1,6 @@
 #      @(#)Makefile    5.8 (Berkeley) 3/10/91
 
-CFLAGS=-O -Iinclude -I.
+CFLAGS=-O -I.
 SEPFLAG=-i
 
 SRCS=  append.c ar.c archive.c contents.c delete.c extract.c misc.c \
index 7655be6..9feff61 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/bin\/ar$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/bin"
 mkdir --parents "$ROOT/cross/usr/man/cat1"
 mkdir --parents "$ROOT/cross/usr/man/cat5"
index 99451e6..8604ded 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/bin\/as$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/bin"
 make CC="$CC" SEPFLAG=
 make DESTDIR="$ROOT/cross" install
index 2128f5a..c242419 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/bin\/cc$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/bin"
 make CC="$CC" CROSSDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" SEPFLAG=
 make DESTDIR="$ROOT/cross" install
diff --git a/bin/include/a.out.h b/bin/include/a.out.h
new file mode 120000 (symlink)
index 0000000..7cb9895
--- /dev/null
@@ -0,0 +1 @@
+../../include/a.out.h
\ No newline at end of file
diff --git a/bin/include/nlist.h b/bin/include/nlist.h
new file mode 120000 (symlink)
index 0000000..1148fd2
--- /dev/null
@@ -0,0 +1 @@
+../../include/nlist.h
\ No newline at end of file
diff --git a/bin/include/sys/exec.h b/bin/include/sys/exec.h
new file mode 120000 (symlink)
index 0000000..01bc5c7
--- /dev/null
@@ -0,0 +1 @@
+../../../sys/h/exec.h
\ No newline at end of file
index 5ee8a67..864106f 100644 (file)
@@ -8,7 +8,7 @@ OBJS=ld.o ../../lib/libc/pdp/gen/nsym.o
 MAN=ld.0
 MANSRC=ld.1
 
-CFLAGS=-O -Iinclude -I../ar -DSTAGEDIR=\"${STAGEDIR}\" -DNUM_VM_PAGES=20
+CFLAGS=-O -I../ar -DSTAGEDIR=\"${STAGEDIR}\" -DNUM_VM_PAGES=20
 SEPFLAG=-i
 
 all:   ld ld.0
index 90a75b9..15407bb 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/bin\/ld$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/bin"
 mkdir --parents "$ROOT/cross/usr/man/cat1"
 make CC="$CC" STAGEDIR="$ROOT/stage" SEPFLAG= LDFLAGS="-L$ROOT/cross/usr/lib"
diff --git a/bin/n.sh b/bin/n.sh
new file mode 100755 (executable)
index 0000000..b3eeda5
--- /dev/null
+++ b/bin/n.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+ROOT="`pwd |sed -e 's/\/bin$//'`"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+mkdir --parents "$ROOT/cross/bin"
+make CC="$CC" SEPFLAG= size
+install -s size -m 755 "$ROOT/cross/bin"
index c3c9beb..2b1f325 100644 (file)
@@ -4,7 +4,7 @@
 SRCS=nm.c ../../lib/libc/pdp/gen/nsym.c
 OBJS=nm.o ../../lib/libc/pdp/gen/nsym.o
 
-CFLAGS=-O -Iinclude -I../ar
+CFLAGS=-O -I../ar
 SEPFLAG=-i
 
 all:   nm
index c046335..8047b83 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/bin\/nm$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/bin"
 make CC="$CC" SEPFLAG=
 make DESTDIR="$ROOT/cross" install
index 1330c8f..20ec704 100644 (file)
@@ -6,22 +6,33 @@ static        char *sccsid = "@(#)size.c      4.4.1 (2.11BSD GTE) 1/1/94";
  * size
  */
 
-#include       <stdio.h>
-#include       <a.out.h>
+#include <a.out.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef pdp11
+#include <sys/types.h>
+#define OFF_T off_t
+#else
+#include <stdint.h>
+#define OFF_T int32_t
+#endif
 
 int    header;
 
-main(argc, argv)
-char **argv;
-{
+int main(argc, argv) int argc; char **argv; {
+#ifndef pdp11
+       /* note: this has to be at least as large as struct exec */
+       unsigned char temp[sizeof(struct ovlhdr)];
+#endif
        struct exec buf;
-       long sum;
+       OFF_T sum;
        int gorp,i;
        int err = 0;
        FILE *f;
-#ifdef pdp11
+#if 1 /*def pdp11 for cross compilation always assume target is pdp11 */
        struct ovlhdr   ovlbuf;         /* overlay structure */
-       long    coresize;               /* total text size */
+       OFF_T   coresize;               /* total text size */
        short   skip;                   /* skip over overlay sizes of 0 */
 #endif
 
@@ -38,8 +49,23 @@ char **argv;
                        err++;
                        continue;
                }
+#ifdef pdp11
                if (fread((char *)&buf, sizeof(buf), 1, f) != 1 ||
                    N_BADMAG(buf)) {
+#else
+               if (fread(temp, sizeof(buf), 1, f) != 1)
+                       goto bad_read;
+               buf.a_magic = temp[0] | (temp[1] << 8);
+               buf.a_text = temp[2] | (temp[3] << 8);
+               buf.a_data = temp[4] | (temp[5] << 8);
+               buf.a_bss = temp[6] | (temp[7] << 8);
+               buf.a_syms = temp[8] | (temp[9] << 8);
+               buf.a_entry = temp[10] | (temp[11] << 8);
+               buf.a_unused = temp[12] | (temp[13] << 8);
+               buf.a_flag = temp[14] | (temp[15] << 8);
+               if (N_BADMAG(buf)) {
+               bad_read:
+#endif
                        printf("size: %s not an object file\n", *argv);
                        fclose(f);
                        err++;
@@ -50,13 +76,27 @@ char **argv;
                        header = 1;
                }
                printf("%u\t%u\t%u\t", buf.a_text,buf.a_data,buf.a_bss);
-               sum = (long) buf.a_text + (long) buf.a_data + (long) buf.a_bss;
+               sum = (OFF_T) buf.a_text + (OFF_T) buf.a_data + (OFF_T) buf.a_bss;
                printf("%ld\t%lx", sum, sum);
                if (gorp>2)
                        printf("\t%s", *argv);
-#ifdef pdp11
+#if 1 /*def pdp11 for cross compilation always assume target is pdp11 */
                if (buf.a_magic == A_MAGIC5 || buf.a_magic == A_MAGIC6) {
-                       fread(&ovlbuf,sizeof(ovlbuf),1,f);
+#ifdef pdp11
+                       if (fread(&ovlbuf,sizeof(ovlbuf),1,f) != 1)
+#else
+                       if (fread(temp,sizeof(ovlbuf),1,f) != 1)
+#endif
+                       {
+                               printf("size: %s not an overlay file\n", *argv);
+                               err++;
+                               continue;
+                       }
+#ifndef pdp11
+                       ovlbuf.max_ovl = temp[0] | (temp[1] << 8);
+                       for (i = 0; i < NOVL; ++i)
+                               ovlbuf.ov_siz[i] = temp[2 + i * 2] | (temp[3 + i * 2] << 8);
+#endif
                        coresize = buf.a_text;
                        for (i = 0; i < NOVL; i++)
                                coresize += ovlbuf.ov_siz[i];
index 6b5df21..267c7fb 100644 (file)
@@ -37,6 +37,7 @@
 #define        _AOUT_H_
 
 #include <sys/exec.h>
+
 #ifdef pdp11
 #include <sys/types.h>
 #define OFF_T off_t
index e3c7332..85fb700 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/lib\/c2$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/lib"
 make CC="$CC" SEPFLAG=
 make DESTDIR="$ROOT/cross" install
index 6de9868..07191fa 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/lib\/ccom$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/lib"
 make CC="$CC" LDC0FLAGS= LDC1FLAGS= PURFLAG=
 make DESTDIR="$ROOT/cross" install
index 811749c..7d0fe3d 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/lib\/cpp$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/lib"
 make CC="$CC" STAGEDIR="$ROOT/stage" SEPFLAG=
 make DESTDIR="$ROOT/cross" install
index 4e7902b..3fb7477 100644 (file)
@@ -420,6 +420,9 @@ nlist.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
 nlist.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
 nlist.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
 nlist.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+nlist.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+nlist.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+nlist.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
 opendir.o: opendir.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
 opendir.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
 opendir.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
index e733f47..e8e9302 100644 (file)
@@ -25,21 +25,40 @@ static char sccsid[] = "@(#)nlist.c 5.7.1 (2.11BSD GTE) 12/31/93";
 #include <sys/file.h>
 #include <a.out.h>
 #include <stdio.h>
+#include <string.h>
 
-typedef struct nlist NLIST;
-#define        _strx   n_un.n_strx
-#define        _name   n_un.n_name
-#define        ISVALID(p)      (p->_name && p->_name[0])
+#ifdef pdp11
+#include <sys/types.h>
+#define OFF_T off_t
+#else
+#include <stdint.h>
+#define OFF_T int32_t
+#endif
+
+#ifdef pdp11
+#define N_NAME(sp) ((sp)->n_un.n_name)
+#define ISVALID(sp) ((sp)->n_un.n_name && (sp)->n_un.n_name[0])
+#else
+#define N_NAME(sp) (strtab + (sp)->n_un.n_strx)
+#define ISVALID(sp) ((sp)->n_un.n_strx >= 0 && strtab[(sp)->n_un.n_strx])
+#endif
 
-nlist(name, list)
-       char *name;
-       NLIST *list;
+#ifdef pdp11
+int nlist(name, list) char *name; struct nlist *list;
+#else
+int nlist(name, list, strtab) char *name; struct nlist *list; char *strtab;
+#endif
 {
-       register NLIST *p, *s;
+       register struct nlist *p, *s;
+#ifndef pdp11
+       /* note: this has to be at least as large as struct nlist */
+       unsigned char temp[sizeof(struct xexec)];
+       int i;
+#endif
        struct xexec ebuf;
        FILE *fstr, *fsym;
-       NLIST nbuf;
-       off_t strings_offset, symbol_offset, symbol_size, lseek();
+       struct nlist nbuf;
+       OFF_T strings_offset, symbol_offset, symbol_size, lseek();
        int entries, len, maxlen;
        char sbuf[128];
 
@@ -47,14 +66,32 @@ nlist(name, list)
 
        if (!(fsym = fopen(name, "r")))
                return(-1);
-       if (fread((char *)&ebuf, 1, sizeof(ebuf), fsym) < sizeof (ebuf.e) ||
-           N_BADMAG(ebuf.e))
+#ifdef pdp11
+       if (fread((char *)&ebuf, sizeof(ebuf), 1, fsym) != 1)
+#else
+       if (fread(temp, sizeof(ebuf), 1, fsym) != 1)
+#endif
+               goto done1;
+#ifndef pdp11
+       ebuf.e.a_magic = temp[0] | (temp[1] << 8);
+       ebuf.e.a_text = temp[2] | (temp[3] << 8);
+       ebuf.e.a_data = temp[4] | (temp[5] << 8);
+       ebuf.e.a_bss = temp[6] | (temp[7] << 8);
+       ebuf.e.a_syms = temp[8] | (temp[9] << 8);
+       ebuf.e.a_entry = temp[10] | (temp[11] << 8);
+       ebuf.e.a_unused = temp[12] | (temp[13] << 8);
+       ebuf.e.a_flag = temp[14] | (temp[15] << 8);
+       ebuf.o.max_ovl = temp[16] | (temp[17] << 8);
+       for (i = 0; i < NOVL; ++i)
+               ebuf.o.ov_siz[i] = temp[18 + i * 2] | (temp[19 + i * 2] << 8);
+#endif
+       if (N_BADMAG(ebuf.e))
                goto done1;
 
        symbol_offset = N_SYMOFF(ebuf);
        symbol_size = ebuf.e.a_syms;
        strings_offset = N_STROFF(ebuf);
-       if (fseek(fsym, symbol_offset, L_SET))
+       if (fseek(fsym, (off_t)symbol_offset, L_SET))
                goto done1;
 
        if (!(fstr = fopen(name, "r")))
@@ -71,7 +108,7 @@ nlist(name, list)
                p->n_type = 0;
                p->n_ovly = 0;
                p->n_value = 0;
-               if ((len = strlen(p->_name)) > maxlen)
+               if ((len = strlen(N_NAME(p))) > maxlen)
                        maxlen = len;
        }
        if (++maxlen > sizeof(sbuf)) {          /* for the NULL */
@@ -80,16 +117,27 @@ nlist(name, list)
                goto done2;
        }
 
-       for (s = &nbuf; symbol_size; symbol_size -= sizeof(NLIST)) {
-               if (fread((char *)s, sizeof(NLIST), 1, fsym) != 1)
+       for (s = &nbuf; symbol_size; symbol_size -= sizeof(struct nlist)) {
+#if pdp11
+               if (fread((char *)s, sizeof(struct nlist), 1, fsym) != 1)
+#else
+               if (fread(temp, sizeof(struct nlist), 1, fsym) != 1)
+#endif
                        goto done2;
-               if (!s->_strx)
+#ifndef pdp11
+               s->n_un.n_strx = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+               s->n_type = temp[4];
+               s->n_ovly = temp[5];
+               s->n_value = temp[6] | (temp[7] << 8);
+#endif
+               if (!s->n_un.n_strx)
                        continue;
-               if (fseek(fstr, strings_offset + s->_strx, L_SET))
+               if (fseek(fstr, (off_t)strings_offset + s->n_un.n_strx, L_SET))
                        goto done2;
                (void)fread(sbuf, sizeof(sbuf[0]), maxlen, fstr);
+ /*fprintf(stderr, "%s %02x %02x %04x\n", sbuf, s->n_type, s->n_ovly, s->n_value);*/
                for (p = list; ISVALID(p); p++)
-                       if (!strcmp(p->_name, sbuf)) {
+                       if (!strcmp(N_NAME(p), sbuf)) {
                                p->n_value = s->n_value;
                                p->n_type = s->n_type;
                                p->n_ovly = s->n_ovly;
index 62523fd..3d95df1 100755 (executable)
@@ -1,6 +1,15 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/lib\/libc$//'`"
+AR="$ROOT/cross/bin/ar"
+AS="$ROOT/cross/bin/as"
+CC="$ROOT/cross/bin/cc"
+CPP="$ROOT/cross/lib/cpp"
+LD="$ROOT/cross/bin/ld"
+LORDER="$ROOT/cross/usr/bin/lorder"
+MKDEP="$ROOT/cross/usr/bin/mkdep"
+RANLIB="$ROOT/cross/usr/bin/ranlib"
 mkdir --parents "$ROOT/stage/lib"
-make CC="$ROOT/cross/bin/cc" MKDEP="$ROOT/cross/usr/bin/mkdep" depend
-make AR="$ROOT/cross/bin/ar" AS="$ROOT/cross/bin/as" CC="$ROOT/cross/bin/cc" CPP="$ROOT/cross/lib/cpp" LD="$ROOT/cross/bin/ld" LORDER="$ROOT/cross/usr/bin/lorder"
-make RANLIB="$ROOT/cross/usr/bin/ranlib" DESTDIR="$ROOT/stage" install
+mkdir --parents "$ROOT/stage/usr/lib"
+make CC="$CC" MKDEP="$MKDEP" depend
+make AR="$AR" AS="$AS" CC="$CC" CPP="$CPP" LD="$LD" LORDER="$LORDER"
+make RANLIB="$RANLIB" DESTDIR="$ROOT/stage" install
index fa8d4c1..60cbd38 100644 (file)
 # C library is installed) rather than compiling the sources each time 
 # a kernel is compiled..
 
-DEFS=  -DKERNEL
-CFLAGS=         -O ${DEFS} -I../libc/pdp/gen
-CPP=   /lib/cpp -P ${DEFS} -I../libc/pdp/gen
-AS=    /bin/as -u
-PREFIX=        /usr/src/lib/libc/pdp
+DEFS=-DKERNEL -I../libc/pdp/gen
+CFLAGS=-O ${DEFS}
+CPP=/lib/cpp
+PREFIX=../libc/pdp
 
 SRCS=  bcmp.s bcopy.s bzero.s ffs.s htonl.s htons.s insque.s \
        ldiv.s lmul.s lrem.s remque.s strlen.s udiv.s uldiv.s ulsh.s
@@ -24,47 +23,66 @@ OBJS=       bcmp.o bcopy.o bzero.o ffs.o htonl.o htons.o insque.o \
 
 .c.o:
        ${CC} ${CFLAGS} $*.c
-       ld -X -r $*.o
+       ${LD} -X -r $*.o
        mv a.out $*.o
 
 .s.o:
-       ${CPP} $*.s | ${AS} -o $*.o
-       ld -X -r $*.o
+       ${CPP} -P ${DEFS} $*.s | ${AS} -u -o $*.o
+       ${LD} -X -r $*.o
        mv a.out $*.o
 
 all: FRC libkern.a
 
 libkern.a: ${OBJS}
        rm -f libkern.a
-       ar rv libkern.a ${OBJS}
+       ${AR} rv libkern.a ${OBJS}
 
 clean:
        rm -f ${OBJS} ${SRCS} libkern.a
 
 depend: ${SRCS}
-       mkdep ${CFLAGS} ${SRCS}
+       ${MKDEP} ${CFLAGS} ${SRCS}
 
 install: FRC libkern.a
-       install -o root -g bin -m 644 libkern.a ${DESTDIR}/usr/lib/libkern.a
-       ranlib ${DESTDIR}/usr/lib/libkern.a
+#      install -o root -g bin -m 644 libkern.a ${DESTDIR}/usr/lib/libkern.a
+       install -m 644 libkern.a ${DESTDIR}/usr/lib/libkern.a
+       ${RANLIB} ${DESTDIR}/usr/lib/libkern.a
 
 FRC:
        rm -f ${SRCS}
-       ln ${PREFIX}/gen/bcmp.s bcmp.s 
-       ln ${PREFIX}/gen/bcopy.s bcopy.s
-       ln ${PREFIX}/gen/bzero.s bzero.s
-       ln ${PREFIX}/gen/ffs.s ffs.s
-       ln ${PREFIX}/gen/insque.s insque.s
-       ln ${PREFIX}/gen/remque.s remque.s
-       ln ${PREFIX}/gen/strlen.s strlen.s
-       ln ${PREFIX}/crt/ldiv.s ldiv.s
-       ln ${PREFIX}/crt/lmul.s lmul.s
-       ln ${PREFIX}/crt/lrem.s lrem.s
-       ln ${PREFIX}/crt/udiv.s udiv.s
-       ln ${PREFIX}/crt/uldiv.s uldiv.s
-       ln ${PREFIX}/crt/ulsh.s ulsh.s
-       ln ${PREFIX}/net/htonl.s htonl.s
-       ln ${PREFIX}/net/htons.s htons.s
+       ln -s ${PREFIX}/gen/bcmp.s bcmp.s 
+       ln -s ${PREFIX}/gen/bcopy.s bcopy.s
+       ln -s ${PREFIX}/gen/bzero.s bzero.s
+       ln -s ${PREFIX}/gen/ffs.s ffs.s
+       ln -s ${PREFIX}/gen/insque.s insque.s
+       ln -s ${PREFIX}/gen/remque.s remque.s
+       ln -s ${PREFIX}/gen/strlen.s strlen.s
+       ln -s ${PREFIX}/crt/ldiv.s ldiv.s
+       ln -s ${PREFIX}/crt/lmul.s lmul.s
+       ln -s ${PREFIX}/crt/lrem.s lrem.s
+       ln -s ${PREFIX}/crt/udiv.s udiv.s
+       ln -s ${PREFIX}/crt/uldiv.s uldiv.s
+       ln -s ${PREFIX}/crt/ulsh.s ulsh.s
+       ln -s ${PREFIX}/net/htonl.s htonl.s
+       ln -s ${PREFIX}/net/htons.s htons.s
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+bcmp.o: bcmp.s ../libc/pdp/gen/DEFS.h
+bcopy.o: bcopy.s ../libc/pdp/gen/DEFS.h
+bzero.o: bzero.s ../libc/pdp/gen/DEFS.h
+ffs.o: ffs.s ../libc/pdp/gen/DEFS.h
+htonl.o: htonl.s ../libc/pdp/gen/DEFS.h
+htons.o: htons.s ../libc/pdp/gen/DEFS.h
+insque.o: insque.s ../libc/pdp/gen/DEFS.h
+ldiv.o: ldiv.s ../libc/pdp/gen/DEFS.h
+lmul.o: lmul.s ../libc/pdp/gen/DEFS.h
+lrem.o: lrem.s ../libc/pdp/gen/DEFS.h
+remque.o: remque.s ../libc/pdp/gen/DEFS.h
+strlen.o: strlen.s ../libc/pdp/gen/DEFS.h
+udiv.o: udiv.s ../libc/pdp/gen/DEFS.h
+uldiv.o: uldiv.s ../libc/pdp/gen/DEFS.h
+ulsh.o: ulsh.s ../libc/pdp/gen/DEFS.h
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/lib/libkern/n.sh b/lib/libkern/n.sh
new file mode 100755 (executable)
index 0000000..bc7b6fc
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/sh
+ROOT="`pwd |sed -e 's/\/lib\/libkern$//'`"
+AR="$ROOT/cross/bin/ar"
+AS="$ROOT/cross/bin/as"
+CC="$ROOT/cross/bin/cc"
+CPP="$ROOT/cross/lib/cpp"
+LD="$ROOT/cross/bin/ld"
+LORDER="$ROOT/cross/usr/bin/lorder"
+MKDEP="$ROOT/cross/usr/bin/mkdep"
+RANLIB="$ROOT/cross/usr/bin/ranlib"
+mkdir --parents "$ROOT/stage/usr/lib"
+make CC="$CC" MKDEP="$MKDEP" depend
+make AR="$AR" AS="$AS" CC="$CC" CPP="$CPP" LD="$LD" LORDER="$LORDER"
+make RANLIB="$RANLIB" DESTDIR="$ROOT/stage" install
diff --git a/n.sh b/n.sh
index f69525b..d855493 100755 (executable)
--- a/n.sh
+++ b/n.sh
@@ -3,7 +3,7 @@
 ROOT="`pwd`"
 
 # set up to build cross toolchain
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 
 # create skeleton filesystem for cross toolchain
 mkdir --parents "$ROOT/cross/bin"
@@ -13,6 +13,7 @@ mkdir --parents "$ROOT/cross/usr/lib"
 mkdir --parents "$ROOT/cross/usr/man/cat1"
 mkdir --parents "$ROOT/cross/usr/man/cat3"
 mkdir --parents "$ROOT/cross/usr/man/cat5"
+mkdir --parents "$ROOT/cross/usr/ucb"
 
 # clean leftover files from other architecture
 make clean
@@ -21,6 +22,7 @@ make clean
 make -C usr.lib/libvmf CC="$CC"
 make -C usr.lib/libvmf DESTDIR="$ROOT/cross" install
 
+make -C bin CC="$CC" SEPFLAG= size
 make -C bin/ar CC="$CC" SEPFLAG=
 make -C bin/as CC="$CC" SEPFLAG=
 make -C bin/cc CC="$CC" CROSSDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" SEPFLAG=
@@ -29,9 +31,14 @@ make -C bin/nm CC="$CC" SEPFLAG=
 make -C lib/c2 CC="$CC" SEPFLAG=
 make -C lib/ccom CC="$CC" LDC0FLAGS= LDC1FLAGS= PURFLAG=
 make -C lib/cpp CC="$CC" STAGEDIR="$ROOT/stage" SEPFLAG=
+make -C ucb/strcompact CC="$CC" SEPFLAG= CROSSDIR="$ROOT/cross"
+make -C ucb/symcompact CC="$CC" SEPFLAG=
+make -C ucb/symdump CC="$CC" SEPFLAG=
+make -C ucb/symorder CC="$CC" SEPFLAG=
 make -C usr.bin CC="$ROOT/cross/bin/cc" NM="$ROOT/cross/bin/nm" lorder mkdep
 make -C usr.bin/ranlib CC="$CC" SEPFLAG=
 
+install bin/size -m 755 "$ROOT/cross/bin"
 make -C bin/ar DESTDIR="$ROOT/cross" install
 make -C bin/as DESTDIR="$ROOT/cross" install
 make -C bin/cc DESTDIR="$ROOT/cross" install
@@ -40,11 +47,15 @@ make -C bin/nm DESTDIR="$ROOT/cross" install
 make -C lib/c2 DESTDIR="$ROOT/cross" install
 make -C lib/ccom DESTDIR="$ROOT/cross" install
 make -C lib/cpp DESTDIR="$ROOT/cross" install
+make -C ucb/strcompact DESTDIR="$ROOT/cross" install
+make -C ucb/symcompact DESTDIR="$ROOT/cross" install
+make -C ucb/symdump DESTDIR="$ROOT/cross" install
+make -C ucb/symorder DESTDIR="$ROOT/cross" install
 install usr.bin/lorder -m 755 "$ROOT/cross/usr/bin"
 install usr.bin/mkdep -m 755 "$ROOT/cross/usr/bin"
 make -C usr.bin/ranlib DESTDIR="$ROOT/cross" install
 
-# now got cross toolchain installed, set up to build target 
+# now got cross toolchain installed, set up to build target
 AR="$ROOT/cross/bin/ar"
 AS="$ROOT/cross/bin/as"
 CC="$ROOT/cross/bin/cc"
@@ -53,6 +64,10 @@ LD="$ROOT/cross/bin/ld"
 LORDER="$ROOT/cross/usr/bin/lorder"
 MKDEP="$ROOT/cross/usr/bin/mkdep"
 RANLIB="$ROOT/cross/usr/bin/ranlib"
+SIZE="$ROOT/cross/bin/size"
+STRCOMPACT="$ROOT/cross/usr/ucb/strcompact"
+SYMCOMPACT="$ROOT/cross/usr/ucb/symcompact"
+SYMORDER="$ROOT/cross/usr/ucb/symorder"
 
 # create skeleton filesystem for target
 mkdir --parents "$ROOT/stage/lib"
@@ -61,6 +76,7 @@ mkdir --parents "$ROOT/stage/usr/lib"
 
 # clean leftover files from other architecture
 make clean
+make -C sys/GENERIC clean
 
 # do /usr/include first, since libc needs it
 make -C include SHARED=copies SYSDIR="$ROOT/sys" DESTDIR="$ROOT/stage" install
@@ -68,4 +84,16 @@ make -C include SHARED=copies SYSDIR="$ROOT/sys" DESTDIR="$ROOT/stage" install
 # do /lib/libc.a next, since everything needs it
 make -C lib/libc CC="$CC" MKDEP="$MKDEP" depend
 make -C lib/libc AR="$AR" AS="$AS" CC="$CC" CPP="$CPP" LD="$LD" LORDER="$LORDER"
-make -C lib/libc RANLIB="$RANLIB" DESTDIR="$ROOT/stage" install 
+make -C lib/libc RANLIB="$RANLIB" DESTDIR="$ROOT/stage" install
+
+# now we can build a test program, see test/hello.c
+
+# do /lib/libkern.a, since the kernel needs it
+make -C lib/libkern CC="$CC" MKDEP="$MKDEP" depend
+make -C lib/libkern AR="$AR" AS="$AS" CC="$CC" CPP="$CPP" LD="$LD" LORDER="$LORDER"
+make -C lib/libkern RANLIB="$RANLIB" DESTDIR="$ROOT/stage" install
+
+# now we can build the kernel
+make -C sys/GENERIC I="$ROOT/stage/usr/include" CC="$CC" MKDEP="$MKDEP" depend
+make -C sys/GENERIC I="$ROOT/stage/usr/include" AS="$AS" CC="$CC" CPP="$CPP" LD="$LD" SIZE="$SIZE" STRCOMPACT="$STRCOMPACT" SYMCOMPACT="$SYMCOMPACT" SYMORDER="$SYMORDER"
+make -C sys/GENERIC DESTDIR="$ROOT/stage" install
index c1c295e..9ea82a7 100644 (file)
@@ -34,21 +34,66 @@ SOBJS=      mch_backup.o mch_click.o mch_copy.o mch_csv.o \
        mch_dump.o mch_dzpdma.o mch_fpsim.o mch_KScall.o mch_profile.o \
        mch_start.o mch_trap.o mch_vars.o mch_xxx.o scb.o toy.o
 
+# note: use of ${SED} rather than sed is inconsistent with further down
 .c.o:
-       ${CC} ${CFLAGS} -S $*.c
-       ${SED} -f SPLFIX $*.s | ${AS} -u -o $*.o
+#      ${CC} ${CFLAGS} -S $*.c
+       ${CC} ${CFLAGS} -S $<
+       ${SED} -f SPLFIX $*.s | ${AS} -V -u -o $*.o
        rm -f $*.s
 
 .s.o:
-       ${CPP} $*.s | ${AS} -u -o $*.o
+#      ${CPP} -P ${DEFS} $*.s | ${AS} -V -u -o $*.o
+       ${CPP} -P ${DEFS} $< | ${AS} -V -u -o $*.o
 
-all: assym.h ${COBJS} ${SOBJS} ../pdp/symbols.sort
+all: assym.h csym.h ${COBJS} ${SOBJS} ../pdp/symbols.sort
 
 assym.h: genassym
        ./genassym > $@
 
-genassym:
-       ${CC} -O ${CFLAGS} ${M}/genassym.c -o $@
+csym.h: gencsym
+       ./gencsym > $@
+
+# genassym.c pulls in various header files in order to print sizeof(things),
+# no good when cross compiling because sizeof() on compile host is different,
+# so we compile it for the PDP-11, and THEN convert the *.s into a *.c file
+# for compile host; to access the host C compiler we use cc rather than ${CC}
+genassym: ${M}/genassym.c
+       ${CC} -O ${CFLAGS} -o x.s -S $<
+       (echo '#include <stdio.h>'; \
+echo '#include <stdlib.h>'; \
+echo 'char dummy[]={'; \
+sed -n \
+-e 's/^\(L[0-9]\+\):/};char \1[]={/' \
+-e 's/[ ,]\([0-7]\+\)/0\1,/g' \
+-e 's/\.byte//p' \
+x.s; \
+echo '};int main(){'; \
+sed -n \
+-e 's/^\(L[0-9]\+\)$$/printf(\1,/p' \
+-e 's/^\([0-7]\+\)$$/0\1);/p' \
+x.s; \
+echo 'exit(0);}') >x.c
+       cc -o $@ x.c
+       rm -f x.s x.c
+
+gencsym: ${M}/gencsym.c
+       ${CC} -O ${CFLAGS} -o x.s -S $<
+       (echo '#include <stdio.h>'; \
+echo '#include <stdlib.h>'; \
+echo 'char dummy[]={'; \
+sed -n \
+-e 's/^\(L[0-9]\+\):/};char \1[]={/' \
+-e 's/[ ,]\([0-7]\+\)/0\1,/g' \
+-e 's/\.byte//p' \
+x.s; \
+echo '};int main(){'; \
+sed -n \
+-e 's/^\(L[0-9]\+\)$$/printf(\1,/p' \
+-e 's/^\([0-7]\+\)$$/0\1);/p' \
+x.s; \
+echo 'exit(0);}') >x.c
+       cc -o $@ x.c
+       rm -f x.s x.c
 
 # it's a tab character in the sed statement below not a space.
 
@@ -57,7 +102,186 @@ genassym:
            | sed 's/^  //' | sort -u > ../pdp/symbols.sort
 
 depend:  assym.h
-       mkdep -f Make.pdp ${CFLAGS} ${CFILES} ${SFILES} ${M}/genassym.c
+       ${MKDEP} -f Make.pdp ${CFLAGS} ${CFILES} ${SFILES} ${M}/genassym.c
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+clock.o: ../machine/clock.c ../h/param.h
+clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+clock.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+clock.o: ../machine/clock.h
+conf.o: ../machine/conf.c ../h/param.h
+conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+conf.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/conf.h
+conf.o: ../h/buf.h ../h/time.h
+conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/ioctl.h
+conf.o: ../h/ttychars.h ../h/ttydev.h ../h/resource.h ../h/inode.h ../h/proc.h
+conf.o: ../h/clist.h ../h/tty.h ../h/ttychars.h ../h/ttydev.h rk.h tm.h hk.h
+conf.o: xp.h br.h ht.h rl.h ts.h tms.h si.h ra.h rx.h ram.h lp.h dh.h dz.h
+conf.o: pty.h dr.h dhu.h dhv.h dn.h ingres.h
+cons.o: ../machine/cons.c ../h/param.h
+cons.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+cons.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+cons.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+cons.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+cons.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+cons.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+cons.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/conf.h
+cons.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+cons.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+cons.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+cons.o: ../h/ioctl.h ../h/ttychars.h ../h/ttydev.h ../h/tty.h ../h/ttychars.h
+cons.o: ../h/ttydev.h ../h/systm.h ../machine/cons.h cn.h
+kern_pdp.o: ../machine/kern_pdp.c ../h/param.h
+kern_pdp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_pdp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_pdp.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_pdp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_pdp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_pdp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_pdp.o: ../h/signal.h
+kern_pdp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_pdp.o: ../machine/../machine/autoconfig.h ../machine/../machine/seg.h
+kern_pdp.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+kern_pdp.o: ../h/time.h /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_pdp.o: ../h/resource.h
+kern_pdp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_pdp.o: ../h/ioctl.h ../h/ttychars.h ../h/ttydev.h ../h/proc.h
+kern_pdp.o: ../h/kernel.h
+kern_pdp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h ../h/systm.h
+kern_pdp.o: ../machine/cpu.h ../h/tty.h ../h/ttychars.h ../h/ttydev.h tms.h
+kern_pdp.o: ra.h
+machdep.o: ../machine/machdep.c ../h/param.h
+machdep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+machdep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+machdep.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+machdep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+machdep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+machdep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+machdep.o: ../h/signal.h
+machdep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+machdep.o: ../machine/../machine/psl.h ../machine/../machine/reg.h
+machdep.o: ../h/signalvar.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+machdep.o: ../h/exec.h ../h/time.h
+machdep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+machdep.o: ../h/resource.h
+machdep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+machdep.o: ../h/buf.h ../h/map.h ../h/uba.h ../h/syslog.h
+machdep2.o: ../machine/machdep2.c ../h/param.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+machdep2.o: ../h/signal.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+machdep2.o: ../machine/../machine/seg.h ../machine/../machine/iopage.h
+machdep2.o: ../h/dir.h ../h/inode.h ../h/user.h ../h/../machine/fperr.h
+machdep2.o: ../h/dir.h ../h/exec.h ../h/time.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+machdep2.o: ../h/resource.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+machdep2.o: ../h/fs.h ../h/map.h ../h/buf.h ../h/text.h ../h/file.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/clist.h
+machdep2.o: ../h/uba.h ../h/callout.h ../h/reboot.h ../h/systm.h ram.h
+machdep2.o: ../h/msgbuf.h ../h/namei.h ../h/uio.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h ra.h
+machdep2.o: tms.h ingres.h ../h/disklabel.h ../h/mount.h
+machdep2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ec.h
+mem.o: ../machine/mem.c ../h/param.h
+mem.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+mem.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+mem.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+mem.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+mem.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+mem.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+mem.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+mem.o: ../machine/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+mem.o: ../h/dir.h ../h/exec.h ../h/time.h
+mem.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+mem.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/conf.h
+mem.o: ../h/uio.h
+ram.o: ../machine/ram.c ram.h
+trap.o: ../machine/trap.c ../h/param.h
+trap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+trap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+trap.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+trap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+trap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+trap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+trap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+trap.o: ../machine/../machine/psl.h ../machine/../machine/reg.h
+trap.o: ../machine/../machine/seg.h ../machine/../machine/trap.h
+trap.o: ../machine/../machine/iopage.h ../h/signalvar.h ../h/systm.h
+trap.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+trap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+trap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+trap.o: ../h/vm.h ../h/vmparam.h ../h/../machine/vmparam.h ../h/vmmac.h
+trap.o: ../h/vmmeter.h ../h/vmsystm.h
+mch_backup.o: ../machine/mch_backup.s ../machine/DEFS.h localopts.h assym.h
+mch_click.o: ../machine/mch_click.s ../machine/DEFS.h localopts.h assym.h
+mch_click.o: ../machine/../machine/mch_iopage.h
+mch_copy.o: ../machine/mch_copy.s ../machine/DEFS.h localopts.h assym.h
+mch_copy.o: ../machine/../machine/mch_iopage.h
+mch_csv.o: ../machine/mch_csv.s ../machine/DEFS.h localopts.h assym.h
+mch_csv.o: ../machine/../machine/mch_iopage.h ../machine/../machine/koverlay.h
+mch_dump.o: ../machine/mch_dump.s ../machine/DEFS.h localopts.h assym.h
+mch_dump.o: ../machine/../machine/mch_iopage.h ht.h tm.h ts.h
+mch_dzpdma.o: ../machine/mch_dzpdma.s ../machine/DEFS.h localopts.h assym.h
+mch_dzpdma.o: ../machine/../machine/mch_iopage.h
+mch_dzpdma.o: ../machine/../machine/koverlay.h dz.h
+mch_fpsim.o: ../machine/mch_fpsim.s ../machine/DEFS.h localopts.h assym.h
+mch_KScall.o: ../machine/mch_KScall.s ../machine/DEFS.h localopts.h assym.h
+mch_KScall.o: ../machine/../machine/mch_iopage.h
+mch_profile.o: ../machine/mch_profile.s
+mch_start.o: ../machine/mch_start.s ../machine/DEFS.h localopts.h assym.h
+mch_start.o: ../machine/../machine/mch_iopage.h ../machine/../machine/mch_cpu.h
+mch_start.o: ../machine/../machine/trap.h
+mch_trap.o: ../machine/mch_trap.s ../machine/DEFS.h localopts.h assym.h
+mch_trap.o: ../machine/../machine/mch_iopage.h ../machine/../machine/koverlay.h
+mch_trap.o: ../machine/../machine/trap.h
+mch_vars.o: ../machine/mch_vars.s ../machine/DEFS.h localopts.h assym.h
+mch_vars.o: ../machine/../machine/mch_iopage.h
+mch_xxx.o: ../machine/mch_xxx.s ../machine/DEFS.h localopts.h assym.h
+mch_xxx.o: ../machine/../machine/mch_iopage.h ../machine/../machine/koverlay.h
+scb.o: ../machine/scb.s ../machine/DEFS.h localopts.h assym.h
+scb.o: ../machine/../machine/trap.h ../machine/../machine/mch_iopage.h
+scb.o: ../machine/../machine/koverlay.h acc.h css.h de.h dh.h dhu.h dhv.h dn.h
+scb.o: dr.h dz.h ec.h hk.h ht.h il.h lp.h ra.h rk.h rl.h br.h rx.h si.h sri.h
+scb.o: tm.h ts.h tms.h xp.h vv.h
+toy.o: ../machine/toy.s
+genassym.o: ../machine/genassym.c
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h ../h/param.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+genassym.o: ../h/signal.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+genassym.o: ../machine/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+genassym.o: ../h/dir.h ../h/exec.h ../h/time.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+genassym.o: ../h/resource.h
+genassym.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+genassym.o: ../h/inode.h ../h/mbuf.h ../h/buf.h ../h/proc.h ../h/errno.h
+genassym.o: ../h/reboot.h /home/nick/src/211bsd.git/stage/usr/include/syscall.h
+genassym.o: ../h/vm.h ../h/vmparam.h ../h/../machine/vmparam.h ../h/vmmac.h
+genassym.o: ../h/vmmeter.h ../h/vmsystm.h dz.h ../machine/../net/netisr.h
+genassym.o: ../h/stddef.h
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
index 34631ba..ba6d88e 100644 (file)
@@ -19,13 +19,17 @@ OBJS=
 
 .c.o:
        ${CC} ${CFLAGS} -S $*.c
-       ${SED} -f SPLFIX $*.s | ${AS} -u -o $*.o
+       ${SED} -f SPLFIX $*.s | ${AS} -V -u -o $*.o
        rm -f $*.s
 
 all: ${OBJS}
 
 depend: 
-       mkdep -f Make.pdpmba ${CFLAGS} ${CFILES}
+       ${MKDEP} -f Make.pdpmba ${CFLAGS} ${CFILES}
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
index de40445..532900d 100644 (file)
@@ -22,14 +22,208 @@ OBJS=      br.o dh.o dhu.o dhv.o dkbad.o dn.o dr.o dz.o hk.o ht.o lp.o ra.o rk.o \
        rl.o rx.o si.o tm.o tmscp.o tmscpdump.o ts.o xp.o dn.o
 
 .c.o:
-       ${CC} ${CFLAGS} -S $*.c
-       ${SED} -f SPLFIX $*.s | ${AS} -u -o $*.o
+#      ${CC} ${CFLAGS} -S $*.c
+       ${CC} ${CFLAGS} -S $<
+       ${SED} -f SPLFIX $*.s | ${AS} -V -u -o $*.o
        rm -f $*.s
 
 all: ${OBJS}
 
 depend: 
-       mkdep -f Make.pdpuba ${CFLAGS} ${CFILES}
+       ${MKDEP} -f Make.pdpuba ${CFLAGS} ${CFILES}
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+br.o: ../pdpuba/br.c br.h
+dh.o: ../pdpuba/dh.c dh.h
+dn.o: ../pdpuba/dn.c dn.h
+dhu.o: ../pdpuba/dhu.c dhu.h
+dhv.o: ../pdpuba/dhv.c dhv.h
+dkbad.o: ../pdpuba/dkbad.c ../h/param.h
+dkbad.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+dkbad.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+dkbad.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+dkbad.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+dkbad.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+dkbad.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+dkbad.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+dr.o: ../pdpuba/dr.c dr.h
+dz.o: ../pdpuba/dz.c dz.h
+hk.o: ../pdpuba/hk.c hk.h ../h/param.h
+hk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+hk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+hk.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+hk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+hk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+hk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+hk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/systm.h
+hk.o: ../h/buf.h /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+hk.o: ../h/conf.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+hk.o: ../h/time.h /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+hk.o: ../h/resource.h /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+hk.o: ../h/map.h ../h/uba.h ../pdpuba/hkreg.h ../h/dkbad.h ../h/dk.h
+hk.o: ../h/stat.h ../h/file.h
+hk.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/disklabel.h
+hk.o: ../h/disk.h /home/nick/src/211bsd.git/stage/usr/include/sys/disklabel.h
+hk.o: ../h/syslog.h
+ht.o: ../pdpuba/ht.c ht.h ../h/param.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/buf.h
+ht.o: ../h/ioctl.h ../h/ttychars.h ../h/ttydev.h ../h/conf.h ../h/file.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/user.h
+ht.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+ht.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/mtio.h
+ht.o: ../h/fs.h ../pdpuba/htreg.h ../h/systm.h
+lp.o: ../pdpuba/lp.c lp.h
+ra.o: ../pdpuba/ra.c ra.h ../h/param.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ra.o: ../pdpuba/../machine/seg.h ../pdpuba/../machine/mscp.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/pdp/mscp_common.h
+ra.o: ../h/systm.h ../h/buf.h ../h/conf.h ../h/map.h ../h/syslog.h ../h/ioctl.h
+ra.o: ../h/ttychars.h ../h/ttydev.h ../h/uba.h ../pdpuba/rareg.h ../h/dk.h
+ra.o: ../h/disklabel.h ../h/disk.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/sys/disklabel.h ../h/errno.h
+ra.o: ../h/file.h /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+ra.o: ../h/stat.h /home/nick/src/211bsd.git/stage/usr/include/sys/kernel.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+ra.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rk.o: ../pdpuba/rk.c rk.h ../h/param.h
+rk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+rk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+rk.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+rk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+rk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+rk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/systm.h
+rk.o: ../h/buf.h ../h/conf.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+rk.o: ../h/exec.h ../h/time.h
+rk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+rk.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/dk.h
+rk.o: ../pdpuba/rkreg.h ../h/syslog.h ../h/map.h ../h/uba.h
+rl.o: ../pdpuba/rl.c rl.h ../h/param.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/buf.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h ../h/user.h
+rl.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/systm.h
+rl.o: ../h/conf.h ../h/dk.h ../h/file.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/ioctl.h
+rl.o: ../h/ttychars.h ../h/ttydev.h ../h/stat.h ../h/map.h ../h/uba.h
+rl.o: ../h/disklabel.h ../h/disk.h
+rl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/disklabel.h ../h/syslog.h
+rl.o: ../pdpuba/rlreg.h
+rx.o: ../pdpuba/rx.c rx.h ../h/param.h
+rx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+rx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+rx.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+rx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+rx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+rx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/buf.h
+rx.o: ../h/conf.h ../h/ioctl.h ../h/ttychars.h ../h/ttydev.h ../h/tty.h
+rx.o: ../h/ttychars.h ../h/ttydev.h ../pdpuba/rxreg.h ../h/errno.h ../h/map.h
+rx.o: ../h/uba.h
+si.o: ../pdpuba/si.c si.h
+tm.o: ../pdpuba/tm.c tm.h ../h/param.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/buf.h
+tm.o: ../h/conf.h ../h/file.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/user.h
+tm.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/ioctl.h
+tm.o: ../h/ttychars.h ../h/ttydev.h ../h/fs.h ../h/mtio.h ../h/kernel.h
+tm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h ../h/systm.h
+tm.o: ../pdpuba/tmreg.h ../h/syslog.h ../h/map.h ../h/uba.h
+tmscp.o: ../pdpuba/tmscp.c tms.h ../h/param.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/systm.h
+tmscp.o: ../h/buf.h ../h/conf.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+tmscp.o: ../h/exec.h ../h/time.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tmscp.o: ../h/resource.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/file.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/map.h
+tmscp.o: ../h/ioctl.h ../h/ttychars.h ../h/ttydev.h ../h/syslog.h ../h/mtio.h
+tmscp.o: ../h/uio.h ../h/tty.h ../h/ttychars.h ../h/ttydev.h ../h/uba.h
+tmscp.o: ../h/kernel.h /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+tmscp.o: ../pdpuba/tmscpreg.h ../pdpuba/../pdp/tmscp.h
+tmscp.o: /home/nick/src/211bsd.git/stage/usr/include/machine/mscp_common.h
+tmscp.o: ../pdpuba/../machine/seg.h
+tmscpdump.o: ../pdpuba/tmscpdump.c tms.h ../h/param.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tmscpdump.o: ../h/signal.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/buf.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+tmscpdump.o: ../pdpuba/tmscpreg.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/pdp/tmscp.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/machine/mscp_common.h
+tmscpdump.o: ../h/errno.h ../h/map.h ../h/uba.h
+tmscpdump.o: /home/nick/src/211bsd.git/stage/usr/include/pdp/seg.h
+ts.o: ../pdpuba/ts.c ts.h ../h/param.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/buf.h
+ts.o: ../h/conf.h ../h/file.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/user.h
+ts.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+ts.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/ioctl.h
+ts.o: ../h/ttychars.h ../h/ttydev.h ../h/fs.h ../pdpuba/tsreg.h ../h/mtio.h
+ts.o: ../h/map.h ../h/uba.h
+xp.o: ../pdpuba/xp.c xp.h ../h/param.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+xp.o: ../pdpuba/../machine/seg.h ../h/systm.h ../h/buf.h ../h/conf.h
+xp.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../pdpuba/hpreg.h
+xp.o: ../h/dkbad.h ../h/dk.h ../h/disklabel.h ../h/disk.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/disklabel.h ../h/file.h
+xp.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/map.h ../h/uba.h
+xp.o: ../h/stat.h ../h/syslog.h
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
index 0f486ae..a488bac 100644 (file)
@@ -53,14 +53,1013 @@ OBJS=     init_main.o init_sysent.o kern_acct.o kern_clock.o              \
        vm_swap.o vm_swp.o vm_text.o
 
 .c.o:
-       ${CC} ${CFLAGS} -S $*.c
-       ${SED} -f SPLFIX $*.s | ${AS} -u -o $*.o
+#      ${CC} ${CFLAGS} -S $*.c
+       ${CC} ${CFLAGS} -S $<
+       ${SED} -f SPLFIX $*.s | ${AS} -V -u -o $*.o
        rm -f $*.s
 
 all: ${OBJS}
 
 depend: 
-       mkdep -f Make.sys ${CFLAGS} ${CFILES}
+       ${MKDEP} -f Make.sys ${CFLAGS} ${CFILES}
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+init_main.o: ../sys/init_main.c ../h/param.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+init_main.o: ../h/signal.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+init_main.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+init_main.o: ../h/dir.h ../h/exec.h ../h/time.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+init_main.o: ../h/resource.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/fs.h
+init_main.o: ../h/mount.h /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h
+init_main.o: ../h/map.h ../h/proc.h ../h/ioctl.h ../h/ttychars.h ../h/ttydev.h
+init_main.o: ../h/inode.h ../h/conf.h ../h/buf.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/vm.h
+init_main.o: ../h/vmparam.h ../h/../machine/vmparam.h ../h/vmmac.h
+init_main.o: ../h/vmmeter.h ../h/vmsystm.h ../h/clist.h ../h/uba.h
+init_main.o: ../h/reboot.h ../h/systm.h ../h/kernel.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+init_main.o: ../h/namei.h ../h/uio.h
+init_main.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+init_main.o: ../h/disklabel.h ../h/stat.h
+init_sysent.o: ../sys/init_sysent.c ../h/param.h
+init_sysent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+init_sysent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+init_sysent.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+init_sysent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+init_sysent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+init_sysent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+init_sysent.o: ../h/signal.h
+init_sysent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+init_sysent.o: ../h/systm.h
+kern_acct.o: ../sys/kern_acct.c ../h/param.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_acct.o: ../h/signal.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_acct.o: ../h/systm.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+kern_acct.o: ../h/exec.h ../h/time.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_acct.o: ../h/resource.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_acct.o: ../h/msgbuf.h ../h/kernel.h
+kern_acct.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h ../h/acct.h
+kern_clock.o: ../sys/kern_clock.c ../h/param.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_clock.o: ../h/signal.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_clock.o: ../sys/../machine/psl.h ../sys/../machine/seg.h ../h/user.h
+kern_clock.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_clock.o: ../h/resource.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_clock.o: ../h/proc.h ../h/callout.h ../h/dk.h ../h/kernel.h
+kern_clock.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_clock.o: ../h/systm.h
+kern_descrip.o: ../sys/kern_descrip.c ../h/param.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_descrip.o: ../h/signal.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_descrip.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+kern_descrip.o: ../h/time.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_descrip.o: ../h/resource.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_descrip.o: ../h/proc.h ../h/file.h
+kern_descrip.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+kern_descrip.o: ../h/systm.h ../h/inode.h ../h/ioctl.h ../h/ttychars.h
+kern_descrip.o: ../h/ttydev.h ../h/stat.h ../h/conf.h ../h/syslog.h
+kern_exec.o: ../sys/kern_exec.c ../h/param.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_exec.o: ../h/signal.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_exec.o: ../sys/../machine/reg.h ../sys/../machine/seg.h ../h/systm.h
+kern_exec.o: ../h/map.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+kern_exec.o: ../h/exec.h ../h/time.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_exec.o: ../h/resource.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_exec.o: ../h/proc.h ../h/buf.h ../h/inode.h ../h/acct.h ../h/namei.h
+kern_exec.o: ../h/uio.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+kern_exec.o: ../h/fs.h ../h/mount.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/file.h
+kern_exec.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/text.h
+kern_exec.o: ../h/signalvar.h
+kern_exit.o: ../sys/kern_exit.c ../h/param.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_exit.o: ../h/signal.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_exit.o: ../sys/../machine/psl.h ../sys/../machine/reg.h ../h/systm.h
+kern_exit.o: ../h/map.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+kern_exit.o: ../h/exec.h ../h/time.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_exit.o: ../h/resource.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_exit.o: ../h/proc.h ../h/inode.h ../h/vm.h ../h/vmparam.h
+kern_exit.o: ../h/../machine/vmparam.h ../h/vmmac.h ../h/vmmeter.h
+kern_exit.o: ../h/vmsystm.h ../h/file.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/wait.h
+kern_exit.o: ../h/kernel.h
+kern_exit.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h ingres.h
+kern_fork.o: ../sys/kern_fork.c ../h/param.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_fork.o: ../h/signal.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_fork.o: ../sys/../machine/reg.h ../sys/../machine/seg.h ../h/systm.h
+kern_fork.o: ../h/map.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+kern_fork.o: ../h/exec.h ../h/time.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_fork.o: ../h/resource.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_fork.o: ../h/proc.h ../h/inode.h ../h/acct.h ../h/file.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/vm.h
+kern_fork.o: ../h/vmparam.h ../h/../machine/vmparam.h ../h/vmmac.h
+kern_fork.o: ../h/vmmeter.h ../h/vmsystm.h ../h/text.h ../h/kernel.h
+kern_fork.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_mman.o: ../sys/kern_mman.c ../h/param.h
+kern_mman.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_mman.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_mman.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_mman.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_mman.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_mman.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_mman.o: ../h/signal.h
+kern_mman.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_mman.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+kern_mman.o: ../h/dir.h ../h/exec.h ../h/time.h
+kern_mman.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_mman.o: ../h/resource.h
+kern_mman.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_mman.o: ../h/proc.h ../h/vm.h ../h/vmparam.h ../h/../machine/vmparam.h
+kern_mman.o: ../h/vmmac.h ../h/vmmeter.h ../h/vmsystm.h ../h/text.h
+kern_mman.o: ../h/systm.h
+kern_proc.o: ../sys/kern_proc.c ../h/param.h
+kern_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_proc.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_proc.o: ../h/signal.h
+kern_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_proc.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+kern_proc.o: ../h/time.h
+kern_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_proc.o: ../h/resource.h
+kern_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_proc.o: ../h/proc.h ../h/systm.h
+kern_prot.o: ../sys/kern_prot.c ../h/param.h
+kern_prot.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_prot.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_prot.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_prot.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_prot.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_prot.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_prot.o: ../h/signal.h
+kern_prot.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_prot.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+kern_prot.o: ../h/time.h
+kern_prot.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_prot.o: ../h/resource.h
+kern_prot.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_prot.o: ../h/proc.h ../h/systm.h
+kern_resource.o: ../sys/kern_resource.c ../h/param.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_resource.o: ../h/signal.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_resource.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+kern_resource.o: ../h/time.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_resource.o: ../h/resource.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_resource.o: ../h/proc.h ../h/systm.h ../h/vm.h ../h/vmparam.h
+kern_resource.o: ../h/../machine/vmparam.h ../h/vmmac.h ../h/vmmeter.h
+kern_resource.o: ../h/vmsystm.h ../h/kernel.h
+kern_resource.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_prot2.o: ../sys/kern_prot2.c ../h/param.h
+kern_prot2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_prot2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_prot2.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_prot2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_prot2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_prot2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_prot2.o: ../h/signal.h
+kern_prot2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_prot2.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+kern_prot2.o: ../h/time.h
+kern_prot2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_prot2.o: ../h/resource.h
+kern_prot2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_prot2.o: ../h/acct.h ../h/proc.h ../h/systm.h
+kern_sig.o: ../sys/kern_sig.c ../h/param.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sig.o: ../h/signal.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sig.o: ../sys/../machine/seg.h ../h/systm.h ../h/user.h
+kern_sig.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sig.o: ../h/resource.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_sig.o: ../h/inode.h ../h/proc.h ../h/text.h ../h/namei.h ../h/uio.h
+kern_sig.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+kern_sig.o: ../h/acct.h ../h/signalvar.h
+kern_subr.o: ../sys/kern_subr.c ../h/param.h
+kern_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_subr.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_subr.o: ../h/signal.h
+kern_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_subr.o: ../sys/../machine/seg.h ../h/systm.h ../h/user.h
+kern_subr.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+kern_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_subr.o: ../h/resource.h
+kern_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/buf.h
+kern_subr.o: ../h/uio.h
+kern_sysctl.o: ../sys/kern_sysctl.c
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sysctl.o: ../h/signal.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/user.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/../machine/fperr.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/systm.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/proc.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/buf.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/kernel.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/inode.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/text.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/tty.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vm.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmparam.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/../machine/vmparam.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmac.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmeter.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmsystm.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/map.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/sys/sysctl.h
+kern_sysctl.o: /home/nick/src/211bsd.git/stage/usr/include/machine/cpu.h
+kern_sysctl.o: ../h/conf.h
+kern_sig2.o: ../sys/kern_sig2.c
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sig2.o: ../h/signal.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/signal.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/signalvar.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/namei.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/uio.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/proc.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/systm.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/kernel.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/user.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/../machine/fperr.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
+kern_sig2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_synch.o: ../sys/kern_synch.c ../h/param.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_synch.o: ../h/signal.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_synch.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+kern_synch.o: ../h/dir.h ../h/exec.h ../h/time.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_synch.o: ../h/resource.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_synch.o: ../h/proc.h ../h/buf.h ../h/signal.h ../h/signalvar.h ../h/vm.h
+kern_synch.o: ../h/vmparam.h ../h/../machine/vmparam.h ../h/vmmac.h
+kern_synch.o: ../h/vmmeter.h ../h/vmsystm.h ../h/kernel.h
+kern_synch.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_synch.o: ../h/systm.h
+kern_time.o: ../sys/kern_time.c ../h/param.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_time.o: ../h/signal.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_time.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+kern_time.o: ../h/time.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_time.o: ../h/resource.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_time.o: ../h/proc.h ../h/kernel.h
+kern_time.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+kern_time.o: ../h/systm.h
+kern_xxx.o: ../sys/kern_xxx.c ../h/param.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_xxx.o: ../h/signal.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/user.h
+kern_xxx.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+kern_xxx.o: ../h/resource.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+kern_xxx.o: ../h/signal.h ../h/reboot.h ../h/kernel.h
+kern_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h ../h/systm.h
+kern_xxx.o: ../h/fs.h
+quota_sys.o: ../sys/quota_sys.c ../h/param.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_sys.o: ../h/signal.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_sys.o: ../h/systm.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+quota_sys.o: ../h/exec.h ../h/time.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_sys.o: ../h/resource.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+quota_sys.o: ../h/proc.h ../h/inode.h ../h/quota.h ../h/fs.h ../h/mount.h
+quota_sys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/uio.h
+quota_kern.o: ../sys/quota_kern.c ../h/param.h
+quota_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+quota_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+quota_kern.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+quota_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+quota_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_kern.o: ../h/signal.h
+quota_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_ufs.o: ../sys/quota_ufs.c ../h/param.h
+quota_ufs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+quota_ufs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+quota_ufs.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+quota_ufs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_ufs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+quota_ufs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_ufs.o: ../h/signal.h
+quota_ufs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_subr.o: ../sys/quota_subr.c ../h/param.h
+quota_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+quota_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+quota_subr.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+quota_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+quota_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota_subr.o: ../h/signal.h
+quota_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_log.o: ../sys/subr_log.c ../h/param.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_log.o: ../h/signal.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/user.h
+subr_log.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_log.o: ../h/resource.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+subr_log.o: ../h/ioctl.h ../h/ttychars.h ../h/ttydev.h ../h/msgbuf.h
+subr_log.o: ../h/file.h /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+subr_log.o: ../h/inode.h ../h/errno.h ../h/uio.h
+subr_log.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+subr_log.o: ../h/map.h
+subr_prf.o: ../sys/subr_prf.c ../h/param.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_prf.o: ../h/signal.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/user.h
+subr_prf.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_prf.o: ../h/resource.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+subr_prf.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+subr_prf.o: ../h/buf.h ../h/msgbuf.h ../h/conf.h ../h/ioctl.h ../h/ttychars.h
+subr_prf.o: ../h/ttydev.h ../h/tty.h ../h/ttychars.h ../h/ttydev.h
+subr_prf.o: ../h/reboot.h ../h/systm.h ../h/syslog.h
+subr_rmap.o: ../sys/subr_rmap.c ../h/param.h
+subr_rmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+subr_rmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+subr_rmap.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+subr_rmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_rmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+subr_rmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_rmap.o: ../h/signal.h
+subr_rmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_rmap.o: ../h/systm.h ../h/map.h ../h/vm.h ../h/vmparam.h
+subr_rmap.o: ../h/../machine/vmparam.h ../h/vmmac.h ../h/vmmeter.h
+subr_rmap.o: ../h/vmsystm.h
+subr_xxx.o: ../sys/subr_xxx.c ../h/param.h
+subr_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+subr_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+subr_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+subr_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+subr_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_xxx.o: ../h/signal.h
+subr_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/user.h
+subr_xxx.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+subr_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+subr_xxx.o: ../h/resource.h
+subr_xxx.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+sys_generic.o: ../sys/sys_generic.c ../h/param.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_generic.o: ../h/signal.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_generic.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+sys_generic.o: ../h/dir.h ../h/exec.h ../h/time.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_generic.o: ../h/resource.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+sys_generic.o: ../h/proc.h ../h/signalvar.h ../h/inode.h ../h/file.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/ioctl.h
+sys_generic.o: ../h/ttychars.h ../h/ttydev.h ../h/conf.h ../h/uio.h pty.h
+sys_generic.o: ../h/kernel.h
+sys_generic.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+sys_generic.o: ../h/systm.h
+sys_inode.o: ../sys/sys_inode.c ../h/param.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_inode.o: ../h/signal.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_inode.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+sys_inode.o: ../h/dir.h ../h/exec.h ../h/time.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_inode.o: ../h/resource.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+sys_inode.o: ../h/proc.h ../h/signalvar.h ../h/inode.h ../h/buf.h ../h/fs.h
+sys_inode.o: ../h/file.h /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+sys_inode.o: ../h/stat.h ../h/mount.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/conf.h
+sys_inode.o: ../h/uio.h ../h/ioctl.h ../h/ttychars.h ../h/ttydev.h ../h/tty.h
+sys_inode.o: ../h/ttychars.h ../h/ttydev.h ../h/kernel.h
+sys_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+sys_inode.o: ../h/systm.h ../h/syslog.h
+sys_kern.o: ../sys/sys_kern.c ../h/param.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_kern.o: ../h/signal.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_kern.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+sys_kern.o: ../h/dir.h ../h/exec.h ../h/time.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_kern.o: ../h/resource.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/file.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+sys_kern.o: ../h/socketvar.h ../h/inode.h ../h/proc.h ../h/namei.h ../h/uio.h
+sys_kern.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+sys_kern.o: ../h/mbuf.h ../h/map.h
+sys_pipe.o: ../sys/sys_pipe.c ../h/param.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_pipe.o: ../h/signal.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_pipe.o: ../h/systm.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+sys_pipe.o: ../h/exec.h ../h/time.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_pipe.o: ../h/resource.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+sys_pipe.o: ../h/inode.h ../h/file.h
+sys_pipe.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/fs.h
+sys_pipe.o: ../h/mount.h /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h
+sys_pipe.o: ../h/uio.h
+ingreslock.o: ../sys/ingreslock.c ingres.h
+sys_process.o: ../sys/sys_process.c ../h/param.h
+sys_process.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+sys_process.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+sys_process.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+sys_process.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_process.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+sys_process.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_process.o: ../h/signal.h
+sys_process.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_process.o: ../sys/../machine/psl.h ../sys/../machine/reg.h
+sys_process.o: ../sys/../machine/seg.h ../h/systm.h ../h/user.h
+sys_process.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+sys_process.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sys_process.o: ../h/resource.h
+sys_process.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+sys_process.o: ../h/proc.h ../h/inode.h ../h/text.h ../h/vm.h ../h/vmparam.h
+sys_process.o: ../h/../machine/vmparam.h ../h/vmmac.h ../h/vmmeter.h
+sys_process.o: ../h/vmsystm.h ../h/ptrace.h
+syscalls.o: ../sys/syscalls.c
+tty.o: ../sys/tty.c ../h/param.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/user.h
+tty.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/resource.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/ioctl.h
+tty.o: ../h/ttychars.h ../h/ttydev.h ../h/tty.h ../h/ttychars.h ../h/ttydev.h
+tty.o: ../h/proc.h ../h/file.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/conf.h
+tty.o: ../h/dk.h ../h/uio.h ../h/kernel.h
+tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h ../h/systm.h
+tty.o: ../h/inode.h ../h/syslog.h
+tty_conf.o: ../sys/tty_conf.c ../h/param.h
+tty_conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+tty_conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+tty_conf.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+tty_conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty_conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+tty_conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty_conf.o: ../h/signal.h
+tty_conf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty_conf.o: ../sys/../pdp/seg.h ../h/file.h
+tty_conf.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/ioctl.h
+tty_conf.o: ../h/ttychars.h ../h/ttydev.h ../h/tty.h ../h/ttychars.h
+tty_conf.o: ../h/ttydev.h ../h/errno.h ../h/conf.h sl.h
+tty_pty.o: ../sys/tty_pty.c pty.h
+tty_subr.o: ../sys/tty_subr.c ../h/param.h
+tty_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+tty_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+tty_subr.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+tty_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+tty_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty_subr.o: ../h/signal.h
+tty_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty_subr.o: ../sys/../machine/seg.h ../h/clist.h ../h/ioctl.h ../h/ttychars.h
+tty_subr.o: ../h/ttydev.h ../h/tty.h ../h/ttychars.h ../h/ttydev.h
+tty_tb.o: ../sys/tty_tb.c tb.h
+tty_tty.o: ../sys/tty_tty.c ../h/param.h
+tty_tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+tty_tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+tty_tty.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+tty_tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty_tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+tty_tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty_tty.o: ../h/signal.h
+tty_tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/user.h
+tty_tty.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+tty_tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tty_tty.o: ../h/resource.h
+tty_tty.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+tty_tty.o: ../h/ioctl.h ../h/ttychars.h ../h/ttydev.h ../h/tty.h
+tty_tty.o: ../h/ttychars.h ../h/ttydev.h ../h/conf.h
+ufs_alloc.o: ../sys/ufs_alloc.c ../h/param.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_alloc.o: ../h/signal.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_alloc.o: ../sys/../machine/seg.h ../h/fs.h ../h/dir.h ../h/inode.h
+ufs_alloc.o: ../h/buf.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+ufs_alloc.o: ../h/exec.h ../h/time.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_alloc.o: ../h/resource.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+ufs_alloc.o: ../h/kernel.h
+ufs_alloc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+ufs_alloc.o: ../h/mount.h /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h
+ufs_bio.o: ../sys/ufs_bio.c ../h/param.h
+ufs_bio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_bio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_bio.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_bio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_bio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_bio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_bio.o: ../h/signal.h
+ufs_bio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/buf.h
+ufs_bio.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+ufs_bio.o: ../h/time.h /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_bio.o: ../h/resource.h
+ufs_bio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/conf.h
+ufs_bio.o: ../h/fs.h ../h/dk.h ../h/systm.h ../h/map.h ../h/uba.h ../h/trace.h
+ufs_bio.o: ram.h
+ufs_bmap.o: ../sys/ufs_bmap.c ../h/param.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_bmap.o: ../h/signal.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_bmap.o: ../sys/../machine/seg.h ../h/systm.h ../h/conf.h ../h/dir.h
+ufs_bmap.o: ../h/inode.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+ufs_bmap.o: ../h/exec.h ../h/time.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_bmap.o: ../h/resource.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/buf.h
+ufs_bmap.o: ../h/fs.h ../h/mount.h
+ufs_bmap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/uio.h
+ufs_dsort.o: ../sys/ufs_dsort.c ../h/param.h
+ufs_dsort.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_dsort.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_dsort.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_dsort.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_dsort.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_dsort.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_dsort.o: ../h/signal.h
+ufs_dsort.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_dsort.o: ../h/systm.h ../h/buf.h ../h/dk.h
+ufs_fio.o: ../sys/ufs_fio.c ../h/param.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_fio.o: ../h/signal.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/user.h
+ufs_fio.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_fio.o: ../h/resource.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/fs.h
+ufs_fio.o: ../h/inode.h ../h/mount.h
+ufs_fio.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/namei.h
+ufs_fio.o: ../h/uio.h /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+ufs_fio.o: ../h/systm.h ../h/acct.h ../h/stat.h
+ufs_inode.o: ../sys/ufs_inode.c ../h/param.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_inode.o: ../h/signal.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_inode.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+ufs_inode.o: ../h/dir.h ../h/exec.h ../h/time.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_inode.o: ../h/resource.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+ufs_inode.o: ../h/proc.h ../h/inode.h ../h/fs.h ../h/mount.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/kernel.h
+ufs_inode.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h ../h/buf.h
+ufs_inode.o: ../h/text.h ../h/systm.h ../h/syslog.h
+ufs_mount.o: ../sys/ufs_mount.c ../h/param.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_mount.o: ../h/signal.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_mount.o: ../sys/../machine/seg.h ../h/systm.h ../h/user.h
+ufs_mount.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_mount.o: ../h/resource.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+ufs_mount.o: ../h/inode.h ../h/fs.h ../h/buf.h ../h/mount.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/file.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/namei.h
+ufs_mount.o: ../h/uio.h
+ufs_mount.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+ufs_mount.o: ../h/conf.h ../h/stat.h ../h/disklabel.h ../h/ioctl.h
+ufs_mount.o: ../h/ttychars.h ../h/ttydev.h
+ufs_namei.o: ../sys/ufs_namei.c ../h/param.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_namei.o: ../h/signal.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_namei.o: ../sys/../machine/seg.h ../h/systm.h ../h/dir.h ../h/inode.h
+ufs_namei.o: ../h/fs.h ../h/mount.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/user.h
+ufs_namei.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_namei.o: ../h/resource.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/buf.h
+ufs_namei.o: ../h/namei.h ../h/uio.h
+ufs_namei.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+ufs_subr.o: ../sys/ufs_subr.c ../h/param.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_subr.o: ../h/signal.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_subr.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+ufs_subr.o: ../h/dir.h ../h/exec.h ../h/time.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_subr.o: ../h/resource.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+ufs_subr.o: ../h/fs.h ../h/inode.h ../h/buf.h ../h/mount.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/kernel.h
+ufs_subr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h ../h/systm.h
+ufs_disksubr.o: ../sys/ufs_disksubr.c ../h/errno.h ../h/syslog.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_disksubr.o: ../h/signal.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/user.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/../machine/fperr.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/systm.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/buf.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/disklabel.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/disk.h
+ufs_disksubr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/disklabel.h
+ufs_syscalls2.o: ../sys/ufs_syscalls2.c ../h/param.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_syscalls2.o: ../h/signal.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_syscalls2.o: ../sys/../machine/seg.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+ufs_syscalls2.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+ufs_syscalls2.o: ../h/time.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_syscalls2.o: ../h/resource.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+ufs_syscalls2.o: ../h/inode.h ../h/buf.h ../h/fs.h ../h/namei.h ../h/uio.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+ufs_syscalls2.o: ../h/mount.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h
+ufs_syscalls2.o: ../h/kernel.h
+ufs_syscalls2.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+ufs_syscalls.o: ../sys/ufs_syscalls.c ../h/param.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_syscalls.o: ../h/signal.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_syscalls.o: ../h/systm.h ../h/user.h ../h/../machine/fperr.h ../h/dir.h
+ufs_syscalls.o: ../h/exec.h ../h/time.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ufs_syscalls.o: ../h/resource.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+ufs_syscalls.o: ../h/inode.h ../h/namei.h ../h/uio.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+ufs_syscalls.o: ../h/fs.h ../h/file.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/stat.h
+ufs_syscalls.o: ../h/kernel.h
+ufs_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+uipc_syscalls.o: ../sys/uipc_syscalls.c ../h/param.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+uipc_syscalls.o: ../h/signal.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+uipc_syscalls.o: ../sys/../machine/seg.h ../sys/../machine/psl.h ../h/systm.h
+uipc_syscalls.o: ../h/user.h ../h/../machine/fperr.h ../h/dir.h ../h/exec.h
+uipc_syscalls.o: ../h/time.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+uipc_syscalls.o: ../h/resource.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+uipc_syscalls.o: ../h/proc.h ../h/file.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+uipc_syscalls.o: ../h/inode.h ../h/buf.h ../h/mbuf.h ../h/protosw.h
+uipc_syscalls.o: ../h/socket.h ../h/socketvar.h ../h/uio.h ../h/domain.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/pdpif/if_uba.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/netinet/in.h
+uipc_syscalls.o: /home/nick/src/211bsd.git/stage/usr/include/netinet/in_systm.h
+vm_proc.o: ../sys/vm_proc.c ../h/param.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_proc.o: ../h/signal.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/user.h
+vm_proc.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_proc.o: ../h/resource.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+vm_proc.o: ../h/text.h ../h/map.h ../h/kernel.h
+vm_proc.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+vfs_vnops.o: ../sys/vfs_vnops.c
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vfs_vnops.o: ../h/signal.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/user.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/../machine/fperr.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/namei.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/uio.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/machine/seg.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/inode.h
+vfs_vnops.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+vm_sched.o: ../sys/vm_sched.c ../h/param.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_sched.o: ../h/signal.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/user.h
+vm_sched.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_sched.o: ../h/resource.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+vm_sched.o: ../h/text.h ../h/vm.h ../h/vmparam.h ../h/../machine/vmparam.h
+vm_sched.o: ../h/vmmac.h ../h/vmmeter.h ../h/vmsystm.h ../h/kernel.h
+vm_sched.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h ../h/systm.h
+vm_swap.o: ../sys/vm_swap.c ../h/param.h
+vm_swap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+vm_swap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+vm_swap.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+vm_swap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_swap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+vm_swap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_swap.o: ../h/signal.h
+vm_swap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_swap.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+vm_swap.o: ../h/dir.h ../h/exec.h ../h/time.h
+vm_swap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_swap.o: ../h/resource.h
+vm_swap.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+vm_swap.o: ../h/text.h ../h/map.h ../h/buf.h ../h/systm.h ../h/vm.h
+vm_swap.o: ../h/vmparam.h ../h/../machine/vmparam.h ../h/vmmac.h ../h/vmmeter.h
+vm_swap.o: ../h/vmsystm.h
+vm_swp.o: ../sys/vm_swp.c ../h/param.h
+vm_swp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+vm_swp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+vm_swp.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+vm_swp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_swp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+vm_swp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+vm_swp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_swp.o: ../sys/../machine/seg.h ../h/user.h ../h/../machine/fperr.h
+vm_swp.o: ../h/dir.h ../h/exec.h ../h/time.h
+vm_swp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_swp.o: ../h/resource.h
+vm_swp.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+vm_swp.o: ../h/buf.h ../h/conf.h ../h/systm.h ../h/vm.h ../h/vmparam.h
+vm_swp.o: ../h/../machine/vmparam.h ../h/vmmac.h ../h/vmmeter.h ../h/vmsystm.h
+vm_swp.o: ../h/trace.h ../h/uio.h
+vm_text.o: ../sys/vm_text.c ../h/param.h
+vm_text.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+vm_text.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+vm_text.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+vm_text.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_text.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+vm_text.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_text.o: ../h/signal.h
+vm_text.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_text.o: ../sys/../machine/seg.h ../h/map.h ../h/user.h
+vm_text.o: ../h/../machine/fperr.h ../h/dir.h ../h/exec.h ../h/time.h
+vm_text.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vm_text.o: ../h/resource.h
+vm_text.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h ../h/proc.h
+vm_text.o: ../h/text.h ../h/inode.h ../h/buf.h ../h/uio.h ../h/systm.h
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
index 5c77e9b..862fa23 100644 (file)
@@ -26,10 +26,14 @@ MB= ../pdpmba
 DEFS=  -DKERNEL ${OPTS} -I. -I${H}
 CFLAGS=        -O ${DEFS}
 
-CPP=   /lib/cpp -P ${DEFS}
-AS=    /bin/as -V
+CPP=   /lib/cpp
 ED=    /bin/ed
+MKDEP= /usr/bin/mkdep
 SED=   /bin/sed
+SIZE=  /bin/size
+STRCOMPACT=/usr/ucb/strcompact
+SYMCOMPACT=/usr/ucb/symcompact
+SYMORDER=/usr/ucb/symorder
 
 SUB=   sys pdp pdpuba pdpmba
 
@@ -82,14 +86,14 @@ LD_KOBJ=${CONF} ${BASE} \
 all: unix
 
 unix: ${SUB} ${KERNOBJ} checksys
-       ld -X -i -o unix ${LD_KOBJ}
-       size unix
+       ${LD} -X -i -o unix ${LD_KOBJ}
+       ${SIZE} unix
        @echo Compacting symbol table
-       -symcompact unix
+       -${SYMCOMPACT} unix
        @echo Compacting strings table
-       -strcompact unix
+       -${STRCOMPACT} unix
        @echo rearranging symbols
-       -symorder ../pdp/symbols.sort unix
+       -${SYMORDER} ../pdp/symbols.sort unix
        ./checksys unix
 
 vers.o: FRC
@@ -97,34 +101,38 @@ vers.o: FRC
        ${CC} -c vers.c
 
 boot.o: boot.s
-       ${CPP} boot.s | ${AS} -o boot.o
+       ${CPP} -P ${DEFS} boot.s | ${AS} -V -o boot.o
 
 param.o:
        ${CC} -S ${CFLAGS} param.c
        ${ED} - param.s < ../conf/:comm-to-bss
-       ${AS} -u -o param.o param.s
+       ${AS} -V -u -o param.o param.s
        rm -f param.s
 
 ioconf.o: ioconf.c
        ${CC} -c ${CFLAGS} ioconf.c
 
 sys pdp pdpuba pdpmba:
-       make -f Make.$@ I=${I} H=${H} M=${M} AS="${AS}" CPP="${CPP}" \
-           CFLAGS="${CFLAGS}" SED="${SED}"
+       make -f Make.$@ I="${I}" H="${H}" M="${M}" \
+           AS="${AS}" CPP="${CPP}" CC="${CC}" LD="${LD}" SED="${SED}" \
+           DEFS="${DEFS}" CFLAGS="${CFLAGS}"
 
-checksys: ../conf/checksys.c
-       ${CC} ${CFLAGS} -o $@ ../conf/checksys.c
+checksys: ../conf/checksys.c ../../lib/libc/gen/nlist.c ../../lib/libc/pdp/gen/nsym.c
+#      ${CC} ${CFLAGS} -o $@ ../conf/checksys.c
+       cc -I. -Iinclude -o $@ ../conf/checksys.c ../../lib/libc/gen/nlist.c ../../lib/libc/pdp/gen/nsym.c
 
 clean:
-       rm -f unix core mklog *.o assym.h genassym checksys
+       rm -f unix core mklog *.o assym.h csym.h genassym gencsym checksys
 
 install:
-       install -c -o root -g kmem -m 744 unix ${DESTDIR}/unix
+#      install -c -o root -g kmem -m 744 unix ${DESTDIR}/unix
+       install -m 644 unix ${DESTDIR}/unix
 
 depend: FRC
        for i in ${SUB}; do \
-               make -f Make.$$i CFLAGS="${CFLAGS}" depend; done
-       mkdep ${CFLAGS} param.c ioconf.c ../conf/checksys.c
+               make -f Make.$$i MKDEP="${MKDEP}" CFLAGS="${CFLAGS}" depend; \
+               done
+       ${MKDEP} ${CFLAGS} param.c ioconf.c ../conf/checksys.c
 
 TAGSFILE= ${S}/tags
 TLIST= ${H} ${I} ${N1} ${N2} ${N3} ${N4} ${N5} ${N6} ${M} ${S} ${U} ${MB} ${SS}
@@ -142,3 +150,49 @@ FRC:
 
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+param.o: param.c ../h/param.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/systm.h
+param.o: ../h/buf.h ../h/time.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+param.o: ../h/resource.h ../h/proc.h ../h/text.h ../h/file.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h ../h/dir.h
+param.o: ../h/inode.h ../h/fs.h ../h/mount.h
+param.o: /home/nick/src/211bsd.git/stage/usr/include/sys/fs.h ../h/callout.h
+param.o: ../h/map.h ../h/clist.h ../machine/seg.h
+ioconf.o: ioconf.c ../h/param.h
+ioconf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ioconf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ioconf.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ioconf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ioconf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ioconf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/signal.h
+ioconf.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ../h/systm.h
+checksys.o: ../conf/checksys.c
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/a.out.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+checksys.o: /home/nick/src/211bsd.git/stage/usr/include/varargs.h
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/sys/GENERIC/include/a.out.h b/sys/GENERIC/include/a.out.h
new file mode 120000 (symlink)
index 0000000..9dd9aa8
--- /dev/null
@@ -0,0 +1 @@
+../../../include/a.out.h
\ No newline at end of file
diff --git a/sys/GENERIC/include/machine/machparam.h b/sys/GENERIC/include/machine/machparam.h
new file mode 120000 (symlink)
index 0000000..6997c19
--- /dev/null
@@ -0,0 +1 @@
+../../../pdp/machparam.h
\ No newline at end of file
diff --git a/sys/GENERIC/include/nlist.h b/sys/GENERIC/include/nlist.h
new file mode 120000 (symlink)
index 0000000..0c27973
--- /dev/null
@@ -0,0 +1 @@
+../../../include/nlist.h
\ No newline at end of file
diff --git a/sys/GENERIC/include/sys/exec.h b/sys/GENERIC/include/sys/exec.h
new file mode 120000 (symlink)
index 0000000..cb6c115
--- /dev/null
@@ -0,0 +1 @@
+../../../h/exec.h
\ No newline at end of file
diff --git a/sys/GENERIC/n.sh b/sys/GENERIC/n.sh
new file mode 100755 (executable)
index 0000000..36ea672
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/sh
+ROOT="`pwd |sed -e 's/\/sys\/GENERIC$//'`"
+AS="$ROOT/cross/bin/as"
+CC="$ROOT/cross/bin/cc"
+CPP="$ROOT/cross/lib/cpp"
+LD="$ROOT/cross/bin/ld"
+MKDEP="$ROOT/cross/usr/bin/mkdep"
+SIZE="$ROOT/cross/bin/size"
+STRCOMPACT="$ROOT/cross/usr/ucb/strcompact"
+SYMCOMPACT="$ROOT/cross/usr/ucb/symcompact"
+SYMORDER="$ROOT/cross/usr/ucb/symorder"
+make I="$ROOT/stage/usr/include" CC="$CC" MKDEP="$MKDEP" depend
+make I="$ROOT/stage/usr/include" AS="$AS" CC="$CC" CPP="$CPP" LD="$LD" SIZE="$SIZE" STRCOMPACT="$STRCOMPACT" SYMCOMPACT="$SYMCOMPACT" SYMORDER="$SYMORDER"
+make DESTDIR="$ROOT/stage" install
index 92f8da6..bb554ee 100644 (file)
@@ -1 +1 @@
-char version[] = "2.11 BSD UNIX #115: Sat Apr 22 19:07:25 PDT 2000\n    sms1@curly.2bsd.com:/usr/src/sys/GENERIC\n";
+char version[] = "2.11 BSD UNIX #179: Wednesday 4 January 13:17:28 AEDT 2017\n    nick@nick-HP-Pavilion-x360-Convertible:/home/nick/src/211bsd.git/sys/GENERIC\n";
index ee977b5..a14f8d5 100644 (file)
@@ -1 +1 @@
-115
+179
index 5fbd186..e84505e 100644 (file)
  *     checks the system size and reports any limits exceeded.
  */
 
-#include "param.h"
-#include "user.h"
-#include "file.h"
-#include "ioctl.h"
-#include "clist.h"
-#include "a.out.h"
-#include "stdio.h"
-#include "namei.h"
-#include "msgbuf.h"
+#include <a.out.h>
+#include <fcntl.h>
+#include <nlist.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+/* take ctob(), btoc(), stob(), btos() from machine/machparam.h */
+/* defines USIZE by relying on a previously included "user.h", don't use it */
+#include <machine/machparam.h>
+#undef USIZE
+
+/* take USIZE etc from gencsym.s compiled from gencsym.c on PDP-11 compiler */
+#include "csym.h"
+
+#ifdef pdp11
+#include <sys/types.h>
+#define OFF_T off_t
+#else
+#include <stdint.h>
+#define OFF_T int32_t
+#endif
 
 /* Round up to a click boundary. */
 #define        cround(bytes)   ((bytes + ctob(1) - 1) / ctob(1) * ctob(1));
 #define        N_NLOG          20
 #define        N_NUMSYMS       21
 
-       struct  nlist   nl[N_NUMSYMS];
+       struct  nlist   nl[N_NUMSYMS+1];
 
-char   *names[] = {
-       "_end",                         /*  0 */
-       "_nbuf",                        /*  1 */
-       "_buf",                         /*  2 */
-       "_nproc",                       /*  3 */
-       "_proc",                        /*  4 */
-       "_ntext",                       /*  5 */
-       "_text",                        /*  6 */
-       "_nfile",                       /*  7 */
-       "_file",                        /*  8 */
-       "_ninode",                      /*  9 */
-       "_inode",                       /* 10 */
-       "_ncallout",                    /* 11 */
-       "_callout",                     /* 12 */
-       "_ucb_clist",                   /* 13 */
-       "_nclist",                      /* 14 */
-       "_ram_size",                    /* 15 */
-       "_xitdesc",                     /* 16 */
-       "_quotdesc",                    /* 17 */
-       "_namecache",                   /* 18 */
-       "__iosize",                     /* 19 */
-       "_nlog"                         /* 20 */
-       };
+char   strtab[] =
+       "_end\0"                        /*  0 */
+       "_nbuf\0"                       /*  1 */
+       "_buf\0"                        /*  2 */
+       "_nproc\0"                      /*  3 */
+       "_proc\0"                       /*  4 */
+       "_ntext\0"                      /*  5 */
+       "_text\0"                       /*  6 */
+       "_nfile\0"                      /*  7 */
+       "_file\0"                       /*  8 */
+       "_ninode\0"                     /*  9 */
+       "_inode\0"                      /* 10 */
+       "_ncallout\0"                   /* 11 */
+       "_callout\0"                    /* 12 */
+       "_ucb_clist\0"                  /* 13 */
+       "_nclist\0"                     /* 14 */
+       "_ram_size\0"                   /* 15 */
+       "_xitdesc\0"                    /* 16 */
+       "_quotdesc\0"                   /* 17 */
+       "_namecache\0"                  /* 18 */
+       "__iosize\0"                    /* 19 */
+       "_nlog";                        /* 20 */
 
 static struct exec obj;
 static struct ovlhdr ovlhdr;
 static int fi;
 
-main(argc, argv)
-       int argc;
-       char **argv;
-{
-       register int i;
+#undef PARAMS
+#ifdef __STDC__
+#include <stdarg.h>
+#define PARAMS(args) args
+#else
+#include <varargs.h>
+#define PARAMS(args) ()
+#endif
+
+#ifdef pdp11
+#define N_NAME(sp) ((sp)->n_un.n_name)
+int nlist PARAMS((char *name, struct nlist *list));
+#else
+#define N_NAME(sp) (strtab + (sp)->n_un.n_strx)
+int nlist PARAMS((char *name, struct nlist *list, char *strtab));
+#endif
+
+int main PARAMS((int argc, char **argv));
+static long getval PARAMS((int indx));
+       
+int main(argc, argv) int argc; char **argv; {
+       register int i, j;
+#ifndef pdp11
+       /* note: this must be at least as large as struct exec */
+       unsigned char temp[sizeof(struct ovlhdr)];
+#endif
        long size, totsize, ramdisk, getval();
        int errs = 0, texterrs = 0, ninode;
 
@@ -85,21 +119,52 @@ main(argc, argv)
 /*
  * Can't (portably) initialize unions, so we do it at run time
 */
-       for (i = 0; i < N_NUMSYMS; i++)
-               nl[i].n_un.n_name = names[i];
+       for (i = 0, j = 0; i < N_NUMSYMS; i++, j += strlen(strtab + j) + 1)
+#ifdef pdp11
+               nl[i].n_un.n_name = strtab + j;
+#else
+               nl[i].n_un.n_strx = j;
+       nl[N_NUMSYMS].n_un.n_strx = -1L;
+#endif
        if ((fi = open(argv[1], O_RDONLY)) < 0) {
                perror(argv[1]);
                exit(-1);
        }
-       if (read(fi, &obj, sizeof(obj)) != sizeof(obj)) {
+#ifdef pdp11
+       if (read(fi, &obj, sizeof(obj)) != sizeof(obj))
+#else
+       if (read(fi, temp, sizeof(obj)) != sizeof(obj))
+#endif
+       {
                fputs("checksys: can't read object header.\n", stderr);
                exit(-1);
        }
-       if (obj.a_magic == A_MAGIC5 || obj.a_magic == A_MAGIC6)
-               if (read(fi, &ovlhdr, sizeof(ovlhdr)) != sizeof(ovlhdr)) {
+#ifndef pdp11
+       obj.a_magic = temp[0] | (temp[1] << 8);
+       obj.a_text = temp[2] | (temp[3] << 8);
+       obj.a_data = temp[4] | (temp[5] << 8);
+       obj.a_bss = temp[6] | (temp[7] << 8);
+       obj.a_syms = temp[8] | (temp[9] << 8);
+       obj.a_entry = temp[10] | (temp[11] << 8);
+       obj.a_unused = temp[12] | (temp[13] << 8);
+       obj.a_flag = temp[14] | (temp[15] << 8);
+#endif
+       if (obj.a_magic == A_MAGIC5 || obj.a_magic == A_MAGIC6) {
+#ifdef pdp11
+               if (read(fi, &ovlhdr, sizeof(ovlhdr)) != sizeof(ovlhdr))
+#else
+               if (read(fi, temp, sizeof(ovlhdr)) != sizeof(ovlhdr))
+#endif
+               {
                        fputs("checksys: can't read overlay header.\n", stderr);
                        exit(-1);
                }
+#ifndef pdp11
+               ovlhdr.max_ovl = temp[0] | (temp[1] << 8);
+               for (i = 0; i < NOVL; ++i)
+                       ovlhdr.ov_siz[i] = temp[2 + i * 2] | (temp[3 + i * 2] << 8);
+#endif
+       }
        switch(obj.a_magic) {
 
        /*
@@ -205,7 +270,11 @@ checkov:
                exit(-1);
        }
 
+#ifdef pdp11
        (void)nlist(argv[1], nl);
+#else
+       (void)nlist(argv[1], nl, strtab);
+#endif
 
        if (!nl[N_NINODE].n_type) {
                puts("\"ninode\" not found in namelist.");
@@ -221,7 +290,7 @@ checkov:
                }
        totsize += (getval(N_NBUF) * MAXBSIZE);
        if (nl[N_CLIST].n_value)
-               totsize += cround(getval(N_CLIST) * (long)sizeof(struct cblock));
+               totsize += cround(getval(N_CLIST) * (long)CBLOCK_SIZE);
        if (nl[N_RAM].n_type)
                totsize += getval(N_RAM)*512;
        if (nl[N_QUOTDESC].n_type)
@@ -229,7 +298,7 @@ checkov:
        if (nl[N_XITDESC].n_type)
                totsize += (ninode * 3 * sizeof (long));
        if (nl[N_NAMECACHE].n_type)
-               totsize += (ninode * sizeof(struct namecache));
+               totsize += (ninode * NAMECACHE_SIZE);
        if (nl[N_IOSIZE].n_type)
                totsize += getval(N_IOSIZE);
        if (nl[N_NLOG].n_type)
@@ -239,7 +308,7 @@ checkov:
        for (i = 0; i < N_NUMSYMS; i++) {
                if (!(i % 3))
                        putchar('\n');
-               printf("\t%10.10s {0%06o}", nl[i].n_un.n_name+1, nl[i].n_value);
+               printf("\t%10.10s {0%06o}", N_NAME(nl+i)+1, nl[i].n_value);
        }
        putchar('\n');
        if (errs)
@@ -250,13 +319,14 @@ checkov:
 /*
  *  Get the value of an initialized variable from the object file.
  */
-static long
-getval(indx)
-       int indx;
-{
+static long getval(indx) int indx; {
        register int novl;
+#ifdef pdp11
        u_int ret;
-       off_t offst;
+#else
+       char temp[2];
+#endif
+       OFF_T offst;
 
        if ((nl[indx].n_type&N_TYPE) == N_BSS)
                return((long)0);
@@ -264,15 +334,20 @@ getval(indx)
        offst += obj.a_text;
        offst += sizeof(obj);
        if (obj.a_magic == A_MAGIC2 || obj.a_magic == A_MAGIC5)
-               offst -= (off_t)round(obj.a_text);
+               offst -= (OFF_T)round(obj.a_text);
        if (obj.a_magic == A_MAGIC5 || obj.a_magic == A_MAGIC6) {
                offst += sizeof ovlhdr;
                if (obj.a_magic == A_MAGIC5)
-                       offst -= (off_t)round(ovlhdr.max_ovl);
+                       offst -= (OFF_T)round(ovlhdr.max_ovl);
                for (novl = 0;novl < NOVL;novl++)
-                       offst += (off_t)ovlhdr.ov_siz[novl];
+                       offst += (OFF_T)ovlhdr.ov_siz[novl];
        }
-       (void)lseek(fi, offst, L_SET);
+       (void)lseek(fi, (off_t)offst, L_SET);
+#ifdef pdp11
        read(fi, &ret, sizeof(ret));
        return((long)ret);
+#else
+       read(fi, temp, 2);
+       return((long)(temp[0] + (temp[1] << 8)));
+#endif
 }
index 7a3aba5..33130aa 100644 (file)
@@ -15,7 +15,6 @@
  * Machine type dependent parameters.
  */
 #include <machine/machparam.h>
-
 /*
  * Machine-independent constants
  */
index e408a86..4f535bf 100644 (file)
@@ -6,6 +6,9 @@
  *     @(#)genassym.c  1.1 (2.10BSD Berkeley) 6/12/88
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "param.h"
 #include "../machine/seg.h"
 
 #include "vm.h"
 #include "dz.h"
 #include "../net/netisr.h"
-#include <stdio.h>
-
-struct proc proc[1];           /* satisfy proc.h and inode.h */
-struct inode inode[1];
-struct buf buf[1];
-
-main()
-{
-       {
-               struct buf *bp = 0;
-
-               printf("#define B_ADDR %o\n",&bp->b_un.b_addr);
-               printf("#define B_XMEM %o\n",&bp->b_xmem);
-       }
-
-       {
-               segm *se = 0;
-
-               printf("#define SE_ADDR %o\n",&se->se_addr);
-               printf("#define SE_DESC %o\n",&se->se_desc);
-       }
-
-       {
-               struct user *u = 0;
-
-               printf("#define U_AR0 %o\n",&u->u_ar0);
-               printf("#define U_CUROV %o\n",&u->u_ovdata.uo_curov);
-               printf("#define U_FPERR %o\n",&u->u_fperr);
-               printf("#define U_FPREGS %o\n",&u->u_fps.u_fpregs[0]);
-               printf("#define U_FPSR %o\n",&u->u_fps.u_fpsr);
-               printf("#define U_OVBASE %o\n",&u->u_ovdata.uo_ovbase);
-               printf("#define U_RU %o\n",&u->u_ru);
-               printf("#define U_PROCP %o\n",&u->u_procp);
-               printf("#define U_SSIZE %o\n",&u->u_ssize);
-               printf("#define U_STACK %o\n",u->u_stack);
-       }
-
-       {
-               struct fperr *f = 0;
-
-               printf("#define F_FEC %o\n",&f->f_fec);
-               printf("#define F_FEA %o\n",&f->f_fea);
-       }
-
-       {
-               struct k_rusage *ru = 0;
-
-               printf("#define RU_OVLY %o\n",&ru->ru_ovly);
-       }
-
-       {
-               struct vmrate *vm = 0;
-
-               printf("#define V_INTR %o\n",&vm->v_intr);
-               printf("#define V_SOFT %o\n",&vm->v_soft);
-               printf("#define V_PDMA %o\n",&vm->v_pdma);
-               printf("#define V_OVLY %o\n",&vm->v_ovly);
-       }
-
-       printf("#define NET_SBASE [_u+%d.]\n",NET_SBASE);
-       printf("#define NET_STOP [_u+%d.]\n",NET_STOP);
-       printf("#define KERN_SBASE [_u+%d.]\n",KERN_SBASE);
-       printf("#define KERN_STOP [_u+%d.]\n",KERN_STOP);
-
-       printf("#define DEV_BSIZE %d.\n",DEV_BSIZE);
-       printf("#define EFAULT %d.\n",EFAULT);
-       printf("#define ENOENT %d.\n",ENOENT);
-       printf("#define MAXBSIZE %d.\n",MAXBSIZE);
-       printf("#define NETISR_IMP %d.\n",NETISR_IMP);
-       printf("#define NETISR_IP %d.\n",NETISR_IP);
-       printf("#define NETISR_NS %d.\n",NETISR_NS);
-       printf("#define NETISR_RAW %d.\n",NETISR_RAW);
-       printf("#define NETISR_CLOCK %d.\n",NETISR_CLOCK);
-       printf("#define NOVL %d.\n",NOVL);
-       printf("#define RB_POWRFAIL %d.\n",RB_POWRFAIL);
-       printf("#define RB_SINGLE %d.\n",RB_SINGLE);
-       printf("#define SIGFPE %d.\n",SIGFPE);
-       printf("#define SIGILL %d.\n",SIGILL);
-       printf("#define SIGSEGV %d.\n",SIGSEGV);
-       printf("#define SIGTRAP %d.\n",SIGTRAP);
-       printf("#define SYS_execv %d.\n",SYS_execv);
-       printf("#define SYS_exit %d.\n",SYS_exit);
-       printf("#define USIZE %d.\n",USIZE);
 
+/* for offsetof() macro: */
+#include "stddef.h"
+
+struct item {
+       char *format;
+       int value;
+} items[] = {
+       {"#define B_ADDR %o\n", offsetof(struct buf, b_un.b_addr)},
+       {"#define B_XMEM %o\n", offsetof(struct buf, b_xmem)},
+
+       {"#define SE_ADDR %o\n", offsetof(segm, se_addr)},
+       {"#define SE_DESC %o\n", offsetof(segm, se_desc)},
+
+       {"#define U_AR0 %o\n", offsetof(struct user, u_ar0)},
+       {"#define U_CUROV %o\n", offsetof(struct user, u_ovdata.uo_curov)},
+       {"#define U_FPERR %o\n", offsetof(struct user, u_fperr)},
+       {"#define U_FPREGS %o\n", offsetof(struct user, u_fps.u_fpregs[0])},
+       {"#define U_FPSR %o\n", offsetof(struct user, u_fps.u_fpsr)},
+       {"#define U_OVBASE %o\n", offsetof(struct user, u_ovdata.uo_ovbase)},
+       {"#define U_RU %o\n", offsetof(struct user, u_ru)},
+       {"#define U_PROCP %o\n", offsetof(struct user, u_procp)},
+       {"#define U_SSIZE %o\n", offsetof(struct user, u_ssize)},
+       {"#define U_STACK %o\n", offsetof(struct user, u_stack)},
+
+       {"#define F_FEC %o\n", offsetof(struct fperr, f_fec)},
+       {"#define F_FEA %o\n", offsetof(struct fperr, f_fea)},
+
+       {"#define RU_OVLY %o\n", offsetof(struct k_rusage, ru_ovly)},
+
+       {"#define V_INTR %o\n", offsetof(struct vmrate, v_intr)},
+       {"#define V_SOFT %o\n", offsetof(struct vmrate, v_soft)},
+       {"#define V_PDMA %o\n", offsetof(struct vmrate, v_pdma)},
+       {"#define V_OVLY %o\n", offsetof(struct vmrate, v_ovly)},
+
+       {"#define NET_SBASE [_u+%d.]\n", NET_SBASE},
+       {"#define NET_STOP [_u+%d.]\n", NET_STOP},
+       {"#define KERN_SBASE [_u+%d.]\n", KERN_SBASE},
+       {"#define KERN_STOP [_u+%d.]\n", KERN_STOP},
+
+       {"#define DEV_BSIZE %d.\n", DEV_BSIZE},
+       {"#define EFAULT %d.\n", EFAULT},
+       {"#define ENOENT %d.\n", ENOENT},
+       {"#define MAXBSIZE %d.\n", MAXBSIZE},
+       {"#define NETISR_IMP %d.\n", NETISR_IMP},
+       {"#define NETISR_IP %d.\n", NETISR_IP},
+       {"#define NETISR_NS %d.\n", NETISR_NS},
+       {"#define NETISR_RAW %d.\n", NETISR_RAW},
+       {"#define       NETISR_CLOCK %d.\n", NETISR_CLOCK},
+       {"#define NOVL %d.\n", NOVL},
+       {"#define RB_POWRFAIL %d.\n", RB_POWRFAIL},
+       {"#define RB_SINGLE %d.\n", RB_SINGLE},
+       {"#define SIGFPE %d.\n", SIGFPE},
+       {"#define SIGILL %d.\n", SIGILL},
+       {"#define SIGSEGV %d.\n", SIGSEGV},
+       {"#define SIGTRAP %d.\n", SIGTRAP},
+       {"#define SYS_execv %d.\n", SYS_execv},
+       {"#define SYS_exit %d.\n", SYS_exit},
+       {"#define USIZE %d.\n", USIZE}
+};
+
+/* for compatibility with old genassym.c, not used at the moment: */
+int main() {
+       int i;
+
+       for (i = 0; i < sizeof(items) / sizeof(struct item); ++i)
+               printf(items[i].format, items[i].value);
        exit(0);
 }
diff --git a/sys/pdp/gencsym.c b/sys/pdp/gencsym.c
new file mode 100644 (file)
index 0000000..2d895ab
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1986 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)genassym.c  1.1 (2.10BSD Berkeley) 6/12/88
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "param.h"
+#include "user.h"
+#include "file.h"
+#include "ioctl.h"
+#include "clist.h"
+#include "namei.h"
+#include "msgbuf.h"
+
+/* for offsetof() macro: */
+/*#include "stddef.h"*/
+
+struct item {
+       char *format;
+       int value;
+} items[] = {
+       {"#define MAXBSIZE %d\n", MAXBSIZE},
+       {"#define CBLOCK_SIZE %d\n", sizeof(struct cblock)},
+       {"#define NAMECACHE_SIZE %d\n", sizeof(struct namecache)},
+       {"#define MSG_BSIZE %d\n", MSG_BSIZE},
+       {"#define USIZE %d\n", USIZE}
+};
+
+/* for compatibility with old genassym.c, not used at the moment: */
+int main() {
+       int i;
+
+       for (i = 0; i < sizeof(items) / sizeof(struct item); ++i)
+               printf(items[i].format, items[i].value);
+       exit(0);
+}
index e38de05..a99f0a8 100644 (file)
@@ -147,4 +147,4 @@ u_long      ntohl(), htonl();
 #define        KERNELADD(add)  ((int)(add)&~01)
 #define        ISSUPERADD(add) ((int)(add)&01)
 
-#endif ENDIAN
+#endif /* ENDIAN */
index ba47f3c..2e62d50 100644 (file)
@@ -60,7 +60,7 @@ u_int kdsa6;                  /* saved KDSA6, if any */
 #      ifndef ENABLE34
 #              define KDSA5    KISA5
 #              define KDSA6    KISA6
-#      endif !ENABLE34
+#      endif /* !ENABLE34 */
 #      define KDSD5    KISD5
 #      define KDSD6    KISD6
 #else
@@ -69,7 +69,7 @@ u_int kdsa6;                  /* saved KDSA6, if any */
 #              define  SDSA6   ((u_short *) 0172274)
 #              define  KDSA5   ((u_short *) 0172372)
 #              define  KDSA6   ((u_short *) 0172374)
-#      endif !ENABLE34
+#      endif /* !ENABLE34 */
 #      define SDSD5    ((u_short *) 0172232)
 #      define SDSD6    ((u_short *) 0172234)
 #      define KDSD5    ((u_short *) 0172332)
index 635f95f..31b8e6d 100644 (file)
@@ -12,8 +12,8 @@ SEPFLAG= -i
 # Programs that live in subdirectories, and have makefiles of their own.
 #
 SUBDIR=        Mail compress dbx error ex finger fp ftp indent lock man \
-       more msgs netstat pascal rdist sendbug talk tftp \
-       tn3270 tset vgrind vlp window
+       more msgs netstat pascal rdist sendbug strcompact symcompact \
+       symdump symorder talk tftp tn3270 tset vgrind vlp window
 
 # Shell scripts that need only be installed and are never removed.
 #
@@ -24,8 +24,8 @@ CSHSCRIPT= which
 #
 STD=   apply biff checknr colcrt colrm ctags expand fold \
        from gprof grep head last lastcomm leave logger mkstr \
-       printenv ruptime rwho sccs script soelim strings strcompact \
-       symcompact symdump symorder tail tcopy telnet unexpand unifdef users \
+       printenv ruptime rwho sccs script soelim strings \
+       tail tcopy telnet unexpand unifdef users \
        whois what wc xstr yes
 
 # C programs that live in the current directory and need explicit make lines.
@@ -46,7 +46,7 @@ ${SUBDIR}: FRC
        cd $@; make ${MFLAGS} SEPFLAG=${SEPFLAG}
 
 ${STD} ${KMEM} ${SETUID}:
-       cc ${CFLAGS} ${SEPFLAG} -o $@ $@.c
+       ${CC} ${CFLAGS} ${SEPFLAG} -o $@ $@.c
 
 install: ${STD} ${NSTD} ${KMEM} ${SETUID}
        -for i in ${SUBDIR}; do \
diff --git a/ucb/strcompact/Makefile b/ucb/strcompact/Makefile
new file mode 100644 (file)
index 0000000..0f1404f
--- /dev/null
@@ -0,0 +1,24 @@
+# Nick
+
+# using VPATH to compile ./nsym.o from ../../lib/libc/pdp/gen/nsym.c does not
+# work if there is a ../../lib/libc.pdp/gen/nsym.o leftover from building libc
+#VPATH=../../lib/libc/pdp/gen
+SRCS=strcompact.c ../../lib/libc/pdp/gen/nsym.c
+OBJS=strcompact.o ../../lib/libc/pdp/gen/nsym.o
+
+CFLAGS=-O -DCROSSDIR=\"${CROSSDIR}\"
+SEPFLAG=-i
+
+all:   strcompact
+
+strcompact: ${OBJS}
+       ${CC} ${SEPFLAG} -o $@ ${OBJS}
+
+install: all
+       install -s -m 755 strcompact ${DESTDIR}/usr/ucb
+
+lint:
+       lint -havx ${SRCS}
+
+clean:
+       rm -f ${OBJS} strcompact
diff --git a/ucb/strcompact/include/a.out.h b/ucb/strcompact/include/a.out.h
new file mode 120000 (symlink)
index 0000000..9dd9aa8
--- /dev/null
@@ -0,0 +1 @@
+../../../include/a.out.h
\ No newline at end of file
diff --git a/ucb/strcompact/include/nlist.h b/ucb/strcompact/include/nlist.h
new file mode 120000 (symlink)
index 0000000..0c27973
--- /dev/null
@@ -0,0 +1 @@
+../../../include/nlist.h
\ No newline at end of file
diff --git a/ucb/strcompact/include/sys/exec.h b/ucb/strcompact/include/sys/exec.h
new file mode 120000 (symlink)
index 0000000..0f3c005
--- /dev/null
@@ -0,0 +1 @@
+../../../../sys/h/exec.h
\ No newline at end of file
diff --git a/ucb/strcompact/krcompat.h b/ucb/strcompact/krcompat.h
new file mode 100644 (file)
index 0000000..62f9848
--- /dev/null
@@ -0,0 +1,19 @@
+#ifndef _KRCOMPAT_H
+#define _KRCOMPAT_H 1
+
+#undef PARAMS
+#ifdef __STDC__
+#include <stdarg.h>
+#define PARAMS(args) args
+#else
+#include <varargs.h>
+#define PARAMS(args) ()
+#endif
+
+#ifdef __GNUC__
+#define NORETURN __attribute__ ((noreturn))
+#else
+#define NORETURN
+#endif
+
+#endif
diff --git a/ucb/strcompact/n.sh b/ucb/strcompact/n.sh
new file mode 100755 (executable)
index 0000000..de0efef
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+ROOT="`pwd |sed -e 's/\/ucb\/strcompact$//'`"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+mkdir --parents "$ROOT/cross/usr/ucb"
+make CC="$CC" SEPFLAG= CROSSDIR="$ROOT/cross"
+make DESTDIR="$ROOT/cross" install
similarity index 52%
rename from ucb/strcompact.c
rename to ucb/strcompact/strcompact.c
index 6bd10b8..33fc998 100644 (file)
 #include <stdio.h>
 #include <a.out.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <sys/file.h>
+#include <unistd.h>
+#include "krcompat.h"
+
+#ifdef pdp11
+#include <sys/types.h>
+#define OFF_T off_t
+#else
+#include <stdint.h>
+#define OFF_T int32_t
+#endif
 
        char    *Pgm;
        char    *Sort = "/usr/bin/sort";
-       char    *Symdump = "/usr/ucb/symdump";
+       char    *Symdump = CROSSDIR "/usr/ucb/symdump";
 static char    strfn[32], symfn[32];
 
-main(argc, argv)
-       int     argc;
-       char    **argv;
-       {
+int main PARAMS((int argc, char **argv));
+void copyfile PARAMS((register FILE *in, register FILE *out));
+void fatal PARAMS((char *Pgm, char *str));
+void cleanup PARAMS((void));
+
+int main(argc, argv) int argc; char **argv; {
        struct  nlist   sym;
-       char    buf1[128], symname[64], savedname[64];
+#ifdef pdp11
+       char    buf1[128];
+#else
+/* CROSSDIR can be very long, really should check it, but fudge it for now */
+       char    buf1[BUFSIZ];
+#endif
+       char    symname[64], savedname[64];
+#ifndef pdp11
+       /* note: this has to be at least as large as struct(nlist) and OFF_T */
+       unsigned char temp[sizeof(struct xexec)];
+       int     i;
+#endif
        struct  xexec   xhdr;
        int     nsyms, len;
+       int     fd;
        FILE    *symfp, *strfp, *sortfp;
 register FILE  *fpin;
-       long    stroff;
-       unsigned short  type, value, ovly;
+       OFF_T   stroff;
+       unsigned /*short*/ type, value, ovly;
        void    cleanup();
 
        Pgm = argv[0];
-       signal(SIGQUIT, cleanup);
-       signal(SIGINT, cleanup);
-       signal(SIGHUP, cleanup);
+       signal(SIGQUIT, (sig_t)cleanup);
+       signal(SIGINT, (sig_t)cleanup);
+       signal(SIGHUP, (sig_t)cleanup);
 
        if      (argc != 2)
                {
@@ -71,11 +96,28 @@ register FILE       *fpin;
                        Pgm, argv[1]);
                exit(EX_NOINPUT);
                }
+#ifdef pdp11
        if      (fread(&xhdr, 1, sizeof (xhdr), fpin) < sizeof (xhdr.e))
+#else
+       if      (fread(temp, 1, sizeof (xhdr), fpin) < sizeof (xhdr.e))
+#endif
                {
                fprintf(stderr, "%s: premature EOF\n", Pgm);
                exit(EX_DATAERR);
                }
+#ifndef pdp11
+       xhdr.e.a_magic = temp[0] | (temp[1] << 8);
+       xhdr.e.a_text = temp[2] | (temp[3] << 8);
+       xhdr.e.a_data = temp[4] | (temp[5] << 8);
+       xhdr.e.a_bss = temp[6] | (temp[7] << 8);
+       xhdr.e.a_syms = temp[8] | (temp[9] << 8);
+       xhdr.e.a_entry = temp[10] | (temp[11] << 8);
+       xhdr.e.a_unused = temp[12] | (temp[13] << 8);
+       xhdr.e.a_flag = temp[14] | (temp[15] << 8);
+       xhdr.o.max_ovl = temp[16] | (temp[17] << 8);
+       for (i = 0; i < NOVL; ++i)
+               xhdr.o.ov_siz[i] = temp[18 + i * 2] | (temp[19 + i * 2] << 8);
+#endif
        if      (N_BADMAG(xhdr.e))
                {
                fprintf(stderr, "%s: Bad magic number\n", Pgm);
@@ -88,11 +130,6 @@ register FILE       *fpin;
                exit(EX_OK);
                }
 
-       strcpy(strfn, "/tmp/strXXXXXX");
-       mktemp(strfn);
-       strcpy(symfn, "/tmp/symXXXXXX");
-       mktemp(symfn);
-
        sprintf(buf1, "%s %s | %s +0 -1 +1n -2 +2n -3 +3n -4 -u", Symdump,
                argv[1], Sort);
        sortfp = popen(buf1, "r");
@@ -101,15 +138,20 @@ register FILE     *fpin;
                fprintf(stderr, "%s: symdump | sort failed\n", Pgm);
                exit(EX_SOFTWARE);
                }
-       symfp = fopen(symfn, "w+");
-       strfp = fopen(strfn, "w+");
-       if      (!symfp || !strfp)
+       strcpy(symfn, "/tmp/symXXXXXX");
+       if      ((fd =  mkstemp(symfn)) == -1 || !(symfp = fdopen(fd, "w+")))
                {
-               fprintf(stderr, "%s: can't create %s or %s\n", symfn, strfn);
+               fprintf(stderr, "%s: can't create %s\n", Pgm, symfn);
+               exit(EX_CANTCREAT);
+               }
+       strcpy(strfn, "/tmp/strXXXXXX");
+       if      ((fd = mkstemp(strfn)) == -1 || !(strfp = fdopen(fd, "w+")))
+               {
+               fprintf(stderr, "%s: can't create %s\n", Pgm, strfn);
                exit(EX_CANTCREAT);
                }
 
-       stroff = sizeof (long);
+       stroff = sizeof (OFF_T);
        len = 0;
        nsyms = 0;
        while   (fscanf(sortfp, "%s %u %u %u\n", symname, &type, &ovly,
@@ -126,7 +168,19 @@ register FILE      *fpin;
                sym.n_type = type;
                sym.n_ovly = ovly;
                sym.n_value = value;
+#ifdef pdp11
                fwrite(&sym, sizeof (sym), 1, symfp);
+#else
+               temp[0] = (sym.n_un.n_strx >> 16) & 0xff;
+               temp[1] = (sym.n_un.n_strx >> 24) & 0xff;
+               temp[2] = sym.n_un.n_strx & 0xff;
+               temp[3] = (sym.n_un.n_strx >> 8) & 0xff;
+               temp[4] = sym.n_type & 0xff;
+               temp[5] = sym.n_ovly & 0xff;
+               temp[6] = sym.n_value & 0xff;
+               temp[7] = (sym.n_value >> 8) & 0xff;
+               fwrite(temp, sizeof (sym), 1, symfp);
+#endif
                nsyms++;
                }
        stroff += len;
@@ -137,7 +191,7 @@ register FILE       *fpin;
 
        if      (nsyms == 0)
                {
-               fprintf(stderr, "%s: No symbols - %s not modified\n", argv[1]);
+               fprintf(stderr, "%s: No symbols - %s not modified\n", Pgm, argv[1]);
                cleanup();
                }
 
@@ -149,7 +203,15 @@ register FILE      *fpin;
  * length, reflecting the smaller string table.
 */
        copyfile(symfp, fpin);
-       fwrite(&stroff, sizeof (long), 1, fpin);
+#ifdef pdp11
+       fwrite(&stroff, sizeof (OFF_T), 1, fpin);
+#else
+       temp[0] = (stroff >> 16) & 0xff;
+       temp[1] = (stroff >> 24) & 0xff;
+       temp[2] = stroff & 0xff;
+       temp[3] = (stroff >> 8) & 0xff;
+       fwrite(temp, sizeof (OFF_T), 1, fpin);
+#endif
        copyfile(strfp, fpin);
        ftruncate(fileno(fpin), ftell(fpin));
 
@@ -158,39 +220,52 @@ register FILE     *fpin;
 */
        rewind(fpin);
        xhdr.e.a_syms = nsyms * sizeof (sym);
-       fwrite(&xhdr, sizeof (xhdr.e), 1, fpin);
+#ifdef pdp11
+       fwrite(&xhdr.e, sizeof (xhdr.e), 1, fpin);
+#else
+       temp[0] = xhdr.e.a_magic & 0xff;
+       temp[1] = (xhdr.e.a_magic >> 8) & 0xff;
+       temp[2] = xhdr.e.a_text & 0xff;
+       temp[3] = (xhdr.e.a_text >> 8) & 0xff;
+       temp[4] = xhdr.e.a_data & 0xff;
+       temp[5] = (xhdr.e.a_data >> 8) & 0xff;
+       temp[6] = xhdr.e.a_bss & 0xff;
+       temp[7] = (xhdr.e.a_bss >> 8) & 0xff;
+       temp[8] = xhdr.e.a_syms & 0xff;
+       temp[9] = (xhdr.e.a_syms >> 8) & 0xff;
+       temp[10] = xhdr.e.a_entry & 0xff;
+       temp[11] = (xhdr.e.a_entry >> 8) & 0xff;
+       temp[12] = xhdr.e.a_unused & 0xff;
+       temp[13] = (xhdr.e.a_unused >> 8) & 0xff;
+       temp[14] = xhdr.e.a_flag & 0xff;
+       temp[15] = (xhdr.e.a_flag >> 8) & 0xff;
+       fwrite(temp, sizeof (xhdr.e), 1, fpin);
+#endif
 
        fclose(fpin);
        fclose(symfp);
        fclose(strfp);
        cleanup();
-       }
+}
 
-copyfile(in, out)
-       register FILE *in, *out;
-       {
+void copyfile(in, out) register FILE *in; register FILE *out; {
        register int c;
 
        while   ((c = getc(in)) != EOF)
                putc(c, out);
-       }
-
-fatal(str)
-       char    *str;
-       {
+}
 
+void fatal(Pgm, str) char *Pgm; char *str; {
        if      (strfn[0])
                unlink(strfn);
        if      (symfn[0])
                unlink(symfn);
        if      (!str)
                exit(EX_OK);
-       fprintf(stderr, "%s: %s\n", str);
+       fprintf(stderr, "%s: %s\n", Pgm, str);
        exit(EX_SOFTWARE);
-       }
+}
 
-void
-cleanup()
-       {
-       fatal((char *)NULL);
-       }
+void cleanup() {
+       fatal((char *)NULL, (char *)NULL);
+}
diff --git a/ucb/symcompact/Makefile b/ucb/symcompact/Makefile
new file mode 100644 (file)
index 0000000..c9b4203
--- /dev/null
@@ -0,0 +1,24 @@
+# Nick
+
+# using VPATH to compile ./nsym.o from ../../lib/libc/pdp/gen/nsym.c does not
+# work if there is a ../../lib/libc.pdp/gen/nsym.o leftover from building libc
+#VPATH=../../lib/libc/pdp/gen
+SRCS=symcompact.c ../../lib/libc/pdp/gen/nsym.c
+OBJS=symcompact.o ../../lib/libc/pdp/gen/nsym.o
+
+CFLAGS=-O
+SEPFLAG=-i
+
+all:   symcompact
+
+symcompact: ${OBJS}
+       ${CC} ${SEPFLAG} -o $@ ${OBJS}
+
+install: all
+       install -s -m 755 symcompact ${DESTDIR}/usr/ucb
+
+lint:
+       lint -havx ${SRCS}
+
+clean:
+       rm -f ${OBJS} symcompact
diff --git a/ucb/symcompact/include/a.out.h b/ucb/symcompact/include/a.out.h
new file mode 120000 (symlink)
index 0000000..9dd9aa8
--- /dev/null
@@ -0,0 +1 @@
+../../../include/a.out.h
\ No newline at end of file
diff --git a/ucb/symcompact/include/nlist.h b/ucb/symcompact/include/nlist.h
new file mode 120000 (symlink)
index 0000000..0c27973
--- /dev/null
@@ -0,0 +1 @@
+../../../include/nlist.h
\ No newline at end of file
diff --git a/ucb/symcompact/include/sys/exec.h b/ucb/symcompact/include/sys/exec.h
new file mode 120000 (symlink)
index 0000000..0f3c005
--- /dev/null
@@ -0,0 +1 @@
+../../../../sys/h/exec.h
\ No newline at end of file
diff --git a/ucb/symcompact/krcompat.h b/ucb/symcompact/krcompat.h
new file mode 100644 (file)
index 0000000..62f9848
--- /dev/null
@@ -0,0 +1,19 @@
+#ifndef _KRCOMPAT_H
+#define _KRCOMPAT_H 1
+
+#undef PARAMS
+#ifdef __STDC__
+#include <stdarg.h>
+#define PARAMS(args) args
+#else
+#include <varargs.h>
+#define PARAMS(args) ()
+#endif
+
+#ifdef __GNUC__
+#define NORETURN __attribute__ ((noreturn))
+#else
+#define NORETURN
+#endif
+
+#endif
diff --git a/ucb/symcompact/n.sh b/ucb/symcompact/n.sh
new file mode 100755 (executable)
index 0000000..84028da
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+ROOT="`pwd |sed -e 's/\/ucb\/symcompact$//'`"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+mkdir --parents "$ROOT/cross/usr/ucb"
+make CC="$CC" SEPFLAG=
+make DESTDIR="$ROOT/cross" install
similarity index 64%
rename from ucb/symcompact.c
rename to ucb/symcompact/symcompact.c
index 53866e0..6e0ed4b 100644 (file)
 #include <a.out.h>
 #include <ctype.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <sys/file.h>
+#include <unistd.h>
+#include "krcompat.h"
+
+#ifdef pdp11
+#include <sys/types.h>
+#define OFF_T off_t
+#else
+#include <stdint.h>
+#define OFF_T int32_t
+#endif
 
        char    *Pgm;
 static char    strtmp[20];
 
-main(argc, argv)
-       int     argc;
-       char    **argv;
-       {
+int main PARAMS((int argc, char **argv));
+void cleanup PARAMS((void));
+int exclude PARAMS((register struct nlist *sp));
+
+#ifdef pdp11
+#define N_NAME(sp) ((sp)->n_un.n_name)
+#else
+#define N_NAME(sp) (strtab + (int)(sp)->n_un.n_strx)
+#endif
+
+int main(argc, argv) int argc; char **argv; {
+       int     fd;
        FILE    *fp, *strfp;
        int     cnt, nsyms, len, c, symsremoved = 0, i;
        void    cleanup();
        char    *strtab;
        char    fbuf1[BUFSIZ], fbuf2[BUFSIZ];
        off_t   symoff, stroff, ltmp;
-       long    strsiz;
+       OFF_T   strsiz;
        register struct nlist   *sp, *sp2;
        struct  nlist   *symtab, *symtabend, syment;
+#ifndef pdp11
+       /* note: this has to be at least as large as struct(nlist) and OFF_T */
+       unsigned char temp[sizeof(struct xexec)];
+#endif
        struct  xexec   xhdr;
 
        Pgm = argv[0];
-       signal(SIGQUIT, cleanup);
-       signal(SIGINT, cleanup);
-       signal(SIGHUP, cleanup);
+       signal(SIGQUIT, (sig_t)cleanup);
+       signal(SIGINT, (sig_t)cleanup);
+       signal(SIGHUP, (sig_t)cleanup);
 
        if      (argc != 2)
                {
@@ -79,12 +102,29 @@ main(argc, argv)
                exit(EX_NOINPUT);
                }
        setbuf(fp, fbuf1);
+#ifdef pdp11
        cnt = fread(&xhdr, 1, sizeof (xhdr), fp);
+#else
+       cnt = fread(temp, 1, sizeof (xhdr), fp);
+#endif
        if      (cnt < sizeof (xhdr.e))
                {
                fprintf(stderr, "%s: Premature EOF reading header\n", Pgm);
                exit(EX_DATAERR);
                }
+#ifndef pdp11
+       xhdr.e.a_magic = temp[0] | (temp[1] << 8);
+       xhdr.e.a_text = temp[2] | (temp[3] << 8);
+       xhdr.e.a_data = temp[4] | (temp[5] << 8);
+       xhdr.e.a_bss = temp[6] | (temp[7] << 8);
+       xhdr.e.a_syms = temp[8] | (temp[9] << 8);
+       xhdr.e.a_entry = temp[10] | (temp[11] << 8);
+       xhdr.e.a_unused = temp[12] | (temp[13] << 8);
+       xhdr.e.a_flag = temp[14] | (temp[15] << 8);
+       xhdr.o.max_ovl = temp[16] | (temp[17] << 8);
+       for (i = 0; i < NOVL; ++i)
+               xhdr.o.ov_siz[i] = temp[18 + i * 2] | (temp[19 + i * 2] << 8);
+#endif
        if      (N_BADMAG(xhdr.e))
                {
                fprintf(stderr, "%s: Bad magic number\n", Pgm);
@@ -104,7 +144,12 @@ main(argc, argv)
  * the size.
 */
        fseek(fp, stroff, L_SET);
-       fread(&strsiz, sizeof (long), 1, fp);
+#ifdef pdp11
+       fread(&strsiz, sizeof (OFF_T), 1, fp);
+#else
+       fread(temp, sizeof (OFF_T), 1, fp);
+       strsiz = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+#endif
        if      (strsiz > 48 * 1024L)
                {
                fprintf(stderr, "%s: string table > 48kb\n", Pgm);
@@ -122,8 +167,8 @@ main(argc, argv)
  * address used so that we don't have to adjust each symbol table entry's
  * string offset.
 */
-       cnt = fread(strtab + sizeof (long), 1, (int)strsiz - sizeof (long), fp);
-       if      (cnt != (int)strsiz - sizeof (long))
+       cnt = fread(strtab + sizeof (OFF_T), 1, (int)strsiz - sizeof (OFF_T), fp);
+       if      (cnt != (int)strsiz - sizeof (OFF_T))
                {
                fprintf(stderr, "%s: Premature EOF reading strings\n", Pgm);
                exit(EX_DATAERR);
@@ -136,7 +181,15 @@ main(argc, argv)
        cnt = 0;
        for     (i = 0; i < nsyms; i++)
                {
+#ifdef pdp11
                fread(&syment, sizeof (syment), 1, fp);
+#else
+               fread(temp, sizeof (syment), 1, fp);
+               syment.n_un.n_strx = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+               syment.n_type = temp[4];
+               syment.n_ovly = temp[5];
+               syment.n_value = temp[6] | (temp[7] << 8);
+#endif
                if      (exclude(&syment))
                        continue;
                cnt++;
@@ -161,11 +214,21 @@ main(argc, argv)
 
        for     (i = 0; i < nsyms; i++)
                {
+#ifdef pdp11
                fread(&syment, sizeof (syment), 1, fp);
+#else
+               fread(temp, sizeof (syment), 1, fp);
+               syment.n_un.n_strx = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+               syment.n_type = temp[4];
+               syment.n_ovly = temp[5];
+               syment.n_value = temp[6] | (temp[7] << 8);
+#endif
                if      (exclude(&syment))
                        continue;
                bcopy(&syment, sp, sizeof (syment));
+#ifdef pdp11
                sp->n_un.n_name = strtab + (int)sp->n_un.n_strx;
+#endif
                sp++;
                }
        symtabend = &symtab[cnt];
@@ -178,11 +241,12 @@ main(argc, argv)
 */
        for     (sp = symtab; sp < symtabend; sp++)
                {
+ /*fprintf(stderr, "check %s %02x %02x %04x\n", N_NAME(sp), sp->n_ovly, sp->n_type, sp->n_value);*/
                if      (sp->n_ovly)
                        continue;
                if      ((sp->n_type & N_TYPE) != N_TEXT)
                        continue;
-               if      (sp->n_un.n_name[0] != '~')
+               if      (N_NAME(sp)[0] != '~')
                        continue;
 /*
  * At this point we have the '~' form of a non overlaid text symbol.  Look
@@ -191,21 +255,26 @@ main(argc, argv)
 */
                for     (sp2 = symtab; sp2 < symtabend; sp2++)
                        {
+ /*fprintf(stderr, "against %s %02x %02x %04x\n", N_NAME(sp2), sp2->n_ovly, sp2->n_type, sp2->n_value);*/
                        if      (sp2->n_ovly)
                                continue;
                        if      ((sp2->n_type & N_TYPE) != N_TEXT)
                                continue;
-                       if      (sp2->n_un.n_name[0] != '_')
+                       if      (N_NAME(sp2)[0] != '_')
                                continue;
                        if      (sp2->n_value != sp->n_value)
                                continue;
-                       if      (strcmp(sp->n_un.n_name+1, sp2->n_un.n_name+1))
+                       if      (strcmp(N_NAME(sp)+1, N_NAME(sp2)+1))
                                continue;
 /*
  * Found a match.  Null out the '~' symbol's string address.
 */
                        symsremoved++;
-                       sp->n_un.n_strx = NULL;
+#ifdef pdp11
+                       sp->n_un.n_name = NULL;
+#else
+                       sp->n_un.n_strx = -1L;
+#endif
                        break;
                        }
                }
@@ -214,9 +283,7 @@ main(argc, argv)
  * string table (from the remaining symbols) in a temporary file.
 */
        strcpy(strtmp, "/tmp/strXXXXXX");
-       mktemp(strtmp);
-       strfp = fopen(strtmp, "w+");
-       if      (!strfp)
+       if ((fd = mkstemp(strtmp)) == -1 || !(strfp = fopen(strtmp, "w+")))
                {
                fprintf(stderr, "%s: can't create '%s'\n", Pgm, strtmp);
                exit(EX_CANTCREAT);
@@ -227,13 +294,17 @@ main(argc, argv)
  * As each symbol is written to the tmp file the symbol's string offset
  * is updated with the new file string table offset.
 */
-       ltmp = sizeof (long);
+       ltmp = sizeof (OFF_T);
        for     (sp = symtab; sp < symtabend; sp++)
                {
+#ifdef pdp11
                if      (!sp->n_un.n_name)
+#else
+               if      (sp->n_un.n_strx < 0)
+#endif
                        continue;
-               len = strlen(sp->n_un.n_name) + 1;
-               fwrite(sp->n_un.n_name, len, 1, strfp);
+               len = strlen(N_NAME(sp)) + 1;
+               fwrite(N_NAME(sp), len, 1, strfp);
                sp->n_un.n_strx = ltmp;
                ltmp += len;
                }
@@ -257,12 +328,32 @@ main(argc, argv)
                if      (sp->n_un.n_strx == 0)
                        continue;
                nsyms++;
+#ifdef pdp11
                fwrite(sp, sizeof (struct nlist), 1, fp);
+#else
+               temp[0] = (sp->n_un.n_strx >> 16) & 0xff;
+               temp[1] = (sp->n_un.n_strx >> 24) & 0xff;
+               temp[2] = sp->n_un.n_strx & 0xff;
+               temp[3] = (sp->n_un.n_strx >> 8) & 0xff;
+               temp[4] = sp->n_type & 0xff;
+               temp[5] = sp->n_ovly & 0xff;
+               temp[6] = sp->n_value & 0xff;
+               temp[7] = (sp->n_value >> 8) & 0xff;
+               fwrite(temp, sizeof (struct nlist), 1, fp);
+#endif
                }
 /*
  * Next write out the string table size longword.
 */
-       fwrite(&ltmp, sizeof (long), 1, fp);
+#ifdef pdp11
+       fwrite(&ltmp, sizeof (OFF_T), 1, fp);
+#else
+       temp[0] = (ltmp >> 16) & 0xff;
+       temp[1] = (ltmp >> 24) & 0xff;
+       temp[2] = ltmp & 0xff;
+       temp[3] = (ltmp >> 8) & 0xff;
+       fwrite(temp, sizeof (OFF_T), 1, fp);
+#endif
 /*
  * We're done with the in memory symbol table, release it.  Then append
  * the string table to the executable file.
@@ -273,32 +364,47 @@ main(argc, argv)
        fclose(strfp);
        rewind(fp);
        xhdr.e.a_syms = nsyms * sizeof (struct nlist);
+#ifdef pdp11
        fwrite(&xhdr.e, sizeof (xhdr.e), 1, fp);
+#else
+       temp[0] = xhdr.e.a_magic & 0xff;
+       temp[1] = (xhdr.e.a_magic >> 8) & 0xff;
+       temp[2] = xhdr.e.a_text & 0xff;
+       temp[3] = (xhdr.e.a_text >> 8) & 0xff;
+       temp[4] = xhdr.e.a_data & 0xff;
+       temp[5] = (xhdr.e.a_data >> 8) & 0xff;
+       temp[6] = xhdr.e.a_bss & 0xff;
+       temp[7] = (xhdr.e.a_bss >> 8) & 0xff;
+       temp[8] = xhdr.e.a_syms & 0xff;
+       temp[9] = (xhdr.e.a_syms >> 8) & 0xff;
+       temp[10] = xhdr.e.a_entry & 0xff;
+       temp[11] = (xhdr.e.a_entry >> 8) & 0xff;
+       temp[12] = xhdr.e.a_unused & 0xff;
+       temp[13] = (xhdr.e.a_unused >> 8) & 0xff;
+       temp[14] = xhdr.e.a_flag & 0xff;
+       temp[15] = (xhdr.e.a_flag >> 8) & 0xff;
+       fwrite(temp, sizeof (xhdr.e), 1, fp);
+#endif
        fclose(fp);
        printf("%s: %d symbols removed\n", Pgm, symsremoved);
        cleanup();
-       }
+}
 
-void
-cleanup()
-       {
+void cleanup() {
        if      (strtmp[0])
                unlink(strtmp);
        exit(EX_OK);
-       }
+}
 
 /*
  * Place any symbol exclusion rules in this routine, return 1 if the
  * symbol is to be excluded, 0 if the symbol is to be retained.
 */
 
-exclude(sp)
-       register struct nlist *sp;
-       {
-
+int exclude(sp) register struct nlist *sp; {
        if      (sp->n_type == N_REG)
                return(1);
        if      (sp->n_un.n_strx == 0)
                return(1);
        return(0);
-       }
+}
diff --git a/ucb/symdump.c b/ucb/symdump.c
deleted file mode 100644 (file)
index 7b72183..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *     Program Name:   strdump.c
- *     Date: January 21, 1994
- *     Author: S.M. Schultz
- *
- *     -----------------   Modification History   ---------------
- *      Version Date            Reason For Modification
- *      1.0     12Feb94         1. Initial release into the public domain.
-*/
-
-/*
- * Dump the symbol table of a program to stdout, one symbol per line in
- * the form:
- *
- *     symbol_string  type  overlay  value
- *
- * Typical use is to feed the output of this program into:
- *
- *    "sort +0 -1 +1n -2 +2n -3 +3n -4 -u"
- *
- * This program is used by 'strcompact' to compress the string (and
- * symbol) tables of an executable. 
-*/
-
-#include <sys/types.h>
-#include <sys/dir.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <a.out.h>
-#include <sys/file.h>
-#include <string.h>
-
-       char    **xargv;        /* global copy of argv */
-       char    *strp;          /* pointer to in-memory string table */
-       struct  xexec xhdr;     /* the extended a.out header */
-
-extern char    *malloc();
-
-main(argc, argv)
-       int     argc;
-       char    **argv;
-       {
-
-       if      (argc != 2)
-               {
-               fprintf(stderr, "%s:  need a file name\n", argv[0]);
-               exit(1);
-               }
-       xargv = ++argv;
-       namelist();
-       exit(0);
-       }
-
-namelist()
-       {
-       char    ibuf[BUFSIZ];
-       register FILE   *fi;
-       off_t   o, stroff;
-       long    strsiz;
-       register int n;
-
-       fi = fopen(*xargv, "r");
-       if      (fi == NULL)
-               error("cannot open");
-       setbuf(fi, ibuf);
-
-       fread((char *)&xhdr, 1, sizeof(xhdr), fi);
-       if      (N_BADMAG(xhdr.e))
-               error("bad format");
-       rewind(fi);
-
-       o = N_SYMOFF(xhdr);
-       fseek(fi, o, L_SET);
-       n = xhdr.e.a_syms / sizeof(struct nlist);
-       if      (n == 0)
-               error("no name list");
-
-       stroff = N_STROFF(xhdr);
-       fseek(fi, stroff, L_SET);
-       if      (fread(&strsiz, sizeof (long), 1, fi) != 1)
-               error("no string table");
-       strp = (char *)malloc((int)strsiz);
-       if      (strp == NULL || strsiz > 48 * 1024L)
-               error("no memory for strings");
-       if      (fread(strp+sizeof(strsiz),(int)strsiz-sizeof(strsiz),1,fi)!=1)
-               error("error reading strings");
-
-       fseek(fi, o, L_SET);
-       dumpsyms(fi, n);
-       free((char *)strp);
-       fclose(fi);
-       }
-
-dumpsyms(fi, nsyms)
-       register FILE *fi;
-       int     nsyms;
-       {
-       register int n;
-       struct  nlist sym;
-       register struct nlist *sp;
-
-       sp = &sym;
-       for     (n = 0; n < nsyms; n++)
-               {
-               fread(&sym, sizeof sym, 1, fi);
-               printf("%s %u %u %u\n", strp + (int)sp->n_un.n_strx, sp->n_type,
-                       sp->n_ovly, sp->n_value);
-               }       
-       }
-
-error(s)
-       char *s;
-       {
-       fprintf(stderr, "syms: %s: %s\n", *xargv, s);
-       exit(1);
-       }
diff --git a/ucb/symdump/Makefile b/ucb/symdump/Makefile
new file mode 100644 (file)
index 0000000..3bbd769
--- /dev/null
@@ -0,0 +1,24 @@
+# Nick
+
+# using VPATH to compile ./nsym.o from ../../lib/libc/pdp/gen/nsym.c does not
+# work if there is a ../../lib/libc.pdp/gen/nsym.o leftover from building libc
+#VPATH=../../lib/libc/pdp/gen
+SRCS=symdump.c ../../lib/libc/pdp/gen/nsym.c
+OBJS=symdump.o ../../lib/libc/pdp/gen/nsym.o
+
+CFLAGS=-O
+SEPFLAG=-i
+
+all:   symdump
+
+symdump: ${OBJS}
+       ${CC} ${SEPFLAG} -o $@ ${OBJS}
+
+install: all
+       install -s -m 755 symdump ${DESTDIR}/usr/ucb
+
+lint:
+       lint -havx ${SRCS}
+
+clean:
+       rm -f ${OBJS} symdump
diff --git a/ucb/symdump/include/a.out.h b/ucb/symdump/include/a.out.h
new file mode 120000 (symlink)
index 0000000..9dd9aa8
--- /dev/null
@@ -0,0 +1 @@
+../../../include/a.out.h
\ No newline at end of file
diff --git a/ucb/symdump/include/nlist.h b/ucb/symdump/include/nlist.h
new file mode 120000 (symlink)
index 0000000..0c27973
--- /dev/null
@@ -0,0 +1 @@
+../../../include/nlist.h
\ No newline at end of file
diff --git a/ucb/symdump/include/sys/exec.h b/ucb/symdump/include/sys/exec.h
new file mode 120000 (symlink)
index 0000000..0f3c005
--- /dev/null
@@ -0,0 +1 @@
+../../../../sys/h/exec.h
\ No newline at end of file
diff --git a/ucb/symdump/krcompat.h b/ucb/symdump/krcompat.h
new file mode 100644 (file)
index 0000000..62f9848
--- /dev/null
@@ -0,0 +1,19 @@
+#ifndef _KRCOMPAT_H
+#define _KRCOMPAT_H 1
+
+#undef PARAMS
+#ifdef __STDC__
+#include <stdarg.h>
+#define PARAMS(args) args
+#else
+#include <varargs.h>
+#define PARAMS(args) ()
+#endif
+
+#ifdef __GNUC__
+#define NORETURN __attribute__ ((noreturn))
+#else
+#define NORETURN
+#endif
+
+#endif
diff --git a/ucb/symdump/n.sh b/ucb/symdump/n.sh
new file mode 100755 (executable)
index 0000000..0b0291c
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+ROOT="`pwd |sed -e 's/\/ucb\/symdump$//'`"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+mkdir --parents "$ROOT/cross/usr/ucb"
+make CC="$CC" SEPFLAG=
+make DESTDIR="$ROOT/cross" install
diff --git a/ucb/symdump/symdump.c b/ucb/symdump/symdump.c
new file mode 100644 (file)
index 0000000..7fa5caa
--- /dev/null
@@ -0,0 +1,164 @@
+/*
+ *     Program Name:   strdump.c
+ *     Date: January 21, 1994
+ *     Author: S.M. Schultz
+ *
+ *     -----------------   Modification History   ---------------
+ *      Version Date            Reason For Modification
+ *      1.0     12Feb94         1. Initial release into the public domain.
+*/
+
+/*
+ * Dump the symbol table of a program to stdout, one symbol per line in
+ * the form:
+ *
+ *     symbol_string  type  overlay  value
+ *
+ * Typical use is to feed the output of this program into:
+ *
+ *    "sort +0 -1 +1n -2 +2n -3 +3n -4 -u"
+ *
+ * This program is used by 'strcompact' to compress the string (and
+ * symbol) tables of an executable. 
+*/
+
+#include <sys/types.h>
+#include <sys/dir.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <a.out.h>
+#include <sys/file.h>
+#include <string.h>
+#include <unistd.h>
+#include "krcompat.h"
+
+#ifdef pdp11
+#include <sys/types.h>
+#define OFF_T off_t
+#else
+#include <stdint.h>
+#define OFF_T int32_t
+#endif
+
+       char    **xargv;        /* global copy of argv */
+       char    *strp;          /* pointer to in-memory string table */
+       struct  xexec xhdr;     /* the extended a.out header */
+
+int main PARAMS((int argc, char **argv));
+void namelist PARAMS((void));
+void dumpsyms PARAMS((register FILE *fi, int nsyms));
+void error PARAMS((char *s));
+
+int main(argc, argv) int argc; char **argv; {
+       if      (argc != 2)
+               {
+               fprintf(stderr, "%s:  need a file name\n", argv[0]);
+               exit(1);
+               }
+       xargv = ++argv;
+       namelist();
+       exit(0);
+}
+
+void namelist() {
+#ifndef pdp11
+       /* note: this has to be at least as large as OFF_T */
+       unsigned char temp[sizeof(struct xexec)];
+       int     i;
+#endif
+       char    ibuf[BUFSIZ];
+       register FILE   *fi;
+       OFF_T   o, stroff;
+       OFF_T   strsiz;
+       register int n;
+
+       fi = fopen(*xargv, "r");
+       if      (fi == NULL)
+               error("cannot open");
+       setbuf(fi, ibuf);
+
+#ifdef pdp11
+       if (fread((char *)&xhdr, sizeof(xhdr), 1, fi) != 1)
+#else
+       if (fread(temp, sizeof(xhdr), 1, fi) != 1)
+#endif
+               error("error reading header");
+#ifndef pdp11
+       xhdr.e.a_magic = temp[0] | (temp[1] << 8);
+       xhdr.e.a_text = temp[2] | (temp[3] << 8);
+       xhdr.e.a_data = temp[4] | (temp[5] << 8);
+       xhdr.e.a_bss = temp[6] | (temp[7] << 8);
+       xhdr.e.a_syms = temp[8] | (temp[9] << 8);
+       xhdr.e.a_entry = temp[10] | (temp[11] << 8);
+       xhdr.e.a_unused = temp[12] | (temp[13] << 8);
+       xhdr.e.a_flag = temp[14] | (temp[15] << 8);
+       xhdr.o.max_ovl = temp[16] | (temp[17] << 8);
+       for (i = 0; i < NOVL; ++i)
+               xhdr.o.ov_siz[i] = temp[18 + i * 2] | (temp[19 + i * 2] << 8);
+#endif
+       if      (N_BADMAG(xhdr.e))
+               error("bad format");
+       rewind(fi);
+
+       o = N_SYMOFF(xhdr);
+       fseek(fi, (off_t)o, L_SET);
+       n = xhdr.e.a_syms / sizeof(struct nlist);
+       if      (n == 0)
+               error("no name list");
+
+       stroff = N_STROFF(xhdr);
+       fseek(fi, (off_t)stroff, L_SET);
+#ifdef pdp11
+       if      (fread(&strsiz, sizeof (OFF_T), 1, fi) != 1)
+#else
+       if      (fread(temp, sizeof (OFF_T), 1, fi) != 1)
+#endif
+               error("no string table");
+#ifndef pdp11
+       strsiz = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+#endif
+       strp = (char *)malloc((int)strsiz);
+       if      (strp == NULL || strsiz > 48 * 1024L)
+               error("no memory for strings");
+       if      (fread(strp+sizeof(strsiz),(int)strsiz-sizeof(strsiz),1,fi)!=1)
+               error("error reading strings");
+
+       fseek(fi, o, L_SET);
+       dumpsyms(fi, n);
+       free((char *)strp);
+       fclose(fi);
+}
+
+void dumpsyms(fi, nsyms) register FILE *fi; int nsyms; {
+       register int n;
+#ifndef pdp11
+       unsigned char temp[sizeof(struct nlist)];
+#endif
+       struct  nlist sym;
+       register struct nlist *sp;
+
+       sp = &sym;
+       for     (n = 0; n < nsyms; n++)
+               {
+#ifdef pdp11
+               if (fread(&sym, sizeof sym, 1, fi) != 1)
+#else
+               if (fread(temp, sizeof sym, 1, fi) != 1)
+#endif
+                       error("error reading sym");
+#ifndef pdp11
+               sym.n_un.n_strx = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+               sym.n_type = temp[4];
+               sym.n_ovly = temp[5];
+               sym.n_value = temp[6] | (temp[7] << 8);
+#endif
+               printf("%s %u %u %u\n", strp + (int)sp->n_un.n_strx, sp->n_type,
+                       sp->n_ovly, sp->n_value);
+               }       
+}
+
+void error(s) char *s; {
+       fprintf(stderr, "syms: %s: %s\n", *xargv, s);
+       exit(1);
+}
diff --git a/ucb/symorder/Makefile b/ucb/symorder/Makefile
new file mode 100644 (file)
index 0000000..d20aca4
--- /dev/null
@@ -0,0 +1,24 @@
+# Nick
+
+# using VPATH to compile ./nsym.o from ../../lib/libc/pdp/gen/nsym.c does not
+# work if there is a ../../lib/libc.pdp/gen/nsym.o leftover from building libc
+#VPATH=../../lib/libc/pdp/gen
+SRCS=symorder.c ../../lib/libc/pdp/gen/nsym.c
+OBJS=symorder.o ../../lib/libc/pdp/gen/nsym.o
+
+CFLAGS=-O
+SEPFLAG=-i
+
+all:   symorder
+
+symorder: ${OBJS}
+       ${CC} ${SEPFLAG} -o $@ ${OBJS}
+
+install: all
+       install -s -m 755 symorder ${DESTDIR}/usr/ucb
+
+lint:
+       lint -havx ${SRCS}
+
+clean:
+       rm -f ${OBJS} symorder
diff --git a/ucb/symorder/include/a.out.h b/ucb/symorder/include/a.out.h
new file mode 120000 (symlink)
index 0000000..9dd9aa8
--- /dev/null
@@ -0,0 +1 @@
+../../../include/a.out.h
\ No newline at end of file
diff --git a/ucb/symorder/include/nlist.h b/ucb/symorder/include/nlist.h
new file mode 120000 (symlink)
index 0000000..0c27973
--- /dev/null
@@ -0,0 +1 @@
+../../../include/nlist.h
\ No newline at end of file
diff --git a/ucb/symorder/include/sys/exec.h b/ucb/symorder/include/sys/exec.h
new file mode 120000 (symlink)
index 0000000..0f3c005
--- /dev/null
@@ -0,0 +1 @@
+../../../../sys/h/exec.h
\ No newline at end of file
diff --git a/ucb/symorder/krcompat.h b/ucb/symorder/krcompat.h
new file mode 100644 (file)
index 0000000..62f9848
--- /dev/null
@@ -0,0 +1,19 @@
+#ifndef _KRCOMPAT_H
+#define _KRCOMPAT_H 1
+
+#undef PARAMS
+#ifdef __STDC__
+#include <stdarg.h>
+#define PARAMS(args) args
+#else
+#include <varargs.h>
+#define PARAMS(args) ()
+#endif
+
+#ifdef __GNUC__
+#define NORETURN __attribute__ ((noreturn))
+#else
+#define NORETURN
+#endif
+
+#endif
diff --git a/ucb/symorder/n.sh b/ucb/symorder/n.sh
new file mode 100755 (executable)
index 0000000..7cc2a3c
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+ROOT="`pwd |sed -e 's/\/ucb\/symorder$//'`"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+mkdir --parents "$ROOT/cross/usr/ucb"
+make CC="$CC" SEPFLAG=
+make DESTDIR="$ROOT/cross" install
similarity index 59%
rename from ucb/symorder.c
rename to ucb/symorder/symorder.c
index bdef9b0..72e292b 100644 (file)
 #include <a.out.h>
 #include <ctype.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
 #include <sys/file.h>
+#include <unistd.h>
+#include "krcompat.h"
+
+#ifdef pdp11
+#include <sys/types.h>
+#define OFF_T off_t
+#else
+#include <stdint.h>
+#define OFF_T int32_t
+#endif
 
 #define NUMSYMS        125
        char    *order[NUMSYMS];
        int     nsorted; 
        char    *Pgm;
-       void    cleanup();
 static char    sym1tmp[20], sym2tmp[20], strtmp[20];
 static char    *strtab, *oldname;
 
-main(argc, argv)
-       int     argc;
-       char    **argv;
-       {
+int main PARAMS((int argc, char **argv));
+int inlist PARAMS((register struct nlist *sp));
+void getsyms PARAMS((FILE *fp));
+void cleanup PARAMS((void));
+
+int main(argc, argv) int argc; char **argv; {
+       int     fd;
        FILE    *fp, *fp2, *sym1fp, *sym2fp, *strfp;
        int     cnt, nsyms, len, c;
        char    fbuf1[BUFSIZ], fbuf2[BUFSIZ];
-       off_t   symoff, stroff, ltmp;
-       long    strsiz;
+       OFF_T   symoff, stroff, ltmp;
+       OFF_T   strsiz;
        struct  nlist   sym;
+#ifndef pdp11
+       /* note: this has to be at least as large as struct(nlist) and OFF_T */
+       unsigned char temp[sizeof(struct xexec)];
+       int     i;
+#endif
        struct  xexec   xhdr;
 
        Pgm = argv[0];
 
-       signal(SIGQUIT, cleanup);
-       signal(SIGINT, cleanup);
-       signal(SIGHUP, cleanup);
+       signal(SIGQUIT, (sig_t)cleanup);
+       signal(SIGINT, (sig_t)cleanup);
+       signal(SIGHUP, (sig_t)cleanup);
 
        if      (argc != 3)
                {
@@ -68,12 +86,29 @@ main(argc, argv)
                exit(EX_NOINPUT);
                }
        setbuf(fp, fbuf1);
+#ifdef pdp11
        cnt = fread(&xhdr, 1, sizeof (xhdr), fp);
+#else
+       cnt = fread(temp, 1, sizeof (xhdr), fp);
+#endif
        if      (cnt < sizeof (xhdr.e))
                {
                fprintf(stderr, "%s: Premature EOF reading header\n", Pgm);
                exit(EX_DATAERR);
                }
+#ifndef pdp11
+       xhdr.e.a_magic = temp[0] | (temp[1] << 8);
+       xhdr.e.a_text = temp[2] | (temp[3] << 8);
+       xhdr.e.a_data = temp[4] | (temp[5] << 8);
+       xhdr.e.a_bss = temp[6] | (temp[7] << 8);
+       xhdr.e.a_syms = temp[8] | (temp[9] << 8);
+       xhdr.e.a_entry = temp[10] | (temp[11] << 8);
+       xhdr.e.a_unused = temp[12] | (temp[13] << 8);
+       xhdr.e.a_flag = temp[14] | (temp[15] << 8);
+       xhdr.o.max_ovl = temp[16] | (temp[17] << 8);
+       for (i = 0; i < NOVL; ++i)
+               xhdr.o.ov_siz[i] = temp[18 + i * 2] | (temp[19 + i * 2] << 8);
+#endif
        if      (N_BADMAG(xhdr.e))
                {
                fprintf(stderr, "%s: Bad magic number\n", Pgm);
@@ -92,8 +127,13 @@ main(argc, argv)
  * malloc memory to hold the string table.  First make a sanity check on
  * the size.
 */
-       fseek(fp, stroff, L_SET);
-       fread(&strsiz, sizeof (long), 1, fp);
+       fseek(fp, (off_t)stroff, L_SET);
+#ifdef pdp11
+       fread(&strsiz, sizeof (OFF_T), 1, fp);
+#else
+       fread(temp, sizeof (OFF_T), 1, fp);
+       strsiz = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+#endif
        if      (strsiz > 48 * 1024L)
                {
                fprintf(stderr, "%s: string table > 48kb\n", Pgm);
@@ -111,8 +151,8 @@ main(argc, argv)
  * address used so that we don't have to adjust each symbol table entry's
  * string offset.
 */
-       cnt = fread(strtab + sizeof (long), 1, (int)strsiz - sizeof (long), fp);
-       if      (cnt != (int)strsiz - sizeof (long))
+       cnt = fread(strtab + sizeof (OFF_T), 1, (int)strsiz - sizeof (OFF_T), fp);
+       if      (cnt != (int)strsiz - sizeof (OFF_T))
                {
                fprintf(stderr, "%s: Premature EOF reading strings\n", Pgm);
                exit(EX_DATAERR);
@@ -136,18 +176,21 @@ main(argc, argv)
  * new string table.
 */
        strcpy(sym1tmp, "/tmp/sym1XXXXXX");
-       mktemp(sym1tmp);
+       if      ((fd =  mkstemp(sym1tmp)) == -1 || !(sym1fp = fdopen(fd, "w+")))
+               {
+               fprintf(stderr, "%s: Can't create %s\n", Pgm, sym1tmp);
+               exit(EX_CANTCREAT);
+               }
        strcpy(sym2tmp, "/tmp/sym2XXXXXX");
-       mktemp(sym2tmp);
+       if      ((fd =  mkstemp(sym2tmp)) == -1 || !(sym2fp = fdopen(fd, "w+")))
+               {
+               fprintf(stderr, "%s: Can't create %s\n", Pgm, sym2tmp);
+               exit(EX_CANTCREAT);
+               }
        strcpy(strtmp, "/tmp/strXXXXXX");
-       mktemp(strtmp);
-       sym1fp = fopen(sym1tmp, "w+");
-       sym2fp = fopen(sym2tmp, "w+");
-       strfp = fopen(strtmp, "w+");
-       if      (!sym1fp || !sym2fp || !strfp)
+       if      ((fd =  mkstemp(strtmp)) == -1 || !(strfp = fdopen(fd, "w+")))
                {
-               fprintf(stderr, "%s: Can't create %s, %s or %s\n", sym1tmp,
-                       sym2tmp, strtmp);
+               fprintf(stderr, "%s: Can't create %s\n", Pgm, strtmp);
                exit(EX_CANTCREAT);
                }
        setbuf(sym1fp, fbuf2);
@@ -168,16 +211,32 @@ main(argc, argv)
  * This removal probably should have been done earlier - in 'strcompact' or 
  * 'symcompact' and it may be in the future, but for now just do it here.
 */
-       fseek(fp, symoff, L_SET);
+       fseek(fp, (off_t)symoff, L_SET);
        while   (nsyms--)
                {
+#ifdef pdp11
                fread(&sym, sizeof (sym), 1, fp);
+#else
+               fread(temp, sizeof (sym), 1, fp);
+               sym.n_un.n_strx = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+               sym.n_type = temp[4];
+               sym.n_ovly = temp[5];
+               sym.n_value = temp[6] | (temp[7] << 8);
+#endif
                if      (sym.n_type == N_REG)
                        continue;
                if      (inlist(&sym))
+#ifdef pdp11
                        fwrite(&sym, sizeof (sym), 1, sym1fp);
+#else
+                       fwrite(temp, sizeof (sym), 1, sym1fp);
+#endif
                else
+#ifdef pdp11
                        fwrite(&sym, sizeof (sym), 1, sym2fp);
+#else
+                       fwrite(temp, sizeof (sym), 1, sym2fp);
+#endif
                }
 
 /*
@@ -191,34 +250,78 @@ main(argc, argv)
  * the string offsets or simply write the strings to yet another tmp file.
  * The latter was chosen.
 */
-       fseek(fp, symoff, L_SET);
+       fseek(fp, (off_t)symoff, L_SET);
        ftruncate(fileno(fp), ftell(fp));
-       ltmp = sizeof (long);
+       ltmp = sizeof (OFF_T);
        rewind(sym1fp);
        rewind(sym2fp);
        nsyms = 0;
+#ifdef pdp11
        while   (fread(&sym, sizeof (sym), 1, sym1fp) == 1)
+#else
+       while   (fread(temp, sizeof (sym), 1, sym1fp) == 1)
+#endif
                {
                if      (ferror(sym1fp) || feof(sym1fp))
                        break;
+#ifndef pdp11
+               sym.n_un.n_strx = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+               sym.n_type = temp[4];
+               sym.n_ovly = temp[5];
+               sym.n_value = temp[6] | (temp[7] << 8);
+#endif
                oldname = strtab + (int)sym.n_un.n_strx;
                sym.n_un.n_strx = ltmp;
                len = strlen(oldname) + 1;
                ltmp += len;
+#ifdef pdp11
                fwrite(&sym, sizeof (sym), 1, fp);
+#else
+               temp[0] = (sym.n_un.n_strx >> 16) & 0xff;
+               temp[1] = (sym.n_un.n_strx >> 24) & 0xff;
+               temp[2] = sym.n_un.n_strx & 0xff;
+               temp[3] = (sym.n_un.n_strx >> 8) & 0xff;
+               /*temp[4] = sym.n_type & 0xff;
+               temp[5] = sym.n_ovly & 0xff;
+               temp[6] = sym.n_value & 0xff;
+               temp[7] = (sym.n_value >> 8) & 0xff;*/
+               fwrite(temp, sizeof (sym), 1, fp);
+#endif
                fwrite(oldname, len, 1, strfp);
                nsyms++;
                }
        fclose(sym1fp);
+#ifdef pdp11
        while   (fread(&sym, sizeof (sym), 1, sym2fp) == 1)
+#else
+       while   (fread(temp, sizeof (sym), 1, sym2fp) == 1)
+#endif
                {
                if      (ferror(sym2fp) || feof(sym2fp))
                        break;
+#ifndef pdp11
+               sym.n_un.n_strx = (temp[0] << 16) | (temp[1] << 24) | temp[2] | (temp[3] << 8);
+               sym.n_type = temp[4];
+               sym.n_ovly = temp[5];
+               sym.n_value = temp[6] | (temp[7] << 8);
+#endif
                oldname = strtab + (int)sym.n_un.n_strx;
                sym.n_un.n_strx = ltmp;
                len = strlen(oldname) + 1;
                ltmp += len;
+#ifdef pdp11
                fwrite(&sym, sizeof (sym), 1, fp);
+#else
+               temp[0] = (sym.n_un.n_strx >> 16) & 0xff;
+               temp[1] = (sym.n_un.n_strx >> 24) & 0xff;
+               temp[2] = sym.n_un.n_strx & 0xff;
+               temp[3] = (sym.n_un.n_strx >> 8) & 0xff;
+               /*temp[4] = sym.n_type & 0xff;
+               temp[5] = sym.n_ovly & 0xff;
+               temp[6] = sym.n_value & 0xff;
+               temp[7] = (sym.n_value >> 8) & 0xff;*/
+               fwrite(temp, sizeof (sym), 1, fp);
+#endif
                fwrite(oldname, len, 1, strfp);
                nsyms++;
                }
@@ -227,7 +330,15 @@ main(argc, argv)
  * Next write the symbol table size longword followed by the
  * string table itself.
 */
-       fwrite(&ltmp, sizeof (long), 1, fp);
+#ifdef pdp11
+       fwrite(&ltmp, sizeof (OFF_T), 1, fp);
+#else
+       temp[0] = (ltmp >> 16) & 0xff;
+       temp[1] = (ltmp >> 24) & 0xff;
+       temp[2] = ltmp & 0xff;
+       temp[3] = (ltmp >> 8) & 0xff;
+       fwrite(temp, sizeof (OFF_T), 1, fp);
+#endif
        rewind(strfp);
        while   ((c = getc(strfp)) != EOF)
                putc(c, fp);
@@ -238,15 +349,33 @@ main(argc, argv)
 */
        rewind(fp);
        xhdr.e.a_syms = nsyms * sizeof (struct nlist);
+#ifdef pdp11
        fwrite(&xhdr.e, sizeof (xhdr.e), 1, fp);
+#else
+       temp[0] = xhdr.e.a_magic & 0xff;
+       temp[1] = (xhdr.e.a_magic >> 8) & 0xff;
+       temp[2] = xhdr.e.a_text & 0xff;
+       temp[3] = (xhdr.e.a_text >> 8) & 0xff;
+       temp[4] = xhdr.e.a_data & 0xff;
+       temp[5] = (xhdr.e.a_data >> 8) & 0xff;
+       temp[6] = xhdr.e.a_bss & 0xff;
+       temp[7] = (xhdr.e.a_bss >> 8) & 0xff;
+       temp[8] = xhdr.e.a_syms & 0xff;
+       temp[9] = (xhdr.e.a_syms >> 8) & 0xff;
+       temp[10] = xhdr.e.a_entry & 0xff;
+       temp[11] = (xhdr.e.a_entry >> 8) & 0xff;
+       temp[12] = xhdr.e.a_unused & 0xff;
+       temp[13] = (xhdr.e.a_unused >> 8) & 0xff;
+       temp[14] = xhdr.e.a_flag & 0xff;
+       temp[15] = (xhdr.e.a_flag >> 8) & 0xff;
+       fwrite(temp, sizeof (xhdr.e), 1, fp);
+#endif
        fclose(fp);
        free(strtab);
        cleanup();
-       }
+}
 
-inlist(sp)
-       register struct nlist *sp;
-       {
+int inlist(sp) register struct nlist *sp; {
        register int i;
 
        for     (i = 0; i < nsorted; i++)
@@ -255,11 +384,9 @@ inlist(sp)
                        return(1);
                }
        return(0);
-       }
+}
 
-getsyms(fp)
-       FILE    *fp;
-       {
+void getsyms(fp) FILE *fp; {
        char    asym[128], *start;
        register char *t, **p;
 
@@ -283,11 +410,9 @@ getsyms(fp)
                ++nsorted;
                }
        fclose(fp);
-       }
+}
 
-void
-cleanup()
-       {
+void cleanup() {
        if      (strtmp[0])
                unlink(strtmp);
        if      (sym1tmp[0])
@@ -295,4 +420,4 @@ cleanup()
        if      (sym2tmp[0])
                unlink(sym2tmp);
        exit(EX_OK);
-       }
+}
index ea41ba8..890f78b 100755 (executable)
@@ -1,4 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/usr\.bin$//'`"
 mkdir --parents "$ROOT/cross/usr/bin"
-make NM="$ROOT/cross/bin/nm" lorder && install lorder -m 755 "$ROOT/cross/usr/bin"
+make CC="$ROOT/cross/bin/cc" NM="$ROOT/cross/bin/nm" lorder mkdep
+install lorder -m 755 "$ROOT/cross/usr/bin"
+install mkdep -m 755 "$ROOT/cross/usr/bin"
index 977d502..e34d2b6 100644 (file)
@@ -6,7 +6,7 @@
 SRCS=../../bin/ar/archive.c build.c misc.c ranlib.c touch.c ../../lib/libc/pdp/gen/nsym.c
 OBJS=../../bin/ar/archive.o build.o misc.o ranlib.o touch.o ../../lib/libc/pdp/gen/nsym.o
 
-CFLAGS=-O -Iinclude -I../../bin/ar
+CFLAGS=-O -I../../bin/ar
 SEPFLAG=-i
 
 all:   ranlib.0 ranlib.5.0 ranlib
index 568ee8b..a373c4f 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/usr\.bin\/ranlib$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/usr/bin"
 make CC="$CC" SEPFLAG=
 make DESTDIR="$ROOT/cross" install
index 664167e..dabebcc 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/usr\.lib\/libvmf$//'`"
-CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+CC="cc -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
 mkdir --parents "$ROOT/cross/usr/lib"
 mkdir --parents "$ROOT/cross/usr/man/cat3"
 make CC="$CC"