Make strcompact, symcompact, symdump, symorder use libcross, move back to ucb
authorNick Downing <downing.nick@gmail.com>
Wed, 11 Jan 2017 12:54:04 +0000 (23:54 +1100)
committerNick Downing <downing.nick@gmail.com>
Wed, 11 Jan 2017 12:54:04 +0000 (23:54 +1100)
34 files changed:
.gitignore
n.sh
ucb/Makefile
ucb/n.sh
ucb/strcompact.c [moved from ucb/strcompact/strcompact.c with 66% similarity]
ucb/strcompact/Makefile [deleted file]
ucb/strcompact/include/a.out.h [deleted symlink]
ucb/strcompact/include/nlist.h [deleted symlink]
ucb/strcompact/include/sys/exec.h [deleted symlink]
ucb/strcompact/krcompat.h [deleted file]
ucb/strcompact/n.sh [deleted file]
ucb/symcompact.c [moved from ucb/symcompact/symcompact.c with 67% similarity]
ucb/symcompact/Makefile [deleted file]
ucb/symcompact/include/a.out.h [deleted symlink]
ucb/symcompact/include/nlist.h [deleted symlink]
ucb/symcompact/include/sys/exec.h [deleted symlink]
ucb/symcompact/krcompat.h [deleted file]
ucb/symcompact/n.sh [deleted file]
ucb/symdump.c [moved from ucb/symdump/symdump.c with 56% similarity]
ucb/symdump/Makefile [deleted file]
ucb/symdump/include/a.out.h [deleted symlink]
ucb/symdump/include/nlist.h [deleted symlink]
ucb/symdump/include/sys/exec.h [deleted symlink]
ucb/symdump/krcompat.h [deleted file]
ucb/symdump/n.sh [deleted file]
ucb/symorder.c [moved from ucb/symorder/symorder.c with 64% similarity]
ucb/symorder/Makefile [deleted file]
ucb/symorder/include/a.out.h [deleted symlink]
ucb/symorder/include/nlist.h [deleted symlink]
ucb/symorder/include/sys/exec.h [deleted symlink]
ucb/symorder/krcompat.h [deleted file]
ucb/symorder/n.sh [deleted file]
usr.lib/libF77/Version.c
usr.sbin/named/named/version

index d72a3e6..ab0bf32 100644 (file)
@@ -372,11 +372,11 @@ ucb/script
 ucb/sendbug/bugfiler
 ucb/sendbug/unixtomh
 ucb/soelim
-ucb/strcompact/strcompact
+ucb/strcompact
 ucb/strings
-ucb/symcompact/symcompact
-ucb/symdump/symdump
-ucb/symorder/symorder
+ucb/symcompact
+ucb/symdump
+ucb/symorder
 ucb/tail
 ucb/talk/talk
 ucb/tcopy
diff --git a/n.sh b/n.sh
index 7bcdd40..2f3f17d 100755 (executable)
--- a/n.sh
+++ b/n.sh
@@ -35,7 +35,7 @@ make -C bin MKDEP="$MKDEP" AAASUBDIR="ar as cc ld nm strip" AAASCRIPT= AAASTD="s
 #make -C lib/c2 MKDEP="$MKDEP" depend
 #make -C lib/ccom MKDEP="$MKDEP" depend
 #make -C lib/cpp MKDEP="$MKDEP" depend
-make -C ucb MKDEP="$MKDEP" AAASUBDIR="strcompact symcompact symdump symorder" AAACSHSCRIPT= AAASTD="mkstr unifdef xstr" AAANSTD= AAASETUID= AAAKMEM= depend
+make -C ucb MKDEP="$MKDEP" AAASUBDIR= AAACSHSCRIPT= AAASTD="mkstr unifdef xstr" AAANSTD="strcompact symcompact symdump symorder" AAASETUID= AAAKMEM= depend
 # AAAMKDEP below suppresses problems due to empty file list
 make -C usr.bin MKDEP="$MKDEP" AAAMKDEP="true" AAASUBDIR="lex ranlib yacc" AAASCRIPT="lorder mkdep" AAASRCS= AAASTD= AAANSTD= AAAKMEM= depend
 #make -C usr.lib/libcross MKDEP="$MKDEP" depend
@@ -63,7 +63,7 @@ make -C bin CC="$HOSTCC" LIBCROSS="$HOSTLIBCROSS" MANROFF="$MANROFF" CROSSPREFIX
 make -C lib/c2 CC="$HOSTCC" LIBCROSS="$HOSTLIBCROSS" MANROFF="$MANROFF" SEPFLAG=
 make -C lib/ccom CC="$HOSTCC" LIBCROSS="$HOSTLIBCROSS" HOSTCC="$HOSTCC" LIBCROSS="$HOSTLIBCROSS" HOSTLIBCROSS="$HOSTLIBCROSS" HOSTSEPFLAG= MANROFF="$MANROFF" LDC0FLAGS= LDC1FLAGS=
 make -C lib/cpp CC="$HOSTCC" LIBCROSS="$HOSTLIBCROSS" MANROFF="$MANROFF" STAGEPREFIX="\\\"$ROOT/stage\\\"" SEPFLAG=
-make -C ucb CC="$HOSTCC" LIBCROSS="$HOSTLIBCROSS" MANROFF="$MANROFF" SEPFLAG= CROSSPREFIX="\\\"$ROOT/cross\\\"" LOCALESTR="\\\"LC_ALL=C \\\"" AAASUBDIR="strcompact symcompact symdump symorder" AAACSHSCRIPT= AAASTD="mkstr unifdef xstr" AAANSTD= AAASETUID= AAAKMEM=
+make -C ucb CC="$HOSTCC" LIBCROSS="$HOSTLIBCROSS" MANROFF="$MANROFF" SEPFLAG= CROSSPREFIX="\\\"$ROOT/cross\\\"" LOCALESTR="\\\"LC_ALL=C \\\"" AAASUBDIR= AAACSHSCRIPT= AAASTD="mkstr unifdef xstr" AAANSTD="strcompact symcompact symdump symorder" AAASETUID= AAAKMEM=
 make -C usr.bin CC="$HOSTCC" LIBCROSS="$HOSTLIBCROSS" MANROFF="$MANROFF" SEPFLAG= CROSSCC="$ROOT/cross/bin/cc" CROSSNM="$ROOT/cross/bin/nm" CROSSPREFIX="\\\"$ROOT/cross\\\"" AAASUBDIR="lex ranlib yacc" AAASCRIPT="lorder mkdep" AAASRCS= AAASTD= AAANSTD= AAAKMEM=
 
 echo
@@ -74,6 +74,6 @@ make -C bin INSTALL="$INSTALL" DESTDIR="$ROOT/cross" AAASUBDIR="ar as cc ld nm s
 make -C lib/c2 INSTALL="$INSTALL" DESTDIR="$ROOT/cross" install
 make -C lib/ccom INSTALL="$INSTALL" DESTDIR="$ROOT/cross" install
 make -C lib/cpp INSTALL="$INSTALL" DESTDIR="$ROOT/cross" install
-make -C ucb INSTALL="$INSTALL" DESTDIR="$ROOT/cross" AAASUBDIR="strcompact symcompact symdump symorder" AAACSHSCRIPT= AAASTD="mkstr unifdef xstr" AAANSTD= AAASETUID= AAAKMEM= install
+make -C ucb INSTALL="$INSTALL" DESTDIR="$ROOT/cross" AAASUBDIR= AAACSHSCRIPT= AAASTD="mkstr unifdef xstr" AAANSTD="strcompact symcompact symdump symorder" AAASETUID= AAAKMEM= install
 # AAAINSTALL below suppresses problems due to empty file list
 make -C usr.bin INSTALL="$INSTALL" DESTDIR="$ROOT/cross" AAAINSTALL="true" AAASUBDIR="lex ranlib yacc" AAASCRIPT="lorder mkdep" AAASRCS= AAASTD= AAANSTD= AAAKMEM= install
index 47217e3..2e1cf53 100644 (file)
@@ -13,8 +13,8 @@ SEPFLAG= -i
 # Programs that live in subdirectories, and have makefiles of their own.
 #
 AAASUBDIR=     Mail compress dbx error ex finger fp ftp indent lock man \
-       more msgs netstat pascal rdist sendbug strcompact symcompact \
-       symdump symorder talk tftp tn3270 tset vgrind vlp window
+       more msgs netstat pascal rdist sendbug talk tftp tn3270 tset \
+       vgrind vlp window
 
 # Shell scripts that need only be installed and are never removed.
 #
@@ -31,7 +31,7 @@ AAASTD=       apply biff checknr colcrt colrm ctags expand fold \
 
 # C programs that live in the current directory and need explicit make lines.
 #
-AAANSTD=       clear ul vacation
+AAANSTD=       clear ul vacation strcompact symcompact symdump symorder
 
 # Programs that must run setuid to root
 #
@@ -77,7 +77,7 @@ FRC:
 depend:
        -for i in ${AAASUBDIR}; do (cd $$i; make ${MFLAGS} depend); done
        for i in ${AAASTD} ${AAANSTD} ${AAASETUID} ${AAAKMEM}; do \
-           ${CC} -M ${INCPATH} $$i.c | sed 's/\.o//' | \
+           ${CC} -M ${INCPATH} $$i.c | sed 's/NICK_DISABLED_THIS\.o//' | \
            awk ' { if ($$1 != prev) \
                { if (rec != "") print rec; rec = $$0; prev = $$1; } \
                else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
@@ -104,431 +104,522 @@ ul:
 vacation: vacation.c
        ${CC} -o vacation ${SEPFLAG} ${CFLAGS} vacation.c -ldbm
 
+strcompact: strcompact.c
+       ${CC} -o strcompact ${SEPFLAG} ${CFLAGS} -DCROSSPREFIX="${CROSSPREFIX}" -DLOCALESTR="${LOCALESTR}" strcompact.c ${LIBCROSS}
+
+symcompact: symcompact.c
+       ${CC} -o symcompact ${SEPFLAG} ${CFLAGS} symcompact.c ${LIBCROSS}
+
+symdump: symdump.c
+       ${CC} -o symdump ${SEPFLAG} ${CFLAGS} symdump.c ${LIBCROSS}
+
+symorder: symorder.c
+       ${CC} -o symorder ${SEPFLAG} ${CFLAGS} symorder.c ${LIBCROSS}
+
 # DO NOT DELETE THIS LINE -- make depend uses it
 
-apply: apply.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-biff: biff.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-biff: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-biff: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-biff: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-biff: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-checknr: checknr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-checknr: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-colcrt: colcrt.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-colrm: colrm.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-ctags: ctags.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-ctags: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-ctags: /home/nick/src/211bsd.git/stage/usr/include/strings.h
-ctags: /home/nick/src/211bsd.git/stage/usr/include/string.h
-ctags: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-ctags: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-ctags: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-expand: expand.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-fold: fold.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-from: from.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-from: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-from: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
-from: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
-from: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-from: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-from: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-gprof: gprof.c
-grep: grep.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-grep: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-grep: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-grep: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-grep: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-head: head.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-last: last.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-last: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-last: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-last: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-last: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-last: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-last: /home/nick/src/211bsd.git/stage/usr/include/utmp.h
-lastcomm: lastcomm.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/acct.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/utmp.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/struct.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-lastcomm: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
-leave: leave.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-leave: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-leave: /home/nick/src/211bsd.git/stage/usr/include/time.h
-leave: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-leave: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-leave: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-leave: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
-leave: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
-leave: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-logger: logger.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-logger: /home/nick/src/211bsd.git/stage/usr/include/syslog.h
-logger: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
-logger: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-logger: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-logger: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-logger: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-mkstr: mkstr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-mkstr: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
-mkstr: /home/nick/src/211bsd.git/stage/usr/include/string.h
-mkstr: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-mkstr: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-mkstr: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ./krcompat.h
-mkstr: /home/nick/src/211bsd.git/stage/usr/include/varargs.h
-mkstr: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-mkstr: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-printenv: printenv.c
-ruptime: ruptime.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
-ruptime: /home/nick/src/211bsd.git/stage/usr/include/protocols/rwhod.h
-rwho: rwho.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
-rwho: /home/nick/src/211bsd.git/stage/usr/include/protocols/rwhod.h
-sccs: sccs.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/errno.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sysexits.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-sccs: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
-script: script.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-script: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sgtty.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-script: /home/nick/src/211bsd.git/stage/usr/include/time.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-script: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-script: /home/nick/src/211bsd.git/stage/usr/include/sys/wait.h
-soelim: soelim.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-strings: strings.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/a.out.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-strings: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-tail: tail.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-tail: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-tail: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-tail: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-tail: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-tail: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-tail: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-tail: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-tail: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-tail: /home/nick/src/211bsd.git/stage/usr/include/errno.h
-tcopy: tcopy.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/mtio.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/string.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-tcopy: /home/nick/src/211bsd.git/stage/usr/include/errno.h
-telnet: telnet.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/time.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/netinet/in.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/arpa/telnet.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/arpa/inet.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/errno.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/setjmp.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/netdb.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/strings.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/string.h
-telnet: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-unexpand: unexpand.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-unifdef: unifdef.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-unifdef: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
-unifdef: /home/nick/src/211bsd.git/stage/usr/include/string.h
-unifdef: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-unifdef: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-unifdef: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-unifdef: /home/nick/src/211bsd.git/stage/usr/include/ctype.h ./krcompat.h
-unifdef: /home/nick/src/211bsd.git/stage/usr/include/varargs.h
-users: users.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-users: /home/nick/src/211bsd.git/stage/usr/include/utmp.h
-whois: whois.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-whois: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-whois: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-whois: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h
-whois: /home/nick/src/211bsd.git/stage/usr/include/netinet/in.h
-whois: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-whois: /home/nick/src/211bsd.git/stage/usr/include/netdb.h
-what: what.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-wc: wc.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-xstr: xstr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/string.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ./krcompat.h
-xstr: /home/nick/src/211bsd.git/stage/usr/include/varargs.h
-yes: yes.c
-clear: clear.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-clear: /home/nick/src/211bsd.git/stage/usr/include/sgtty.h
-clear: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
-clear: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
-clear: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
-ul: ul.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-vacation: vacation.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-vacation: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-vacation: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-vacation: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
-vacation: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-vacation: /home/nick/src/211bsd.git/stage/usr/include/sysexits.h
-vacation: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-vacation: /home/nick/src/211bsd.git/stage/usr/include/paths.h
-quota: quota.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/fstab.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/errno.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/string.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/quota.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-quota: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-rlogin: rlogin.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/wait.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/netinet/in.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sgtty.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/errno.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/setjmp.h
-rlogin: /home/nick/src/211bsd.git/stage/usr/include/netdb.h
-rsh: rsh.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/netinet/in.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/errno.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
-rsh: /home/nick/src/211bsd.git/stage/usr/include/netdb.h
-gcore: gcore.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/user.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/machine/fperr.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/time.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/proc.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-gcore: /home/nick/src/211bsd.git/stage/usr/include/varargs.h
-vmstat: vmstat.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/vm.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/vmparam.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/machine/vmparam.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmac.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmeter.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/vmsystm.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/dk.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/buf.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/inode.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/namei.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/uio.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-vmstat: /home/nick/src/211bsd.git/stage/usr/include/sys/text.h
-w: w.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
-w: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-w: /home/nick/src/211bsd.git/stage/usr/include/signal.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/sysctl.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-w: /home/nick/src/211bsd.git/stage/usr/include/time.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
-w: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/inode.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/text.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/proc.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/vm.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/vmparam.h
-w: /home/nick/src/211bsd.git/stage/usr/include/machine/vmparam.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmac.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmeter.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/vmsystm.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/map.h
-w: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
-w: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
-w: /home/nick/src/211bsd.git/stage/usr/include/utmp.h
-w: /home/nick/src/211bsd.git/stage/usr/include/string.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/user.h
-w: /home/nick/src/211bsd.git/stage/usr/include/machine/fperr.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/proc.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/tty.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
-w: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+apply.o: apply.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+biff.o: biff.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+biff.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+biff.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+biff.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+biff.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+checknr.o: checknr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+checknr.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+colcrt.o: colcrt.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+colrm.o: colrm.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+ctags.o: ctags.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+ctags.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+ctags.o: /home/nick/src/211bsd.git/stage/usr/include/strings.h
+ctags.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+ctags.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ctags.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ctags.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+expand.o: expand.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+fold.o: fold.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+from.o: from.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+from.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+from.o: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
+from.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+from.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+from.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+from.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+gprof.o: gprof.c
+grep.o: grep.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+grep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+grep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+grep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+grep.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+head.o: head.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+last.o: last.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+last.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+last.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+last.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+last.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+last.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+last.o: /home/nick/src/211bsd.git/stage/usr/include/utmp.h
+lastcomm.o: lastcomm.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/acct.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/utmp.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/struct.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+lastcomm.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+leave.o: leave.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+leave.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+leave.o: /home/nick/src/211bsd.git/stage/usr/include/time.h
+leave.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+leave.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+leave.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+leave.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+leave.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+leave.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+logger.o: logger.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+logger.o: /home/nick/src/211bsd.git/stage/usr/include/syslog.h
+logger.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+logger.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+logger.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+logger.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+logger.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+mkstr.o: mkstr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+mkstr.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+mkstr.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+mkstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+mkstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+mkstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ./krcompat.h
+mkstr.o: /home/nick/src/211bsd.git/stage/usr/include/varargs.h
+mkstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+mkstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+printenv.o: printenv.c
+ruptime.o: ruptime.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+ruptime.o: /home/nick/src/211bsd.git/stage/usr/include/protocols/rwhod.h
+rwho.o: rwho.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+rwho.o: /home/nick/src/211bsd.git/stage/usr/include/protocols/rwhod.h
+sccs.o: sccs.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/errno.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sysexits.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+sccs.o: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
+script.o: script.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sgtty.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/time.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+script.o: /home/nick/src/211bsd.git/stage/usr/include/sys/wait.h
+soelim.o: soelim.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+strings.o: strings.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/a.out.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+strings.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tail.o: tail.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+tail.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+tail.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tail.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+tail.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tail.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+tail.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+tail.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+tail.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tail.o: /home/nick/src/211bsd.git/stage/usr/include/errno.h
+tcopy.o: tcopy.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/mtio.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+tcopy.o: /home/nick/src/211bsd.git/stage/usr/include/errno.h
+telnet.o: telnet.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/time.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/netinet/in.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/arpa/telnet.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/arpa/inet.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/errno.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/setjmp.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/strings.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+telnet.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+unexpand.o: unexpand.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+unifdef.o: unifdef.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+unifdef.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+unifdef.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+unifdef.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+unifdef.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+unifdef.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+unifdef.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h ./krcompat.h
+unifdef.o: /home/nick/src/211bsd.git/stage/usr/include/varargs.h
+users.o: users.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+users.o: /home/nick/src/211bsd.git/stage/usr/include/utmp.h
+whois.o: whois.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+whois.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+whois.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+whois.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h
+whois.o: /home/nick/src/211bsd.git/stage/usr/include/netinet/in.h
+whois.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+whois.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h
+what.o: what.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+wc.o: wc.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+xstr.o: xstr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h ./krcompat.h
+xstr.o: /home/nick/src/211bsd.git/stage/usr/include/varargs.h
+yes.o: yes.c
+clear.o: clear.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+clear.o: /home/nick/src/211bsd.git/stage/usr/include/sgtty.h
+clear.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
+clear.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+clear.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+ul.o: ul.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+vacation.o: vacation.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vacation.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+vacation.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vacation.o: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
+vacation.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+vacation.o: /home/nick/src/211bsd.git/stage/usr/include/sysexits.h
+vacation.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+vacation.o: /home/nick/src/211bsd.git/stage/usr/include/paths.h
+strcompact.o: strcompact.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sysexits.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/a.out.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+strcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symcompact.o: symcompact.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sysexits.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/a.out.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symcompact.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symdump.o: symdump.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/a.out.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symdump.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symorder.o: symorder.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/stdlib.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sysexits.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/unistd.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/a.out.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+symorder.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota.o: quota.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/fstab.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/errno.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/quota.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+quota.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+rlogin.o: rlogin.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/wait.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/netinet/in.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sgtty.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/errno.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/setjmp.h
+rlogin.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h
+rsh.o: rsh.c /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/netinet/in.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/errno.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/pwd.h
+rsh.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h
+gcore.o: gcore.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/user.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/machine/fperr.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/time.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/proc.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+gcore.o: /home/nick/src/211bsd.git/stage/usr/include/varargs.h
+vmstat.o: vmstat.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/nlist.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vm.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmparam.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/machine/vmparam.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmac.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmeter.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmsystm.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dk.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/buf.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/inode.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/namei.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/uio.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+vmstat.o: /home/nick/src/211bsd.git/stage/usr/include/sys/text.h
+w.o: w.c /home/nick/src/211bsd.git/stage/usr/include/sys/param.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/localopts.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stddef.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/machine/machparam.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/signal.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/sysctl.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/time.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/inode.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/text.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/proc.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vm.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmparam.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/machine/vmparam.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmac.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmmeter.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/vmsystm.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/map.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/stdio.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/utmp.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/string.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/stat.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/user.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/machine/fperr.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/dir.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/exec.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/time.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/resource.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/errno.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/proc.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ioctl.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/tty.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttychars.h
+w.o: /home/nick/src/211bsd.git/stage/usr/include/sys/ttydev.h
 # DEPENDENCIES MUST END AT END OF FILE
 # IF YOU PUT STUFF HERE IT WILL GO AWAY
 # see make depend above
index 91e0da2..7a64661 100755 (executable)
--- a/ucb/n.sh
+++ b/ucb/n.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 ROOT="`pwd |sed -e 's/\/ucb$//'`"
-HOSTCC="cc -g -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+HOSTCC="cc -I$ROOT/cross/usr/include -L$ROOT/cross/usr/lib -DCROSS -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
+HOSTLIBCROSS="-lcross"
 INSTALL="$ROOT/scripts/install.sh --strip-program=/bin/true"
 MANROFF="nroff -man"
 mkdir --parents "$ROOT/cross/usr/ucb"
-make CC="$HOSTCC" MANROFF="$MANROFF" SEPFLAG= mkstr unifdef xstr && \
-$INSTALL mkstr unifdef xstr "$ROOT/cross/usr/ucb"
+make CC="$HOSTCC" LIBCROSS="$HOSTLIBCROSS" CROSSPREFIX="\\\"$ROOT/cross\\\"" LOCALESTR="\\\"LC_ALL=C \\\"" MANROFF="$MANROFF" SEPFLAG= mkstr strcompact symcompact symdump symorder unifdef xstr && \
+$INSTALL mkstr strcompact symcompact symdump symorder unifdef xstr "$ROOT/cross/usr/ucb"
similarity index 66%
rename from ucb/strcompact/strcompact.c
rename to ucb/strcompact.c
index 0f69797..f0d479f 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
+#ifdef CROSS
+#include "cross/a.out.h"
+#include "cross/sys/types.h"
 #else
-#include <stdint.h>
-#define OFF_T int32_t
+#include <a.out.h>
+#include <sys/types.h>
+#define cross_exec exec
+#define cross_nlist nlist
+#define cross_off_t off_t
+#define cross_xexec xexec
 #endif
 
        char    *Pgm;
        char    *Symdump = CROSSPREFIX "/usr/ucb/symdump";
 static char    strfn[32], symfn[32];
 
-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));
+#ifndef __P
+#ifdef __STDC__
+#define __P(params) params
+#else
+#define __P(params) ()
+#endif
+#endif
+
+int main __P((int argc, char **argv));
+void copyfile __P((register FILE *in, register FILE *out));
+void fatal __P((char *Pgm, char *str));
+void cleanup __P((void));
 
 int main(argc, argv) int argc; char **argv; {
-       struct  nlist   sym;
-#ifdef pdp11
-       char    buf1[128];
-#else
+       struct  cross_nlist     sym;
+#ifdef CROSS
 /* CROSSPREFIX can be very long, really should check it, but fudge it for now */
        char    buf1[BUFSIZ];
+#else
+       char    buf1[128];
 #endif
        char    symname[64], savedname[64];
-#ifndef pdp11
-       /* note: must be at least as large as struct(nlist), OFF_T */
-       char    temp[sizeof(struct xexec)];
+       struct  cross_xexec     xhdr;
+#ifdef CROSS
        int     i;
 #endif
-       struct  xexec   xhdr;
        int     nsyms, len;
        int     fd;
        FILE    *symfp, *strfp, *sortfp;
 register FILE  *fpin;
-       OFF_T   stroff;
+       cross_off_t     stroff;
        unsigned /*short*/ type, value, ovly;
        void    cleanup();
+#ifdef CROSS
+       cross_off_t     temp_stroff;
+#endif
 
        Pgm = argv[0];
        signal(SIGQUIT, (sig_t)cleanup);
@@ -96,34 +107,30 @@ 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] & 0xff) | ((temp[1] & 0xff) << 8);
-       xhdr.e.a_text = (temp[2] & 0xff) | ((temp[3] & 0xff) << 8);
-       xhdr.e.a_data = (temp[4] & 0xff) | ((temp[5] & 0xff) << 8);
-       xhdr.e.a_bss = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
-       xhdr.e.a_syms = (temp[8] & 0xff) | ((temp[9] & 0xff) << 8);
-       xhdr.e.a_entry = (temp[10] & 0xff) | ((temp[11] & 0xff) << 8);
-       xhdr.e.a_unused = (temp[12] & 0xff) | ((temp[13] & 0xff) << 8);
-       xhdr.e.a_flag = (temp[14] & 0xff) | ((temp[15] & 0xff) << 8);
-       xhdr.o.max_ovl = (temp[16] & 0xff) | ((temp[17] & 0xff) << 8);
+#ifdef CROSS
+       xhdr.e.a_magic = cross_read_int((char *)&xhdr.e.a_magic);
+       xhdr.e.a_text = cross_read_uint((char *)&xhdr.e.a_text);
+       xhdr.e.a_data = cross_read_uint((char *)&xhdr.e.a_data);
+       xhdr.e.a_bss = cross_read_uint((char *)&xhdr.e.a_bss);
+       xhdr.e.a_syms = cross_read_uint((char *)&xhdr.e.a_syms);
+       xhdr.e.a_entry = cross_read_uint((char *)&xhdr.e.a_entry);
+       xhdr.e.a_unused = cross_read_uint((char *)&xhdr.e.a_unused);
+       xhdr.e.a_flag = cross_read_uint((char *)&xhdr.e.a_flag);
+       xhdr.o.max_ovl = cross_read_int((char *)&xhdr.o.max_ovl);
        for (i = 0; i < NOVL; ++i)
-               xhdr.o.ov_siz[i] = (temp[i * 2 + 18] & 0xff) | ((temp[i * 2 + 19] & 0xff) << 8);
+               xhdr.o.ov_siz[i] = cross_read_uint((char *)(xhdr.o.ov_siz + i));
 #endif
        if      (N_BADMAG(xhdr.e))
                {
                fprintf(stderr, "%s: Bad magic number\n", Pgm);
                exit(EX_DATAERR);
                }
-       nsyms = xhdr.e.a_syms / sizeof (struct nlist);
+       nsyms = xhdr.e.a_syms / sizeof (struct cross_nlist);
        if      (!nsyms)
                {
                fprintf(stderr, "%s: '%s' stripped\n", Pgm, argv[1]);
@@ -152,7 +159,7 @@ register FILE       *fpin;
                exit(EX_CANTCREAT);
                }
 
-       stroff = sizeof (OFF_T);
+       stroff = sizeof (cross_off_t);
        len = 0;
        nsyms = 0;
        while   (fscanf(sortfp, "%s %u %u %u\n", symname, &type, &ovly,
@@ -169,19 +176,11 @@ 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);
+#ifdef CROSS
+               cross_write_off_t((char *)&sym.n_un.n_strx, sym.n_un.n_strx);
+               cross_write_uint((char *)&sym.n_value, sym.n_value);
 #endif
+               fwrite(&sym, sizeof (sym), 1, symfp);
                nsyms++;
                }
        stroff += len;
@@ -204,14 +203,11 @@ register FILE     *fpin;
  * length, reflecting the smaller string table.
 */
        copyfile(symfp, fpin);
-#ifdef pdp11
-       fwrite(&stroff, sizeof (OFF_T), 1, fpin);
+#ifdef CROSS
+       cross_write_off_t((char *)&temp_stroff, stroff);
+       fwrite(&temp_stroff, sizeof (cross_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);
+       fwrite(&stroff, sizeof (cross_off_t), 1, fpin);
 #endif
        copyfile(strfp, fpin);
        ftruncate(fileno(fpin), ftell(fpin));
@@ -221,27 +217,17 @@ register FILE     *fpin;
 */
        rewind(fpin);
        xhdr.e.a_syms = nsyms * sizeof (sym);
-#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);
+#ifdef CROSS
+       cross_write_int((char *)&xhdr.e.a_magic, xhdr.e.a_magic);
+       cross_write_uint((char *)&xhdr.e.a_text, xhdr.e.a_text);
+       cross_write_uint((char *)&xhdr.e.a_data, xhdr.e.a_data);
+       cross_write_uint((char *)&xhdr.e.a_bss, xhdr.e.a_bss);
+       cross_write_uint((char *)&xhdr.e.a_syms, xhdr.e.a_syms);
+       cross_write_uint((char *)&xhdr.e.a_entry, xhdr.e.a_entry);
+       cross_write_uint((char *)&xhdr.e.a_unused, xhdr.e.a_unused);
+       cross_write_uint((char *)&xhdr.e.a_flag, xhdr.e.a_flag);
 #endif
+       fwrite(&xhdr.e, sizeof (xhdr.e), 1, fpin);
 
        fclose(fpin);
        fclose(symfp);
diff --git a/ucb/strcompact/Makefile b/ucb/strcompact/Makefile
deleted file mode 100644 (file)
index 2fa1b34..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-INSTALL=install
-# 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 -DCROSSPREFIX="${CROSSPREFIX}" -DLOCALESTR="${LOCALESTR}"
-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
deleted file mode 120000 (symlink)
index 9dd9aa8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../include/a.out.h
\ No newline at end of file
diff --git a/ucb/strcompact/include/nlist.h b/ucb/strcompact/include/nlist.h
deleted file mode 120000 (symlink)
index 0c27973..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../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
deleted file mode 120000 (symlink)
index 0f3c005..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../sys/h/exec.h
\ No newline at end of file
diff --git a/ucb/strcompact/krcompat.h b/ucb/strcompact/krcompat.h
deleted file mode 100644 (file)
index b5c0b7d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _KRCOMPAT_H
-#define _KRCOMPAT_H 1
-
-#undef PARAMS
-#ifdef __STDC__
-#include <stdarg.h>
-#define VA_START(ap, arg) va_start(ap, arg)
-#define PARAMS(args) args
-#else
-#include <varargs.h>
-#define VA_START(ap, arg) va_start(ap)
-#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
deleted file mode 100755 (executable)
index 072b2ab..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-ROOT="`pwd |sed -e 's/\/ucb\/strcompact$//'`"
-HOSTCC="cc -g -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
-INSTALL="$ROOT/scripts/install.sh --strip-program=/bin/true"
-MANROFF="nroff -man"
-mkdir --parents "$ROOT/cross/usr/ucb"
-make CC="$HOSTCC" MANROFF="$MANROFF" SEPFLAG= CROSSPREFIX="\\\"$ROOT/cross\\\"" LOCALESTR="\\\"LC_ALL=C \\\"" && \
-make INSTALL="$INSTALL" DESTDIR="$ROOT/cross" install
similarity index 67%
rename from ucb/symcompact/symcompact.c
rename to ucb/symcompact.c
index 0ca2866..e33869c 100644 (file)
@@ -17,7 +17,7 @@
  * program and the routine has been relocated by the linker, in that event
  * the '_' form is the overlay "thunk" and the '~' form is the actual 
  * routine itself.  Only 'text' symbols have both forms.  Reducing the
- * number of symbols greatly speeds up 'nlist' processing as well as 
+ * number of symbols greatly speeds up 'cross_nlist' processing as well as 
  * cutting down memory requirements for programs such as 'adb' and 'nm'.
  *
  * NOTE: This program attempts to hold both the string and symbol tables
@@ -36,7 +36,6 @@
 */
 
 #include <stdio.h>
-#include <a.out.h>
 #include <ctype.h>
 #include <signal.h>
 #include <stdlib.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
+#ifdef CROSS
+#include "cross/a.out.h"
+#include "cross/sys/types.h"
 #else
-#include <stdint.h>
-#define OFF_T int32_t
+#include <a.out.h>
+#include <sys/types.h>
+#define cross_exec exec
+#define cross_nlist nlist
+#define cross_off_t off_t
+#define cross_xexec xexec
 #endif
 
        char    *Pgm;
 static char    strtmp[20];
 
-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)
+#ifndef __P
+#ifdef __STDC__
+#define __P(params) params
 #else
+#define __P(params) ()
+#endif
+#endif
+
+int main __P((int argc, char **argv));
+void cleanup __P((void));
+int exclude __P((register struct cross_nlist *sp));
+
+#ifdef CROSS
 #define N_NAME(sp) (strtab + (int)(sp)->n_un.n_strx)
+#else
+#define N_NAME(sp) ((sp)->n_un.n_name)
 #endif
 
 int main(argc, argv) int argc; char **argv; {
@@ -74,15 +84,11 @@ int main(argc, argv) int argc; char **argv; {
        void    cleanup();
        char    *strtab;
        char    fbuf1[BUFSIZ], fbuf2[BUFSIZ];
-       off_t   symoff, stroff, ltmp;
-       OFF_T   strsiz;
-       register struct nlist   *sp, *sp2;
-       struct  nlist   *symtab, *symtabend, syment;
-#ifndef pdp11
-       /* note: must be at least as large as struct(nlist), OFF_T */
-       char    temp[sizeof(struct xexec)];
-#endif
-       struct  xexec   xhdr;
+       cross_off_t     symoff, stroff, ltmp;
+       cross_off_t     strsiz;
+       register struct cross_nlist     *sp, *sp2;
+       struct  cross_nlist     *symtab, *symtabend, syment;
+       struct  cross_xexec     xhdr;
 
        Pgm = argv[0];
        signal(SIGQUIT, (sig_t)cleanup);
@@ -102,35 +108,31 @@ int main(argc, argv) int argc; char **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] & 0xff) | ((temp[1] & 0xff) << 8);
-       xhdr.e.a_text = (temp[2] & 0xff) | ((temp[3] & 0xff) << 8);
-       xhdr.e.a_data = (temp[4] & 0xff) | ((temp[5] & 0xff) << 8);
-       xhdr.e.a_bss = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
-       xhdr.e.a_syms = (temp[8] & 0xff) | ((temp[9] & 0xff) << 8);
-       xhdr.e.a_entry = (temp[10] & 0xff) | ((temp[11] & 0xff) << 8);
-       xhdr.e.a_unused = (temp[12] & 0xff) | ((temp[13] & 0xff) << 8);
-       xhdr.e.a_flag = (temp[14] & 0xff) | ((temp[15] & 0xff) << 8);
-       xhdr.o.max_ovl = (temp[16] & 0xff) | ((temp[17] & 0xff) << 8);
+#ifdef CROSS
+       xhdr.e.a_magic = cross_read_int((char *)&xhdr.e.a_magic);
+       xhdr.e.a_text = cross_read_uint((char *)&xhdr.e.a_text);
+       xhdr.e.a_data = cross_read_uint((char *)&xhdr.e.a_data);
+       xhdr.e.a_bss = cross_read_uint((char *)&xhdr.e.a_bss);
+       xhdr.e.a_syms = cross_read_uint((char *)&xhdr.e.a_syms);
+       xhdr.e.a_entry = cross_read_uint((char *)&xhdr.e.a_entry);
+       xhdr.e.a_unused = cross_read_uint((char *)&xhdr.e.a_unused);
+       xhdr.e.a_flag = cross_read_uint((char *)&xhdr.e.a_flag);
+       xhdr.o.max_ovl = cross_read_int((char *)&xhdr.o.max_ovl);
        for (i = 0; i < NOVL; ++i)
-               xhdr.o.ov_siz[i] = (temp[i * 2 + 18] & 0xff) | ((temp[i * 2 + 19] & 0xff) << 8);
+               xhdr.o.ov_siz[i] = cross_read_uint((char *)(xhdr.o.ov_siz + i));
 #endif
        if      (N_BADMAG(xhdr.e))
                {
                fprintf(stderr, "%s: Bad magic number\n", Pgm);
                exit(EX_DATAERR);
                }
-       nsyms = xhdr.e.a_syms / sizeof (struct nlist);
+       nsyms = xhdr.e.a_syms / sizeof (struct cross_nlist);
        if      (!nsyms)
                {
                fprintf(stderr, "%s: '%s' stripped\n", Pgm);
@@ -144,12 +146,9 @@ int main(argc, argv) int argc; char **argv; {
  * the size.
 */
        fseek(fp, stroff, L_SET);
-#ifdef pdp11
-       fread(&strsiz, sizeof (OFF_T), 1, fp);
-#else
-       fread(temp, sizeof (OFF_T), 1, fp);
-       strsiz = ((temp[0] & 0xffL) << 16) | ((temp[1] & 0xffL) << 24) |
-           (temp[2] & 0xffL) | ((temp[3] & 0xffL) << 8);
+       fread(&strsiz, sizeof (cross_off_t), 1, fp);
+#ifdef CROSS
+       strsiz = cross_read_off_t((char *)&strsiz);
 #endif
        if      (strsiz > 48 * 1024L)
                {
@@ -168,8 +167,8 @@ int main(argc, argv) int argc; char **argv; {
  * address used so that we don't have to adjust each symbol table entry's
  * string offset.
 */
-       cnt = fread(strtab + sizeof (OFF_T), 1, (int)strsiz - sizeof (OFF_T), fp);
-       if      (cnt != (int)strsiz - sizeof (OFF_T))
+       cnt = fread(strtab + sizeof (cross_off_t), 1, (int)strsiz - sizeof (cross_off_t), fp);
+       if      (cnt != (int)strsiz - sizeof (cross_off_t))
                {
                fprintf(stderr, "%s: Premature EOF reading strings\n", Pgm);
                exit(EX_DATAERR);
@@ -182,15 +181,10 @@ int main(argc, argv) int argc; char **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] & 0xffL) << 16) | ((temp[1] & 0xffL) << 24) |
-                   (temp[2] & 0xffL) | ((temp[3] & 0xffL) << 8);
-               syment.n_type = temp[4] & 0xff;
-               syment.n_ovly = temp[5] & 0xff;
-               syment.n_value = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
+#ifdef CROSS
+               syment.n_un.n_strx = cross_read_off_t((char *)&syment.n_un.n_strx);
+               syment.n_value = cross_read_uint((char *)&syment.n_value);
 #endif
                if      (exclude(&syment))
                        continue;
@@ -200,7 +194,7 @@ int main(argc, argv) int argc; char **argv; {
 /*
  * Allocate memory for the symbol table.
 */
-       symtab = (struct nlist *)malloc(cnt * sizeof (struct nlist));
+       symtab = (struct cross_nlist *)malloc(cnt * sizeof (struct cross_nlist));
        if      (!symtab)
                {
                fprintf(stderr, "%s: no memory for symbols\n", Pgm);
@@ -216,15 +210,10 @@ int main(argc, argv) int argc; char **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] & 0xffL) << 16) | ((temp[1] & 0xffL) << 24) |
-                   (temp[2] & 0xffL) | ((temp[3] & 0xffL) << 8);
-               syment.n_type = temp[4] & 0xff;
-               syment.n_ovly = temp[5] & 0xff;
-               syment.n_value = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
+#ifdef CROSS
+               syment.n_un.n_strx = cross_read_off_t((char *)&syment.n_un.n_strx);
+               syment.n_value = cross_read_uint((char *)&syment.n_value);
 #endif
                if      (exclude(&syment))
                        continue;
@@ -273,10 +262,10 @@ int main(argc, argv) int argc; char **argv; {
  * Found a match.  Null out the '~' symbol's string address.
 */
                        symsremoved++;
-#ifdef pdp11
-                       sp->n_un.n_name = NULL;
+#ifdef CROSS
+                       sp->n_un.n_strx = 0;
 #else
-                       sp->n_un.n_strx = -1L;
+                       sp->n_un.n_name = NULL;
 #endif
                        break;
                        }
@@ -297,16 +286,17 @@ int main(argc, argv) int argc; char **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 (OFF_T);
+       ltmp = sizeof (cross_off_t);
        for     (sp = symtab; sp < symtabend; sp++)
                {
 #ifdef pdp11
+               /* note: we could have just nulled out all 4 bytes earlier */
                if      (!sp->n_un.n_name) {
-                       sp->n_un.n_strx = -1L;
+                       sp->n_un.n_strx = 0;
                        continue;
                }
 #else
-               if      (sp->n_un.n_strx < 0)
+               if      (!sp->n_un.n_strx)
 #endif
                        continue;
                len = strlen(N_NAME(sp)) + 1;
@@ -331,35 +321,22 @@ int main(argc, argv) int argc; char **argv; {
        ftruncate(fileno(fp), ftell(fp));
        for     (sp = symtab; sp < symtabend; sp++)
                {
-               if      (sp->n_un.n_strx < 0)
+               if      (!sp->n_un.n_strx)
                        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);
+#ifdef CROSS
+               cross_write_off_t((char *)&sp->n_un.n_strx, sp->n_un.n_strx);
+               cross_write_uint((char *)&sp->n_value, sp->n_value);
 #endif
+               fwrite(sp, sizeof (struct cross_nlist), 1, fp);
                }
 /*
  * Next write out the string table size longword.
 */
-#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);
+#ifdef CROSS
+       cross_write_off_t((char *)&ltmp, ltmp);
 #endif
+       fwrite(&ltmp, sizeof (cross_off_t), 1, fp);
 /*
  * We're done with the in memory symbol table, release it.  Then append
  * the string table to the executable file.
@@ -369,28 +346,18 @@ int main(argc, argv) int argc; char **argv; {
                putc(c, fp);
        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);
+       xhdr.e.a_syms = nsyms * sizeof (struct cross_nlist);
+#ifdef CROSS
+       cross_write_int((char *)&xhdr.e.a_magic, xhdr.e.a_magic);
+       cross_write_uint((char *)&xhdr.e.a_text, xhdr.e.a_text);
+       cross_write_uint((char *)&xhdr.e.a_data, xhdr.e.a_data);
+       cross_write_uint((char *)&xhdr.e.a_bss, xhdr.e.a_bss);
+       cross_write_uint((char *)&xhdr.e.a_syms, xhdr.e.a_syms);
+       cross_write_uint((char *)&xhdr.e.a_entry, xhdr.e.a_entry);
+       cross_write_uint((char *)&xhdr.e.a_unused, xhdr.e.a_unused);
+       cross_write_uint((char *)&xhdr.e.a_flag, xhdr.e.a_flag);
 #endif
+       fwrite(&xhdr.e, sizeof (xhdr.e), 1, fp);
        fclose(fp);
        printf("%s: %d symbols removed\n", Pgm, symsremoved);
        cleanup();
@@ -407,7 +374,7 @@ void cleanup() {
  * symbol is to be excluded, 0 if the symbol is to be retained.
 */
 
-int exclude(sp) register struct nlist *sp; {
+int exclude(sp) register struct cross_nlist *sp; {
        if      (sp->n_type == N_REG)
                return(1);
        if      (sp->n_un.n_strx == 0)
diff --git a/ucb/symcompact/Makefile b/ucb/symcompact/Makefile
deleted file mode 100644 (file)
index 1d36ed8..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-INSTALL=install
-# 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
deleted file mode 120000 (symlink)
index 9dd9aa8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../include/a.out.h
\ No newline at end of file
diff --git a/ucb/symcompact/include/nlist.h b/ucb/symcompact/include/nlist.h
deleted file mode 120000 (symlink)
index 0c27973..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../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
deleted file mode 120000 (symlink)
index 0f3c005..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../sys/h/exec.h
\ No newline at end of file
diff --git a/ucb/symcompact/krcompat.h b/ucb/symcompact/krcompat.h
deleted file mode 100644 (file)
index b5c0b7d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _KRCOMPAT_H
-#define _KRCOMPAT_H 1
-
-#undef PARAMS
-#ifdef __STDC__
-#include <stdarg.h>
-#define VA_START(ap, arg) va_start(ap, arg)
-#define PARAMS(args) args
-#else
-#include <varargs.h>
-#define VA_START(ap, arg) va_start(ap)
-#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
deleted file mode 100755 (executable)
index 8ca6026..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-ROOT="`pwd |sed -e 's/\/ucb\/symcompact$//'`"
-HOSTCC="cc -g -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
-INSTALL="$ROOT/scripts/install.sh --strip-program=/bin/true"
-MANROFF="nroff -man"
-mkdir --parents "$ROOT/cross/usr/ucb"
-make CC="$HOSTCC" MANROFF="$MANROFF" SEPFLAG= && \
-make INSTALL="$INSTALL" DESTDIR="$ROOT/cross" install
similarity index 56%
rename from ucb/symdump/symdump.c
rename to ucb/symdump.c
index 5126a33..2b626ee 100644 (file)
 #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
+#ifdef CROSS
+#include "cross/a.out.h"
+#include "cross/sys/types.h"
 #else
-#include <stdint.h>
-#define OFF_T int32_t
+#include <a.out.h>
+#include <sys/types.h>
+#define cross_exec exec
+#define cross_nlist nlist
+#define cross_off_t off_t
+#define cross_xexec xexec
 #endif
 
        char    **xargv;        /* global copy of argv */
        char    *strp;          /* pointer to in-memory string table */
-       struct  xexec xhdr;     /* the extended a.out header */
+       struct  cross_xexec xhdr;       /* the extended a.out header */
+
+#ifndef __P
+#ifdef __STDC__
+#define __P(params) params
+#else
+#define __P(params) ()
+#endif
+#endif
 
-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 __P((int argc, char **argv));
+void namelist __P((void));
+void dumpsyms __P((register FILE *fi, int nsyms));
+void error __P((char *s));
 
 int main(argc, argv) int argc; char **argv; {
        if      (argc != 2)
@@ -63,14 +73,12 @@ int main(argc, argv) int argc; char **argv; {
 
 void namelist() {
 #ifndef pdp11
-       /* note: must be at least as large as OFF_T */
-       char    temp[sizeof(struct xexec)];
        int     i;
 #endif
        char    ibuf[BUFSIZ];
        register FILE   *fi;
-       OFF_T   o, stroff;
-       OFF_T   strsiz;
+       cross_off_t     o, stroff;
+       cross_off_t     strsiz;
        register int n;
 
        fi = fopen(*xargv, "r");
@@ -78,24 +86,20 @@ void namelist() {
                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] & 0xff) | ((temp[1] & 0xff) << 8);
-       xhdr.e.a_text = (temp[2] & 0xff) | ((temp[3] & 0xff) << 8);
-       xhdr.e.a_data = (temp[4] & 0xff) | ((temp[5] & 0xff) << 8);
-       xhdr.e.a_bss = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
-       xhdr.e.a_syms = (temp[8] & 0xff) | ((temp[9] & 0xff) << 8);
-       xhdr.e.a_entry = (temp[10] & 0xff) | ((temp[11] & 0xff) << 8);
-       xhdr.e.a_unused = (temp[12] & 0xff) | ((temp[13] & 0xff) << 8);
-       xhdr.e.a_flag = (temp[14] & 0xff) | ((temp[15] & 0xff) << 8);
-       xhdr.o.max_ovl = (temp[16] & 0xff) | ((temp[17] & 0xff) << 8);
+#ifdef CROSS
+       xhdr.e.a_magic = cross_read_int((char *)&xhdr.e.a_magic);
+       xhdr.e.a_text = cross_read_uint((char *)&xhdr.e.a_text);
+       xhdr.e.a_data = cross_read_uint((char *)&xhdr.e.a_data);
+       xhdr.e.a_bss = cross_read_uint((char *)&xhdr.e.a_bss);
+       xhdr.e.a_syms = cross_read_uint((char *)&xhdr.e.a_syms);
+       xhdr.e.a_entry = cross_read_uint((char *)&xhdr.e.a_entry);
+       xhdr.e.a_unused = cross_read_uint((char *)&xhdr.e.a_unused);
+       xhdr.e.a_flag = cross_read_uint((char *)&xhdr.e.a_flag);
+       xhdr.o.max_ovl = cross_read_int((char *)&xhdr.o.max_ovl);
        for (i = 0; i < NOVL; ++i)
-               xhdr.o.ov_siz[i] = (temp[18 + i * 2] & 0xff) | ((temp[19 + i * 2] & 0xff) << 8);
+               xhdr.o.ov_siz[i] = cross_read_uint((char *)(xhdr.o.ov_siz + i));
 #endif
        if      (N_BADMAG(xhdr.e))
                error("bad format");
@@ -103,21 +107,16 @@ void namelist() {
 
        o = N_SYMOFF(xhdr);
        fseek(fi, (off_t)o, L_SET);
-       n = xhdr.e.a_syms / sizeof(struct nlist);
+       n = xhdr.e.a_syms / sizeof(struct cross_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
+       if      (fread(&strsiz, sizeof (cross_off_t), 1, fi) != 1)
                error("no string table");
-#ifndef pdp11
-       strsiz = ((temp[0] & 0xffL) << 16) | ((temp[1] & 0xffL) << 24) |
-           (temp[2] & 0xffL) | ((temp[3] & 0xffL) << 8);
+#ifdef CROSS
+       strsiz = cross_read_off_t((char *)&strsiz);
 #endif
        strp = (char *)malloc((int)strsiz);
        if      (strp == NULL || strsiz > 48 * 1024L)
@@ -133,27 +132,17 @@ void namelist() {
 
 void dumpsyms(fi, nsyms) register FILE *fi; int nsyms; {
        register int n;
-#ifndef pdp11
-       char    temp[sizeof(struct nlist)];
-#endif
-       struct  nlist sym;
-       register struct nlist *sp;
+       struct  cross_nlist sym;
+       register struct cross_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] & 0xffL) << 16) | ((temp[1] & 0xffL) << 24) |
-                   (temp[2] & 0xffL) | ((temp[3] & 0xffL) << 8);
-               sym.n_type = temp[4] & 0xff;
-               sym.n_ovly = temp[5] & 0xff;
-               sym.n_value = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
+#ifdef CROSS
+               sym.n_un.n_strx = cross_read_off_t((char *)&sym.n_un.n_strx);
+               sym.n_value = cross_read_uint((char *)&sym.n_value);
 #endif
                printf("%s %u %u %u\n", strp + (int)sp->n_un.n_strx, sp->n_type,
                        sp->n_ovly, sp->n_value);
diff --git a/ucb/symdump/Makefile b/ucb/symdump/Makefile
deleted file mode 100644 (file)
index 8012037..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-INSTALL=install
-# 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
deleted file mode 120000 (symlink)
index 9dd9aa8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../include/a.out.h
\ No newline at end of file
diff --git a/ucb/symdump/include/nlist.h b/ucb/symdump/include/nlist.h
deleted file mode 120000 (symlink)
index 0c27973..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../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
deleted file mode 120000 (symlink)
index 0f3c005..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../sys/h/exec.h
\ No newline at end of file
diff --git a/ucb/symdump/krcompat.h b/ucb/symdump/krcompat.h
deleted file mode 100644 (file)
index b5c0b7d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _KRCOMPAT_H
-#define _KRCOMPAT_H 1
-
-#undef PARAMS
-#ifdef __STDC__
-#include <stdarg.h>
-#define VA_START(ap, arg) va_start(ap, arg)
-#define PARAMS(args) args
-#else
-#include <varargs.h>
-#define VA_START(ap, arg) va_start(ap)
-#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
deleted file mode 100755 (executable)
index bd63b85..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-ROOT="`pwd |sed -e 's/\/ucb\/symdump$//'`"
-HOSTCC="cc -g -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
-INSTALL="$ROOT/scripts/install.sh --strip-program=/bin/true"
-MANROFF="nroff -man"
-mkdir --parents "$ROOT/cross/usr/ucb"
-make CC="$HOSTCC" MANROFF="$MANROFF" SEPFLAG= && \
-make INSTALL="$INSTALL" DESTDIR="$ROOT/cross" install
similarity index 64%
rename from ucb/symorder/symorder.c
rename to ucb/symorder.c
index dfddf39..d79311e 100644 (file)
@@ -22,7 +22,6 @@
 */
 
 #include <stdio.h>
-#include <a.out.h>
 #include <ctype.h>
 #include <signal.h>
 #include <stdlib.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
+#ifdef CROSS
+#include "cross/a.out.h"
+#include "cross/sys/types.h"
 #else
-#include <stdint.h>
-#define OFF_T int32_t
+#include <a.out.h>
+#include <sys/types.h>
+#define cross_exec exec
+#define cross_nlist nlist
+#define cross_off_t off_t
+#define cross_xexec xexec
 #endif
 
 #define NUMSYMS        125
 static char    sym1tmp[20], sym2tmp[20], strtmp[20];
 static char    *strtab, *oldname;
 
-int main PARAMS((int argc, char **argv));
-int inlist PARAMS((register struct nlist *sp));
-void getsyms PARAMS((FILE *fp));
-void cleanup PARAMS((void));
+#ifndef __P
+#ifdef __STDC__
+#define __P(params) params
+#else
+#define __P(params) ()
+#endif
+#endif
+
+int main __P((int argc, char **argv));
+int inlist __P((register struct cross_nlist *sp));
+void getsyms __P((FILE *fp));
+void cleanup __P((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;
-       OFF_T   strsiz;
-       struct  nlist   sym;
-#ifndef pdp11
-       /* note: must be at least as large as struct(nlist), OFF_T */
-       char    temp[sizeof(struct xexec)];
+       cross_off_t     symoff, stroff, ltmp;
+       cross_off_t     strsiz;
+       struct  cross_nlist     sym;
+       struct  cross_xexec     xhdr;
+#ifdef CROSS
        int     i;
 #endif
-       struct  xexec   xhdr;
 
        Pgm = argv[0];
 
@@ -86,35 +94,31 @@ int main(argc, argv) int argc; char **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] & 0xff) | ((temp[1] & 0xff) << 8);
-       xhdr.e.a_text = (temp[2] & 0xff) | ((temp[3] & 0xff) << 8);
-       xhdr.e.a_data = (temp[4] & 0xff) | ((temp[5] & 0xff) << 8);
-       xhdr.e.a_bss = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
-       xhdr.e.a_syms = (temp[8] & 0xff) | ((temp[9] & 0xff) << 8);
-       xhdr.e.a_entry = (temp[10] & 0xff) | ((temp[11] & 0xff) << 8);
-       xhdr.e.a_unused = (temp[12] & 0xff) | ((temp[13] & 0xff) << 8);
-       xhdr.e.a_flag = (temp[14] & 0xff) | ((temp[15] & 0xff) << 8);
-       xhdr.o.max_ovl = (temp[16] & 0xff) | ((temp[17] & 0xff) << 8);
+#ifdef CROSS
+       xhdr.e.a_magic = cross_read_int((char *)&xhdr.e.a_magic);
+       xhdr.e.a_text = cross_read_uint((char *)&xhdr.e.a_text);
+       xhdr.e.a_data = cross_read_uint((char *)&xhdr.e.a_data);
+       xhdr.e.a_bss = cross_read_uint((char *)&xhdr.e.a_bss);
+       xhdr.e.a_syms = cross_read_uint((char *)&xhdr.e.a_syms);
+       xhdr.e.a_entry = cross_read_uint((char *)&xhdr.e.a_entry);
+       xhdr.e.a_unused = cross_read_uint((char *)&xhdr.e.a_unused);
+       xhdr.e.a_flag = cross_read_uint((char *)&xhdr.e.a_flag);
+       xhdr.o.max_ovl = cross_read_int((char *)&xhdr.o.max_ovl);
        for (i = 0; i < NOVL; ++i)
-               xhdr.o.ov_siz[i] = (temp[i * 2 + 18] & 0xff) | ((temp[i * 2 + 19] & 0xff) << 8);
+               xhdr.o.ov_siz[i] = cross_read_uint((char *)(xhdr.o.ov_siz + i));
 #endif
        if      (N_BADMAG(xhdr.e))
                {
                fprintf(stderr, "%s: Bad magic number\n", Pgm);
                exit(EX_DATAERR);
                }
-       nsyms = xhdr.e.a_syms / sizeof (struct nlist);
+       nsyms = xhdr.e.a_syms / sizeof (struct cross_nlist);
        if      (!nsyms)
                {
                fprintf(stderr, "%s: '%s' stripped\n", Pgm);
@@ -128,12 +132,9 @@ int main(argc, argv) int argc; char **argv; {
  * the size.
 */
        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] & 0xffL) << 16) | ((temp[1] & 0xffL) << 24) |
-           (temp[2] & 0xffL) | ((temp[3] & 0xffL) << 8);
+       fread(&strsiz, sizeof (cross_off_t), 1, fp);
+#ifdef CROSS
+       strsiz = cross_read_off_t((char *)&strsiz);
 #endif
        if      (strsiz > 48 * 1024L)
                {
@@ -152,8 +153,8 @@ int main(argc, argv) int argc; char **argv; {
  * address used so that we don't have to adjust each symbol table entry's
  * string offset.
 */
-       cnt = fread(strtab + sizeof (OFF_T), 1, (int)strsiz - sizeof (OFF_T), fp);
-       if      (cnt != (int)strsiz - sizeof (OFF_T))
+       cnt = fread(strtab + sizeof (cross_off_t), 1, (int)strsiz - sizeof (cross_off_t), fp);
+       if      (cnt != (int)strsiz - sizeof (cross_off_t))
                {
                fprintf(stderr, "%s: Premature EOF reading strings\n", Pgm);
                exit(EX_DATAERR);
@@ -215,30 +216,29 @@ int main(argc, argv) int argc; char **argv; {
        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] & 0xffL) << 16) | ((temp[1] & 0xffL) << 24) |
-                   (temp[2] & 0xffL) | ((temp[3] & 0xffL) << 8);
-               sym.n_type = temp[4] & 0xff;
-               sym.n_ovly = temp[5] & 0xff;
-               sym.n_value = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
+#ifdef CROSS
+               sym.n_un.n_strx = cross_read_off_t((char *)&sym.n_un.n_strx);
+               sym.n_value = cross_read_uint((char *)&sym.n_value);
 #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);
+                       {
+#ifdef CROSS
+                       cross_write_off_t((char *)&sym.n_un.n_strx, sym.n_un.n_strx);
+                       cross_write_uint((char *)&sym.n_value, sym.n_value);
 #endif
+                       fwrite(&sym, sizeof (sym), 1, sym1fp);
+                       }
                else
-#ifdef pdp11
-                       fwrite(&sym, sizeof (sym), 1, sym2fp);
-#else
-                       fwrite(temp, sizeof (sym), 1, sym2fp);
+                       {
+#ifdef CROSS
+                       cross_write_off_t((char *)&sym.n_un.n_strx, sym.n_un.n_strx);
+                       cross_write_uint((char *)&sym.n_value, sym.n_value);
 #endif
+                       fwrite(&sym, sizeof (sym), 1, sym2fp);
+                       }
                }
 
 /*
@@ -254,77 +254,48 @@ int main(argc, argv) int argc; char **argv; {
 */
        fseek(fp, (off_t)symoff, L_SET);
        ftruncate(fileno(fp), ftell(fp));
-       ltmp = sizeof (OFF_T);
+       ltmp = sizeof (cross_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] & 0xffL) << 16) | ((temp[1] & 0xffL) << 24) | (temp[2] & 0xffL) | ((temp[3] & 0xffL) << 8);
-               sym.n_type = temp[4] & 0xff;
-               sym.n_ovly = temp[5] & 0xff;
-               sym.n_value = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
+#ifdef CROSS
+               sym.n_un.n_strx = cross_read_off_t((char *)&sym.n_un.n_strx);
+               /*sym.n_value = cross_read_uint((char *)&sym.n_value);*/
 #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);
+#ifdef CROSS
+               cross_write_off_t((char *)&sym.n_un.n_strx, sym.n_un.n_strx);
+               /*cross_write_uint((char *)&sym.n_value, sym.n_value);*/
 #endif
+               fwrite(&sym, sizeof (sym), 1, fp);
                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] & 0xffL) << 16) | ((temp[1] & 0xffL) << 24) |
-                   (temp[2] & 0xffL) | ((temp[3] & 0xffL) << 8);
-               sym.n_type = temp[4] & 0xff;
-               sym.n_ovly = temp[5] & 0xff;
-               sym.n_value = (temp[6] & 0xff) | ((temp[7] & 0xff) << 8);
+#ifdef CROSS
+               sym.n_un.n_strx = cross_read_off_t((char *)&sym.n_un.n_strx);
+               /*sym.n_value = cross_read_uint((char *)&sym.n_value);*/
 #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);
+#ifdef CROSS
+               cross_write_off_t((char *)&sym.n_un.n_strx, sym.n_un.n_strx);
+               /*cross_write_uint((char *)&sym.n_value, sym.n_value);*/
 #endif
+               fwrite(&sym, sizeof (sym), 1, fp);
                fwrite(oldname, len, 1, strfp);
                nsyms++;
                }
@@ -333,15 +304,10 @@ int main(argc, argv) int argc; char **argv; {
  * Next write the symbol table size longword followed by the
  * string table itself.
 */
-#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);
+#ifdef CROSS
+       cross_write_off_t((char *)&ltmp, ltmp);
 #endif
+       fwrite(&ltmp, sizeof (cross_off_t), 1, fp);
        rewind(strfp);
        while   ((c = getc(strfp)) != EOF)
                putc(c, fp);
@@ -351,34 +317,24 @@ int main(argc, argv) int argc; char **argv; {
  * the correct size of the symbol table.
 */
        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);
+       xhdr.e.a_syms = nsyms * sizeof (struct cross_nlist);
+#ifdef CROSS
+       cross_write_int((char *)&xhdr.e.a_magic, xhdr.e.a_magic);
+       cross_write_uint((char *)&xhdr.e.a_text, xhdr.e.a_text);
+       cross_write_uint((char *)&xhdr.e.a_data, xhdr.e.a_data);
+       cross_write_uint((char *)&xhdr.e.a_bss, xhdr.e.a_bss);
+       cross_write_uint((char *)&xhdr.e.a_syms, xhdr.e.a_syms);
+       cross_write_uint((char *)&xhdr.e.a_entry, xhdr.e.a_entry);
+       cross_write_uint((char *)&xhdr.e.a_unused, xhdr.e.a_unused);
+       cross_write_uint((char *)&xhdr.e.a_flag, xhdr.e.a_flag);
 #endif
+       fwrite(&xhdr.e, sizeof (xhdr.e), 1, fp);
        fclose(fp);
        free(strtab);
        cleanup();
 }
 
-int inlist(sp) register struct nlist *sp; {
+int inlist(sp) register struct cross_nlist *sp; {
        register int i;
 
        for     (i = 0; i < nsorted; i++)
diff --git a/ucb/symorder/Makefile b/ucb/symorder/Makefile
deleted file mode 100644 (file)
index 23f1ac3..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-INSTALL=install
-# 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
deleted file mode 120000 (symlink)
index 9dd9aa8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../include/a.out.h
\ No newline at end of file
diff --git a/ucb/symorder/include/nlist.h b/ucb/symorder/include/nlist.h
deleted file mode 120000 (symlink)
index 0c27973..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../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
deleted file mode 120000 (symlink)
index 0f3c005..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../sys/h/exec.h
\ No newline at end of file
diff --git a/ucb/symorder/krcompat.h b/ucb/symorder/krcompat.h
deleted file mode 100644 (file)
index b5c0b7d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _KRCOMPAT_H
-#define _KRCOMPAT_H 1
-
-#undef PARAMS
-#ifdef __STDC__
-#include <stdarg.h>
-#define VA_START(ap, arg) va_start(ap, arg)
-#define PARAMS(args) args
-#else
-#include <varargs.h>
-#define VA_START(ap, arg) va_start(ap)
-#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
deleted file mode 100755 (executable)
index d9b9403..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-ROOT="`pwd |sed -e 's/\/ucb\/symorder$//'`"
-HOSTCC="cc -g -Iinclude -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result"
-INSTALL="$ROOT/scripts/install.sh --strip-program=/bin/true"
-MANROFF="nroff -man"
-mkdir --parents "$ROOT/cross/usr/ucb"
-make CC="$HOSTCC" MANROFF="$MANROFF" SEPFLAG= && \
-make INSTALL="$INSTALL" DESTDIR="$ROOT/cross" install
index 995e2b1..066a43e 100644 (file)
@@ -1,5 +1,5 @@
 char *libF77_id[] = {
-       "@(#)libF77.a   Jan 11 22:27:23 2017",
+       "@(#)libF77.a   Jan 11 23:51:19 2017",
        "@(#)abort_.c   5.1     6/7/85",
        "@(#)besj0_.c   5.1     6/7/85",
        "@(#)besj1_.c   5.1     6/7/85",