From: Nick Downing <downing.nick@gmail.com>
Date: Sat, 21 Jan 2017 10:28:28 +0000 (+1100)
Subject: Put libx_c makefiles almost back to standard, by using xifying C compiler
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=303b84a114545c132b1e8943736ee392d2f7c838;p=43bsd.git

Put libx_c makefiles almost back to standard, by using xifying C compiler
---

diff --git a/lib/libx_c/Makefile b/lib/libx_c/Makefile
index 238e221..e6badce 100644
--- a/lib/libx_c/Makefile
+++ b/lib/libx_c/Makefile
@@ -63,13 +63,15 @@ libc.a: ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP}
 # ${MACHINE}/csu/${DFLMON}
 	ar ma findiop.o libc.a exit.o
 	ar ma exit.o libc.a fakcu.o
-#	rm -f t1 tmp/*
-#	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib_p); done
-#	cd tmp; ar x ../net/${HOSTLOOKUP}/hostlib_p
+	rm -f t1 tmp/*
+	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib_p); done
+	cd tmp; ar x ../net/${HOSTLOOKUP}/hostlib_p
 #	ls tmp/*.o | sort -t/ +1 > t1
-#	ar cr libc_p.a `lorder \`cat t1\` | tsort` ${MACHINE}/csu/${DFLMON}
-#	ar ma findiop.o libc_p.a exit.o
-#	ar ma exit.o libc_p.a fakcu.o
+	ls tmp/*.o | LC_ALL=C sort -t/ > t1
+	ar cr libc_p.a `lorder \`cat t1\` | tsort`
+# ${MACHINE}/csu/${DFLMON}
+	ar ma findiop.o libc_p.a exit.o
+	ar ma exit.o libc_p.a fakcu.o
 	rm -rf t1 tmp
 
 ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP}: FRC
@@ -112,8 +114,11 @@ install:
 	mkdir -p ${DESTDIR}/lib/.xify
 	${INSTALL} libc.a ${DESTDIR}/lib/.xify/libx_c.a
 	ranlib ${DESTDIR}/lib/.xify/libx_c.a
-#	${INSTALL} libc_p.a ${DESTDIR}/usr/lib/libc_p.a
-#	ranlib ${DESTDIR}/usr/lib/libc_p.a
+	${INSTALL} libc_p.a ${DESTDIR}/usr/lib/libc_p.a
+	ranlib ${DESTDIR}/usr/lib/libc_p.a
+	mkdir -p ${DESTDIR}/usr/lib/.xify
+	${INSTALL} libc_p.a ${DESTDIR}/usr/lib/.xify/libx_c_p.a
+	ranlib ${DESTDIR}/usr/lib/.xify/libx_c_p.a
 	cd ${MACHINE}/csu; make DESTDIR=${DESTDIR} install
 
 tags:
diff --git a/lib/libx_c/compat-4.1/Makefile b/lib/libx_c/compat-4.1/Makefile
index 96e6f9f..efe65cc 100644
--- a/lib/libx_c/compat-4.1/Makefile
+++ b/lib/libx_c/compat-4.1/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -20,19 +20,16 @@ OBJS=	${STD} ${TRASH}
 TAGSFILE=tags
 
 .c.o:
-#	${CC} -p ${CFLAGS} -c $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
+	${CC} -p ${CFLAGS} -c $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
 
-#compat-4.1lib compat-4.1lib_p: ${OBJS}
-compat-4.1lib: ${OBJS}
-#	@echo "building profiled compat-4.1lib"
-#	@cd profiled; ar cru ../compat-4.1lib_p ${OBJS}
+compat-4.1lib compat-4.1lib_p: ${OBJS}
+	@echo "building profiled compat-4.1lib"
+	@cd profiled; ar cru ../compat-4.1lib_p ${OBJS}
 	@echo "buiding normal compat-4.1lib"
 	@ar cru compat-4.1lib ${OBJS}
 
@@ -43,7 +40,7 @@ tags:
 	done
 
 clean:
-	rm -f compat-4.1lib compat-4.1lib_p *.temp.c *.o profiled/*.o tags Makefile.bak
+	rm -f compat-4.1lib compat-4.1lib_p *.o profiled/*.o tags Makefile.bak
 
 depend:
 	for i in ${SRCS}; do \
diff --git a/lib/libx_c/compat-sys5/Makefile b/lib/libx_c/compat-sys5/Makefile
index 48a79b7..56223da 100644
--- a/lib/libx_c/compat-sys5/Makefile
+++ b/lib/libx_c/compat-sys5/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
 #	Makefile	1.5	85/09/05
 #
 CFLAGS=	-O ${DEFS}
@@ -12,19 +12,16 @@ OBJS=	getopt.o memccpy.o memchr.o memcmp.o memcpy.o memset.o \
 TAGSFILE=tags
 
 .c.o:
-#	${CC} -p ${CFLAGS} -c $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
+	${CC} -p ${CFLAGS} -c $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
 
-#compat-sys5lib compat-sys5lib_p: ${OBJS}
-compat-sys5lib: ${OBJS}
-#	@echo "building profiled compat-sys5lib"
-#	@cd profiled; ar cru ../compat-sys5lib_p ${OBJS}
+compat-sys5lib compat-sys5lib_p: ${OBJS}
+	@echo "building profiled compat-sys5lib"
+	@cd profiled; ar cru ../compat-sys5lib_p ${OBJS}
 	@echo "buiding normal compat-sys5lib"
 	@ar cru compat-sys5lib ${OBJS}
 
@@ -35,7 +32,7 @@ tags:
 	done
 
 clean:
-	rm -f compat-sys5lib compat-sys5lib_p *.temp.c *.o profiled/*.o Makefile.bak
+	rm -f compat-sys5lib compat-sys5lib_p *.o profiled/*.o Makefile.bak
 
 depend:
 	for i in ${SRCS}; do \
diff --git a/lib/libx_c/gen/Makefile b/lib/libx_c/gen/Makefile
index e72b1e4..e7b54f3 100644
--- a/lib/libx_c/gen/Makefile
+++ b/lib/libx_c/gen/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -38,19 +38,16 @@ CFLAGS=	-O ${DEFS}
 TAGSFILE=tags
 
 .c.o:
-#	${CC} -p ${CFLAGS} -c $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
+	${CC} -p ${CFLAGS} -c $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
 
 genlib genlib_p: ${OBJS}
-genlib: ${OBJS}
-#	@echo "building profiled genlib"
-#	@cd profiled; ar cru ../genlib_p ${OBJS}
+	@echo "building profiled genlib"
+	@cd profiled; ar cru ../genlib_p ${OBJS}
 	@echo "buiding normal genlib"
 	@ar cru genlib ${OBJS}
 
@@ -68,7 +65,7 @@ tags:
 	done
 
 clean:
-	rm -f genlib genlib_p *.temp.c *.o profiled/*.o tags Makefile.bak
+	rm -f genlib genlib_p *.o profiled/*.o tags Makefile.bak
 
 depend:
 	for i in ${SRCS}; do \
diff --git a/lib/libx_c/inet/Makefile b/lib/libx_c/inet/Makefile
index 1480cd8..f90cca0 100644
--- a/lib/libx_c/inet/Makefile
+++ b/lib/libx_c/inet/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -18,19 +18,16 @@ CFLAGS=	-O ${DEFS}
 TAGSFILE=tags
 
 .c.o:
-#	${CC} -p -c ${CFLAGS} $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
-
-#inetlib inetlib_p: ${OBJS}
-inetlib: ${OBJS}
-#	@echo "building profiled inetlib"
-#	@cd profiled; ar cru ../inetlib_p ${OBJS}
+	${CC} -p -c ${CFLAGS} $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
+
+inetlib inetlib_p: ${OBJS}
+	@echo "building profiled inetlib"
+	@cd profiled; ar cru ../inetlib_p ${OBJS}
 	@echo "building normal inetlib"
 	@ar cru inetlib ${OBJS}
 
@@ -41,7 +38,7 @@ tags:
 	done
 
 clean:
-	rm -f inetlib inetlib_p *.temp.c *.o profiled/*.o errs a.out core \
+	rm -f inetlib inetlib_p *.o profiled/*.o errs a.out core \
 		tags Makefile.bak
 
 depend:
diff --git a/lib/libx_c/linux/Makefile b/lib/libx_c/linux/Makefile
index f07afc7..59429e2 100644
--- a/lib/libx_c/linux/Makefile
+++ b/lib/libx_c/linux/Makefile
@@ -12,15 +12,15 @@ ALL=	gen sys
 #gen net stdio sys ${COMPAT}
 TAGSFILE=tags
 
-#linuxlib linuxlib_p: ${ALL}
-linuxlib: ${ALL}
+linuxlib linuxlib_p: ${ALL}
 	-mkdir tmp
 	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib); done
 #	ar cr linuxlib `ls tmp/*.o | sort -t/ +1`
 	ar cr linuxlib `ls tmp/*.o | LC_ALL=C sort -t/`
-#	rm -f tmp/*
-#	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib_p); done
+	rm -f tmp/*
+	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib_p); done
 #	ar cr linuxlib_p `ls tmp/*.o | sort -t/ +1`
+	ar cr linuxlib_p `ls tmp/*.o | LC_ALL=C sort -t/`
 	rm -rf tmp
 
 ${ALL}:	FRC
diff --git a/lib/libx_c/linux/csu/Makefile b/lib/libx_c/linux/csu/Makefile
index a2310bb..56a0c13 100644
--- a/lib/libx_c/linux/csu/Makefile
+++ b/lib/libx_c/linux/csu/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
 DESTDIR=${ROOT}/cross
 #
 # Copyright (c) 1980 Regents of the University of California.
@@ -15,26 +15,33 @@ DESTDIR=${ROOT}/cross
 #DESTDIR=
 SRCS=	crt0.c
 # mon.c gmon.c
-OBJS=	crt0.o
-# mcrt0.o gcrt0.o mon.o gmon.o
+OBJS=	crt0.o mcrt0.o gcrt0.o
+# mon.o gmon.o
 TAGSFILE=tags
 
 all: ${OBJS}
 
 install: ${OBJS}
 	mv crt0.o ${DESTDIR}/lib/crt0.o
-#	mv mcrt0.o ${DESTDIR}/lib/mcrt0.o
-#	mv gcrt0.o ${DESTDIR}/usr/lib/gcrt0.o
+	mv mcrt0.o ${DESTDIR}/lib/mcrt0.o
+	mv gcrt0.o ${DESTDIR}/usr/lib/gcrt0.o
 
-crt0.o:	crt0.c
+crt0.o: crt0.c
+	${CC} -DCRT0 -c crt0.c
+
+mcrt0.o: crt0.c
+	${CC} -DMCRT0 -o $@ -c crt0.c
+
+gcrt0.o: crt0.c
+	${CC} -DGCRT0 -o $@ -c crt0.c
+
+#crt0.o:	crt0.c
 #	cc -S ${DFLAGS} -DCRT0 crt0.c
 #	/lib/cpp crt0.s > x.s
 #	as -o x.o x.s
 #	ld -x -r -o crt0.o x.o
 #	rm -f x.s x.o crt0.s
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
-
+#
 #moncrt0.o: crt0.c
 #	cc -S ${DFLAGS} -DMCRT0 crt0.c
 #	/lib/cpp crt0.s > x.s
@@ -69,7 +76,7 @@ tags:
 	done
 
 clean:
-	rm -f ${OBJS} *.o *.s *.temp.c core errs tags Makefile.bak
+	rm -f ${OBJS} *.o *.s core errs tags Makefile.bak
 
 lint:	crt0.c
 	lint crt0.c -DMCRT0
diff --git a/lib/libx_c/linux/gen/Makefile b/lib/libx_c/linux/gen/Makefile
index 8f871e5..1ca647f 100644
--- a/lib/libx_c/linux/gen/Makefile
+++ b/lib/libx_c/linux/gen/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -13,26 +13,23 @@ OBJS=	abort.o modf.o
 TAGSFILE=tags
 
 .c.o:
-#	/lib/cpp -E ${DEFS} -DPROF $*.c | ${AS} -o $*.o
-#	-ld -x -r $*.o
-#	mv a.out profiled/$*.o
-#	/lib/cpp -E ${DEFS} $*.c | ${AS} -o $*.o
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
-
-#genlib genlib_p: ${OBJS}
-genlib: ${OBJS}
-#	@echo "building profiled genlib_p"
-#	@cd profiled; ar cru ../genlib_p ${OBJS}
-	@echo "building normal genlib_p"
+	${CC} -p ${CFLAGS} -c $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
+
+genlib genlib_p: ${OBJS}
+	@echo "building profiled genlib"
+	@cd profiled; ar cru ../genlib_p ${OBJS}
+	@echo "building normal genlib"
 	@ar cru genlib ${OBJS}
 
 tags:
 
 clean:
-	rm -f genlib genlib_p *.temp.c ${OBJS} profiled/*.o tags Makefile.bak
+	rm -f genlib genlib_p ${OBJS} profiled/*.o tags Makefile.bak
 
 depend:
 	for i in ${SRCS}; do \
diff --git a/lib/libx_c/linux/sys/Makefile b/lib/libx_c/linux/sys/Makefile
index c444078..1fb5d36 100644
--- a/lib/libx_c/linux/sys/Makefile
+++ b/lib/libx_c/linux/sys/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -15,26 +15,23 @@ OBJS=	close.o fstat.o getpagesize.o isatty.o lseek.o read.o readv.o sbrk.o \
 TAGSFILE=tags
 
 .c.o:
-#	/lib/cpp -E ${DEFS} -DPROF $*.c | ${AS} -o $*.o
-#	-ld -x -r $*.o
-#	mv a.out profiled/$*.o
-#	/lib/cpp -E ${DEFS} $*.c | ${AS} -o $*.o
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
-
-#syslib syslib_p: ${OBJS}
-syslib: ${OBJS}
-#	@echo "building profiled syslib_p"
-#	@cd profiled; ar cru ../syslib_p ${OBJS}
-	@echo "building normal syslib_p"
+	${CC} -p ${CFLAGS} -c $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
+
+syslib syslib_p: ${OBJS}
+	@echo "building profiled syslib"
+	@cd profiled; ar cru ../syslib_p ${OBJS}
+	@echo "building normal syslib"
 	@ar cru syslib ${OBJS}
 
 tags:
 
 clean:
-	rm -f syslib syslib_p *.temp.c ${OBJS} profiled/*.o tags Makefile.bak
+	rm -f syslib syslib_p ${OBJS} profiled/*.o tags Makefile.bak
 
 depend:
 	for i in ${SRCS}; do \
diff --git a/lib/libx_c/net/Makefile b/lib/libx_c/net/Makefile
index 2596d4e..78eacdd 100644
--- a/lib/libx_c/net/Makefile
+++ b/lib/libx_c/net/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -23,19 +23,16 @@ CFLAGS=	-O ${DEFS}
 TAGSFILE=tags
 
 .c.o:
-#	${CC} -p -c ${CFLAGS} $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
+	${CC} -p -c ${CFLAGS} $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
 
-#netlib netlib_p: ${OBJS}
-netlib: ${OBJS}
-#	@echo "building profiled netlib"
-#	@cd profiled; ar cru ../netlib_p ${OBJS}
+netlib netlib_p: ${OBJS}
+	@echo "building profiled netlib"
+	@cd profiled; ar cru ../netlib_p ${OBJS}
 	@echo "building normal netlib"
 	@ar cru netlib ${OBJS}
 
@@ -46,7 +43,7 @@ tags:
 	done
 
 clean:
-	rm -f *.temp.c *.o profiled/*.o errs a.out core netlib netlib_p \
+	rm -f *.o profiled/*.o errs a.out core netlib netlib_p \
 		tags Makefile.bak
 
 depend:
diff --git a/lib/libx_c/net/hosttable/Makefile b/lib/libx_c/net/hosttable/Makefile
index 3d1df7b..f02ea9b 100644
--- a/lib/libx_c/net/hosttable/Makefile
+++ b/lib/libx_c/net/hosttable/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
 
 #
 # Copyright (c) 1983 Regents of the University of California.
@@ -14,18 +14,16 @@ SRCS=	gethostnamadr.c gethostent.c
 CFLAGS=	-O ${DEFS}
 
 .c.o: 
-#	${CC} -p -c ${CFLAGS} $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
+	${CC} -p -c ${CFLAGS} $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
 
 hostlib hostlib_p: ${OBJS} 
-#	@echo "building profiled hostlib"
-#	@cd profiled; ar cru ../hostlib_p ${OBJS}
+	@echo "building profiled hostlib"
+	@cd profiled; ar cru ../hostlib_p ${OBJS}
 	@echo "building normal netlib"
 	@ar cru hostlib ${OBJS}
 	
@@ -36,7 +34,7 @@ tags:
 	done
 
 clean:
-	rm -f *.temp.c *.o errs a.out core hostlib hostlib_p profiled/*.o \
+	rm -f *.o errs a.out core hostlib hostlib_p profiled/*.o \
 		tags Makefile.bak
 
 depend:
diff --git a/lib/libx_c/net/named/Makefile b/lib/libx_c/net/named/Makefile
index a263a9f..7765f7d 100644
--- a/lib/libx_c/net/named/Makefile
+++ b/lib/libx_c/net/named/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -17,19 +17,16 @@ TAGSFILE= tags
 DESTDIR=
 
 .c.o:
-#	${CC} -p -c ${CFLAGS} $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
-
-#hostlib hostlib_p: ${OBJS}
-hostlib: ${OBJS}
-#	@echo "building profiled hostlib"
-#	@cd profiled; ar cru ../hostlib_p ${OBJS}
+	${CC} -p -c ${CFLAGS} $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
+
+hostlib hostlib_p: ${OBJS} 
+	@echo "building profiled hostlib"
+	@cd profiled; ar cru ../hostlib_p ${OBJS}
 	@echo "building normal hostlib"
 	@ar cru hostlib ${OBJS}
 	
@@ -40,7 +37,7 @@ tags:
 	done
 
 clean:
-	rm -f *.temp.c *.o errs a.out core hostlib hostlib_p profiled/*.o \
+	rm -f *.o errs a.out core hostlib hostlib_p profiled/*.o \
 		tags Makefile.bak
 
 depend:
diff --git a/lib/libx_c/ns/Makefile b/lib/libx_c/ns/Makefile
index 0ebdc48..2a599fc 100644
--- a/lib/libx_c/ns/Makefile
+++ b/lib/libx_c/ns/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -14,19 +14,16 @@ CFLAGS=	-O ${DEFS}
 TAGSFILE=tags
 
 .c.o:
-#	${CC} -p -c ${CFLAGS} $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
-
-#nslib nslib_p: ${OBJS}
-nslib: ${OBJS}
-#	@echo "building profiled nslib"
-#	@cd profiled; ar cru ../nslib_p ${OBJS}
+	${CC} -p -c ${CFLAGS} $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
+
+nslib nslib_p: ${OBJS}
+	@echo "building profiled nslib"
+	@cd profiled; ar cru ../nslib_p ${OBJS}
 	@echo "building normal nslib"
 	@ar cru nslib ${OBJS}
 
@@ -37,7 +34,7 @@ tags:
 	done
 
 clean:
-	rm -f nslib nslib_p *.temp.c *.o profiled/*.o errs a.out core \
+	rm -f nslib nslib_p *.o profiled/*.o errs a.out core \
 		tags Makefile.bak
 
 depend:
diff --git a/lib/libx_c/post.patch b/lib/libx_c/post.patch
index cc566c0..008a06a 100644
--- a/lib/libx_c/post.patch
+++ b/lib/libx_c/post.patch
@@ -1,105 +1,27 @@
 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-20 15:08:37.023597586 +1100
-+++ libx_c/compat-4.1/Makefile	2017-01-21 12:54:10.195680463 +1100
+--- libx_c.post/compat-4.1/Makefile	2017-01-21 21:23:47.550682235 +1100
++++ libx_c/compat-4.1/Makefile	2017-01-21 21:07:20.622709834 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
-@@ -18,16 +20,19 @@
- TAGSFILE=tags
- 
- .c.o:
--	${CC} -p ${CFLAGS} -c $*.c
--	-ld -X -r $*.o
--	mv a.out profiled/$*.o
--	${CC} ${CFLAGS} -c $*.c
--	-ld -x -r $*.o
--	mv a.out $*.o
--
--compat-4.1lib compat-4.1lib_p: ${OBJS}
--	@echo "building profiled compat-4.1lib"
--	@cd profiled; ar cru ../compat-4.1lib_p ${OBJS}
-+#	${CC} -p ${CFLAGS} -c $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#compat-4.1lib compat-4.1lib_p: ${OBJS}
-+compat-4.1lib: ${OBJS}
-+#	@echo "building profiled compat-4.1lib"
-+#	@cd profiled; ar cru ../compat-4.1lib_p ${OBJS}
- 	@echo "buiding normal compat-4.1lib"
- 	@ar cru compat-4.1lib ${OBJS}
- 
-@@ -38,7 +43,7 @@
- 	done
- 
- clean:
--	rm -f compat-4.1lib compat-4.1lib_p *.o profiled/*.o tags Makefile.bak
-+	rm -f compat-4.1lib compat-4.1lib_p *.temp.c *.o profiled/*.o tags Makefile.bak
- 
- depend:
- 	for i in ${SRCS}; do \
-@@ -59,4 +64,3 @@
+@@ -59,4 +61,3 @@
  
  # DO NOT DELETE THIS LINE -- make depend uses it
  
 -
 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-20 15:08:37.051597659 +1100
-+++ libx_c/compat-sys5/Makefile	2017-01-21 12:54:10.199680491 +1100
+--- libx_c.post/compat-sys5/Makefile	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/compat-sys5/Makefile	2017-01-21 21:07:20.626709834 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
  #	Makefile	1.5	85/09/05
  #
  CFLAGS=	-O ${DEFS}
-@@ -10,16 +12,19 @@
- TAGSFILE=tags
- 
- .c.o:
--	${CC} -p ${CFLAGS} -c $*.c
--	-ld -X -r $*.o
--	mv a.out profiled/$*.o
--	${CC} ${CFLAGS} -c $*.c
--	-ld -x -r $*.o
--	mv a.out $*.o
--
--compat-sys5lib compat-sys5lib_p: ${OBJS}
--	@echo "building profiled compat-sys5lib"
--	@cd profiled; ar cru ../compat-sys5lib_p ${OBJS}
-+#	${CC} -p ${CFLAGS} -c $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#compat-sys5lib compat-sys5lib_p: ${OBJS}
-+compat-sys5lib: ${OBJS}
-+#	@echo "building profiled compat-sys5lib"
-+#	@cd profiled; ar cru ../compat-sys5lib_p ${OBJS}
- 	@echo "buiding normal compat-sys5lib"
- 	@ar cru compat-sys5lib ${OBJS}
- 
-@@ -30,7 +35,7 @@
- 	done
- 
- clean:
--	rm -f compat-sys5lib compat-sys5lib_p *.o profiled/*.o Makefile.bak
-+	rm -f compat-sys5lib compat-sys5lib_p *.temp.c *.o profiled/*.o Makefile.bak
- 
- depend:
- 	for i in ${SRCS}; do \
-@@ -51,22 +56,3 @@
+@@ -51,22 +53,3 @@
  
  # DO NOT DELETE THIS LINE -- make depend uses it
  
@@ -123,8 +45,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -# IF YOU PUT STUFF HERE IT WILL GO AWAY
 -# see make depend above
 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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/bcopy.c	2017-01-20 15:08:37.059597681 +1100
+--- libx_c.post/gen/bcopy.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/bcopy.c	2017-01-21 21:03:58.114734092 +1100
 @@ -1,6 +1,12 @@
  #include <gen.h>
  #include <sys/types.h>
@@ -159,8 +81,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/getpass.c	2017-01-20 15:08:37.059597681 +1100
+--- libx_c.post/gen/getpass.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/getpass.c	2017-01-21 21:03:58.114734092 +1100
 @@ -20,7 +20,7 @@
  	FILE *fi;
  	static char pbuf[9];
@@ -171,8 +93,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/getpwnamuid.c	2017-01-20 15:08:37.059597681 +1100
+--- libx_c.post/gen/getpwnamuid.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/getpwnamuid.c	2017-01-21 21:03:58.114734092 +1100
 @@ -44,19 +44,37 @@
          cp = key.dptr;
  	tp = line;
@@ -212,15 +134,15 @@ 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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/Makefile	2017-01-21 12:54:10.199680491 +1100
+--- libx_c.post/gen/Makefile	2017-01-21 21:23:47.558682235 +1100
++++ libx_c/gen/Makefile	2017-01-21 21:09:13.922699224 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
-@@ -5,66 +7,59 @@
+@@ -5,44 +7,34 @@
  #
  #	@(#)Makefile	5.7 (Berkeley) 3/26/86
  #
@@ -290,27 +212,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  TAGSFILE=tags
  
  .c.o:
--	${CC} -p ${CFLAGS} -c $*.c
--	-ld -X -r $*.o
--	mv a.out profiled/$*.o
--	${CC} ${CFLAGS} -c $*.c
--	-ld -x -r $*.o
--	mv a.out $*.o
-+#	${CC} -p ${CFLAGS} -c $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
- 
- genlib genlib_p: ${OBJS}
--	@echo "building profiled genlib"
--	@cd profiled; ar cru ../genlib_p ${OBJS}
-+genlib: ${OBJS}
-+#	@echo "building profiled genlib"
-+#	@cd profiled; ar cru ../genlib_p ${OBJS}
+@@ -59,12 +51,12 @@
  	@echo "buiding normal genlib"
  	@ar cru genlib ${OBJS}
  
@@ -329,16 +231,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  
  tags:
  	cwd=`pwd`; \
-@@ -73,7 +68,7 @@
- 	done
- 
- clean:
--	rm -f genlib genlib_p *.o profiled/*.o tags Makefile.bak
-+	rm -f genlib genlib_p *.temp.c *.o profiled/*.o tags Makefile.bak
- 
- depend:
- 	for i in ${SRCS}; do \
-@@ -94,106 +89,3 @@
+@@ -94,106 +86,3 @@
  
  # DO NOT DELETE THIS LINE -- make depend uses it
  
@@ -446,8 +339,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -# IF YOU PUT STUFF HERE IT WILL GO AWAY
 -# see make depend above
 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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/malloc.c	2017-01-20 15:08:37.059597681 +1100
+--- libx_c.post/gen/malloc.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/malloc.c	2017-01-21 21:03:58.118734092 +1100
 @@ -4,6 +4,12 @@
  #include <sys/proc.h>
  #include <sys/types.h>
@@ -508,8 +401,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/ndbm.c	2017-01-20 15:08:37.059597681 +1100
+--- libx_c.post/gen/ndbm.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/ndbm.c	2017-01-21 21:03:58.118734092 +1100
 @@ -70,14 +70,14 @@
  		flags = (flags & ~03) | O_RDWR;
  	strcpy(db->dbm_pagbuf, file);
@@ -528,8 +421,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/qsort.c	2017-01-20 15:08:37.059597681 +1100
+--- libx_c.post/gen/qsort.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/qsort.c	2017-01-21 21:03:58.118734092 +1100
 @@ -36,7 +36,7 @@
  
  static void qst __P((char *base, char *max));
@@ -540,8 +433,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/scandir.c	2017-01-20 15:08:37.059597681 +1100
+--- libx_c.post/gen/scandir.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/scandir.c	2017-01-21 21:03:58.118734092 +1100
 @@ -24,7 +24,7 @@
  /*#include <sys/stat.h>*/
  /*#include <sys/dir.h>*/
@@ -561,8 +454,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/signal.c	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/gen/signal.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/signal.c	2017-01-21 21:03:58.118734092 +1100
 @@ -15,12 +15,12 @@
   */
  /*#include <signal.h>*/
@@ -586,8 +479,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/sleep.c	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/gen/sleep.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/sleep.c	2017-01-21 21:03:58.118734092 +1100
 @@ -15,7 +15,7 @@
  /*#include <signal.h>*/
  
@@ -598,8 +491,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/system.c	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/gen/system.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/system.c	2017-01-21 21:03:58.118734092 +1100
 @@ -11,7 +11,7 @@
  
  int system(s) char *s; {
@@ -610,8 +503,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/usleep.c	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/gen/usleep.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/usleep.c	2017-01-21 21:03:58.118734092 +1100
 @@ -18,7 +18,7 @@
  #define TICK	10000		/* system clock resolution in microseconds */
  
@@ -622,8 +515,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-20 15:08:37.051597659 +1100
-+++ libx_c/gen/valloc.c	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/gen/valloc.c	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/gen/valloc.c	2017-01-21 21:03:58.118734092 +1100
 @@ -1,6 +1,12 @@
  #include <gen.h>
  #include <sys.h>
@@ -651,8 +544,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-20 15:08:37.027597596 +1100
-+++ libx_c/gen.h	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/gen.h	2017-01-21 21:23:47.538682234 +1100
++++ libx_c/gen.h	2017-01-21 21:03:58.118734092 +1100
 @@ -108,7 +108,7 @@
  char *mktemp __P((char *as));
  
@@ -663,54 +556,15 @@ 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-20 15:08:37.027597596 +1100
-+++ libx_c/inet/Makefile	2017-01-21 12:54:10.199680491 +1100
+--- libx_c.post/inet/Makefile	2017-01-21 21:23:47.554682235 +1100
++++ libx_c/inet/Makefile	2017-01-21 21:07:20.626709834 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
-@@ -16,16 +18,19 @@
- TAGSFILE=tags
- 
- .c.o:
--	${CC} -p -c ${CFLAGS} $*.c
--	-ld -X -r $*.o
--	mv a.out profiled/$*.o
--	${CC} ${CFLAGS} -c $*.c
--	-ld -x -r $*.o
--	mv a.out $*.o
--
--inetlib inetlib_p: ${OBJS}
--	@echo "building profiled inetlib"
--	@cd profiled; ar cru ../inetlib_p ${OBJS}
-+#	${CC} -p -c ${CFLAGS} $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#inetlib inetlib_p: ${OBJS}
-+inetlib: ${OBJS}
-+#	@echo "building profiled inetlib"
-+#	@cd profiled; ar cru ../inetlib_p ${OBJS}
- 	@echo "building normal inetlib"
- 	@ar cru inetlib ${OBJS}
- 
-@@ -36,7 +41,7 @@
- 	done
- 
- clean:
--	rm -f inetlib inetlib_p *.o profiled/*.o errs a.out core \
-+	rm -f inetlib inetlib_p *.temp.c *.o profiled/*.o errs a.out core \
- 		tags Makefile.bak
- 
- depend:
-@@ -58,14 +63,3 @@
+@@ -58,14 +60,3 @@
  
  # DO NOT DELETE THIS LINE -- make depend uses it
  
@@ -727,7 +581,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -# see make depend above
 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-20 15:08:37.063597691 +1100
++++ libx_c/linux/csu/crt0.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,19 @@
 +#include <stdio.h>
 +
@@ -750,10 +604,10 @@ 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-21 12:54:10.195680463 +1100
-@@ -0,0 +1,97 @@
++++ libx_c/linux/csu/Makefile	2017-01-21 21:20:06.882676352 +1100
+@@ -0,0 +1,104 @@
 +ROOT=../../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
 +DESTDIR=${ROOT}/cross
 +#
 +# Copyright (c) 1980 Regents of the University of California.
@@ -769,26 +623,33 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#DESTDIR=
 +SRCS=	crt0.c
 +# mon.c gmon.c
-+OBJS=	crt0.o
-+# mcrt0.o gcrt0.o mon.o gmon.o
++OBJS=	crt0.o mcrt0.o gcrt0.o
++# mon.o gmon.o
 +TAGSFILE=tags
 +
 +all: ${OBJS}
 +
 +install: ${OBJS}
 +	mv crt0.o ${DESTDIR}/lib/crt0.o
-+#	mv mcrt0.o ${DESTDIR}/lib/mcrt0.o
-+#	mv gcrt0.o ${DESTDIR}/usr/lib/gcrt0.o
++	mv mcrt0.o ${DESTDIR}/lib/mcrt0.o
++	mv gcrt0.o ${DESTDIR}/usr/lib/gcrt0.o
++
++crt0.o: crt0.c
++	${CC} -DCRT0 -c crt0.c
 +
-+crt0.o:	crt0.c
++mcrt0.o: crt0.c
++	${CC} -DMCRT0 -o $@ -c crt0.c
++
++gcrt0.o: crt0.c
++	${CC} -DGCRT0 -o $@ -c crt0.c
++
++#crt0.o:	crt0.c
 +#	cc -S ${DFLAGS} -DCRT0 crt0.c
 +#	/lib/cpp crt0.s > x.s
 +#	as -o x.o x.s
 +#	ld -x -r -o crt0.o x.o
 +#	rm -f x.s x.o crt0.s
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
++#
 +#moncrt0.o: crt0.c
 +#	cc -S ${DFLAGS} -DMCRT0 crt0.c
 +#	/lib/cpp crt0.s > x.s
@@ -823,7 +684,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +	done
 +
 +clean:
-+	rm -f ${OBJS} *.o *.s *.temp.c core errs tags Makefile.bak
++	rm -f ${OBJS} *.o *.s core errs tags Makefile.bak
 +
 +lint:	crt0.c
 +	lint crt0.c -DMCRT0
@@ -851,7 +712,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/gen/abort.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,7 @@
 +#include <nox_stdlib.h>
 +
@@ -862,10 +723,10 @@ 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-21 12:54:10.199680491 +1100
-@@ -0,0 +1,55 @@
++++ libx_c/linux/gen/Makefile	2017-01-21 21:10:33.190693023 +1100
+@@ -0,0 +1,52 @@
 +ROOT=../../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
@@ -879,26 +740,23 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +TAGSFILE=tags
 +
 +.c.o:
-+#	/lib/cpp -E ${DEFS} -DPROF $*.c | ${AS} -o $*.o
-+#	-ld -x -r $*.o
-+#	mv a.out profiled/$*.o
-+#	/lib/cpp -E ${DEFS} $*.c | ${AS} -o $*.o
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#genlib genlib_p: ${OBJS}
-+genlib: ${OBJS}
-+#	@echo "building profiled genlib_p"
-+#	@cd profiled; ar cru ../genlib_p ${OBJS}
-+	@echo "building normal genlib_p"
++	${CC} -p ${CFLAGS} -c $*.c
++	-ld -X -r $*.o
++	mv a.out profiled/$*.o
++	${CC} ${CFLAGS} -c $*.c
++	-ld -x -r $*.o
++	mv a.out $*.o
++
++genlib genlib_p: ${OBJS}
++	@echo "building profiled genlib"
++	@cd profiled; ar cru ../genlib_p ${OBJS}
++	@echo "building normal genlib"
 +	@ar cru genlib ${OBJS}
 +
 +tags:
 +
 +clean:
-+	rm -f genlib genlib_p *.temp.c ${OBJS} profiled/*.o tags Makefile.bak
++	rm -f genlib genlib_p ${OBJS} profiled/*.o tags Makefile.bak
 +
 +depend:
 +	for i in ${SRCS}; do \
@@ -921,7 +779,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/gen/modf.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,7 @@
 +#include <nox_math.h>
 +
@@ -932,7 +790,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-21 12:54:10.199680491 +1100
++++ libx_c/linux/Makefile	2017-01-21 21:18:36.878675836 +1100
 @@ -0,0 +1,43 @@
 +#
 +# Copyright (c) 1980 Regents of the University of California.
@@ -948,15 +806,15 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +#gen net stdio sys ${COMPAT}
 +TAGSFILE=tags
 +
-+#linuxlib linuxlib_p: ${ALL}
-+linuxlib: ${ALL}
++linuxlib linuxlib_p: ${ALL}
 +	-mkdir tmp
 +	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib); done
 +#	ar cr linuxlib `ls tmp/*.o | sort -t/ +1`
 +	ar cr linuxlib `ls tmp/*.o | LC_ALL=C sort -t/`
-+#	rm -f tmp/*
-+#	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib_p); done
++	rm -f tmp/*
++	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib_p); done
 +#	ar cr linuxlib_p `ls tmp/*.o | sort -t/ +1`
++	ar cr linuxlib_p `ls tmp/*.o | LC_ALL=C sort -t/`
 +	rm -rf tmp
 +
 +${ALL}:	FRC
@@ -979,7 +837,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/close.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,13 @@
 +#include <nox_unistd.h>
 +
@@ -996,7 +854,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/_exit.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,7 @@
 +#include <nox_unistd.h>
 +
@@ -1007,7 +865,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/fstat.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,17 @@
 +#include <sys/nox_stat.h>
 +#include <nox_unistd.h>
@@ -1028,7 +886,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/getpagesize.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,7 @@
 +#include <nox_unistd.h>
 +
@@ -1039,7 +897,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/isatty.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,13 @@
 +#include <nox_unistd.h>
 +
@@ -1056,7 +914,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/lseek.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,15 @@
 +#include <nox_unistd.h>
 +#include <sys/nox_types.h>
@@ -1075,10 +933,10 @@ 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-21 12:54:10.199680491 +1100
-@@ -0,0 +1,57 @@
++++ libx_c/linux/sys/Makefile	2017-01-21 21:10:02.274695320 +1100
+@@ -0,0 +1,54 @@
 +ROOT=../../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
@@ -1094,26 +952,23 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +TAGSFILE=tags
 +
 +.c.o:
-+#	/lib/cpp -E ${DEFS} -DPROF $*.c | ${AS} -o $*.o
-+#	-ld -x -r $*.o
-+#	mv a.out profiled/$*.o
-+#	/lib/cpp -E ${DEFS} $*.c | ${AS} -o $*.o
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#syslib syslib_p: ${OBJS}
-+syslib: ${OBJS}
-+#	@echo "building profiled syslib_p"
-+#	@cd profiled; ar cru ../syslib_p ${OBJS}
-+	@echo "building normal syslib_p"
++	${CC} -p ${CFLAGS} -c $*.c
++	-ld -X -r $*.o
++	mv a.out profiled/$*.o
++	${CC} ${CFLAGS} -c $*.c
++	-ld -x -r $*.o
++	mv a.out $*.o
++
++syslib syslib_p: ${OBJS}
++	@echo "building profiled syslib"
++	@cd profiled; ar cru ../syslib_p ${OBJS}
++	@echo "building normal syslib"
 +	@ar cru syslib ${OBJS}
 +
 +tags:
 +
 +clean:
-+	rm -f syslib syslib_p *.temp.c ${OBJS} profiled/*.o tags Makefile.bak
++	rm -f syslib syslib_p ${OBJS} profiled/*.o tags Makefile.bak
 +
 +depend:
 +	for i in ${SRCS}; do \
@@ -1136,7 +991,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/read.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,15 @@
 +#include <nox_unistd.h>
 +
@@ -1155,7 +1010,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/readv.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,26 @@
 +#include <nox_unistd.h>
 +#include <sys/nox_uio.h>
@@ -1185,7 +1040,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/sbrk.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,14 @@
 +#include <nox_stdint.h>
 +#include <nox_unistd.h>
@@ -1203,7 +1058,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/vopen.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,49 @@
 +#include <nox_fcntl.h>
 +
@@ -1256,7 +1111,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/write.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,15 @@
 +#include <nox_unistd.h>
 +
@@ -1275,7 +1130,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-20 15:08:37.063597691 +1100
++++ libx_c/linux/sys/writev.c	2017-01-21 21:03:58.118734092 +1100
 @@ -0,0 +1,26 @@
 +#include <nox_unistd.h>
 +#include <sys/nox_uio.h>
@@ -1304,15 +1159,15 @@ 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-20 15:08:37.027597596 +1100
-+++ libx_c/Makefile	2017-01-21 13:04:29.367675920 +1100
+--- libx_c.post/Makefile	2017-01-21 21:23:47.538682234 +1100
++++ libx_c/Makefile	2017-01-21 21:19:35.970676049 +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,31 +41,35 @@
+@@ -39,29 +41,35 @@
  #HOSTLOOKUP=	hosttable
  HOSTLOOKUP=	named
  #							
@@ -1344,24 +1199,19 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +# ${MACHINE}/csu/${DFLMON}
  	ar ma findiop.o libc.a exit.o
  	ar ma exit.o libc.a fakcu.o
--	rm -f t1 tmp/*
--	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib_p); done
--	cd tmp; ar x ../net/${HOSTLOOKUP}/hostlib_p
+ 	rm -f t1 tmp/*
+ 	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib_p); done
+ 	cd tmp; ar x ../net/${HOSTLOOKUP}/hostlib_p
 -	ls tmp/*.o | sort -t/ +1 > t1
 -	ar cr libc_p.a `lorder \`cat t1\` | tsort` ${MACHINE}/csu/${DFLMON}
--	ar ma findiop.o libc_p.a exit.o
--	ar ma exit.o libc_p.a fakcu.o
-+#	rm -f t1 tmp/*
-+#	for i in ${ALL}; do (cd tmp; ar x ../$$i/$${i}lib_p); done
-+#	cd tmp; ar x ../net/${HOSTLOOKUP}/hostlib_p
 +#	ls tmp/*.o | sort -t/ +1 > t1
-+#	ar cr libc_p.a `lorder \`cat t1\` | tsort` ${MACHINE}/csu/${DFLMON}
-+#	ar ma findiop.o libc_p.a exit.o
-+#	ar ma exit.o libc_p.a fakcu.o
++	ls tmp/*.o | LC_ALL=C sort -t/ > t1
++	ar cr libc_p.a `lorder \`cat t1\` | tsort`
++# ${MACHINE}/csu/${DFLMON}
+ 	ar ma findiop.o libc_p.a exit.o
+ 	ar ma exit.o libc_p.a fakcu.o
  	rm -rf t1 tmp
- 
- ${MACHINE}/csu ${ALL} net/${HOSTLOOKUP}: FRC
-@@ -71,11 +77,43 @@
+@@ -71,11 +79,46 @@
  
  FRC:
  
@@ -1398,62 +1248,27 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +install:
  	${INSTALL} libc.a ${DESTDIR}/lib/libc.a
  	ranlib ${DESTDIR}/lib/libc.a
--	${INSTALL} libc_p.a ${DESTDIR}/usr/lib/libc_p.a
--	ranlib ${DESTDIR}/usr/lib/libc_p.a
 +	mkdir -p ${DESTDIR}/lib/.xify
 +	${INSTALL} libc.a ${DESTDIR}/lib/.xify/libx_c.a
 +	ranlib ${DESTDIR}/lib/.xify/libx_c.a
-+#	${INSTALL} libc_p.a ${DESTDIR}/usr/lib/libc_p.a
-+#	ranlib ${DESTDIR}/usr/lib/libc_p.a
+ 	${INSTALL} libc_p.a ${DESTDIR}/usr/lib/libc_p.a
+ 	ranlib ${DESTDIR}/usr/lib/libc_p.a
++	mkdir -p ${DESTDIR}/usr/lib/.xify
++	${INSTALL} libc_p.a ${DESTDIR}/usr/lib/.xify/libx_c_p.a
++	ranlib ${DESTDIR}/usr/lib/.xify/libx_c_p.a
  	cd ${MACHINE}/csu; make DESTDIR=${DESTDIR} install
  
  tags:
 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-20 15:08:37.023597586 +1100
-+++ libx_c/net/hosttable/Makefile	2017-01-21 12:54:10.195680463 +1100
+--- libx_c.post/net/hosttable/Makefile	2017-01-21 21:23:47.550682235 +1100
++++ libx_c/net/hosttable/Makefile	2017-01-21 21:07:20.626709834 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
  
  #
  # Copyright (c) 1983 Regents of the University of California.
-@@ -12,16 +14,18 @@
- CFLAGS=	-O ${DEFS}
- 
- .c.o: 
--	${CC} -p -c ${CFLAGS} $*.c
--	-ld -X -r $*.o
--	mv a.out profiled/$*.o
--	${CC} ${CFLAGS} -c $*.c
--	-ld -x -r $*.o
--	mv a.out $*.o
-+#	${CC} -p -c ${CFLAGS} $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
- 
- hostlib hostlib_p: ${OBJS} 
--	@echo "building profiled hostlib"
--	@cd profiled; ar cru ../hostlib_p ${OBJS}
-+#	@echo "building profiled hostlib"
-+#	@cd profiled; ar cru ../hostlib_p ${OBJS}
- 	@echo "building normal netlib"
- 	@ar cru hostlib ${OBJS}
- 	
-@@ -32,7 +36,7 @@
- 	done
- 
- clean:
--	rm -f *.o errs a.out core hostlib hostlib_p profiled/*.o \
-+	rm -f *.temp.c *.o errs a.out core hostlib hostlib_p profiled/*.o \
- 		tags Makefile.bak
- 
- depend:
-@@ -54,11 +58,3 @@
+@@ -54,11 +56,3 @@
  
  # DO NOT DELETE THIS LINE -- make depend uses it
  
@@ -1466,54 +1281,15 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -# IF YOU PUT STUFF HERE IT WILL GO AWAY
 -# see make depend above
 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-20 15:08:37.023597586 +1100
-+++ libx_c/net/Makefile	2017-01-21 12:54:10.195680463 +1100
+--- libx_c.post/net/Makefile	2017-01-21 21:23:47.550682235 +1100
++++ libx_c/net/Makefile	2017-01-21 21:07:20.626709834 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
-@@ -21,16 +23,19 @@
- TAGSFILE=tags
- 
- .c.o:
--	${CC} -p -c ${CFLAGS} $*.c
--	-ld -X -r $*.o
--	mv a.out profiled/$*.o
--	${CC} ${CFLAGS} -c $*.c
--	-ld -x -r $*.o
--	mv a.out $*.o
--
--netlib netlib_p: ${OBJS}
--	@echo "building profiled netlib"
--	@cd profiled; ar cru ../netlib_p ${OBJS}
-+#	${CC} -p -c ${CFLAGS} $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#netlib netlib_p: ${OBJS}
-+netlib: ${OBJS}
-+#	@echo "building profiled netlib"
-+#	@cd profiled; ar cru ../netlib_p ${OBJS}
- 	@echo "building normal netlib"
- 	@ar cru netlib ${OBJS}
- 
-@@ -41,7 +46,7 @@
- 	done
- 
- clean:
--	rm -f *.o profiled/*.o errs a.out core netlib netlib_p \
-+	rm -f *.temp.c *.o profiled/*.o errs a.out core netlib netlib_p \
- 		tags Makefile.bak
- 
- depend:
-@@ -63,54 +68,3 @@
+@@ -63,54 +65,3 @@
  
  # DO NOT DELETE THIS LINE -- make depend uses it
  
@@ -1569,8 +1345,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -# IF YOU PUT STUFF HERE IT WILL GO AWAY
 -# see make depend above
 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-20 15:08:37.027597596 +1100
-+++ libx_c/net/named/gethostnamadr.c	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/net/named/gethostnamadr.c	2017-01-21 21:23:47.550682235 +1100
++++ libx_c/net/named/gethostnamadr.c	2017-01-21 21:03:58.118734092 +1100
 @@ -12,6 +12,12 @@
  #include <sys/socket.h>
  #include <sys/types.h>
@@ -1596,54 +1372,15 @@ 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-20 15:08:37.027597596 +1100
-+++ libx_c/net/named/Makefile	2017-01-21 12:54:10.195680463 +1100
+--- libx_c.post/net/named/Makefile	2017-01-21 21:23:47.550682235 +1100
++++ libx_c/net/named/Makefile	2017-01-21 21:07:20.626709834 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
-@@ -15,16 +17,19 @@
- DESTDIR=
- 
- .c.o:
--	${CC} -p -c ${CFLAGS} $*.c
--	-ld -X -r $*.o
--	mv a.out profiled/$*.o
--	${CC} ${CFLAGS} -c $*.c
--	-ld -x -r $*.o
--	mv a.out $*.o
--
--hostlib hostlib_p: ${OBJS} 
--	@echo "building profiled hostlib"
--	@cd profiled; ar cru ../hostlib_p ${OBJS}
-+#	${CC} -p -c ${CFLAGS} $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#hostlib hostlib_p: ${OBJS}
-+hostlib: ${OBJS}
-+#	@echo "building profiled hostlib"
-+#	@cd profiled; ar cru ../hostlib_p ${OBJS}
- 	@echo "building normal hostlib"
- 	@ar cru hostlib ${OBJS}
- 	
-@@ -35,7 +40,7 @@
- 	done
- 
- clean:
--	rm -f *.o errs a.out core hostlib hostlib_p profiled/*.o \
-+	rm -f *.temp.c *.o errs a.out core hostlib hostlib_p profiled/*.o \
- 		tags Makefile.bak
- 
- depend:
-@@ -57,14 +62,3 @@
+@@ -57,14 +59,3 @@
  
  # DO NOT DELETE THIS LINE -- make depend uses it
  
@@ -1659,54 +1396,15 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -# IF YOU PUT STUFF HERE IT WILL GO AWAY
 -# see make depend above
 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-20 15:08:37.019597575 +1100
-+++ libx_c/ns/Makefile	2017-01-21 12:54:10.195680463 +1100
+--- libx_c.post/ns/Makefile	2017-01-21 21:23:47.546682235 +1100
++++ libx_c/ns/Makefile	2017-01-21 21:07:20.622709834 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
-@@ -12,16 +14,19 @@
- TAGSFILE=tags
- 
- .c.o:
--	${CC} -p -c ${CFLAGS} $*.c
--	-ld -X -r $*.o
--	mv a.out profiled/$*.o
--	${CC} ${CFLAGS} -c $*.c
--	-ld -x -r $*.o
--	mv a.out $*.o
--
--nslib nslib_p: ${OBJS}
--	@echo "building profiled nslib"
--	@cd profiled; ar cru ../nslib_p ${OBJS}
-+#	${CC} -p -c ${CFLAGS} $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#nslib nslib_p: ${OBJS}
-+nslib: ${OBJS}
-+#	@echo "building profiled nslib"
-+#	@cd profiled; ar cru ../nslib_p ${OBJS}
- 	@echo "building normal nslib"
- 	@ar cru nslib ${OBJS}
- 
-@@ -32,7 +37,7 @@
- 	done
- 
- clean:
--	rm -f nslib nslib_p *.o profiled/*.o errs a.out core \
-+	rm -f nslib nslib_p *.temp.c *.o profiled/*.o errs a.out core \
- 		tags Makefile.bak
- 
- depend:
-@@ -54,8 +59,3 @@
+@@ -54,8 +56,3 @@
  
  # DO NOT DELETE THIS LINE -- make depend uses it
  
@@ -1716,8 +1414,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -# IF YOU PUT STUFF HERE IT WILL GO AWAY
 -# see make depend above
 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-20 15:08:37.019597575 +1100
-+++ libx_c/stdio/doprnt.c	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/stdio/doprnt.c	2017-01-21 21:23:47.546682235 +1100
++++ libx_c/stdio/doprnt.c	2017-01-21 21:03:58.118734092 +1100
 @@ -13,6 +13,14 @@
  #define _va_start(argp, arg) va_start(argp)
  #endif
@@ -1762,8 +1460,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-20 15:08:37.019597575 +1100
-+++ libx_c/stdio/findiop.c	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/stdio/findiop.c	2017-01-21 21:23:47.546682235 +1100
++++ libx_c/stdio/findiop.c	2017-01-21 21:03:58.118734092 +1100
 @@ -105,7 +105,7 @@
  			*iov = (FILE *)calloc(1, sizeof **iov);
  }
@@ -1774,15 +1472,15 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  	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-20 15:08:37.019597575 +1100
-+++ libx_c/stdio/Makefile	2017-01-21 12:54:10.195680463 +1100
+--- libx_c.post/stdio/Makefile	2017-01-21 21:23:47.546682235 +1100
++++ libx_c/stdio/Makefile	2017-01-21 21:08:15.646704419 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
-@@ -5,48 +7,35 @@
+@@ -5,35 +7,19 @@
  #
  #	@(#)Makefile	5.4 (Berkeley) 9/5/85
  #
@@ -1830,42 +1528,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  TAGSFILE=tags
  
  .c.o:
--	${CC} -p ${CFLAGS} -c $*.c
--	-ld -X -r $*.o
--	mv a.out profiled/$*.o
--	${CC} ${CFLAGS} -c $*.c
--	-ld -x -r $*.o
--	mv a.out $*.o
--
--stdiolib stdiolib_p: ${OBJS}
--	@echo "building profiled stdiolib"
--	@cd profiled; ar cru ../stdiolib_p ${OBJS}
-+#	${CC} -p ${CFLAGS} -c $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#stdiolib stdiolib_p: ${OBJS}
-+stdiolib: ${OBJS}
-+#	@echo "building profiled stdiolib"
-+#	@cd profiled; ar cru ../stdiolib_p ${OBJS}
- 	@echo "building normal stdiolib"
- 	@ar cru stdiolib ${OBJS}
- 
-@@ -57,7 +46,7 @@
- 	done
- 
- clean:
--	rm -f stdiolib stdiolib_p *.o profiled/*.o tags Makefile.bak
-+	rm -f stdiolib stdiolib_p *.temp.c *.o profiled/*.o tags Makefile.bak
- 
- depend:
- 	for i in ${SRCS}; do \
-@@ -78,41 +67,3 @@
+@@ -78,41 +64,3 @@
  
  # DO NOT DELETE THIS LINE -- make depend uses it
  
@@ -1908,8 +1571,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 -# IF YOU PUT STUFF HERE IT WILL GO AWAY
 -# see make depend above
 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-20 15:08:37.031597606 +1100
-+++ libx_c/stdio.h	2017-01-21 15:03:39.049076033 +1100
+--- libx_c.post/stdio.h	2017-01-21 21:23:47.542682235 +1100
++++ libx_c/stdio.h	2017-01-21 21:03:58.122734091 +1100
 @@ -82,7 +82,7 @@
  #endif
  
@@ -1965,8 +1628,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/sys/dir.h libx_c/sys/dir.h
---- libx_c.post/sys/dir.h	2017-01-20 15:08:37.035597617 +1100
-+++ libx_c/sys/dir.h	2017-01-20 15:08:37.063597691 +1100
+--- libx_c.post/sys/dir.h	2017-01-21 21:23:47.530682234 +1100
++++ libx_c/sys/dir.h	2017-01-21 21:03:58.122734091 +1100
 @@ -122,7 +122,7 @@
  struct direct *readdir __P((register DIR *dirp));
  
@@ -1978,10 +1641,10 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
  /* 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	1970-01-01 10:00:00.000000000 +1000
-+++ libx_c/sys/Makefile	2017-01-21 12:54:10.199680491 +1100
-@@ -0,0 +1,93 @@
++++ libx_c/sys/Makefile	2017-01-21 21:08:41.702702023 +1100
+@@ -0,0 +1,90 @@
 +ROOT=../../..
-+CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
++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
@@ -2028,19 +1691,16 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +TAGSFILE=tags
 +
 +.c.o:
-+#	${CC} -p -c ${CFLAGS} $*.c
-+#	-ld -X -r $*.o
-+#	mv a.out profiled/$*.o
-+#	${CC} ${CFLAGS} -c $*.c
-+#	-ld -x -r $*.o
-+#	mv a.out $*.o
-+	${ROOT}/xify/xify $< $*.temp.c
-+	${CC} -o $@ -c $*.temp.c
-+
-+#syslib syslib_p: ${OBJS}
-+syslib: ${OBJS}
-+#	@echo "building profiled syslib"
-+#	@cd profiled; ar cru ../syslib_p ${OBJS}
++	${CC} -p -c ${CFLAGS} $*.c
++	-ld -X -r $*.o
++	mv a.out profiled/$*.o
++	${CC} ${CFLAGS} -c $*.c
++	-ld -x -r $*.o
++	mv a.out $*.o
++
++syslib syslib_p: ${OBJS}
++	@echo "building profiled syslib"
++	@cd profiled; ar cru ../syslib_p ${OBJS}
 +	@echo "building normal syslib"
 +	@ar cru syslib ${OBJS}
 +
@@ -2051,7 +1711,7 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +	done
 +
 +clean:
-+	rm -f syslib syslib_p *.temp.c *.o profiled/*.o errs a.out core \
++	rm -f syslib syslib_p *.o profiled/*.o errs a.out core \
 +		tags Makefile.bak
 +
 +depend:
@@ -2074,8 +1734,8 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +# DO NOT DELETE THIS LINE -- make depend uses it
 +
 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-20 15:08:37.035597617 +1100
-+++ libx_c/sys/open.c	2017-01-20 15:08:37.067597702 +1100
+--- libx_c.post/sys/open.c	2017-01-21 21:23:47.526682234 +1100
++++ libx_c/sys/open.c	2017-01-21 21:03:58.122734091 +1100
 @@ -17,7 +17,7 @@
  	va_list argp;
  	int res;
@@ -2086,8 +1746,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-20 15:08:37.035597617 +1100
-+++ libx_c/sys/signal.h	2017-01-20 15:08:37.067597702 +1100
+--- libx_c.post/sys/signal.h	2017-01-21 21:23:47.526682234 +1100
++++ libx_c/sys/signal.h	2017-01-21 21:03:58.122734091 +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 8ea59c2..e2235e0 100644
--- a/lib/libx_c/stdio/Makefile
+++ b/lib/libx_c/stdio/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -23,19 +23,16 @@ CFLAGS=	-O ${DEFS}
 TAGSFILE=tags
 
 .c.o:
-#	${CC} -p ${CFLAGS} -c $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
+	${CC} -p ${CFLAGS} -c $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
 
-#stdiolib stdiolib_p: ${OBJS}
-stdiolib: ${OBJS}
-#	@echo "building profiled stdiolib"
-#	@cd profiled; ar cru ../stdiolib_p ${OBJS}
+stdiolib stdiolib_p: ${OBJS}
+	@echo "building profiled stdiolib"
+	@cd profiled; ar cru ../stdiolib_p ${OBJS}
 	@echo "building normal stdiolib"
 	@ar cru stdiolib ${OBJS}
 
@@ -46,7 +43,7 @@ tags:
 	done
 
 clean:
-	rm -f stdiolib stdiolib_p *.temp.c *.o profiled/*.o tags Makefile.bak
+	rm -f stdiolib stdiolib_p *.o profiled/*.o tags Makefile.bak
 
 depend:
 	for i in ${SRCS}; do \
diff --git a/lib/libx_c/sys/Makefile b/lib/libx_c/sys/Makefile
index 2e72242..572e616 100644
--- a/lib/libx_c/sys/Makefile
+++ b/lib/libx_c/sys/Makefile
@@ -1,5 +1,5 @@
 ROOT=../../..
-CC=gcc -g -I${ROOT}/cross/usr/include/.xify -Dx_vax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
+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
@@ -46,19 +46,16 @@ CFLAGS=	-O ${DEFS}
 TAGSFILE=tags
 
 .c.o:
-#	${CC} -p -c ${CFLAGS} $*.c
-#	-ld -X -r $*.o
-#	mv a.out profiled/$*.o
-#	${CC} ${CFLAGS} -c $*.c
-#	-ld -x -r $*.o
-#	mv a.out $*.o
-	${ROOT}/xify/xify $< $*.temp.c
-	${CC} -o $@ -c $*.temp.c
+	${CC} -p -c ${CFLAGS} $*.c
+	-ld -X -r $*.o
+	mv a.out profiled/$*.o
+	${CC} ${CFLAGS} -c $*.c
+	-ld -x -r $*.o
+	mv a.out $*.o
 
-#syslib syslib_p: ${OBJS}
-syslib: ${OBJS}
-#	@echo "building profiled syslib"
-#	@cd profiled; ar cru ../syslib_p ${OBJS}
+syslib syslib_p: ${OBJS}
+	@echo "building profiled syslib"
+	@cd profiled; ar cru ../syslib_p ${OBJS}
 	@echo "building normal syslib"
 	@ar cru syslib ${OBJS}
 
@@ -69,7 +66,7 @@ tags:
 	done
 
 clean:
-	rm -f syslib syslib_p *.temp.c *.o profiled/*.o errs a.out core \
+	rm -f syslib syslib_p *.o profiled/*.o errs a.out core \
 		tags Makefile.bak
 
 depend:
diff --git a/lib/libx_c/unxify.sh b/lib/libx_c/unxify.sh
new file mode 100755
index 0000000..7a30f04
--- /dev/null
+++ b/lib/libx_c/unxify.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+rm -rf ns/.xify
+rm -rf stdio/.xify
+rm -rf compat-4.1/.xify
+rm -rf net/.xify
+rm -rf net/named/.xify
+rm -rf linux/csu/.xify
+rm -rf linux/sys/.xify
+rm -rf linux/gen/.xify
+rm -rf inet/.xify
+rm -rf compat-sys5/.xify
+rm -rf sys/.xify
+rm -rf gen/.xify
diff --git a/n.sh b/n.sh
index 087ee33..977cb2c 100755
--- a/n.sh
+++ b/n.sh
@@ -1,4 +1,24 @@
-#!/bin/sh
+#!/bin/sh -e
+
 rm -rf cross
-mkdir --p cross/include
-mkdir --p cross/lib
+mkdir -p cross/bin
+mkdir -p cross/include
+mkdir -p cross/lib
+mkdir -p cross/usr/lib
+
+mkdir -p lib/libx_c/compat-4.1/profiled
+mkdir -p lib/libx_c/compat-sys5/profiled
+mkdir -p lib/libx_c/gen/profiled
+mkdir -p lib/libx_c/inet/profiled
+mkdir -p lib/libx_c/linux/gen/profiled
+mkdir -p lib/libx_c/linux/profiled
+mkdir -p lib/libx_c/linux/sys/profiled
+mkdir -p lib/libx_c/net/hosttable/profiled
+mkdir -p lib/libx_c/net/named/profiled
+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 xify && make clean && make && make install)
+(cd lib/libx_c && make clean && make install-headers && make && make install)
diff --git a/test/Makefile b/test/Makefile
index bbfb286..6b194e7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,13 +1,10 @@
 ROOT=..
 CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc
-CFLAGS=-d -g -Dvax
-#CC=${ROOT}/cross/bin/cc -g -Dvax -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result
-
-.c.o:
-	${CC} ${CFLAGS} -c $<
+CFLAGS=-g -Dvax
 
 hello: hello.o
 	${CC} ${CFLAGS} -o $@ hello.o
 
 clean:
 	rm -f hello *.o
+	rm -rf .xify
diff --git a/xify/xifyfilt.c b/xify/xifyfilt.c
index da9d9d3..d09fe7c 100644
--- a/xify/xifyfilt.c
+++ b/xify/xifyfilt.c
@@ -52,8 +52,10 @@ int main() {
               (l != 0 || m != 8 || memcmp(p, "stdarg.h", 8) != 0) /*&&
               (l != 0 || m != 9 || memcmp(p, "varargs.h", 9) != 0)*/
             ) {
+#if 0 /* just remove for now, since we are not doing anything with it yet */
               fwrite(p - 1, l + m + 2, 1, stderr); /* include <> or "" */
               fputc('\n', stderr);
+#endif
               fwrite(p, l, 1, stdout);
               fwrite("x_", 2, 1, stdout);
               p = q;