Module Name: src
Committed By: dsl
Date: Fri Jul 17 19:37:55 UTC 2009
Modified Files:
src/lib/libc/arch/i386/string: Makefile.inc
src/lib/libc/arch/m68k/string: Makefile.inc
src/lib/libc/arch/mips/string: Makefile.inc
src/lib/libc/arch/vax/string: Makefile.inc
src/lib/libc/arch/x86_64/string: Makefile.inc
Removed Files:
src/lib/libc/arch/mips/string: index.S rindex.S
Log Message:
Change all archs so that strchr.[cS] and strrchr.[cS] exist and generate
duplicate symbols for index() and rindex().
libc and kernel build ok for affected archs (i386, amd64, vax, sun3,
evbmips-eb) all seem ok.
(vax might lose an asm index() - but comments imply it is worse than the C)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/i386/string/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/m68k/string/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/mips/string/Makefile.inc
cvs rdiff -u -r1.8 -r0 src/lib/libc/arch/mips/string/index.S
cvs rdiff -u -r1.7 -r0 src/lib/libc/arch/mips/string/rindex.S
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/vax/string/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/x86_64/string/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/i386/string/Makefile.inc
diff -u src/lib/libc/arch/i386/string/Makefile.inc:1.3 src/lib/libc/arch/i386/string/Makefile.inc:1.4
--- src/lib/libc/arch/i386/string/Makefile.inc:1.3 Fri Aug 1 17:03:48 2003
+++ src/lib/libc/arch/i386/string/Makefile.inc Fri Jul 17 19:37:54 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.3 2003/08/01 17:03:48 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/07/17 19:37:54 dsl Exp $
# objects built from assembler sources (need lint stubs)
-SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S \
- memcpy.S memmove.S memset.S rindex.S strcat.S strchr.S \
+SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.S memcmp.S \
+ memcpy.S memmove.S memset.S strcat.S strchr.S \
strcmp.S strcpy.S strlen.S strncmp.S strrchr.S swab.S
# objects built from C sources
Index: src/lib/libc/arch/m68k/string/Makefile.inc
diff -u src/lib/libc/arch/m68k/string/Makefile.inc:1.3 src/lib/libc/arch/m68k/string/Makefile.inc:1.4
--- src/lib/libc/arch/m68k/string/Makefile.inc:1.3 Mon Feb 5 00:17:22 2001
+++ src/lib/libc/arch/m68k/string/Makefile.inc Fri Jul 17 19:37:55 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.3 2001/02/05 00:17:22 scottr Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/07/17 19:37:55 dsl Exp $
-SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.c memcmp.S memset.S \
- rindex.S strcat.S strcmp.S strcpy.S strcspn.c strlen.S \
+SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.c memcmp.S memset.S \
+ strcat.S strcmp.S strcpy.S strcspn.c strlen.S \
strncat.c strncmp.S strncpy.S strpbrk.c strsep.c \
strspn.c strstr.c swab.S
SRCS+= memcpy.S memccpy.S memmove.S strchr.S strrchr.S
Index: src/lib/libc/arch/mips/string/Makefile.inc
diff -u src/lib/libc/arch/mips/string/Makefile.inc:1.2 src/lib/libc/arch/mips/string/Makefile.inc:1.3
--- src/lib/libc/arch/mips/string/Makefile.inc:1.2 Tue Oct 10 21:51:54 2000
+++ src/lib/libc/arch/mips/string/Makefile.inc Fri Jul 17 19:37:55 2009
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.2 2000/10/10 21:51:54 jeffs Exp $
+# $NetBSD: Makefile.inc,v 1.3 2009/07/17 19:37:55 dsl Exp $
-SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.c memcmp.c memset.c \
+SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.c memcmp.c memset.c \
memcpy.S memmove.S \
- rindex.S strcat.c strcmp.S strcpy.c strcspn.c strlen.S \
+ strchr.S strrchr.S \
+ strcat.c strcmp.S strcpy.c strcspn.c strlen.S \
strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
strspn.c strstr.c swab.c
Index: src/lib/libc/arch/vax/string/Makefile.inc
diff -u src/lib/libc/arch/vax/string/Makefile.inc:1.2 src/lib/libc/arch/vax/string/Makefile.inc:1.3
--- src/lib/libc/arch/vax/string/Makefile.inc:1.2 Sun May 19 15:57:37 1996
+++ src/lib/libc/arch/vax/string/Makefile.inc Fri Jul 17 19:37:55 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.2 1996/05/19 15:57:37 ragge Exp $
+# $NetBSD: Makefile.inc,v 1.3 2009/07/17 19:37:55 dsl Exp $
-SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.c memcmp.S memset.S \
- rindex.c strcat.c strcmp.c strcpy.c strcspn.c strlen.c \
+SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.c memcmp.S memset.S \
+ strcat.c strcmp.c strcpy.c strcspn.c strlen.c \
strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
strspn.c strstr.c swab.c
SRCS+= memcpy.S memmove.S
Index: src/lib/libc/arch/x86_64/string/Makefile.inc
diff -u src/lib/libc/arch/x86_64/string/Makefile.inc:1.2 src/lib/libc/arch/x86_64/string/Makefile.inc:1.3
--- src/lib/libc/arch/x86_64/string/Makefile.inc:1.2 Fri Aug 1 17:03:57 2003
+++ src/lib/libc/arch/x86_64/string/Makefile.inc Fri Jul 17 19:37:55 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.2 2003/08/01 17:03:57 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.3 2009/07/17 19:37:55 dsl Exp $
# objects built from assembler sources (need lint stubs)
-SRCS+= bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S \
- memcpy.S memmove.S memset.S rindex.S strcat.S strchr.S \
+SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.S memcmp.S \
+ memcpy.S memmove.S memset.S strcat.S strchr.S \
strcmp.S strcpy.S strlen.S strncmp.S strrchr.S swab.S
# objects built from C sources
