From c2808d8b071b2aef9b390713b505f4c9dc567fbd Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Mon, 25 Aug 2014 00:19:51 +0200 Subject: [PATCH] remove libcompat_minix as library . get rid of includes in libcompat_minix: . move configfile.h to minix/include/ . all others are unneeded as they point to other files . merge the .c files with libc Change-Id: I5e840c66fb9bc484f377926aa9d66473bbd16259 --- distrib/sets/lists/minix/md.evbarm | 2 +- distrib/sets/lists/minix/md.i386 | 2 +- distrib/sets/lists/minix/mi | 22 ++++++++-------- lib/Makefile | 1 - lib/libc/pkgconfig/libc.pc | 2 +- minix/commands/Makefile.inc | 2 +- minix/commands/add_route/add_route.c | 2 +- minix/commands/arp/arp.c | 2 +- minix/commands/dhcpd/dhcpd.c | 2 +- minix/commands/dhcpd/tags.c | 2 +- minix/commands/hostaddr/hostaddr.c | 7 ++--- minix/commands/irdpd/irdpd.c | 2 +- minix/commands/nonamed/nonamed.c | 6 ++--- minix/commands/pr_routes/pr_routes.c | 2 +- minix/commands/rarpd/rarpd.c | 4 +-- minix/commands/rcp/rcp.c | 2 +- minix/commands/rget/rget.c | 2 +- minix/commands/rlogin/rlogin.c | 2 +- minix/commands/rsh/rsh.c | 2 +- minix/commands/rshd/rshd.c | 2 +- minix/commands/swifi/socket.c | 2 +- minix/commands/syslogd/syslogd.c | 2 +- minix/commands/tcpd/tcpd.c | 2 +- minix/commands/tcpdp/tcpd.c | 2 +- minix/commands/tcpstat/tcpstat.c | 2 +- minix/commands/telnet/ttn.c | 2 +- minix/commands/telnetd/main.c | 2 +- minix/commands/udpstat/udpstat.c | 2 +- minix/drivers/Makefile.inc | 4 +-- minix/drivers/storage/ramdisk/Makefile | 1 - .../storage/ramdisk/proto.common.dynamic | 1 - minix/fs/Makefile.inc | 4 +-- minix/include/Makefile | 2 +- .../libcompat_minix => }/include/configfile.h | 0 minix/lib/Makefile | 1 - minix/lib/libc/Makefile.inc | 2 +- .../gen}/configfile.c | 0 .../lib/{libcompat_minix => libc/gen}/mtab.c | 0 .../{libcompat_minix => libc/gen}/stderr.c | 0 minix/lib/libcompat_minix/Makefile | 26 ------------------- minix/lib/libcompat_minix/include/Makefile | 12 --------- .../lib/libcompat_minix/include/earm/Makefile | 8 ------ .../include/earm/compat_jmp_buf.h | 16 ------------ .../lib/libcompat_minix/include/i386/Makefile | 8 ------ .../include/i386/compat_jmp_buf.h | 16 ------------ .../lib/libcompat_minix/include/net/Makefile | 4 --- .../libcompat_minix/include/net/gen/Makefile | 8 ------ .../libcompat_minix/include/net/gen/nameser.h | 5 ---- .../libcompat_minix/include/net/gen/netdb.h | 5 ---- .../libcompat_minix/include/net/gen/resolv.h | 5 ---- .../lib/libcompat_minix/include/sys/Makefile | 8 ------ .../lib/libcompat_minix/include/sys/jmp_buf.h | 2 -- minix/lib/libcompat_minix/pkgconfig/Makefile | 9 ------- .../libcompat_minix/pkgconfig/compat_minix.pc | 4 --- minix/lib/libcompat_minix/shlib_version | 2 -- minix/lib/libminlib/servxcheck.c | 2 +- minix/net/Makefile.inc | 4 +-- minix/servers/Makefile.inc | 4 +-- minix/tests/Makefile | 2 +- minix/tests/blocktest/Makefile.inc | 4 +-- minix/tests/ds/Makefile.inc | 4 +-- minix/tests/kernel/sys_vumap/Makefile.inc | 4 +-- minix/tests/safecopy/Makefile | 4 +-- minix/usr.sbin/mkfs.mfs/Makefile.mkfs | 2 +- share/mk/bsd.prog.mk | 1 - tools/Makefile.host | 4 --- 66 files changed, 64 insertions(+), 210 deletions(-) rename minix/{lib/libcompat_minix => }/include/configfile.h (100%) rename minix/lib/{libcompat_minix => libc/gen}/configfile.c (100%) rename minix/lib/{libcompat_minix => libc/gen}/mtab.c (100%) rename minix/lib/{libcompat_minix => libc/gen}/stderr.c (100%) delete mode 100644 minix/lib/libcompat_minix/Makefile delete mode 100644 minix/lib/libcompat_minix/include/Makefile delete mode 100644 minix/lib/libcompat_minix/include/earm/Makefile delete mode 100644 minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h delete mode 100644 minix/lib/libcompat_minix/include/i386/Makefile delete mode 100644 minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h delete mode 100644 minix/lib/libcompat_minix/include/net/Makefile delete mode 100644 minix/lib/libcompat_minix/include/net/gen/Makefile delete mode 100644 minix/lib/libcompat_minix/include/net/gen/nameser.h delete mode 100644 minix/lib/libcompat_minix/include/net/gen/netdb.h delete mode 100644 minix/lib/libcompat_minix/include/net/gen/resolv.h delete mode 100644 minix/lib/libcompat_minix/include/sys/Makefile delete mode 100644 minix/lib/libcompat_minix/include/sys/jmp_buf.h delete mode 100644 minix/lib/libcompat_minix/pkgconfig/Makefile delete mode 100644 minix/lib/libcompat_minix/pkgconfig/compat_minix.pc delete mode 100644 minix/lib/libcompat_minix/shlib_version diff --git a/distrib/sets/lists/minix/md.evbarm b/distrib/sets/lists/minix/md.evbarm index 695d6d465..b99548b03 100644 --- a/distrib/sets/lists/minix/md.evbarm +++ b/distrib/sets/lists/minix/md.evbarm @@ -40,7 +40,7 @@ ./usr/include/arm/bswap.h minix-sys ./usr/include/arm/byte_swap.h minix-sys ./usr/include/arm/cdefs.h minix-sys -./usr/include/arm/compat_jmp_buf.h minix-sys +./usr/include/arm/compat_jmp_buf.h minix-sys obsolete ./usr/include/arm/cpuconf.h minix-sys ./usr/include/arm/cpu.h minix-sys ./usr/include/arm/disklabel.h minix-sys diff --git a/distrib/sets/lists/minix/md.i386 b/distrib/sets/lists/minix/md.i386 index 8fefd25ea..424a347fe 100644 --- a/distrib/sets/lists/minix/md.i386 +++ b/distrib/sets/lists/minix/md.i386 @@ -69,7 +69,7 @@ ./usr/include/i386/byte_swap.h minix-sys ./usr/include/i386/cdefs.h minix-sys ./usr/include/i386/cmos.h minix-sys -./usr/include/i386/compat_jmp_buf.h minix-sys +./usr/include/i386/compat_jmp_buf.h minix-sys obsolete ./usr/include/i386/cpu.h minix-sys ./usr/include/i386/disklabel.h minix-sys ./usr/include/i386/diskparm.h minix-sys diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 979e984d4..7beb005b9 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -1423,12 +1423,12 @@ ./usr/include/net/gen/in.h minix-sys ./usr/include/net/gen/ip_hdr.h minix-sys ./usr/include/net/gen/ip_io.h minix-sys -./usr/include/net/gen/nameser.h minix-sys -./usr/include/net/gen/netdb.h minix-sys +./usr/include/net/gen/nameser.h minix-sys obsolete +./usr/include/net/gen/netdb.h minix-sys obsolete ./usr/include/net/gen/oneCsum.h minix-sys ./usr/include/net/gen/psip_hdr.h minix-sys ./usr/include/net/gen/psip_io.h minix-sys -./usr/include/net/gen/resolv.h minix-sys +./usr/include/net/gen/resolv.h minix-sys obsolete ./usr/include/net/gen/rip.h minix-sys ./usr/include/net/gen/route.h minix-sys ./usr/include/net/gen/socket.h minix-sys @@ -1635,7 +1635,7 @@ ./usr/include/sys/ioctl.h minix-sys ./usr/include/sys/iostat.h minix-sys ./usr/include/sys/ipc.h minix-sys -./usr/include/sys/jmp_buf.h minix-sys +./usr/include/sys/jmp_buf.h minix-sys obsolete ./usr/include/sys/joystick.h minix-sys ./usr/include/sys/kbdio.h minix-sys ./usr/include/sys/kcore.h minix-sys @@ -1858,7 +1858,7 @@ ./usr/lib/bc/libc.a minix-sys bitcode ./usr/lib/bc/libc++.a minix-sys bitcode ./usr/lib/bc/libchardriver.a minix-sys bitcode -./usr/lib/bc/libcompat_minix.a minix-sys bitcode +./usr/lib/bc/libcompat_minix.a minix-sys bitcode obsolete ./usr/lib/bc/libcrypt.a minix-sys bitcode ./usr/lib/bc/libcurses.a minix-sys bitcode ./usr/lib/bc/libddekit.a minix-sys bitcode @@ -1914,7 +1914,7 @@ ./usr/lib/cawf/me.mac minix-sys ./usr/lib/cawf/mnx.mac minix-sys ./usr/lib/cawf/ms.mac minix-sys -./usr/lib/compat_minix.pc minix-sys +./usr/lib/compat_minix.pc minix-sys obsolete ./usr/lib/crontab minix-sys ./usr/lib/crt0.o minix-sys ./usr/lib/crtbegin.o minix-sys @@ -1991,11 +1991,11 @@ ./usr/lib/libc++.a minix-sys libcxx ./usr/lib/libchardriver.a minix-sys ./usr/lib/libchardriver_pic.a minix-sys -./usr/lib/libcompat_minix.a minix-sys -./usr/lib/libcompat_minix_pic.a minix-sys -./usr/lib/libcompat_minix.so.0.0 minix-sys -./usr/lib/libcompat_minix.so.0 minix-sys -./usr/lib/libcompat_minix.so minix-sys +./usr/lib/libcompat_minix.a minix-sys obsolete +./usr/lib/libcompat_minix_pic.a minix-sys obsolete +./usr/lib/libcompat_minix.so.0.0 minix-sys obsolete +./usr/lib/libcompat_minix.so.0 minix-sys obsolete +./usr/lib/libcompat_minix.so minix-sys obsolete ./usr/lib/libc.pc minix-sys ./usr/lib/libc_pic.a minix-sys ./usr/lib/libc++_pic.a minix-sys libcxx diff --git a/lib/Makefile b/lib/Makefile index a5ec01b86..be825604a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -39,7 +39,6 @@ SUBDIR+= ../minix/lib/libasyn \ ../minix/lib/libbdev \ ../minix/lib/libblockdriver \ ../minix/lib/libchardriver \ - ../minix/lib/libcompat_minix \ ../minix/lib/libddekit \ ../minix/lib/libdevman \ ../minix/lib/libexec \ diff --git a/lib/libc/pkgconfig/libc.pc b/lib/libc/pkgconfig/libc.pc index e997aa887..415f4d29f 100644 --- a/lib/libc/pkgconfig/libc.pc +++ b/lib/libc/pkgconfig/libc.pc @@ -1,4 +1,4 @@ Name: c Description: NetBSD C Library Version: 1.0 -Libs: -lc -lminlib -lcompat_minix +Libs: -lc -lminlib diff --git a/minix/commands/Makefile.inc b/minix/commands/Makefile.inc index dbfc37950..70ce47200 100644 --- a/minix/commands/Makefile.inc +++ b/minix/commands/Makefile.inc @@ -1,7 +1,7 @@ # Only include Minix-specific libraries when compiling # for non-Minix, i.e. not natively in a crossbuild. .if !defined(HOSTPROGNAME) -LDADD+= -lminlib -lcompat_minix -lasyn -lterminfo +LDADD+= -lminlib -lasyn -lterminfo .endif BINDIR?=/usr/bin diff --git a/minix/commands/add_route/add_route.c b/minix/commands/add_route/add_route.c index 4e9787b3b..34f5fdc3e 100644 --- a/minix/commands/add_route/add_route.c +++ b/minix/commands/add_route/add_route.c @@ -15,7 +15,7 @@ Created August 7, 1991 by Philip Homburg #include #include -#include +#include #include #include #include diff --git a/minix/commands/arp/arp.c b/minix/commands/arp/arp.c index d394c5260..a66d61a1a 100644 --- a/minix/commands/arp/arp.c +++ b/minix/commands/arp/arp.c @@ -25,7 +25,7 @@ Manipulate ARP table #include #include #include -#include +#include #include #include diff --git a/minix/commands/dhcpd/dhcpd.c b/minix/commands/dhcpd/dhcpd.c index 00f8e051c..d88cb2314 100644 --- a/minix/commands/dhcpd/dhcpd.c +++ b/minix/commands/dhcpd/dhcpd.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/minix/commands/dhcpd/tags.c b/minix/commands/dhcpd/tags.c index e16e2b292..c85b1a835 100644 --- a/minix/commands/dhcpd/tags.c +++ b/minix/commands/dhcpd/tags.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/minix/commands/hostaddr/hostaddr.c b/minix/commands/hostaddr/hostaddr.c index 18cc506bd..362a2d512 100644 --- a/minix/commands/hostaddr/hostaddr.c +++ b/minix/commands/hostaddr/hostaddr.c @@ -26,10 +26,11 @@ Created: Jan 27, 1992 by Philip Homburg #include #include #include -#include +#include #include -#include -#include + +#include +#include #include #include diff --git a/minix/commands/irdpd/irdpd.c b/minix/commands/irdpd/irdpd.c index edbbbaa20..4caf62b9a 100644 --- a/minix/commands/irdpd/irdpd.c +++ b/minix/commands/irdpd/irdpd.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/minix/commands/nonamed/nonamed.c b/minix/commands/nonamed/nonamed.c index 34362da61..aeeb5803e 100644 --- a/minix/commands/nonamed/nonamed.c +++ b/minix/commands/nonamed/nonamed.c @@ -32,9 +32,9 @@ static const char version[] = "2.7"; #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/minix/commands/pr_routes/pr_routes.c b/minix/commands/pr_routes/pr_routes.c index 1e24e3fd7..6826a5325 100644 --- a/minix/commands/pr_routes/pr_routes.c +++ b/minix/commands/pr_routes/pr_routes.c @@ -19,7 +19,7 @@ vmd/cmd/simple/pr_routes.c #include #include #include -#include +#include #include #define N_IF 64 /* More than enough? */ diff --git a/minix/commands/rarpd/rarpd.c b/minix/commands/rarpd/rarpd.c index cf4a6b419..cf4962651 100644 --- a/minix/commands/rarpd/rarpd.c +++ b/minix/commands/rarpd/rarpd.c @@ -28,14 +28,14 @@ Changed: Dec 11, 2000 by Kees J. Bot #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #define MAX_RARP_RETRIES 5 #define RARP_TIMEOUT 5 diff --git a/minix/commands/rcp/rcp.c b/minix/commands/rcp/rcp.c index 2087a7bef..3b0318e0e 100644 --- a/minix/commands/rcp/rcp.c +++ b/minix/commands/rcp/rcp.c @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)rcp.c 1.1 87/12/21 SMI"; /* from UCB 5.3 6/8/85"*/ #include #include -#include +#include #include #if __STDC__ diff --git a/minix/commands/rget/rget.c b/minix/commands/rget/rget.c index 48777bc12..0c35736b3 100644 --- a/minix/commands/rget/rget.c +++ b/minix/commands/rget/rget.c @@ -18,7 +18,7 @@ #if __minix #include #include -#include +#include #include #include #include diff --git a/minix/commands/rlogin/rlogin.c b/minix/commands/rlogin/rlogin.c index 116287db2..90839c49c 100644 --- a/minix/commands/rlogin/rlogin.c +++ b/minix/commands/rlogin/rlogin.c @@ -59,7 +59,7 @@ static char sccsid[] = "@(#)rlogin.c 5.33 (Berkeley) 3/1/91"; #include #include #include -#include +#include #include #include diff --git a/minix/commands/rsh/rsh.c b/minix/commands/rsh/rsh.c index 2c308f8c4..230068c2b 100644 --- a/minix/commands/rsh/rsh.c +++ b/minix/commands/rsh/rsh.c @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)rsh.c 5.24 (Berkeley) 7/1/91"; #include #include -#include +#include int main( int argc, char *argv[] ); void usage( void ); char *copyargs( char **argv ); diff --git a/minix/commands/rshd/rshd.c b/minix/commands/rshd/rshd.c index ec15f825a..cc2bdde54 100644 --- a/minix/commands/rshd/rshd.c +++ b/minix/commands/rshd/rshd.c @@ -30,7 +30,7 @@ in.rshd.c #include #include #include -#include +#include #include #include #include diff --git a/minix/commands/swifi/socket.c b/minix/commands/swifi/socket.c index 324b7f116..bebcc0e82 100644 --- a/minix/commands/swifi/socket.c +++ b/minix/commands/swifi/socket.c @@ -24,7 +24,7 @@ Open a TCP connection #include #include #include -#include +#include #include #include #include diff --git a/minix/commands/syslogd/syslogd.c b/minix/commands/syslogd/syslogd.c index 636dcad16..e16ede9cf 100644 --- a/minix/commands/syslogd/syslogd.c +++ b/minix/commands/syslogd/syslogd.c @@ -102,7 +102,7 @@ #include #include #include -#include +#include #define SYSLOG_NAMES #include diff --git a/minix/commands/tcpd/tcpd.c b/minix/commands/tcpd/tcpd.c index 419a77781..0d7679cfd 100644 --- a/minix/commands/tcpd/tcpd.c +++ b/minix/commands/tcpd/tcpd.c @@ -19,7 +19,7 @@ tcpd.c #include #include #include -#include +#include #include #include diff --git a/minix/commands/tcpdp/tcpd.c b/minix/commands/tcpdp/tcpd.c index b7ed98276..9d1d32d7f 100644 --- a/minix/commands/tcpdp/tcpd.c +++ b/minix/commands/tcpdp/tcpd.c @@ -19,7 +19,7 @@ tcpd.c #include #include #include -#include +#include #include #include diff --git a/minix/commands/tcpstat/tcpstat.c b/minix/commands/tcpstat/tcpstat.c index 33c44d196..f5200a456 100644 --- a/minix/commands/tcpstat/tcpstat.c +++ b/minix/commands/tcpstat/tcpstat.c @@ -21,7 +21,7 @@ Created: June 1995 by Philip Homburg #endif #include #include -#include +#include #include #include #include diff --git a/minix/commands/telnet/ttn.c b/minix/commands/telnet/ttn.c index ba4f0c716..7ba56590c 100644 --- a/minix/commands/telnet/ttn.c +++ b/minix/commands/telnet/ttn.c @@ -18,7 +18,7 @@ ttn.c #include #include #include -#include +#include #include #include #include "ttn.h" diff --git a/minix/commands/telnetd/main.c b/minix/commands/telnetd/main.c index c2f1f623e..a4ded56aa 100644 --- a/minix/commands/telnetd/main.c +++ b/minix/commands/telnetd/main.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include "telnetd.h" diff --git a/minix/commands/udpstat/udpstat.c b/minix/commands/udpstat/udpstat.c index 972865b63..54c1c73d1 100644 --- a/minix/commands/udpstat/udpstat.c +++ b/minix/commands/udpstat/udpstat.c @@ -22,7 +22,7 @@ Created: March 2001 by Philip Homburg #endif #include #include -#include +#include #include #include diff --git a/minix/drivers/Makefile.inc b/minix/drivers/Makefile.inc index c90ad6ae7..f9a17bb73 100644 --- a/minix/drivers/Makefile.inc +++ b/minix/drivers/Makefile.inc @@ -1,7 +1,7 @@ BINDIR?= /service MAN?= -LDADD+= -lminlib -lcompat_minix -DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} +LDADD+= -lminlib +DPADD+= ${LIBMINLIB} .include "../Makefile.inc" diff --git a/minix/drivers/storage/ramdisk/Makefile b/minix/drivers/storage/ramdisk/Makefile index 89d3e855f..1c843aa85 100644 --- a/minix/drivers/storage/ramdisk/Makefile +++ b/minix/drivers/storage/ramdisk/Makefile @@ -99,7 +99,6 @@ RAMDISK_DYNAMIC= 1 PROGRAMS+= ld.elf_so PROG_LIBS+= libc PROG_MINIXLIBS+= libminlib -PROG_MINIXLIBS+= libcompat_minix PROG_MINIXLIBS+= libterminfo .endif diff --git a/minix/drivers/storage/ramdisk/proto.common.dynamic b/minix/drivers/storage/ramdisk/proto.common.dynamic index 6f1fe737f..c411a0daf 100644 --- a/minix/drivers/storage/ramdisk/proto.common.dynamic +++ b/minix/drivers/storage/ramdisk/proto.common.dynamic @@ -5,7 +5,6 @@ lib d--755 0 0 libc.so.0 ---755 0 0 libc.so.0 libminlib.so.0 ---755 0 0 libminlib.so.0 - libcompat_minix.so.0 ---755 0 0 libcompat_minix.so.0 libterminfo.so.0 ---755 0 0 libterminfo.so.0 $ $ diff --git a/minix/fs/Makefile.inc b/minix/fs/Makefile.inc index c90ad6ae7..f9a17bb73 100644 --- a/minix/fs/Makefile.inc +++ b/minix/fs/Makefile.inc @@ -1,7 +1,7 @@ BINDIR?= /service MAN?= -LDADD+= -lminlib -lcompat_minix -DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} +LDADD+= -lminlib +DPADD+= ${LIBMINLIB} .include "../Makefile.inc" diff --git a/minix/include/Makefile b/minix/include/Makefile index c11cb7824..510fd5338 100644 --- a/minix/include/Makefile +++ b/minix/include/Makefile @@ -2,7 +2,7 @@ NOOBJ= # defined -INCS+= env.h fetch.h lib.h libutil.h varargs.h +INCS+= env.h fetch.h lib.h libutil.h varargs.h configfile.h .include diff --git a/minix/lib/libcompat_minix/include/configfile.h b/minix/include/configfile.h similarity index 100% rename from minix/lib/libcompat_minix/include/configfile.h rename to minix/include/configfile.h diff --git a/minix/lib/Makefile b/minix/lib/Makefile index c245be803..d0d2f3f0d 100644 --- a/minix/lib/Makefile +++ b/minix/lib/Makefile @@ -12,7 +12,6 @@ SUBDIR+= libaudiodriver SUBDIR+= libbdev SUBDIR+= libblockdriver SUBDIR+= libchardriver -SUBDIR+= libcompat_minix SUBDIR+= libddekit SUBDIR+= libdevman SUBDIR+= libexec diff --git a/minix/lib/libc/Makefile.inc b/minix/lib/libc/Makefile.inc index a78d7ffc4..54710cca8 100644 --- a/minix/lib/libc/Makefile.inc +++ b/minix/lib/libc/Makefile.inc @@ -3,4 +3,4 @@ SRCS+= minix-malloc.c minix-calloc.c SRCS+= minix-malloc-debug.c - +SRCS+= configfile.c mtab.c stderr.c diff --git a/minix/lib/libcompat_minix/configfile.c b/minix/lib/libc/gen/configfile.c similarity index 100% rename from minix/lib/libcompat_minix/configfile.c rename to minix/lib/libc/gen/configfile.c diff --git a/minix/lib/libcompat_minix/mtab.c b/minix/lib/libc/gen/mtab.c similarity index 100% rename from minix/lib/libcompat_minix/mtab.c rename to minix/lib/libc/gen/mtab.c diff --git a/minix/lib/libcompat_minix/stderr.c b/minix/lib/libc/gen/stderr.c similarity index 100% rename from minix/lib/libcompat_minix/stderr.c rename to minix/lib/libc/gen/stderr.c diff --git a/minix/lib/libcompat_minix/Makefile b/minix/lib/libcompat_minix/Makefile deleted file mode 100644 index 391ee3f66..000000000 --- a/minix/lib/libcompat_minix/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -NOGCCERROR=yes -NOCLANGERROR=yes - -.include - -LIB= compat_minix -USE_SHLIBDIR= yes - -.PATH: ${.CURDIR} - -# std_err() -SRCS+= stderr.c - -# Configfile Library. -SRCS+= configfile.c - -# Minix 'mtab' handling functions. -# -# These should be changed when we switch to -# NetBSD's 'mtab' format. -SRCS+= mtab.c - -SUBDIR+= pkgconfig include - -.include -.include diff --git a/minix/lib/libcompat_minix/include/Makefile b/minix/lib/libcompat_minix/include/Makefile deleted file mode 100644 index 37c0e9560..000000000 --- a/minix/lib/libcompat_minix/include/Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -INCSDIR= /usr/include - -INCS+= configfile.h - -NOOBJ= # defined - -SUBDIR+= ${MACHINE_ARCH} -SUBDIR+= net sys - -.include -.include diff --git a/minix/lib/libcompat_minix/include/earm/Makefile b/minix/lib/libcompat_minix/include/earm/Makefile deleted file mode 100644 index 8b52c8c22..000000000 --- a/minix/lib/libcompat_minix/include/earm/Makefile +++ /dev/null @@ -1,8 +0,0 @@ - -INCSDIR= /usr/include/arm - -INCS= compat_jmp_buf.h - -NOOBJ= # defined - -.include diff --git a/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h b/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h deleted file mode 100644 index 841f75cda..000000000 --- a/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _COMPAT_MACHINE_JMP_BUF_H -#define _COMPAT_MACHINE_JMP_BUF_H - -/* This file is strictly dependant on the libc's - * setjmp/longjmp code! Keep it in sync! */ - -/* This is used only by libddekit's src/thread.c. - * Being incredibly fragile (not to mention hardly - * portable, it would be a good idea to replace - * that code. */ - -#define JB_PC 148 -#define JB_SP 144 -#define JB_BP 136 - -#endif /* _COMPAT_MACHINE_JMP_BUF_H */ diff --git a/minix/lib/libcompat_minix/include/i386/Makefile b/minix/lib/libcompat_minix/include/i386/Makefile deleted file mode 100644 index fc4342685..000000000 --- a/minix/lib/libcompat_minix/include/i386/Makefile +++ /dev/null @@ -1,8 +0,0 @@ - -INCSDIR= /usr/include/${MACHINE_ARCH} - -INCS= compat_jmp_buf.h - -NOOBJ= # defined - -.include diff --git a/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h b/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h deleted file mode 100644 index bb5526c2c..000000000 --- a/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _COMPAT_MACHINE_JMP_BUF_H -#define _COMPAT_MACHINE_JMP_BUF_H - -/* This file is strictly dependant on the libc's - * setjmp/longjmp code! Keep it in sync! */ - -/* This is used only by libddekit's src/thread.c. - * Being incredibly fragile (not to mention hardly - * portable, it would be a good idea to replace - * that code. */ - -#define JB_PC 0 -#define JB_SP 8 -#define JB_BP 12 - -#endif /* _COMPAT_MACHINE_JMP_BUF_H */ diff --git a/minix/lib/libcompat_minix/include/net/Makefile b/minix/lib/libcompat_minix/include/net/Makefile deleted file mode 100644 index 22cfa78b0..000000000 --- a/minix/lib/libcompat_minix/include/net/Makefile +++ /dev/null @@ -1,4 +0,0 @@ - -SUBDIR+= gen - -.include diff --git a/minix/lib/libcompat_minix/include/net/gen/Makefile b/minix/lib/libcompat_minix/include/net/gen/Makefile deleted file mode 100644 index b7cb02ecc..000000000 --- a/minix/lib/libcompat_minix/include/net/gen/Makefile +++ /dev/null @@ -1,8 +0,0 @@ - -INCSDIR= /usr/include/net/gen - -INCS= netdb.h resolv.h nameser.h - -NOOBJ= # defined - -.include diff --git a/minix/lib/libcompat_minix/include/net/gen/nameser.h b/minix/lib/libcompat_minix/include/net/gen/nameser.h deleted file mode 100644 index 5c23c9b14..000000000 --- a/minix/lib/libcompat_minix/include/net/gen/nameser.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * Minix compatibility. - */ -#include - diff --git a/minix/lib/libcompat_minix/include/net/gen/netdb.h b/minix/lib/libcompat_minix/include/net/gen/netdb.h deleted file mode 100644 index 630e5d6cb..000000000 --- a/minix/lib/libcompat_minix/include/net/gen/netdb.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * Minix compatibility. - */ -#include - diff --git a/minix/lib/libcompat_minix/include/net/gen/resolv.h b/minix/lib/libcompat_minix/include/net/gen/resolv.h deleted file mode 100644 index 9e347aa0d..000000000 --- a/minix/lib/libcompat_minix/include/net/gen/resolv.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * Minix compatibility. - */ -#include - diff --git a/minix/lib/libcompat_minix/include/sys/Makefile b/minix/lib/libcompat_minix/include/sys/Makefile deleted file mode 100644 index 2f54b88fa..000000000 --- a/minix/lib/libcompat_minix/include/sys/Makefile +++ /dev/null @@ -1,8 +0,0 @@ - -INCSDIR= /usr/include/sys - -INCS= jmp_buf.h - -NOOBJ= # defined - -.include diff --git a/minix/lib/libcompat_minix/include/sys/jmp_buf.h b/minix/lib/libcompat_minix/include/sys/jmp_buf.h deleted file mode 100644 index 28f137454..000000000 --- a/minix/lib/libcompat_minix/include/sys/jmp_buf.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Stub for libddekit. Hopefully this will go away soon. */ -#include diff --git a/minix/lib/libcompat_minix/pkgconfig/Makefile b/minix/lib/libcompat_minix/pkgconfig/Makefile deleted file mode 100644 index 6fa213cf5..000000000 --- a/minix/lib/libcompat_minix/pkgconfig/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -NOOBJ= # defined - -.include - -FILES=compat_minix.pc -FILESDIR=/usr/lib -FILESMODE=444 - -.include diff --git a/minix/lib/libcompat_minix/pkgconfig/compat_minix.pc b/minix/lib/libcompat_minix/pkgconfig/compat_minix.pc deleted file mode 100644 index 5e7eec352..000000000 --- a/minix/lib/libcompat_minix/pkgconfig/compat_minix.pc +++ /dev/null @@ -1,4 +0,0 @@ -Name: compat_minix -Description: Minix Compatibility Library -Version: 1.0 -Libs: -lcompat_minix diff --git a/minix/lib/libcompat_minix/shlib_version b/minix/lib/libcompat_minix/shlib_version deleted file mode 100644 index 97c9f92d6..000000000 --- a/minix/lib/libcompat_minix/shlib_version +++ /dev/null @@ -1,2 +0,0 @@ -major=0 -minor=0 diff --git a/minix/lib/libminlib/servxcheck.c b/minix/lib/libminlib/servxcheck.c index 3010878ed..47d2caca9 100644 --- a/minix/lib/libminlib/servxcheck.c +++ b/minix/lib/libminlib/servxcheck.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include /* Default service access file. */ static const char *path_servacces = _PATH_SERVACCES; diff --git a/minix/net/Makefile.inc b/minix/net/Makefile.inc index c90ad6ae7..6e52d1428 100644 --- a/minix/net/Makefile.inc +++ b/minix/net/Makefile.inc @@ -1,7 +1,7 @@ BINDIR?= /service MAN?= -LDADD+= -lminlib -lcompat_minix -DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} +LDADD+= -lminlib +DPADD+= ${LIBMINLIB} .include "../Makefile.inc" diff --git a/minix/servers/Makefile.inc b/minix/servers/Makefile.inc index c90ad6ae7..f9a17bb73 100644 --- a/minix/servers/Makefile.inc +++ b/minix/servers/Makefile.inc @@ -1,7 +1,7 @@ BINDIR?= /service MAN?= -LDADD+= -lminlib -lcompat_minix -DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} +LDADD+= -lminlib +DPADD+= ${LIBMINLIB} .include "../Makefile.inc" diff --git a/minix/tests/Makefile b/minix/tests/Makefile index b436d28ac..3cf2a91a5 100644 --- a/minix/tests/Makefile +++ b/minix/tests/Makefile @@ -15,7 +15,7 @@ BINOWN= bin FILES= test1.c CFLAGS+= -fno-builtin -LDADD+= -lm -lcompat_minix +LDADD+= -lm .include diff --git a/minix/tests/blocktest/Makefile.inc b/minix/tests/blocktest/Makefile.inc index 25168204d..cbeb43b83 100644 --- a/minix/tests/blocktest/Makefile.inc +++ b/minix/tests/blocktest/Makefile.inc @@ -1,4 +1,4 @@ # Copied from drivers/Makefile.inc, and slightly edited. -LDADD+= -lminlib -lcompat_minix -DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} +LDADD+= -lminlib +DPADD+= ${LIBMINLIB} BINDIR?=/usr/sbin diff --git a/minix/tests/ds/Makefile.inc b/minix/tests/ds/Makefile.inc index 42bdd2bec..950d4e92a 100644 --- a/minix/tests/ds/Makefile.inc +++ b/minix/tests/ds/Makefile.inc @@ -1,4 +1,4 @@ # Copied from drivers/Makefile.inc -LDADD+= -lminlib -lcompat_minix -DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} +LDADD+= -lminlib +DPADD+= ${LIBMINLIB} BINDIR?=/usr/sbin diff --git a/minix/tests/kernel/sys_vumap/Makefile.inc b/minix/tests/kernel/sys_vumap/Makefile.inc index 42bdd2bec..83e42085b 100644 --- a/minix/tests/kernel/sys_vumap/Makefile.inc +++ b/minix/tests/kernel/sys_vumap/Makefile.inc @@ -1,4 +1,4 @@ # Copied from drivers/Makefile.inc -LDADD+= -lminlib -lcompat_minix -DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX} +LDADD+= -lminlib +DPADD+= ${LIBMINLIB} BINDIR?=/usr/sbin diff --git a/minix/tests/safecopy/Makefile b/minix/tests/safecopy/Makefile index 42fd715c6..3a6921cf1 100644 --- a/minix/tests/safecopy/Makefile +++ b/minix/tests/safecopy/Makefile @@ -2,10 +2,10 @@ all: requestor grantor 1fifo 2fifo chmod +x down run requestor: requestor.c inc.h - cc -static -o $@ $< -lsys -lminlib -lcompat_minix + cc -static -o $@ $< -lsys -lminlib grantor: grantor.c inc.h - cc -static -o $@ $< -lsys -lminlib -lcompat_minix + cc -static -o $@ $< -lsys -lminlib 1fifo 2fifo: mkfifo $@ diff --git a/minix/usr.sbin/mkfs.mfs/Makefile.mkfs b/minix/usr.sbin/mkfs.mfs/Makefile.mkfs index dc131d8dc..3dbdba0d2 100644 --- a/minix/usr.sbin/mkfs.mfs/Makefile.mkfs +++ b/minix/usr.sbin/mkfs.mfs/Makefile.mkfs @@ -11,7 +11,7 @@ CPPFLAGS+= -I${.CURDIR} .if ${HOST_OSTYPE:C/\-.*//:U} == "Minix" || !defined(HOSTPROGNAME) #LSC: FIXME This should not be required, more so only on Minix... -LDADD+= -lminlib -lcompat_minix +LDADD+= -lminlib DPADD+= ${MINLIB} ${COMPAT_MINIX} .endif diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 3c50ff598..fea244b01 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -216,7 +216,6 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a blockdriver \ chardriver \ clkconf \ - compat_minix \ ddekit \ ddekit_usb_client \ ddekit_usb_server \ diff --git a/tools/Makefile.host b/tools/Makefile.host index 3088a91ba..219b5e538 100644 --- a/tools/Makefile.host +++ b/tools/Makefile.host @@ -13,10 +13,6 @@ NOMAN= # defined HOSTEXEEXT=.exe .endif -.if ${HOST_OSTYPE:C/\-.*//} == "Minix" -LDADD+= -lcompat_minix -.endif # ${HOST_OSTYPE:C/\-.*//} == "Minix" - # Resolve pathnames in variables. _RESOLVE_VARS= CFLAGS CPPFLAGS DPADD HOST_CPPFLAGS LDADD .for var in ${_RESOLVE_VARS}