From d6d410416dcbb2e501cc303dfcccf640408e4f7d Mon Sep 17 00:00:00 2001 From: Nick Downing Date: Sun, 22 Jan 2017 22:29:51 +1100 Subject: [PATCH] Fix makefile in include and lib/libc to reflect recent changes (they have to be tested), make build script n.sh (in root of repo) invoke the xified C compiler and linker using the PATH so makefile can use cc and ld not just ${CC} and ${LD} --- include/Makefile | 22 ++- lib/libc/Makefile | 2 +- lib/libx_c/Makefile | 9 +- lib/libx_c/compat-4.1/Makefile | 2 - lib/libx_c/compat-sys5/Makefile | 2 - lib/libx_c/gen/Makefile | 2 - lib/libx_c/inet/Makefile | 2 - lib/libx_c/linux/csu/Makefile | 3 - lib/libx_c/linux/gen/Makefile | 2 - lib/libx_c/linux/sys/Makefile | 2 - lib/libx_c/net/Makefile | 2 - lib/libx_c/net/hosttable/Makefile | 2 - lib/libx_c/net/named/Makefile | 2 - lib/libx_c/ns/Makefile | 2 - lib/libx_c/post.patch | 274 +++++++++--------------------- lib/libx_c/stdio/Makefile | 2 - lib/libx_c/sys/Makefile | 2 - n.sh | 19 ++- xify/cc.c | 11 ++ xify/ld.c | 17 +- 20 files changed, 141 insertions(+), 240 deletions(-) diff --git a/include/Makefile b/include/Makefile index d2552aa..0001d4d 100644 --- a/include/Makefile +++ b/include/Makefile @@ -18,10 +18,9 @@ # DESTDIR= SUBDIRS=arpa pascal protocols -STD= a.out.h ar.h assert.h ctype.h curses.h ndbm.h disktab.h \ - fcntl.h fstab.h grp.h lastlog.h math.h memory.h mp.h mtab.h \ - netdb.h nlist.h pcc.h pwd.h ranlib.h resolv.h setjmp.h \ - sgtty.h stab.h stdio.h string.h strings.h struct.h syscall.h \ +STD= a.out.h ar.h assert.h ctype.h disktab.h fstab.h gen.h grp.h lastlog.h \ + math.h memory.h mtab.h ndbm.h netdb.h pcc.h pwd.h ranlib.h resolv.h \ + setjmp.h sgtty.h stab.h stdio.h string.h strings.h struct.h syscall.h \ sysexits.h time.h ttyent.h utmp.h varargs.h vfont.h LINKS= errno.h signal.h syslog.h MACHINE=vax @@ -55,9 +54,15 @@ install: ${SHARED} ln -s sys/$$i ${DESTDIR}/usr/include/$$i; \ done rm -f ${DESTDIR}/usr/include/machine - ln -s ./${MACHINE} ${DESTDIR}/usr/include/machine +# ln -s ./${MACHINE} ${DESTDIR}/usr/include/machine + ln -s ${MACHINE} ${DESTDIR}/usr/include/machine rm -f ${DESTDIR}/usr/include/frame.h ln -s machine/frame.h ${DESTDIR}/usr/include/frame.h +# Nick's rationalizations of 4.3 header files: + rm -f ${DESTDIR}/usr/include/fcntl.h + ln -s sys/file.h ${DESTDIR}/usr/include/fcntl.h + rm -f ${DESTDIR}/usr/include/nlist.h + ln -s a.out.h ${DESTDIR}/usr/include/nlist.h symlinks: -for i in ${SYSDIRS}; do \ @@ -78,15 +83,16 @@ symlinks: fi copies: - -for i in ${SYSDIRS}; do \ + -cd ../sys; \ + for i in ${SYSDIRS}; do \ rm -rf ${DESTDIR}/usr/include/$$i; \ - cd /sys; \ tar cf - $$i/*.h | (cd ${DESTDIR}/usr/include; tar xpfB -); \ done rm -rf ${DESTDIR}/usr/include/sys; mkdir ${DESTDIR}/usr/include/sys; chmod 775 ${DESTDIR}/usr/include/sys; - -(cd /sys/h; tar cf - *.h | (cd ${DESTDIR}/usr/include/sys; tar xpfB -)) + -cd ../sys/h; \ + tar cf - *.h | (cd ${DESTDIR}/usr/include/sys; tar xpfB -) tags: cwd=/usr/include; \ diff --git a/lib/libc/Makefile b/lib/libc/Makefile index d0a104a..15fb840 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -45,7 +45,7 @@ DFLMON= mon.o MACHINE=vax DEFS= COMPAT= compat-4.1 compat-sys5 -ALL= gen inet net ns stdio ${MACHINE} ${COMPAT} +ALL= gen inet net ns stdio sys ${COMPAT} ${MACHINE} TAGSFILE=tags libc.a libc_p.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP} diff --git a/lib/libx_c/Makefile b/lib/libx_c/Makefile index 3f752a8..cbb7f07 100644 --- a/lib/libx_c/Makefile +++ b/lib/libx_c/Makefile @@ -1,5 +1,3 @@ -ROOT=${shell pwd}/../.. -DESTDIR=${ROOT}/cross # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement @@ -41,7 +39,7 @@ DESTDIR=${ROOT}/cross #HOSTLOOKUP= hosttable HOSTLOOKUP= named # -#DESTDIR= +DESTDIR= INSTALL=install -m 644 DFLMON= mon.o MACHINE=linux @@ -51,8 +49,7 @@ COMPAT= compat-4.1 compat-sys5 ALL= gen inet net ns stdio sys ${COMPAT} ${MACHINE} TAGSFILE=tags -#libc.a libc_p.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP} -libc.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP} +libc.a libc_p.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP} rm -rf t1 tmp -mkdir tmp for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib); done @@ -107,7 +104,7 @@ install-headers: #${DESTDIR}/usr/include/`dirname $$i`/.xify/x_`basename $$i`.deps; \ # done -install: +install: ${INSTALL} libc.a ${DESTDIR}/lib/libc.a ranlib ${DESTDIR}/lib/libc.a ${INSTALL} libc_p.a ${DESTDIR}/usr/lib/libc_p.a diff --git a/lib/libx_c/compat-4.1/Makefile b/lib/libx_c/compat-4.1/Makefile index efe65cc..4080fd5 100644 --- a/lib/libx_c/compat-4.1/Makefile +++ b/lib/libx_c/compat-4.1/Makefile @@ -1,5 +1,3 @@ -ROOT=../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/compat-sys5/Makefile b/lib/libx_c/compat-sys5/Makefile index 56223da..4af68bc 100644 --- a/lib/libx_c/compat-sys5/Makefile +++ b/lib/libx_c/compat-sys5/Makefile @@ -1,5 +1,3 @@ -ROOT=../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # Makefile 1.5 85/09/05 # CFLAGS= -O ${DEFS} diff --git a/lib/libx_c/gen/Makefile b/lib/libx_c/gen/Makefile index e7b54f3..2313b43 100644 --- a/lib/libx_c/gen/Makefile +++ b/lib/libx_c/gen/Makefile @@ -1,5 +1,3 @@ -ROOT=../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/inet/Makefile b/lib/libx_c/inet/Makefile index f90cca0..34fc6d8 100644 --- a/lib/libx_c/inet/Makefile +++ b/lib/libx_c/inet/Makefile @@ -1,5 +1,3 @@ -ROOT=../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/linux/csu/Makefile b/lib/libx_c/linux/csu/Makefile index 56a0c13..d0a5e31 100644 --- a/lib/libx_c/linux/csu/Makefile +++ b/lib/libx_c/linux/csu/Makefile @@ -1,6 +1,3 @@ -ROOT=../../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax -DESTDIR=${ROOT}/cross # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/linux/gen/Makefile b/lib/libx_c/linux/gen/Makefile index 1ca647f..c313fba 100644 --- a/lib/libx_c/linux/gen/Makefile +++ b/lib/libx_c/linux/gen/Makefile @@ -1,5 +1,3 @@ -ROOT=../../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/linux/sys/Makefile b/lib/libx_c/linux/sys/Makefile index 1fb5d36..e09be89 100644 --- a/lib/libx_c/linux/sys/Makefile +++ b/lib/libx_c/linux/sys/Makefile @@ -1,5 +1,3 @@ -ROOT=../../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/net/Makefile b/lib/libx_c/net/Makefile index 78eacdd..def2b5c 100644 --- a/lib/libx_c/net/Makefile +++ b/lib/libx_c/net/Makefile @@ -1,5 +1,3 @@ -ROOT=../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1983 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/net/hosttable/Makefile b/lib/libx_c/net/hosttable/Makefile index f02ea9b..5d9aad6 100644 --- a/lib/libx_c/net/hosttable/Makefile +++ b/lib/libx_c/net/hosttable/Makefile @@ -1,5 +1,3 @@ -ROOT=../../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1983 Regents of the University of California. diff --git a/lib/libx_c/net/named/Makefile b/lib/libx_c/net/named/Makefile index 7765f7d..6958409 100644 --- a/lib/libx_c/net/named/Makefile +++ b/lib/libx_c/net/named/Makefile @@ -1,5 +1,3 @@ -ROOT=../../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1983 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/ns/Makefile b/lib/libx_c/ns/Makefile index 2a599fc..d28ab05 100644 --- a/lib/libx_c/ns/Makefile +++ b/lib/libx_c/ns/Makefile @@ -1,5 +1,3 @@ -ROOT=../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/post.patch b/lib/libx_c/post.patch index 4216111..db90f14 100644 --- a/lib/libx_c/post.patch +++ b/lib/libx_c/post.patch @@ -1,24 +1,6 @@ -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/compat-4.1/Makefile libx_c/compat-4.1/Makefile ---- libx_c.post/compat-4.1/Makefile 2017-01-23 12:45:44.611282723 +1100 -+++ libx_c/compat-4.1/Makefile 2017-01-23 12:45:44.639282819 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - # - # Copyright (c) 1980 Regents of the University of California. - # All rights reserved. The Berkeley software License Agreement -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/compat-sys5/Makefile libx_c/compat-sys5/Makefile ---- libx_c.post/compat-sys5/Makefile 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/compat-sys5/Makefile 2017-01-23 12:45:44.639282819 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - # Makefile 1.5 85/09/05 - # - CFLAGS= -O ${DEFS} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/bcopy.c libx_c/gen/bcopy.c ---- libx_c.post/gen/bcopy.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/bcopy.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/bcopy.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/bcopy.c 2017-01-23 13:27:16.969935480 +1100 @@ -1,6 +1,12 @@ #include #include @@ -53,8 +35,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' *--dst = *--src; while (--length); diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/getpass.c libx_c/gen/getpass.c ---- libx_c.post/gen/getpass.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/getpass.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/getpass.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/getpass.c 2017-01-23 13:27:16.969935480 +1100 @@ -20,7 +20,7 @@ FILE *fi; static char pbuf[9]; @@ -65,8 +47,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' if ((fi = fdopen(open("/dev/tty", 2), "r")) == NULL) fi = stdin; diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/getpwnamuid.c libx_c/gen/getpwnamuid.c ---- libx_c.post/gen/getpwnamuid.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/getpwnamuid.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/getpwnamuid.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/getpwnamuid.c 2017-01-23 13:27:16.969935480 +1100 @@ -43,19 +43,37 @@ cp = key.dptr; tp = line; @@ -106,15 +88,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' } diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/Makefile libx_c/gen/Makefile ---- libx_c.post/gen/Makefile 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - # - # Copyright (c) 1980 Regents of the University of California. - # All rights reserved. The Berkeley software License Agreement -@@ -49,12 +51,12 @@ +--- libx_c.post/gen/Makefile 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/Makefile 2017-01-23 13:22:54.000000000 +1100 +@@ -49,12 +49,12 @@ @echo "buiding normal genlib" @ar cru genlib ${OBJS} @@ -134,8 +110,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' tags: cwd=`pwd`; \ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/malloc.c libx_c/gen/malloc.c ---- libx_c.post/gen/malloc.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/malloc.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/malloc.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/malloc.c 2017-01-23 13:27:16.969935480 +1100 @@ -5,6 +5,12 @@ /*#include gen.h*/ /*#include gen.h*/ @@ -196,8 +172,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' /* * Add new memory allocated to that on diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/ndbm.c libx_c/gen/ndbm.c ---- libx_c.post/gen/ndbm.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/ndbm.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/ndbm.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/ndbm.c 2017-01-23 13:27:16.969935480 +1100 @@ -70,14 +70,14 @@ flags = (flags & ~03) | O_RDWR; strcpy(db->dbm_pagbuf, file); @@ -216,8 +192,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' va_end(argp); if (db->dbm_dirf < 0) diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/qsort.c libx_c/gen/qsort.c ---- libx_c.post/gen/qsort.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/qsort.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/qsort.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/qsort.c 2017-01-23 13:27:16.969935480 +1100 @@ -36,7 +36,7 @@ static void qst __P((char *base, char *max)); @@ -228,8 +204,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' register char c, *i, *j, *lo, *hi; char *min, *max; diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/scandir.c libx_c/gen/scandir.c ---- libx_c.post/gen/scandir.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/scandir.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/scandir.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/scandir.c 2017-01-23 13:27:16.969935480 +1100 @@ -24,7 +24,7 @@ /*#include */ /*#include */ @@ -249,8 +225,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' return(nitems); } diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/signal.c libx_c/gen/signal.c ---- libx_c.post/gen/signal.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/signal.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/signal.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/signal.c 2017-01-23 13:27:16.969935480 +1100 @@ -15,12 +15,12 @@ */ /*#include */ @@ -274,8 +250,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + return ((void (*) __P((int sig)))osv.sv_handler); } diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/sleep.c libx_c/gen/sleep.c ---- libx_c.post/gen/sleep.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/sleep.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/sleep.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/sleep.c 2017-01-23 13:27:16.969935480 +1100 @@ -15,7 +15,7 @@ /*#include */ @@ -286,8 +262,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' static int ringring; diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/system.c libx_c/gen/system.c ---- libx_c.post/gen/system.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/system.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/system.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/system.c 2017-01-23 13:27:16.969935480 +1100 @@ -11,7 +11,7 @@ int system(s) char *s; { @@ -298,8 +274,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' if ((pid = vfork()) == 0) { execl("/bin/sh", "sh", "-c", s, 0); diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/usleep.c libx_c/gen/usleep.c ---- libx_c.post/gen/usleep.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/usleep.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/usleep.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/usleep.c 2017-01-23 13:27:16.969935480 +1100 @@ -18,7 +18,7 @@ #define TICK 10000 /* system clock resolution in microseconds */ @@ -310,8 +286,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' static int ringring; diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen/valloc.c libx_c/gen/valloc.c ---- libx_c.post/gen/valloc.c 2017-01-23 12:45:44.631282792 +1100 -+++ libx_c/gen/valloc.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen/valloc.c 2017-01-23 13:27:16.961935459 +1100 ++++ libx_c/gen/valloc.c 2017-01-23 13:27:16.969935480 +1100 @@ -1,6 +1,12 @@ #include #include @@ -339,8 +315,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' return ((char *)j); } diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/gen.h libx_c/gen.h ---- libx_c.post/gen.h 2017-01-23 12:45:44.603282695 +1100 -+++ libx_c/gen.h 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/gen.h 2017-01-23 13:27:16.929935373 +1100 ++++ libx_c/gen.h 2017-01-23 13:27:16.969935480 +1100 @@ -99,7 +99,7 @@ char *mktemp __P((char *as)); @@ -350,18 +326,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' /* gen/random.c */ int srandom __P((unsigned x)); -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/inet/Makefile libx_c/inet/Makefile ---- libx_c.post/inet/Makefile 2017-01-23 12:45:44.611282723 +1100 -+++ libx_c/inet/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - # - # Copyright (c) 1980 Regents of the University of California. - # All rights reserved. The Berkeley software License Agreement diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/csu/crt0.c libx_c/linux/csu/crt0.c --- libx_c.post/linux/csu/crt0.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/csu/crt0.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/csu/crt0.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,19 @@ +#include + @@ -384,11 +351,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/csu/Makefile libx_c/linux/csu/Makefile --- libx_c.post/linux/csu/Makefile 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/csu/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -0,0 +1,104 @@ -+ROOT=../../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax -+DESTDIR=${ROOT}/cross ++++ libx_c/linux/csu/Makefile 2017-01-23 13:22:54.000000000 +1100 +@@ -0,0 +1,101 @@ +# +# Copyright (c) 1980 Regents of the University of California. +# All rights reserved. The Berkeley software License Agreement @@ -492,7 +456,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/gen/abort.c libx_c/linux/gen/abort.c --- libx_c.post/linux/gen/abort.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/gen/abort.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/gen/abort.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,7 @@ +#include + @@ -503,10 +467,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/gen/Makefile libx_c/linux/gen/Makefile --- libx_c.post/linux/gen/Makefile 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/gen/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -0,0 +1,52 @@ -+ROOT=../../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax ++++ libx_c/linux/gen/Makefile 2017-01-23 13:22:54.000000000 +1100 +@@ -0,0 +1,50 @@ +# +# Copyright (c) 1980 Regents of the University of California. +# All rights reserved. The Berkeley software License Agreement @@ -559,7 +521,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/gen/modf.c libx_c/linux/gen/modf.c --- libx_c.post/linux/gen/modf.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/gen/modf.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/gen/modf.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,7 @@ +#include + @@ -570,7 +532,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/Makefile libx_c/linux/Makefile --- libx_c.post/linux/Makefile 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/Makefile 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/Makefile 2017-01-23 13:11:22.000000000 +1100 @@ -0,0 +1,43 @@ +# +# Copyright (c) 1980 Regents of the University of California. @@ -617,7 +579,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + (cd $$i; make ${MFLAGS} DEFS=${DEFS} depend); done diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/close.c libx_c/linux/sys/close.c --- libx_c.post/linux/sys/close.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/close.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/close.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,13 @@ +#include + @@ -634,7 +596,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/_exit.c libx_c/linux/sys/_exit.c --- libx_c.post/linux/sys/_exit.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/_exit.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/_exit.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,7 @@ +#include + @@ -645,7 +607,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/fstat.c libx_c/linux/sys/fstat.c --- libx_c.post/linux/sys/fstat.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/fstat.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/fstat.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,17 @@ +#include +#include @@ -666,7 +628,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/getpagesize.c libx_c/linux/sys/getpagesize.c --- libx_c.post/linux/sys/getpagesize.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/getpagesize.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/getpagesize.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,7 @@ +#include + @@ -677,7 +639,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/isatty.c libx_c/linux/sys/isatty.c --- libx_c.post/linux/sys/isatty.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/isatty.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/isatty.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,13 @@ +#include + @@ -694,7 +656,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/lseek.c libx_c/linux/sys/lseek.c --- libx_c.post/linux/sys/lseek.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/lseek.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/lseek.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,15 @@ +#include +#include @@ -713,10 +675,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/Makefile libx_c/linux/sys/Makefile --- libx_c.post/linux/sys/Makefile 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -0,0 +1,54 @@ -+ROOT=../../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax ++++ libx_c/linux/sys/Makefile 2017-01-23 13:22:54.000000000 +1100 +@@ -0,0 +1,52 @@ +# +# Copyright (c) 1980 Regents of the University of California. +# All rights reserved. The Berkeley software License Agreement @@ -771,7 +731,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/read.c libx_c/linux/sys/read.c --- libx_c.post/linux/sys/read.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/read.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/read.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,15 @@ +#include + @@ -790,7 +750,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/readv.c libx_c/linux/sys/readv.c --- libx_c.post/linux/sys/readv.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/readv.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/readv.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,26 @@ +#include +#include @@ -820,7 +780,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/sbrk.c libx_c/linux/sys/sbrk.c --- libx_c.post/linux/sys/sbrk.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/sbrk.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/sbrk.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,14 @@ +#include +#include @@ -838,7 +798,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/vopen.c libx_c/linux/sys/vopen.c --- libx_c.post/linux/sys/vopen.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/vopen.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/vopen.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,49 @@ +#include + @@ -891,7 +851,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/write.c libx_c/linux/sys/write.c --- libx_c.post/linux/sys/write.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/write.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/write.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,15 @@ +#include + @@ -910,7 +870,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/linux/sys/writev.c libx_c/linux/sys/writev.c --- libx_c.post/linux/sys/writev.c 1970-01-01 10:00:00.000000000 +1000 -+++ libx_c/linux/sys/writev.c 2017-01-23 12:45:44.643282833 +1100 ++++ libx_c/linux/sys/writev.c 2017-01-23 13:27:16.969935480 +1100 @@ -0,0 +1,26 @@ +#include +#include @@ -939,20 +899,10 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + return res; +} diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/Makefile libx_c/Makefile ---- libx_c.post/Makefile 2017-01-23 12:45:44.603282695 +1100 -+++ libx_c/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -1,3 +1,5 @@ -+ROOT=${shell pwd}/../.. -+DESTDIR=${ROOT}/cross - # - # Copyright (c) 1980 Regents of the University of California. - # All rights reserved. The Berkeley software License Agreement -@@ -39,29 +41,35 @@ - #HOSTLOOKUP= hosttable - HOSTLOOKUP= named - # --DESTDIR= -+#DESTDIR= +--- libx_c.post/Makefile 2017-01-23 13:27:16.929935373 +1100 ++++ libx_c/Makefile 2017-01-23 13:22:54.000000000 +1100 +@@ -42,7 +42,8 @@ + DESTDIR= INSTALL=install -m 644 DFLMON= mon.o -MACHINE=vax @@ -960,14 +910,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +#vax DEFS= COMPAT= compat-4.1 compat-sys5 --ALL= gen inet net ns stdio ${MACHINE} ${COMPAT} -+ALL= gen inet net ns stdio sys ${COMPAT} ${MACHINE} - TAGSFILE=tags - --libc.a libc_p.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP} -+#libc.a libc_p.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP} -+libc.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP} - rm -rf t1 tmp + ALL= gen inet net ns stdio sys ${COMPAT} ${MACHINE} +@@ -53,15 +54,19 @@ -mkdir tmp for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib); done cd tmp; ar x ../net/${HOSTLOOKUP}/hostlib @@ -991,11 +935,10 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' ar ma findiop.o libc_p.a exit.o ar ma exit.o libc_p.a fakcu.o rm -rf t1 tmp -@@ -71,7 +79,35 @@ +@@ -71,6 +76,34 @@ FRC: --install: +install-headers: + rm -rf ${DESTDIR}/usr/include + for i in `find . -name '*.h' -print`; \ @@ -1024,22 +967,12 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' +#${DESTDIR}/usr/include/`dirname $$i`/.xify/x_`basename $$i`.deps; \ +# done + -+install: + install: ${INSTALL} libc.a ${DESTDIR}/lib/libc.a ranlib ${DESTDIR}/lib/libc.a - ${INSTALL} libc_p.a ${DESTDIR}/usr/lib/libc_p.a -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/hosttable/Makefile libx_c/net/hosttable/Makefile ---- libx_c.post/net/hosttable/Makefile 2017-01-23 12:45:44.611282723 +1100 -+++ libx_c/net/hosttable/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - - # - # Copyright (c) 1983 Regents of the University of California. diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/if.h libx_c/net/if.h ---- libx_c.post/net/if.h 2017-01-23 12:45:44.611282723 +1100 -+++ libx_c/net/if.h 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/net/if.h 2017-01-23 13:27:16.937935394 +1100 ++++ libx_c/net/if.h 2017-01-23 13:27:16.973935491 +1100 @@ -1,6 +1,7 @@ #ifndef _NET_IF_H_ #define _NET_IF_H_ @@ -1057,18 +990,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' #endif #endif -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/Makefile libx_c/net/Makefile ---- libx_c.post/net/Makefile 2017-01-23 12:45:44.611282723 +1100 -+++ libx_c/net/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - # - # Copyright (c) 1983 Regents of the University of California. - # All rights reserved. The Berkeley software License Agreement diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/named/gethostnamadr.c libx_c/net/named/gethostnamadr.c ---- libx_c.post/net/named/gethostnamadr.c 2017-01-23 12:45:44.611282723 +1100 -+++ libx_c/net/named/gethostnamadr.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/net/named/gethostnamadr.c 2017-01-23 13:27:16.937935394 +1100 ++++ libx_c/net/named/gethostnamadr.c 2017-01-23 13:27:16.973935491 +1100 @@ -11,6 +11,12 @@ #include /*#include arpa/inet.h*/ @@ -1093,18 +1017,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' if (bp + n >= &hostbuf[sizeof(hostbuf)]) { #ifdef DEBUG -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/net/named/Makefile libx_c/net/named/Makefile ---- libx_c.post/net/named/Makefile 2017-01-23 12:45:44.611282723 +1100 -+++ libx_c/net/named/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - # - # Copyright (c) 1983 Regents of the University of California. - # All rights reserved. The Berkeley software License Agreement diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/netinet/in.h libx_c/netinet/in.h ---- libx_c.post/netinet/in.h 2017-01-23 12:45:44.627282778 +1100 -+++ libx_c/netinet/in.h 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/netinet/in.h 2017-01-23 13:27:16.941935405 +1100 ++++ libx_c/netinet/in.h 2017-01-23 13:27:16.973935491 +1100 @@ -109,4 +109,30 @@ /*u_long in_netof(), in_lnaof();*/ #endif @@ -1137,8 +1052,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' + #endif diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/netns/ns.h libx_c/netns/ns.h ---- libx_c.post/netns/ns.h 2017-01-23 12:45:44.627282778 +1100 -+++ libx_c/netns/ns.h 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/netns/ns.h 2017-01-23 13:27:16.941935405 +1100 ++++ libx_c/netns/ns.h 2017-01-23 13:27:16.973935491 +1100 @@ -133,6 +133,22 @@ #endif #endif @@ -1162,18 +1077,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' /* ns/ns_addr.c */ struct ns_addr ns_addr __P((char *name)); -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/ns/Makefile libx_c/ns/Makefile ---- libx_c.post/ns/Makefile 2017-01-23 12:45:44.607282710 +1100 -+++ libx_c/ns/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - # - # Copyright (c) 1980 Regents of the University of California. - # All rights reserved. The Berkeley software License Agreement diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio/doprnt.c libx_c/stdio/doprnt.c ---- libx_c.post/stdio/doprnt.c 2017-01-23 12:45:44.607282710 +1100 -+++ libx_c/stdio/doprnt.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/stdio/doprnt.c 2017-01-23 13:27:16.933935384 +1100 ++++ libx_c/stdio/doprnt.c 2017-01-23 13:27:16.973935491 +1100 @@ -12,6 +12,13 @@ #define _va_start(argp, arg) va_start(argp) #endif @@ -1217,8 +1123,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' goto nosign; case 's': diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio/findiop.c libx_c/stdio/findiop.c ---- libx_c.post/stdio/findiop.c 2017-01-23 12:45:44.607282710 +1100 -+++ libx_c/stdio/findiop.c 2017-01-23 12:45:44.643282833 +1100 +--- libx_c.post/stdio/findiop.c 2017-01-23 13:27:16.933935384 +1100 ++++ libx_c/stdio/findiop.c 2017-01-23 13:27:16.973935491 +1100 @@ -105,7 +105,7 @@ *iov = (FILE *)calloc(1, sizeof **iov); } @@ -1228,18 +1134,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' register FILE **iov; register FILE *fp; -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio/Makefile libx_c/stdio/Makefile ---- libx_c.post/stdio/Makefile 2017-01-23 12:45:44.607282710 +1100 -+++ libx_c/stdio/Makefile 2017-01-23 12:45:44.643282833 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - # - # Copyright (c) 1980 Regents of the University of California. - # All rights reserved. The Berkeley software License Agreement diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/stdio.h libx_c/stdio.h ---- libx_c.post/stdio.h 2017-01-23 12:45:44.607282710 +1100 -+++ libx_c/stdio.h 2017-01-23 12:45:44.647282847 +1100 +--- libx_c.post/stdio.h 2017-01-23 13:27:16.933935384 +1100 ++++ libx_c/stdio.h 2017-01-23 13:27:16.973935491 +1100 @@ -82,7 +82,7 @@ #endif @@ -1295,8 +1192,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' /* stdio/puts.c */ int puts __P((register char *s)); diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/string.h libx_c/string.h ---- libx_c.post/string.h 2017-01-23 12:45:44.607282710 +1100 -+++ libx_c/string.h 2017-01-23 12:45:44.647282847 +1100 +--- libx_c.post/string.h 2017-01-23 13:27:16.929935373 +1100 ++++ libx_c/string.h 2017-01-23 13:27:16.973935491 +1100 @@ -9,7 +9,8 @@ * @(#)string.h 5.1 (Berkeley) 85/08/05 */ @@ -1308,8 +1205,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' /* * these next few are obsolete trash diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/dir.h libx_c/sys/dir.h ---- libx_c.post/sys/dir.h 2017-01-23 12:45:44.615282736 +1100 -+++ libx_c/sys/dir.h 2017-01-23 12:45:44.647282847 +1100 +--- libx_c.post/sys/dir.h 2017-01-23 13:27:16.949935426 +1100 ++++ libx_c/sys/dir.h 2017-01-23 13:27:16.973935491 +1100 @@ -122,7 +122,7 @@ struct direct *readdir __P((register DIR *dirp)); @@ -1319,18 +1216,9 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' int alphasort __P((struct direct **d1, struct direct **d2)); /* gen/seekdir.c */ -diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/Makefile libx_c/sys/Makefile ---- libx_c.post/sys/Makefile 2017-01-23 12:45:44.619282751 +1100 -+++ libx_c/sys/Makefile 2017-01-23 12:45:44.647282847 +1100 -@@ -1,3 +1,5 @@ -+ROOT=../../.. -+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax - # - # Copyright (c) 1980 Regents of the University of California. - # All rights reserved. The Berkeley software License Agreement diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/open.c libx_c/sys/open.c ---- libx_c.post/sys/open.c 2017-01-23 12:45:44.615282736 +1100 -+++ libx_c/sys/open.c 2017-01-23 12:45:44.647282847 +1100 +--- libx_c.post/sys/open.c 2017-01-23 13:27:16.949935426 +1100 ++++ libx_c/sys/open.c 2017-01-23 13:27:16.973935491 +1100 @@ -18,7 +18,7 @@ va_list argp; int res; @@ -1341,8 +1229,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' ' va_end(argp); return res; diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '--exclude=*.sh' '--exclude=*.a' '--exclude=*.o' '--exclude=*.[ch].nocomm' '--exclude=*.[ch].protos' '--exclude=*.[ch].protos.nocomm' '--exclude=*.temp' '--exclude=*.temp.c' '--exclude=*.[ch].usedby' '--exclude=*.[ch].uses' libx_c.post/sys/signal.h libx_c/sys/signal.h ---- libx_c.post/sys/signal.h 2017-01-23 12:45:44.615282736 +1100 -+++ libx_c/sys/signal.h 2017-01-23 12:45:44.647282847 +1100 +--- libx_c.post/sys/signal.h 2017-01-23 13:27:16.949935426 +1100 ++++ libx_c/sys/signal.h 2017-01-23 13:27:16.973935491 +1100 @@ -9,7 +9,7 @@ * @(#)signal.h 7.1 (Berkeley) 6/4/86 */ diff --git a/lib/libx_c/stdio/Makefile b/lib/libx_c/stdio/Makefile index e2235e0..331b111 100644 --- a/lib/libx_c/stdio/Makefile +++ b/lib/libx_c/stdio/Makefile @@ -1,5 +1,3 @@ -ROOT=../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/lib/libx_c/sys/Makefile b/lib/libx_c/sys/Makefile index 572e616..c61a4ae 100644 --- a/lib/libx_c/sys/Makefile +++ b/lib/libx_c/sys/Makefile @@ -1,5 +1,3 @@ -ROOT=../../.. -CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax # # Copyright (c) 1980 Regents of the University of California. # All rights reserved. The Berkeley software License Agreement diff --git a/n.sh b/n.sh index 923a754..f5627f5 100755 --- a/n.sh +++ b/n.sh @@ -1,11 +1,20 @@ #!/bin/sh -e +ROOT=`pwd` + rm -rf cross mkdir -p cross/bin -mkdir -p cross/include mkdir -p cross/lib +mkdir -p cross/usr/include mkdir -p cross/usr/lib +(cd xify && make clean && make && make DESTDIR=$ROOT/cross install) + +# new way, not working yet because no prototypes in include yet: +#(cd include && make DESTDIR=$ROOT/cross SHARED=copies install) +# old way: +(cd lib/libx_c && make DESTDIR=$ROOT/cross install-headers) + mkdir -p lib/libx_c/compat-4.1/profiled mkdir -p lib/libx_c/compat-sys5/profiled mkdir -p lib/libx_c/gen/profiled @@ -19,7 +28,11 @@ mkdir -p lib/libx_c/net/profiled mkdir -p lib/libx_c/ns/profiled mkdir -p lib/libx_c/stdio/profiled mkdir -p lib/libx_c/sys/profiled +( + cd lib/libx_c && \ + make clean && \ + FAKEROOT=$ROOT/cross PATH=$ROOT/cross/bin:$PATH make CC="cc -Dvax" && \ + make DESTDIR=$ROOT/cross install +) -(cd xify && make clean && make && make install) -(cd lib/libx_c && make clean && make install-headers && make && make install) (cd test && make clean && make) diff --git a/xify/cc.c b/xify/cc.c index eefe21d..3dc2600 100644 --- a/xify/cc.c +++ b/xify/cc.c @@ -89,6 +89,8 @@ int in_queue_tail; char in_path[BUFSIZ]; char out_path[BUFSIZ]; char err_path[BUFSIZ]; + +extern char **environ; #endif #define cunlink(s) if (s) unlink(s) @@ -123,6 +125,7 @@ int main(argc, argv) int argc; char **argv; { #endif int i, j, c; #ifdef XIFY + char **p; struct stat statbuf; #endif @@ -303,6 +306,14 @@ int main(argc, argv) int argc; char **argv; { if (plist[i][2] == '/') plist[i] = strspl("-I", strspl(t, plist[i] + 2)); } + for (i = 0; environ[i]; ++i) + if (strncmp(environ[i], "PATH=", 5) == 0) + goto found_path_var; + p = (char **)calloc(i + 2, sizeof(char *)); + bcopy(environ, p, i * sizeof(char *)); + environ = p; +found_path_var: + environ[i] = "PATH=/bin:/usr/bin"; #else if (pflag==0) sprintf(tmp0, "/tmp/ctm%05.5d", getpid()); diff --git a/xify/ld.c b/xify/ld.c index 446108c..1d19d41 100644 --- a/xify/ld.c +++ b/xify/ld.c @@ -354,12 +354,15 @@ int ndir; /* number of directories */ #ifdef XIFY char *gcc = "/usr/bin/gcc"; +char *ld = "/usr/bin/ld"; char **av; int na; char in_path[BUFSIZ]; char out_path[BUFSIZ]; + +extern char **environ; #else /* * Base of the string table of the current module (pass1 and pass2). @@ -492,6 +495,14 @@ int main(argc, argv) int argc; char **argv; { if (dirs[i][0] == '/') dirs[i] = strspl(ap, dirs[i]); } + for (i = 0; environ[i]; ++i) + if (strncmp(environ[i], "PATH=", 5) == 0) + goto found_path_var; + p = (char **)calloc(i + 2, sizeof(char *)); + bcopy(environ, p, i * sizeof(char *)); + environ = p; +found_path_var: + environ[i] = "PATH=/bin:/usr/bin"; #else dirs[ndir++] = "/lib"; dirs[ndir++] = "/usr/lib"; @@ -730,10 +741,12 @@ void endload(argc, argv) int argc; char **argv; { #ifdef XIFY /* ld currently adds upto 5 args; 10 is room to spare */ av = (char **)calloc(argc+10, sizeof (char **)); - av[0] = "gcc"; av[1] = "-o"; av[2] = ofilename; + av[0] = rflag ? "ld" : "gcc"; av[1] = "-o"; av[2] = ofilename; na = 3; for (i = 0; i < ndir; ++i) av[na++] = strspl("-L", dirs[i]); + if (rflag) + av[na++] = "-r"; #else clibseg = libseg; filname = 0; @@ -804,7 +817,7 @@ next: ; } #ifdef XIFY - if (callsys(gcc, av)) + if (callsys(rflag ? ld : gcc, av)) delexit(); #endif finishout(); -- 2.34.1