diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 0ef1efb8e..2f2c781d4 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -1856,7 +1856,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 @@ -1912,7 +1912,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 @@ -1989,11 +1989,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/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 5edb62fea..f53141ba4 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/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 8fdecf41b..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 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/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}