don't keep minix-port.patch files in repo
. causes git noise, and unnecessary conflicts . are easily generated with 'make nbsd_diff' in tools/
This commit is contained in:
@@ -1,51 +0,0 @@
|
||||
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
|
||||
Reference in New Issue
Block a user