Make xified linker automatically create links like .xify/libx_c.a -> ../libc.a

diff --git a/lib/libx_c/Makefile b/lib/libx_c/Makefile
index e6badce..786be14 100644 (file)
--- a/lib/libx_c/Makefile
+++ b/lib/libx_c/Makefile
@@ -111,14 +111,8 @@ install-headers:
 install:
        ${INSTALL} libc.a ${DESTDIR}/lib/libc.a
        ranlib ${DESTDIR}/lib/libc.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
-       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/post.patch b/lib/libx_c/post.patch
index 008a06a..b881ec9 100644 (file)
--- a/lib/libx_c/post.patch
+++ b/lib/libx_c/post.patch
@@ -1,6 +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-21 21:23:47.550682235 +1100
-+++ libx_c/compat-4.1/Makefile 2017-01-21 21:07:20.622709834 +1100
+--- libx_c.post/compat-4.1/Makefile    2017-01-21 22:50:06.040114532 +1100
++++ libx_c/compat-4.1/Makefile 2017-01-21 22:50:06.076114575 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -13,8 +13,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/compat-sys5/Makefile libx_c/compat-sys5/Makefile
---- 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
+--- libx_c.post/compat-sys5/Makefile   2017-01-21 22:50:06.064114562 +1100
++++ libx_c/compat-sys5/Makefile        2017-01-21 22:50:06.076114575 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -45,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/bcopy.c 2017-01-21 21:03:58.114734092 +1100
+--- libx_c.post/gen/bcopy.c    2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/bcopy.c 2017-01-21 22:50:06.076114575 +1100
 @@ -1,6 +1,12 @@
  #include <gen.h>
  #include <sys/types.h>
@@ -81,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/getpass.c       2017-01-21 21:03:58.114734092 +1100
+--- libx_c.post/gen/getpass.c  2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/getpass.c       2017-01-21 22:50:06.076114575 +1100
 @@ -20,7 +20,7 @@
        FILE *fi;
        static char pbuf[9];
@@ -93,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/getpwnamuid.c   2017-01-21 21:03:58.114734092 +1100
+--- libx_c.post/gen/getpwnamuid.c      2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/getpwnamuid.c   2017-01-21 22:50:06.076114575 +1100
 @@ -44,19 +44,37 @@
          cp = key.dptr;
        tp = line;
@@ -134,8 +134,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/gen/Makefile libx_c/gen/Makefile
---- 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
+--- libx_c.post/gen/Makefile   2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/Makefile        2017-01-21 22:50:06.076114575 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -339,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/malloc.c        2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen/malloc.c   2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/malloc.c        2017-01-21 22:50:06.076114575 +1100
 @@ -4,6 +4,12 @@
  #include <sys/proc.h>
  #include <sys/types.h>
@@ -401,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/ndbm.c  2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen/ndbm.c     2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/ndbm.c  2017-01-21 22:50:06.076114575 +1100
 @@ -70,14 +70,14 @@
                flags = (flags & ~03) | O_RDWR;
        strcpy(db->dbm_pagbuf, file);
@@ -421,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/qsort.c 2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen/qsort.c    2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/qsort.c 2017-01-21 22:50:06.076114575 +1100
 @@ -36,7 +36,7 @@
  
  static void qst __P((char *base, char *max));
@@ -433,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/scandir.c       2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen/scandir.c  2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/scandir.c       2017-01-21 22:50:06.076114575 +1100
 @@ -24,7 +24,7 @@
  /*#include <sys/stat.h>*/
  /*#include <sys/dir.h>*/
@@ -454,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/signal.c        2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen/signal.c   2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/signal.c        2017-01-21 22:50:06.076114575 +1100
 @@ -15,12 +15,12 @@
   */
  /*#include <signal.h>*/
@@ -479,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/sleep.c 2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen/sleep.c    2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/sleep.c 2017-01-21 22:50:06.076114575 +1100
 @@ -15,7 +15,7 @@
  /*#include <signal.h>*/
  
@@ -491,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/system.c        2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen/system.c   2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/system.c        2017-01-21 22:50:06.076114575 +1100
 @@ -11,7 +11,7 @@
  
  int system(s) char *s; {
@@ -503,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/usleep.c        2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen/usleep.c   2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/usleep.c        2017-01-21 22:50:06.076114575 +1100
 @@ -18,7 +18,7 @@
  #define TICK  10000           /* system clock resolution in microseconds */
  
@@ -515,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-21 21:23:47.554682235 +1100
-+++ libx_c/gen/valloc.c        2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen/valloc.c   2017-01-21 22:50:06.068114566 +1100
++++ libx_c/gen/valloc.c        2017-01-21 22:50:06.076114575 +1100
 @@ -1,6 +1,12 @@
  #include <gen.h>
  #include <sys.h>
@@ -544,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-21 21:23:47.538682234 +1100
-+++ libx_c/gen.h       2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/gen.h  2017-01-21 22:50:06.048114542 +1100
++++ libx_c/gen.h       2017-01-21 22:50:06.080114580 +1100
 @@ -108,7 +108,7 @@
  char *mktemp __P((char *as));
  
@@ -556,8 +556,8 @@ 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-21 21:23:47.554682235 +1100
-+++ libx_c/inet/Makefile       2017-01-21 21:07:20.626709834 +1100
+--- libx_c.post/inet/Makefile  2017-01-21 22:50:06.044114538 +1100
++++ libx_c/inet/Makefile       2017-01-21 22:50:06.080114580 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -581,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/csu/crt0.c    2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,19 @@
 +#include <stdio.h>
 +
@@ -604,7 +604,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/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 21:20:06.882676352 +1100
++++ libx_c/linux/csu/Makefile  2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,104 @@
 +ROOT=../../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -712,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/gen/abort.c   2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,7 @@
 +#include <nox_stdlib.h>
 +
@@ -723,7 +723,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/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 21:10:33.190693023 +1100
++++ libx_c/linux/gen/Makefile  2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,52 @@
 +ROOT=../../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -779,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/gen/modf.c    2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,7 @@
 +#include <nox_math.h>
 +
@@ -790,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 21:18:36.878675836 +1100
++++ libx_c/linux/Makefile      2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,43 @@
 +#
 +# Copyright (c) 1980 Regents of the University of California.
@@ -837,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/close.c   2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,13 @@
 +#include <nox_unistd.h>
 +
@@ -854,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/_exit.c   2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,7 @@
 +#include <nox_unistd.h>
 +
@@ -865,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/fstat.c   2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,17 @@
 +#include <sys/nox_stat.h>
 +#include <nox_unistd.h>
@@ -886,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/getpagesize.c     2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,7 @@
 +#include <nox_unistd.h>
 +
@@ -897,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/isatty.c  2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,13 @@
 +#include <nox_unistd.h>
 +
@@ -914,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/lseek.c   2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,15 @@
 +#include <nox_unistd.h>
 +#include <sys/nox_types.h>
@@ -933,7 +933,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/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 21:10:02.274695320 +1100
++++ libx_c/linux/sys/Makefile  2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,54 @@
 +ROOT=../../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -991,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/read.c    2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,15 @@
 +#include <nox_unistd.h>
 +
@@ -1010,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/readv.c   2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,26 @@
 +#include <nox_unistd.h>
 +#include <sys/nox_uio.h>
@@ -1040,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/sbrk.c    2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,14 @@
 +#include <nox_stdint.h>
 +#include <nox_unistd.h>
@@ -1058,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/vopen.c   2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,49 @@
 +#include <nox_fcntl.h>
 +
@@ -1111,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/write.c   2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,15 @@
 +#include <nox_unistd.h>
 +
@@ -1130,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-21 21:03:58.118734092 +1100
++++ libx_c/linux/sys/writev.c  2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,26 @@
 +#include <nox_unistd.h>
 +#include <sys/nox_uio.h>
@@ -1159,8 +1159,8 @@ 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-21 21:23:47.538682234 +1100
-+++ libx_c/Makefile    2017-01-21 21:19:35.970676049 +1100
+--- libx_c.post/Makefile       2017-01-21 22:50:06.048114542 +1100
++++ libx_c/Makefile    2017-01-21 22:50:31.188144203 +1100
 @@ -1,3 +1,5 @@
 +ROOT=${shell pwd}/../..
 +DESTDIR=${ROOT}/cross
@@ -1211,7 +1211,7 @@ 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,11 +79,46 @@
+@@ -71,7 +79,36 @@
  
  FRC:
  
@@ -1248,20 +1248,10 @@ diff --unified --recursive --new-file '--exclude=[abcdefghijklmnopqrstuvwxyz]' '
 +install:
        ${INSTALL} libc.a ${DESTDIR}/lib/libc.a
        ranlib ${DESTDIR}/lib/libc.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
-+      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-21 21:23:47.550682235 +1100
-+++ libx_c/net/hosttable/Makefile      2017-01-21 21:07:20.626709834 +1100
+--- libx_c.post/net/hosttable/Makefile 2017-01-21 22:50:06.044114538 +1100
++++ libx_c/net/hosttable/Makefile      2017-01-21 22:50:06.080114580 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -1281,8 +1271,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/Makefile libx_c/net/Makefile
---- 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
+--- libx_c.post/net/Makefile   2017-01-21 22:50:06.044114538 +1100
++++ libx_c/net/Makefile        2017-01-21 22:50:06.080114580 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -1345,8 +1335,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-21 21:23:47.550682235 +1100
-+++ libx_c/net/named/gethostnamadr.c   2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/net/named/gethostnamadr.c      2017-01-21 22:50:06.044114538 +1100
++++ libx_c/net/named/gethostnamadr.c   2017-01-21 22:50:06.080114580 +1100
 @@ -12,6 +12,12 @@
  #include <sys/socket.h>
  #include <sys/types.h>
@@ -1372,8 +1362,8 @@ 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-21 21:23:47.550682235 +1100
-+++ libx_c/net/named/Makefile  2017-01-21 21:07:20.626709834 +1100
+--- libx_c.post/net/named/Makefile     2017-01-21 22:50:06.044114538 +1100
++++ libx_c/net/named/Makefile  2017-01-21 22:50:06.080114580 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -1396,8 +1386,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/ns/Makefile libx_c/ns/Makefile
---- 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
+--- libx_c.post/ns/Makefile    2017-01-21 22:50:06.036114529 +1100
++++ libx_c/ns/Makefile 2017-01-21 22:50:06.080114580 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -1414,8 +1404,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-21 21:23:47.546682235 +1100
-+++ libx_c/stdio/doprnt.c      2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/stdio/doprnt.c 2017-01-21 22:50:06.040114532 +1100
++++ libx_c/stdio/doprnt.c      2017-01-21 22:50:06.080114580 +1100
 @@ -13,6 +13,14 @@
  #define _va_start(argp, arg) va_start(argp)
  #endif
@@ -1460,8 +1450,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-21 21:23:47.546682235 +1100
-+++ libx_c/stdio/findiop.c     2017-01-21 21:03:58.118734092 +1100
+--- libx_c.post/stdio/findiop.c        2017-01-21 22:50:06.040114532 +1100
++++ libx_c/stdio/findiop.c     2017-01-21 22:50:06.080114580 +1100
 @@ -105,7 +105,7 @@
                        *iov = (FILE *)calloc(1, sizeof **iov);
  }
@@ -1472,8 +1462,8 @@ 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-21 21:23:47.546682235 +1100
-+++ libx_c/stdio/Makefile      2017-01-21 21:08:15.646704419 +1100
+--- libx_c.post/stdio/Makefile 2017-01-21 22:50:06.040114532 +1100
++++ libx_c/stdio/Makefile      2017-01-21 22:50:06.080114580 +1100
 @@ -1,3 +1,5 @@
 +ROOT=../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -1571,8 +1561,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-21 21:23:47.542682235 +1100
-+++ libx_c/stdio.h     2017-01-21 21:03:58.122734091 +1100
+--- libx_c.post/stdio.h        2017-01-21 22:50:06.048114542 +1100
++++ libx_c/stdio.h     2017-01-21 22:50:06.080114580 +1100
 @@ -82,7 +82,7 @@
  #endif
  
@@ -1628,8 +1618,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-21 21:23:47.530682234 +1100
-+++ libx_c/sys/dir.h   2017-01-21 21:03:58.122734091 +1100
+--- libx_c.post/sys/dir.h      2017-01-21 22:50:06.052114547 +1100
++++ libx_c/sys/dir.h   2017-01-21 22:50:06.080114580 +1100
 @@ -122,7 +122,7 @@
  struct direct *readdir __P((register DIR *dirp));
  
@@ -1641,7 +1631,7 @@ 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 21:08:41.702702023 +1100
++++ libx_c/sys/Makefile        2017-01-21 22:50:06.080114580 +1100
 @@ -0,0 +1,90 @@
 +ROOT=../../..
 +CC=FAKEROOT=${ROOT}/cross ${ROOT}/cross/bin/cc -Dvax
@@ -1734,8 +1724,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-21 21:23:47.526682234 +1100
-+++ libx_c/sys/open.c  2017-01-21 21:03:58.122734091 +1100
+--- libx_c.post/sys/open.c     2017-01-21 22:50:06.052114547 +1100
++++ libx_c/sys/open.c  2017-01-21 22:50:06.080114580 +1100
 @@ -17,7 +17,7 @@
        va_list argp;
        int res;
@@ -1746,8 +1736,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-21 21:23:47.526682234 +1100
-+++ libx_c/sys/signal.h        2017-01-21 21:03:58.122734091 +1100
+--- libx_c.post/sys/signal.h   2017-01-21 22:50:06.052114547 +1100
++++ libx_c/sys/signal.h        2017-01-21 22:50:06.080114580 +1100
 @@ -9,7 +9,7 @@
   *    @(#)signal.h    7.1 (Berkeley) 6/4/86
   */

diff --git a/n.sh b/n.sh
index 977cb2c..923a754 100755 (executable)
--- a/n.sh
+++ b/n.sh
@@ -22,3 +22,4 @@ 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)
+(cd test && make clean && make)

diff --git a/xify/ld.c b/xify/ld.c
index 7c57cfc..dd5e18e 100644 (file)
--- a/xify/ld.c
+++ b/xify/ld.c
@@ -24,7 +24,9 @@ static char sccsid[] = "@(#)ld.c      5.4 (Berkeley) 11/26/85";
 #include <string.h>
 #include <strings.h>
 #include <ctype.h>
-#ifndef XIFY
+#ifdef XIFY
+#include <errno.h>
+#else
 #include <ar.h>
 #include <a.out.h>
 #include <ranlib.h>
@@ -387,6 +389,7 @@ int htoi __P((register char *p));
 void delexit __P((void));
 void endload __P((int argc, char **argv));
 #ifdef XIFY
+void xify_lib __P((char *in_name));
 int callsys __P((char *f, char **v));
 #else
 void load1arg __P((register char *cp));
@@ -783,10 +786,13 @@ void endload(argc, argv) int argc; char **argv; {
                case 'L':
                        goto next;
                case 'l':
+                       ap[--i]='-';
 #ifdef XIFY
-                       av[na++] = strspl("-lx_", ap + i + 1);
+                       filname = ap + i;
+                       xify_lib(filname + 2);
+                       av[na++] = strspl("-lx_", filname + 2);
 #else
-                       ap[--i]='-';
+
                        load2arg(&ap[i]);
 #endif
                        goto next;
@@ -802,6 +808,45 @@ next:
 }
 
 #ifdef XIFY
+void xify_lib(in_name) char *in_name; {
+       int i, j;
+       char in_path[BUFSIZ];
+       char out_path[BUFSIZ];
+       struct stat statbuf;
+
+       for (int i = 0; i < ndir; ++i) {
+               j = strlen(dirs[i]) - 6; /* always ends with "/.xify" */
+               bcopy(dirs[i], in_path, j);
+               strcpy(in_path + j, "/lib");
+               strcat(in_path + j, in_name);
+               strcat(in_path + j, ".a");
+               if (stat(in_path, &statbuf) == 0)
+                       goto found;
+       }
+       error(1, "not found\n");
+       exit(1);
+
+found:
+       j += 6; /* j = strlen(dirs[i]); */
+       bcopy(dirs[i], out_path, j);
+       strcpy(out_path + j, "/libx_");
+       strcat(out_path + j, in_name);
+       strcat(out_path + j, ".a");
+       if (stat(out_path, &statbuf) == 0)
+               return;
+       if (mkdir(dirs[i], 0777) == -1 && errno != EEXIST) {
+               filname = dirs[i];
+               error(1, "can't mkdir\n");
+       }
+       strcpy(in_path, "../lib");
+       strcat(in_path, in_name);
+       strcat(in_path, ".a");
+       if (symlink(in_path, out_path) == -1) {
+               filname = out_path;
+               error(1, "can't symlink\n");
+       }
+}
+
 int callsys(f, v) char *f; char **v; {
        int t, status;
        char **cpp;