upstream/1.1.0_cvsrelease/1.1.0_cvs

5 files changed, 16 insertions, 8 deletions

diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index edd26209a1e2..bb5f703b6573 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -12,11 +12,11 @@ SRCS+=	bcmp.s bcopy.s bzero.s ffs.s index.s memchr.c memcmp.c memset.c \
 	strncat.c strncmp.s strncpy.s strpbrk.c strsep.c \
 	strspn.c strstr.c
 .elif (${MACHINE} == "i386")
-SRCS+=	bcmp.s bcopy.s bzero.s ffs.s index.s memchr.s memcmp.s memset.s \
-	rindex.s strcat.s strcmp.s strcpy.s strcspn.c strlen.s \
-	strncat.c strncmp.s strncpy.c strpbrk.c strsep.c \
+SRCS+=	bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S memset.S \
+	rindex.S strcat.S strcmp.S strcpy.S strcspn.c strlen.S \
+	strncat.c strncmp.S strncpy.c strpbrk.c strsep.c \
 	strspn.c strstr.c
-SRCS+=	memmove.s strchr.s strrchr.s
+SRCS+=	memmove.S strchr.S strrchr.S
 .elif (${MACHINE} == "tahoe")
 SRCS+=	bcmp.s bcopy.s bzero.s ffs.s index.c memchr.c memcmp.s memset.c \
 	rindex.c strcat.s strcmp.s strcpy.s strcspn.c strlen.s \
@@ -33,7 +33,9 @@ SRCS+=	memmove.s strchr.s strrchr.s
 
 # if no machine specific memmove(3), build one out of bcopy(3).
 .if empty(SRCS:Mmemcpy.s)
+.if empty(SRCS:Mmemcpy.S)
 .if empty(SRCS:Mmemmove.s)
+.if empty(SRCS:Mmemmove.S)
 OBJS+=	memmove.o
 memmove.o: bcopy.c
 	${CC} -DMEMMOVE ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
@@ -46,9 +48,12 @@ memmove.po: bcopy.c
 	@mv a.out ${.TARGET}
 .endif
 .endif
+.endif
+.endif
 
 # if no machine specific strchr(3), build one out of index(3).
 .if empty(SRCS:Mstrchr.s)
+.if empty(SRCS:Mstrchr.S)
 OBJS+=	strchr.o
 strchr.o: index.c
 	${CC} -DSTRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
@@ -60,9 +65,11 @@ strchr.po: index.c
 	@${LD} -X -r ${.TARGET}
 	@mv a.out ${.TARGET}
 .endif
+.endif
 
 # if no machine specific strrchr(3), build one out of rindex(3).
 .if empty(SRCS:Mstrrchr.s)
+.if empty(SRCS:Mstrrchr.S)
 OBJS+=	strrchr.o
 strrchr.o: rindex.c
 	${CC} -DSTRRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
@@ -74,6 +81,7 @@ strrchr.po: rindex.c
 	@${LD} -X -r ${.TARGET}
 	@mv a.out ${.TARGET}
 .endif
+.endif
 
 MAN3+=	string/bcmp.3 string/bcopy.3 string/bstring.3 string/bzero.3 \
 	string/ffs.3 string/index.3 string/memccpy.3 string/memchr.3 \
diff --git a/lib/libc/string/bzero.3 b/lib/libc/string/bzero.3
index f3fadba8d929..6f6acb65b1f0 100644
--- a/lib/libc/string/bzero.3
+++ b/lib/libc/string/bzero.3
@@ -35,7 +35,7 @@
 .\"
 .Dd April 19, 1991
 .Dt BZERO 3
-.Os BDS 4.3
+.Os BSD 4.3
 .Sh NAME
 .Nm bzero
 .Nd write zeroes to a byte string
diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3
index 53ed88af0b3c..482b13b77fad 100644
--- a/lib/libc/string/ffs.3
+++ b/lib/libc/string/ffs.3
@@ -46,7 +46,7 @@
 .Sh DESCRIPTION
 The
 .Fn ffs
-fucntion
+function
 finds the first bit set in
 .Fa value
 and returns the index of that bit.
diff --git a/lib/libc/string/strchr.3 b/lib/libc/string/strchr.3
index 1e53b530c1d4..34744d94882b 100644
--- a/lib/libc/string/strchr.3
+++ b/lib/libc/string/strchr.3
@@ -48,7 +48,7 @@
 .Sh DESCRIPTION
 The
 .Fn strchr
-function locates the first occurence of
+function locates the first occurrence of
 .Ar c
 in the string pointed to by
 .Ar s .
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index 0901722d49f2..a4283ff849c0 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -48,7 +48,7 @@ The
 .Fn strsep
 locates in the null-terminated string at
 .Fa *stringp
-the first occurence of any character in
+the first occurrence of any character in
 .Fa delim
 and replaces this with a
 .Ql \e0 ,