./usr/lib/bc/libmenu.a minix-sys bitcode
./usr/lib/bc/libminc.a minix-sys bitcode
./usr/lib/bc/libminixfs.a minix-sys bitcode
-./usr/lib/bc/libminlib.a minix-sys bitcode
-./usr/lib/bc/libmthread.a minix-sys bitcode
+./usr/lib/bc/libminlib.a minix-sys bitcode obsolete
+./usr/lib/bc/libmthread.a minix-sys bitcode
./usr/lib/bc/libnetdriver.a minix-sys bitcode
./usr/lib/bc/libnetsock.a minix-sys bitcode
./usr/lib/bc/libopcodes.a minix-sys bitcode,binutils
./usr/lib/libminc.a minix-sys
./usr/lib/libminixfs.a minix-sys
./usr/lib/libminixfs_pic.a minix-sys
-./usr/lib/libminlib.a minix-sys
-./usr/lib/libminlib_pic.a minix-sys
-./usr/lib/libminlib.so.0.0 minix-sys
-./usr/lib/libminlib.so.0 minix-sys
-./usr/lib/libminlib.so minix-sys
+./usr/lib/libminlib.a minix-sys obsolete
+./usr/lib/libminlib_pic.a minix-sys obsolete
+./usr/lib/libminlib.so.0.0 minix-sys obsolete
+./usr/lib/libminlib.so.0 minix-sys obsolete
+./usr/lib/libminlib.so minix-sys obsolete
./usr/lib/libm_pic.a minix-sys
./usr/lib/libm.so.0 minix-sys
./usr/lib/libm.so.0.10 minix-sys
./usr/lib/lua/5.1/gpio.so minix-sys
./usr/lib/lua/5.1/sqlite.so minix-sys
./usr/lib/lua/5.1/syslog.so minix-sys
-./usr/lib/minlib.pc minix-sys
+./usr/lib/minlib.pc minix-sys obsolete
./usr/lib/pkgconfig minix-sys
./usr/lib/pkgconfig/atf-c.pc minix-sys atf
./usr/lib/pkgconfig/atf-c++.pc minix-sys atf
.if defined(__MINIX)
#LSC MINIX libc depends on
-# - libminlib because of minix/lib/libc/malloc-debug.c
# - libmthread because of sys/lib/libunwind
-SUBDIR+= ../minix/lib/libminlib
SUBDIR+= .WAIT
SUBDIR+= ../minix/lib/libsys
# gen sources
.if defined(__MINIX)
.PATH: ${NETBSDSRCDIR}/minix/lib/libc/gen
+
+CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/minix/fs
+CPPFLAGS.fsversion.c+= -I${NETBSDSRCDIR}/minix/fs
+
+SRCS+= dhcp_gettag.c dhcp_settag.c fsversion.c gcov.c gcov_flush.c itoa.c \
+ oneC_sum.c paramvalue.c read_tsc_64.c servxcheck.c fslib.c
+
.endif # defined(__MINIX)
.PATH: ${ARCHDIR}/gen ${.CURDIR}/gen
Name: c
Description: NetBSD C Library
Version: 1.0
-Libs: -lc -lminlib
+Libs: -lc
# Only include Minix-specific libraries when compiling
# for non-Minix, i.e. not natively in a crossbuild.
.if !defined(HOSTPROGNAME)
-LDADD+= -lminlib -lasyn -lterminfo
+LDADD+= -lasyn -lterminfo
.endif
BINDIR?=/usr/bin
BINDIR?= /service
MAN?=
-LDADD+= -lminlib
-DPADD+= ${LIBMINLIB}
-
.include "../Makefile.inc"
BINDIR?= /service
MAN?=
-DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS} ${LIBMINLIB}
-LDADD+= -laudiodriver -lchardriver -lsys -lminlib
+DPADD+= ${LIBAUDIODRIVER} ${LIBCHARDRIVER} ${LIBSYS}
+LDADD+= -laudiodriver -lchardriver -lsys
.include "../Makefile.inc"
RAMDISK_DYNAMIC= 1
PROGRAMS+= ld.elf_so
PROG_LIBS+= libc
-PROG_MINIXLIBS+= libminlib
PROG_MINIXLIBS+= libterminfo
.endif
usr d--755 0 0
lib d--755 0 0
libc.so.0 ---755 0 0 libc.so.0
- libminlib.so.0 ---755 0 0 libminlib.so.0
libterminfo.so.0 ---755 0 0 libterminfo.so.0
$
$
FILESNAME= $(PROG)
FILESDIR= /etc/system.conf.d
-DPADD+= ${LIBBLOCKDRIVER} ${LIBDDEKIT_USB_CLIENT} ${LIBSYS} ${LIBMINLIB} ${LIBDDEKIT} ${LIBUSB}
-LDADD+= -lblockdriver -lddekit_usb_client -lsys -lminlib -lddekit -lusb
+DPADD+= ${LIBBLOCKDRIVER} ${LIBDDEKIT_USB_CLIENT} ${LIBSYS} ${LIBDDEKIT} ${LIBUSB}
+LDADD+= -lblockdriver -lddekit_usb_client -lsys -lddekit -lusb
#For easier debugging, uncomment:
#LDADD+= -Wl,-Ttext=0x800000
CPPFLAGS+= -I${.CURDIR}/../../include
-DPADD+= ${LIBDDEKIT} ${LIBDDEKIT_USB_SERVER} ${LIBDEVMAN} ${LIBUSB} ${LIBMINC} ${LIBCLKCONF} ${LIBSYS} ${LIBMINLIB}
-LDADD+= -lddekit -lddekit_usb_server -ldevman -lusb -lminc -lclkconf -lsys -lminlib
+DPADD+= ${LIBDDEKIT} ${LIBDDEKIT_USB_SERVER} ${LIBDEVMAN} ${LIBUSB} ${LIBMINC} ${LIBCLKCONF} ${LIBSYS}
+LDADD+= -lddekit -lddekit_usb_server -ldevman -lusb -lminc -lclkconf -lsys
.include <minix.service.mk>
BINDIR?= /service
MAN?=
-LDADD+= -lminlib
-DPADD+= ${LIBMINLIB}
-
.include "../Makefile.inc"
stadir.c table.c time.c utility.c \
write.c ialloc.c inode.c main.c path.c \
super.c
-DPADD+= ${LIBMINIXFS} ${LIBBDEV} ${LIBSYS} ${LIBMINLIB}
-LDADD+= -lminixfs -lbdev -lsys -lminlib
+DPADD+= ${LIBMINIXFS} ${LIBBDEV} ${LIBSYS}
+LDADD+= -lminixfs -lbdev -lsys
WARNS=3
SRCS= main.c table.c mount.c super.c inode.c \
utility.c misc.c path.c read.c stadir.c
-DPADD+= ${LIBBDEV} ${LIBSYS} ${LIBMINLIB}
-LDADD+= -lbdev -lsys -lc -lminixfs -lminlib
+DPADD+= ${LIBBDEV} ${LIBSYS}
+LDADD+= -lbdev -lsys -lc -lminixfs
CPPFLAGS+= -DNR_BUFS=100
CPPFLAGS+= -I${NETBSDSRCDIR}/minix/fs
CPPFLAGS+= -I${NETBSDSRCDIR}/minix/servers
-DPADD+= ${LIBVTREEFS} ${LIBMINLIB}
-LDADD+= -lvtreefs -lminlib
+DPADD+= ${LIBVTREEFS} ${LIBMINIXFS}
+LDADD+= -lvtreefs -lminixfs
.include <minix.service.mk>
SRCS+= clock.c cpulocals.c interrupt.c main.c proc.c system.c \
table.c utility.c usermapped_data.c
-LDADD+= -ltimers -lsys -lexec -lminlib
+LDADD+= -ltimers -lsys -lexec
LINKERSCRIPT= ${.CURDIR}/arch/${MACHINE_ARCH}/kernel.lds
HERE=${.CURDIR}/arch/${MACHINE_ARCH}
.PATH: ${HERE}
-# objects we want unpaged from -lminlib
+# objects we want unpaged from -lc
MINLIB_OBJS_UNPAGED= get_bp.o
-get_bp.o: ${NETBSDSRCDIR}/minix/lib/libminlib/${MACHINE_ARCH}/get_bp.S
+get_bp.o: ${NETBSDSRCDIR}/minix/lib/libc/arch/arm/get_bp.S
# objects we want unpaged from -lsys
SYS_OBJS_UNPAGED=assert.o stacktrace.o
HERE=${.CURDIR}/arch/${MACHINE_ARCH}
.PATH: ${HERE}
-# objects we want unpaged from -lminlib
+# objects we want unpaged from -lc
MINLIB_OBJS_UNPAGED= _cpufeature.o _cpuid.o get_bp.o
-_cpufeature.o: ${NETBSDSRCDIR}/minix/lib/libminlib/${MACHINE_ARCH}/_cpufeature.c
-_cpuid.o: ${NETBSDSRCDIR}/minix/lib/libminlib/${MACHINE_ARCH}/_cpuid.S
-get_bp.o: ${NETBSDSRCDIR}/minix/lib/libminlib/${MACHINE_ARCH}/get_bp.S
+_cpufeature.o: ${NETBSDSRCDIR}/minix/lib/libc/arch/${MACHINE_ARCH}/_cpufeature.c
+_cpuid.o: ${NETBSDSRCDIR}/minix/lib/libc/arch/${MACHINE_ARCH}/_cpuid.S
+get_bp.o: ${NETBSDSRCDIR}/minix/lib/libc/arch/${MACHINE_ARCH}/get_bp.S
# objects we want unpaged from -lsys
SYS_OBJS_UNPAGED=assert.o stacktrace.o
.include <bsd.own.mk>
-SUBDIR+= libminlib
-SUBDIR+= .WAIT
-
SUBDIR+= libsys
SUBDIR+= libmthread
SUBDIR+= .WAIT
# MINIX Specifics sources
.PATH: ${NETBSDSRCDIR}/minix/lib/libc
+CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/minix/fs
+
SRCS+= minix-malloc.c minix-calloc.c
SRCS+= minix-malloc-debug.c
SRCS+= configfile.c mtab.c stderr.c
--- /dev/null
+C_HERE=${NETBSDSRCDIR}/minix/lib/libc/arch/${ARCHSUBDIR}
+.PATH: ${C_HERE}
+
+SRCS+= get_bp.S \
+ read_tsc.c
#include <sys/types.h>
+#include <minix/minlib.h>
void
read_tsc(u32_t *hi, u32_t *lo)
--- /dev/null
+C_HERE=${NETBSDSRCDIR}/minix/lib/libc/arch/${ARCHSUBDIR}
+.PATH: ${C_HERE}
+
+.warning looking into ${C_HERE}
+
+SRCS+= _cpuid.S \
+ get_bp.S \
+ getprocessor.S \
+ read_tsc.S \
+ _cpufeature.c
+
#include <minix/config.h> /* for unused stuff in <minix/type.h> :-( */
#include <limits.h>
#include <dirent.h>
+#include <assert.h>
#include <sys/types.h>
#include <minix/const.h>
#include <minix/type.h> /* for unshort :-( */
else if(S_ISFIFO(mode)) return DT_FIFO;
else if(S_ISSOCK(mode)) return DT_SOCK;
- panic("unknown type, mode 0x%x", mode);
+ assert(0 && "unknown type");
}
chdir.c chmod.c fchmod.c chown.c fchown.c chroot.c close.c \
clock_getres.c clock_gettime.c clock_settime.c \
connect.c dup.c dup2.c execve.c fcntl.c flock.c fpathconf.c fork.c \
- fstatfs.c fstatvfs.c fsync.c ftruncate.c gcov_flush.c getdents.c \
+ fstatfs.c fstatvfs.c fsync.c ftruncate.c gcov_flush_sys.c getdents.c \
getegid.c getgid.c \
getgroups.c getitimer.c setitimer.c __getlogin.c getpeername.c \
getpgrp.c getpid.c getppid.c priority.c getrlimit.c getsockname.c \
lchmod.o lchmod.pico lchmod.bc: ${NETBSDSRCDIR}/tools/compat/lchmod.c
.include "${NETBSDSRCDIR}/minix/lib/libc/arch/${ARCHSUBDIR}/sys/Makefile.inc"
+.include "${NETBSDSRCDIR}/minix/lib/libc/arch/${ARCHSUBDIR}/Makefile.inc"
.endif # ${USE_BITCODE:Uno} == "yes"
.endfor
+CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/minix/fs
+
# LSC: I would like not to have to copy te file, but I can't
# have libsa appear first in the .PATH, for a lot of files
# would be taken from there, which is not the intention ATM.
.for f in \
_errno.o \
getprogname.o setprogname.o execle.o sleep.o time.o \
- ctype_.o tolower_.o toupper_.o usleep.o sigsetops.o
+ ctype_.o tolower_.o toupper_.o usleep.o sigsetops.o
${f} ${f:C/\.o/.bc/}: ${LIBCDIR}/gen/${f:C/\.o/.c/}
OBJS+= ${f}
CLEANFILES+= ${f}
CPPFLAGS.toupper_.c+= -I${LIBCDIR}/locale
.for f in \
- waitpid.o
+ waitpid.o read_tsc_64.o fslib.o itoa.o
${f} ${f:C/\.o/.bc/}: ${LIBMINIXCDIR}/gen/${f:C/\.o/.c/}
OBJS+= ${f}
CLEANFILES+= ${f}
.endif # ${USE_BITCODE:Uno} == "yes"
.endfor
+ARCHSUBDIR=${MACHINE_CPU}
+.include "${NETBSDSRCDIR}/minix/lib/libc/arch/${MACHINE_CPU}/Makefile.inc"
+
.include <bsd.lib.mk>
.include <bsd.own.mk>
LIB= minixfs
-SRCS= fetch_credentials.c cache.c
+SRCS= fetch_credentials.c cache.c
.include <bsd.lib.mk>
+++ /dev/null
-NOGCCERROR=yes
-NOCLANGERROR=yes
-
-.include <bsd.own.mk>
-
-.PATH: ${.CURDIR} ${.CURDIR}/${MACHINE_ARCH}
-.include "${MACHINE_ARCH}/Makefile.inc"
-
-INCSDIR= /usr/include
-LIB= minlib
-
-USE_SHLIBDIR= yes
-
-CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/minix/fs
-CPPFLAGS.fsversion.c+= -I${NETBSDSRCDIR}/minix/fs
-SRCS+= fslib.c fsversion.c
-
-# DHCP get/set tags.
-SRCS+= dhcp_gettag.c dhcp_settag.c
-
-# Gcov support.
-SRCS+= gcov.c gcov_flush.c
-
-# Various utils
-SRCS+= itoa.c read_tsc_64.c
-
-# servxcheck
-SRCS+= servxcheck.c
-
-# queryparam
-SRCS+= paramvalue.c
-
-SRCS+= oneC_sum.c
-
-SUBDIR+= pkgconfig
-
-.include <bsd.lib.mk>
-.include <bsd.subdir.mk>
+++ /dev/null
-SRCS+= get_bp.S read_tsc.c
+++ /dev/null
-SRCS+= _cpufeature.c _cpuid.S get_bp.S getprocessor.S \
- read_tsc.S
+++ /dev/null
-.include <bsd.own.mk>
-
-NOOBJ= # defined
-
-FILES=minlib.pc
-FILESDIR=/usr/lib
-FILESMODE=444
-
-.include <bsd.prog.mk>
+++ /dev/null
-Name: minlib
-Description: Minix Compatibility Library
-Version: 1.0
-Libs: -lminlib
-Cflags:
-
+++ /dev/null
-major=0
-minor=0
BINDIR?= /service
MAN?=
-LDADD+= -lminlib
-DPADD+= ${LIBMINLIB}
-
.include "../Makefile.inc"
BINDIR?= /service
MAN?=
-LDADD+= -lminlib
-DPADD+= ${LIBMINLIB}
-
.include "../Makefile.inc"
PROG = devman
SRCS = main.c device.c buf.c bind.c
-DPADD+= ${LIBSYS} ${LIBMINLIB}
-LDADD = -lvtreefs -lsys -lminlib
+DPADD+= ${LIBSYS}
+LDADD = -lvtreefs -lsys
.include <minix.service.mk>
PROGS += testvm
OBJS.testvm+= testcache.o
LDSTATIC.testvm= -static
-LDADD.testvm+= -lsys -ltimers -lminlib
+LDADD.testvm+= -lsys -ltimers
FILES += testvm.conf
# Copied from drivers/Makefile.inc, and slightly edited.
-LDADD+= -lminlib
-DPADD+= ${LIBMINLIB}
BINDIR?=/usr/sbin
#uncomment the following for proper debugging
#CFLAGS+=-g
#LDFLAGS+= -Ttext=0x4000000
-LDADD+= -lsys -lddekit -lminlib
-DPADD+= ${LIBSYS} ${LIBDDEKIT} ${LIBMINLIB}
+LDADD+= -lsys -lddekit
+DPADD+= ${LIBSYS} ${LIBDDEKIT}
MAN=
# Copied from drivers/Makefile.inc
-LDADD+= -lminlib
-DPADD+= ${LIBMINLIB}
BINDIR?=/usr/sbin
# Copied from drivers/Makefile.inc
-LDADD+= -lminlib
-DPADD+= ${LIBMINLIB}
BINDIR?=/usr/sbin
chmod +x down run
requestor: requestor.c inc.h
- cc -static -o $@ $< -lsys -lminlib
+ cc -static -o $@ $< -lsys
grantor: grantor.c inc.h
- cc -static -o $@ $< -lsys -lminlib
+ cc -static -o $@ $< -lsys
1fifo 2fifo:
mkfifo $@
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
-DPADD+= ${MINLIB} ${COMPAT_MINIX}
-.endif
-
NOGCCERROR?= yes
NOCLANGERROR?= yes
PROG= mkproto
MAN=
-LDADD+= -lminlib
-DPADD+= ${LIBMINLIB}
-
NOGCCERROR?= yes
NOCLANGERROR?= yes
.endif
.else
.if ${LIB} != "c" && ${LIB:Mgcc*} == "" \
- && ${LIB} != "minlib" && ${LIB} != "sys" && ${LIB} != "minc" && ${LIB} != "mthread" # Minix-specific libs
+ && ${LIB} != "sys" && ${LIB} != "minc" && ${LIB} != "mthread" # Minix-specific libs
.if !empty(LIBC_SO)
DPLIBC ?= ${DESTDIR}${LIBC_SO}
.endif
lwip \
minc \
minixfs \
- minlib \
mthread \
netdriver \
netsock \