cc17b27a2b
3 sets of libraries are built now: . ack: all libraries that ack can compile (/usr/lib/i386/) . clang+elf: all libraries with minix headers (/usr/lib/) . clang+elf: all libraries with netbsd headers (/usr/netbsd/) Once everything can be compiled with netbsd libraries and headers, the /usr/netbsd hierarchy will be obsolete and its libraries compiled with netbsd headers will be installed in /usr/lib, and its headers in /usr/include. (i.e. minix libc and current minix headers set will be gone.) To use the NetBSD libc system (libraries + headers) before it is the default libc, see: http://wiki.minix3.org/en/DevelopersGuide/UsingNetBSDCode This wiki page also documents the maintenance of the patch files of minix-specific changes to imported NetBSD code. Changes in this commit: . libsys: Add NBSD compilation and create a safe NBSD-based libc. . Port rest of libraries (except libddekit) to new header system. . Enable compilation of libddekit with new headers. . Enable kernel compilation with new headers. . Enable drivers compilation with new headers. . Port legacy commands to new headers and libc. . Port servers to new headers. . Add <sys/sigcontext.h> in compat library. . Remove dependency file in tree. . Enable compilation of common/lib/libc/atomic in libsys . Do not generate RCSID strings in libc. . Temporarily disable zoneinfo as they are incompatible with NetBSD format . obj-nbsd for .gitignore . Procfs: use only integer arithmetic. (Antoine Leca) . Increase ramdisk size to create NBSD-based images. . Remove INCSYMLINKS handling hack. . Add nbsd_include/sys/exec_elf.h . Enable ELF compilation with NBSD libc. . Add 'make nbsdsrc' in tools to download reference NetBSD sources. . Automate minix-port.patch creation. . Avoid using fstavfs() as it is *extremely* slow and unneeded. . Set err() as PRIVATE to avoid name clash with libc. . [NBSD] servers/vm: remove compilation warnings. . u32 is not a long in NBSD headers. . UPDATING info on netbsd hierarchy . commands fixes for netbsd libc
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
diff -ru nbsdsrc/src/common/lib/libc/Makefile.inc common/lib/libc/Makefile.inc
|
|
--- nbsdsrc/src/common/lib/libc/Makefile.inc
|
|
+++ common/lib/libc/Makefile.inc
|
|
@@ -1,7 +1,11 @@
|
|
# $NetBSD: Makefile.inc,v 1.10 2008/10/26 07:22:50 mrg Exp $
|
|
|
|
COMMON_DIR:=${.PARSEDIR}
|
|
+.if defined(__MINIX)
|
|
+COMMON_CODEDIRS=atomic gen inet md net quad stdlib string
|
|
+.else
|
|
COMMON_CODEDIRS=atomic gen gmon inet md net quad stdlib string sys
|
|
+.endif
|
|
COMMON_CODEDIRS+=hash/sha1 hash/sha2 hash/rmd160
|
|
|
|
.if defined(COMMON_MACHINE_ARCH) && !empty(COMMON_MACHINE_ARCH) && \
|
|
diff -ru nbsdsrc/src/common/lib/libc/arch/i386/atomic/Makefile.inc common/lib/libc/arch/i386/atomic/Makefile.inc
|
|
--- nbsdsrc/src/common/lib/libc/arch/i386/atomic/Makefile.inc
|
|
+++ common/lib/libc/arch/i386/atomic/Makefile.inc
|
|
@@ -1,7 +1,7 @@
|
|
# $NetBSD: Makefile.inc,v 1.7 2009/01/04 17:54:29 pooka Exp $
|
|
|
|
.if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" \
|
|
- || ${LIB} == "rump")
|
|
+ || ${LIB} == "rump" || (defined(__MINIX) && ${LIB} == "sys"))
|
|
|
|
SRCS+= atomic_add_64_cas.c atomic_add_64_nv_cas.c atomic_and_64_cas.c \
|
|
atomic_and_64_nv_cas.c atomic_dec_64_cas.c atomic_dec_64_nv_cas.c \
|
|
diff -ru nbsdsrc/src/common/lib/libc/arch/i386/string/strchr.S common/lib/libc/arch/i386/string/strchr.S
|
|
--- nbsdsrc/src/common/lib/libc/arch/i386/string/strchr.S
|
|
+++ common/lib/libc/arch/i386/string/strchr.S
|
|
@@ -100,4 +100,8 @@
|
|
popl %esi
|
|
ret
|
|
|
|
+#ifdef __minix
|
|
+STRONG_ALIAS(_C_LABEL(index),_C_LABEL(strchr))
|
|
+#else
|
|
STRONG_ALIAS(index,strchr)
|
|
+#endif
|
|
diff -ru nbsdsrc/src/common/lib/libc/arch/i386/string/strrchr.S common/lib/libc/arch/i386/string/strrchr.S
|
|
--- nbsdsrc/src/common/lib/libc/arch/i386/string/strrchr.S
|
|
+++ common/lib/libc/arch/i386/string/strrchr.S
|
|
@@ -93,4 +93,8 @@
|
|
popl %esi
|
|
ret
|
|
|
|
+#ifdef __minix
|
|
+STRONG_ALIAS(_C_LABEL(rindex),_C_LABEL(strrchr))
|
|
+#else
|
|
STRONG_ALIAS(rindex,strrchr)
|
|
+#endif
|