Module Name: src
Committed By: dsl
Date: Thu Jul 30 20:57:17 UTC 2009
Modified Files:
src/lib/libc: Makefile
src/lib/libc/arch/alpha/string: Makefile.inc
src/lib/libc/arch/arm/string: Makefile.inc
src/lib/libc/arch/hppa/string: Makefile.inc
src/lib/libc/arch/i386/string: Makefile.inc
src/lib/libc/arch/ia64/string: Makefile.inc
src/lib/libc/arch/m68k/string: Makefile.inc
src/lib/libc/arch/mips/string: Makefile.inc
src/lib/libc/arch/powerpc/string: Makefile.inc
src/lib/libc/arch/powerpc64/string: Makefile.inc
src/lib/libc/arch/sh3/string: Makefile.inc
src/lib/libc/arch/sparc/string: Makefile.inc
src/lib/libc/arch/sparc64/string: Makefile.inc
src/lib/libc/arch/vax/string: Makefile.inc
src/lib/libc/arch/x86_64/gen: makecontext.c
src/lib/libc/arch/x86_64/string: Makefile.inc
src/lib/libc/string: Makefile.inc
Log Message:
If SRCS contains any .S files then remove the corresponding .c file from
SRCS and add to LSRCS (for lint).
Change the 'string' Makefiles so that the arch/*/string/Makefile.inc
need only specify the .S files for that architecture and not the .c
files for all the files they don't override.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/lib/libc/Makefile
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/alpha/string/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/arm/string/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/hppa/string/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/i386/string/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/ia64/string/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/m68k/string/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/mips/string/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/arch/powerpc/string/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/powerpc64/string/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/sh3/string/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/sparc/string/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/sparc64/string/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/vax/string/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/x86_64/gen/makecontext.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/x86_64/string/Makefile.inc
cvs rdiff -u -r1.74 -r1.75 src/lib/libc/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/Makefile
diff -u src/lib/libc/Makefile:1.136 src/lib/libc/Makefile:1.137
--- src/lib/libc/Makefile:1.136 Sun Oct 26 07:43:07 2008
+++ src/lib/libc/Makefile Thu Jul 30 20:57:15 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2008/10/26 07:43:07 mrg Exp $
+# $NetBSD: Makefile,v 1.137 2009/07/30 20:57:15 dsl Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -91,6 +91,20 @@
.include "${.CURDIR}/yp/Makefile.inc"
.endif
+# Remove from SRCS the .c files for any .S files added by the MD makefiles.
+# Any files added to NO_SRCS will also not be compiled
+# (eg because another file generates the same entry point)
+# Use the .c file to generate the lint library, but don't add to DPSRCS
+# (since it would overwrite the .d file containing the foo.o: foo.S rules).
+.for asm_file in ${SRCS:M*.S} ${NO_SRCS}
+unwanted_file := ${SRCS:M${asm_file:.S=.c}}
+.if "${unwanted_file}" != ""
+SRCS := ${SRCS:N${unwanted_file}}
+LSRCS += ${unwanted_file}
+.endif
+.endfor
+
+
NLS= C.msg Pig.msg ca.msg cs.msg de.msg es.msg fi.msg fr.msg nl.msg \
no.msg pl.msg sk.msg sv.msg
Index: src/lib/libc/arch/alpha/string/Makefile.inc
diff -u src/lib/libc/arch/alpha/string/Makefile.inc:1.5 src/lib/libc/arch/alpha/string/Makefile.inc:1.6
--- src/lib/libc/arch/alpha/string/Makefile.inc:1.5 Sat Jul 18 09:44:30 2009
+++ src/lib/libc/arch/alpha/string/Makefile.inc Thu Jul 30 20:57:15 2009
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.5 2009/07/18 09:44:30 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.6 2009/07/30 20:57:15 dsl Exp $
+
+SRCS+= bcopy.S bzero.S ffs.S
-SRCS+= bcmp.c bcopy.S bzero.S ffs.S memchr.c memcmp.c memset.c \
- 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/arm/string/Makefile.inc
diff -u src/lib/libc/arch/arm/string/Makefile.inc:1.7 src/lib/libc/arch/arm/string/Makefile.inc:1.8
--- src/lib/libc/arch/arm/string/Makefile.inc:1.7 Sat Jul 18 09:44:30 2009
+++ src/lib/libc/arch/arm/string/Makefile.inc Thu Jul 30 20:57:15 2009
@@ -1,9 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.7 2009/07/18 09:44:30 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.8 2009/07/30 20:57:15 dsl Exp $
SRCS+= memcpy.S bcopy.S memmove.S memset.S bzero.S ffs.S strcmp.S
SRCS+= strncmp.S memcmp.S
-SRCS+= bcmp.c memchr.c \
- strcat.c strcpy.c strcspn.c strlen.c \
- strncat.c strncpy.c strpbrk.c strsep.c \
- strspn.c strstr.c swab.c
Index: src/lib/libc/arch/hppa/string/Makefile.inc
diff -u src/lib/libc/arch/hppa/string/Makefile.inc:1.2 src/lib/libc/arch/hppa/string/Makefile.inc:1.3
--- src/lib/libc/arch/hppa/string/Makefile.inc:1.2 Sat Jul 18 09:44:30 2009
+++ src/lib/libc/arch/hppa/string/Makefile.inc Thu Jul 30 20:57:16 2009
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/07/18 09:44:30 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.3 2009/07/30 20:57:16 dsl Exp $
# $OpenBSD: Makefile.inc,v 1.4 1999/09/14 00:46:18 mickey Exp $
-SRCS+= memchr.c memcmp.c memset.c \
- 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+= bcmp.S bzero.S ffs.S
+
# NetBSD doesn't currently let archs supply a strlcpy.S.
# plus, the one that fredette made is untested.
#SRCS+= strlcpy.S
Index: src/lib/libc/arch/i386/string/Makefile.inc
diff -u src/lib/libc/arch/i386/string/Makefile.inc:1.4 src/lib/libc/arch/i386/string/Makefile.inc:1.5
--- src/lib/libc/arch/i386/string/Makefile.inc:1.4 Fri Jul 17 19:37:54 2009
+++ src/lib/libc/arch/i386/string/Makefile.inc Thu Jul 30 20:57:16 2009
@@ -1,20 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/07/17 19:37:54 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.5 2009/07/30 20:57:16 dsl Exp $
-# objects built from assembler sources (need lint stubs)
+# objects built from assembler sources
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
-SRCS+= strcspn.c strncat.c strncpy.c strpbrk.c strsep.c strspn.c \
- strstr.c
-
-SRCS.i386.string=\
- Lint_bcmp.c Lint_bcopy.c Lint_bzero.c Lint_ffs.c Lint_index.c \
- Lint_memchr.c Lint_memcmp.c Lint_memcpy.c Lint_memmove.c \
- Lint_memset.c Lint_rindex.c Lint_strcat.c Lint_strchr.c \
- Lint_strcmp.c Lint_strcpy.c Lint_strlen.c Lint_strncmp.c \
- Lint_strrchr.c Lint_swab.c
-LSRCS+= ${SRCS.i386.string}
-DPSRCS+= ${SRCS.i386.string}
-CLEANFILES+= ${SRCS.i386.string}
Index: src/lib/libc/arch/ia64/string/Makefile.inc
diff -u src/lib/libc/arch/ia64/string/Makefile.inc:1.3 src/lib/libc/arch/ia64/string/Makefile.inc:1.4
--- src/lib/libc/arch/ia64/string/Makefile.inc:1.3 Sat Jul 18 09:44:30 2009
+++ src/lib/libc/arch/ia64/string/Makefile.inc Thu Jul 30 20:57:16 2009
@@ -1,6 +1,2 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/07/18 09:44:30 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:16 dsl Exp $
-SRCS+= bcmp.c bcopy.c memchr.c memcmp.c memset.c \
- 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
Index: src/lib/libc/arch/m68k/string/Makefile.inc
diff -u src/lib/libc/arch/m68k/string/Makefile.inc:1.4 src/lib/libc/arch/m68k/string/Makefile.inc:1.5
--- src/lib/libc/arch/m68k/string/Makefile.inc:1.4 Fri Jul 17 19:37:55 2009
+++ src/lib/libc/arch/m68k/string/Makefile.inc Thu Jul 30 20:57:16 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/07/17 19:37:55 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.5 2009/07/30 20:57:16 dsl Exp $
-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+= bcmp.S bcopy.S bzero.S ffs.S memcmp.S memset.S \
+ strcat.S strcmp.S strcpy.S strlen.S \
+ strncmp.S strncpy.S \
+ 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.3 src/lib/libc/arch/mips/string/Makefile.inc:1.4
--- src/lib/libc/arch/mips/string/Makefile.inc:1.3 Fri Jul 17 19:37:55 2009
+++ src/lib/libc/arch/mips/string/Makefile.inc Thu Jul 30 20:57:16 2009
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/07/17 19:37:55 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:16 dsl Exp $
-SRCS+= bcmp.S bcopy.S bzero.S ffs.S memchr.c memcmp.c memset.c \
+SRCS+= bcmp.S bcopy.S bzero.S ffs.S \
memcpy.S memmove.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
+ strcmp.S strlen.S \
Index: src/lib/libc/arch/powerpc/string/Makefile.inc
diff -u src/lib/libc/arch/powerpc/string/Makefile.inc:1.9 src/lib/libc/arch/powerpc/string/Makefile.inc:1.10
--- src/lib/libc/arch/powerpc/string/Makefile.inc:1.9 Sat Jul 18 09:44:30 2009
+++ src/lib/libc/arch/powerpc/string/Makefile.inc Thu Jul 30 20:57:16 2009
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.9 2009/07/18 09:44:30 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.10 2009/07/30 20:57:16 dsl Exp $
+
+SRCS+= bzero.S ffs.S strlen.S
# disable the asm versions of these because they break the explora.
# the special rules here are to override the suffix rules which seem
# to prefer .S files over .c
.if ${MACHINE} == "evbppc"
-SRCS+= bzero.S ffs.S strlen.S memcmp.c bcopy.c
bcopy.o: bcopy.c
bcopy.po: bcopy.c
bcopy.so: bcopy.c
@@ -18,10 +19,5 @@
memmove.po: memmove.c
memmove.so: memmove.c
.else
-SRCS+= bzero.S ffs.S strlen.S memcmp.S bcopy.S memcpy.S memmove.S
+SRCS+= memcmp.S bcopy.S memcpy.S memmove.S
.endif
-
-SRCS+= bcmp.c memchr.c \
- strcat.c strcmp.c strcpy.c strcspn.c \
- strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
- strspn.c strstr.c swab.c
Index: src/lib/libc/arch/powerpc64/string/Makefile.inc
diff -u src/lib/libc/arch/powerpc64/string/Makefile.inc:1.3 src/lib/libc/arch/powerpc64/string/Makefile.inc:1.4
--- src/lib/libc/arch/powerpc64/string/Makefile.inc:1.3 Sat Jul 18 09:44:30 2009
+++ src/lib/libc/arch/powerpc64/string/Makefile.inc Thu Jul 30 20:57:16 2009
@@ -1,8 +1,3 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/07/18 09:44:30 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:16 dsl Exp $
SRCS+= bzero.S ffs.S strlen.S
-
-SRCS+= bcmp.c bcopy.c memchr.c memcmp.c \
- strcat.c strcmp.c strcpy.c strcspn.c \
- strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
- strspn.c strstr.c swab.c
Index: src/lib/libc/arch/sh3/string/Makefile.inc
diff -u src/lib/libc/arch/sh3/string/Makefile.inc:1.4 src/lib/libc/arch/sh3/string/Makefile.inc:1.5
--- src/lib/libc/arch/sh3/string/Makefile.inc:1.4 Sat Jul 18 09:44:30 2009
+++ src/lib/libc/arch/sh3/string/Makefile.inc Thu Jul 30 20:57:16 2009
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/07/18 09:44:30 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.5 2009/07/30 20:57:16 dsl Exp $
-SRCS+= bcmp.c bcopy.S bzero.S ffs.S memchr.c memcmp.c 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+= bcopy.S bzero.S ffs.S memset.S
SRCS+= memcpy.S memmove.S
Index: src/lib/libc/arch/sparc/string/Makefile.inc
diff -u src/lib/libc/arch/sparc/string/Makefile.inc:1.3 src/lib/libc/arch/sparc/string/Makefile.inc:1.4
--- src/lib/libc/arch/sparc/string/Makefile.inc:1.3 Sat Jul 18 09:44:30 2009
+++ src/lib/libc/arch/sparc/string/Makefile.inc Thu Jul 30 20:57:17 2009
@@ -1,6 +1,3 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/07/18 09:44:30 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:17 dsl Exp $
-SRCS+= bcmp.c bcopy.c bzero.S ffs.S memchr.c memcmp.c memset.S \
- strcat.c strcmp.c strcpy.c strcspn.c strlen.S \
- strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
- strspn.c strstr.c swab.c
+SRCS+= bzero.S ffs.S memset.S strlen.S
Index: src/lib/libc/arch/sparc64/string/Makefile.inc
diff -u src/lib/libc/arch/sparc64/string/Makefile.inc:1.5 src/lib/libc/arch/sparc64/string/Makefile.inc:1.6
--- src/lib/libc/arch/sparc64/string/Makefile.inc:1.5 Sat Jul 18 09:44:30 2009
+++ src/lib/libc/arch/sparc64/string/Makefile.inc Thu Jul 30 20:57:17 2009
@@ -1,6 +1,3 @@
-# $NetBSD: Makefile.inc,v 1.5 2009/07/18 09:44:30 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.6 2009/07/30 20:57:17 dsl Exp $
-SRCS+= bcmp.c ffs.S memchr.c memcmp.c memcpy.S memset.S \
- strcat.c strcmp.c strcpy.c strcspn.c strlen.S \
- strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
- strspn.c strstr.c swab.c
+SRCS+= ffs.S memcpy.S memset.S strlen.S
Index: src/lib/libc/arch/vax/string/Makefile.inc
diff -u src/lib/libc/arch/vax/string/Makefile.inc:1.3 src/lib/libc/arch/vax/string/Makefile.inc:1.4
--- src/lib/libc/arch/vax/string/Makefile.inc:1.3 Fri Jul 17 19:37:55 2009
+++ src/lib/libc/arch/vax/string/Makefile.inc Thu Jul 30 20:57:17 2009
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/07/17 19:37:55 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:17 dsl Exp $
-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+= bcmp.S bcopy.S bzero.S ffs.S memcmp.S memset.S
SRCS+= memcpy.S memmove.S
Index: src/lib/libc/arch/x86_64/gen/makecontext.c
diff -u src/lib/libc/arch/x86_64/gen/makecontext.c:1.3 src/lib/libc/arch/x86_64/gen/makecontext.c:1.4
--- src/lib/libc/arch/x86_64/gen/makecontext.c:1.3 Mon Apr 28 20:22:58 2008
+++ src/lib/libc/arch/x86_64/gen/makecontext.c Thu Jul 30 20:57:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:58 martin Exp $ */
+/* $NetBSD: makecontext.c,v 1.4 2009/07/30 20:57:17 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.3 2008/04/28 20:22:58 martin Exp $");
+__RCSID("$NetBSD: makecontext.c,v 1.4 2009/07/30 20:57:17 dsl Exp $");
#endif
#include <inttypes.h>
@@ -67,7 +67,7 @@
if (stackargs > 0)
sp -= stackargs;
/* LINTED __greg_t is safe */
- gr[_REG_URSP] = (__greg_t)sp;
+ gr[_REG_RSP] = (__greg_t)sp;
gr[_REG_RBP] = (__greg_t)0; /* Wipe out frame pointer. */
/* Put return address on top of stack. */
Index: src/lib/libc/arch/x86_64/string/Makefile.inc
diff -u src/lib/libc/arch/x86_64/string/Makefile.inc:1.3 src/lib/libc/arch/x86_64/string/Makefile.inc:1.4
--- src/lib/libc/arch/x86_64/string/Makefile.inc:1.3 Fri Jul 17 19:37:55 2009
+++ src/lib/libc/arch/x86_64/string/Makefile.inc Thu Jul 30 20:57:17 2009
@@ -1,20 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/07/17 19:37:55 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/07/30 20:57:17 dsl Exp $
-# objects built from assembler sources (need lint stubs)
+# objects built from assembler sources
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
-SRCS+= strcspn.c strncat.c strncpy.c strpbrk.c strsep.c strspn.c \
- strstr.c
-
-SRCS.x86_64.string=\
- Lint_bcmp.c Lint_bcopy.c Lint_bzero.c Lint_ffs.c Lint_index.c \
- Lint_memchr.c Lint_memcmp.c Lint_memcpy.c Lint_memmove.c \
- Lint_memset.c Lint_rindex.c Lint_strcat.c Lint_strchr.c \
- Lint_strcmp.c Lint_strcpy.c Lint_strlen.c Lint_strncmp.c \
- Lint_strrchr.c Lint_swab.c
-LSRCS+= ${SRCS.x86_64.string}
-DPSRCS+= ${SRCS.x86_64.string}
-CLEANFILES+= ${SRCS.x86_64.string}
Index: src/lib/libc/string/Makefile.inc
diff -u src/lib/libc/string/Makefile.inc:1.74 src/lib/libc/string/Makefile.inc:1.75
--- src/lib/libc/string/Makefile.inc:1.74 Tue Jul 21 14:55:33 2009
+++ src/lib/libc/string/Makefile.inc Thu Jul 30 20:57:15 2009
@@ -1,9 +1,13 @@
# from: @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $NetBSD: Makefile.inc,v 1.74 2009/07/21 14:55:33 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.75 2009/07/30 20:57:15 dsl Exp $
# string sources
.PATH: ${ARCHDIR}/string ${.CURDIR}/string
+# NB: if a .S version of any of these is added in the arch/*/Makefile
+# then the relevant .c file is automatically removed
+# Also adding the .c name to NO_SRCS will have the same effect
+
SRCS+= bm.c stpcpy.c stpncpy.c \
strcasecmp.c strncasecmp.c strcasestr.c strcoll.c strdup.c \
strerror.c strlcat.c strlcpy.c strnlen.c \
@@ -11,6 +15,15 @@
strtok_r.c strxfrm.c __strsignal.c strerror_r.c strndup.c \
stresep.c memrchr.c
+SRCS+= bcmp.c bcopy.c bzero.c ffs.c memchr.c memcmp.c memset.c
+SRCS+= strcat.c strcmp.c strcpy.c strcspn.c strlen.c
+SRCS+= strncat.c strncmp.c strncpy.c strpbrk.c strsep.c
+SRCS+= strspn.c strstr.c swab.c
+
+SRCS+= memccpy.c memcpy.c memmem.c memmove.c
+SRCS+= strchr.c strrchr.c
+SRCS+= popcount32.c popcount64.c
+
# wide char
SRCS+= wcscat.c wcschr.c wcscmp.c wcscpy.c wcscspn.c wcslcat.c wcslcpy.c \
wcslen.c wcsncat.c wcscasecmp.c wcsdup.c wcsncasecmp.c \
@@ -23,45 +36,8 @@
# namespace protection wrappers
SRCS+= _strlcat.c _strlcpy.c _strerror_r.c
-# machine-dependent net sources
-# m-d Makefile.inc must include sources for:
-# bcmp() bcopy() bzero() ffs() memchr() memcmp() memset()
-# strcat() strcmp() strcpy() strcspn() strlen()
-# strncat() strncmp() strncpy() strpbrk() strsep()
-# strspn() strstr() swav()
-# m-d Makefile.inc may include sources for:
-# memcpy() memmem() memmove() strchr() strrchr()
-
.include "${ARCHDIR}/string/Makefile.inc"
-# if no m-d versions of memccpy(), memcpy(), memmove(), strchr(), or strrchr()
-# then use the machine independent versions.
-#
-.if empty(SRCS:Mmemccpy.S)
-SRCS+= memccpy.c
-.endif
-.if empty(SRCS:Mmemcpy.S)
-SRCS+= memcpy.c
-.endif
-.if empty(SRCS:Mmemmem.S)
-SRCS+= memmem.c
-.endif
-.if empty(SRCS:Mmemmove.S)
-SRCS+= memmove.c
-.endif
-.if empty(SRCS:Mstrchr.S)
-SRCS+= strchr.c
-.endif
-.if empty(SRCS:Mstrrchr.S)
-SRCS+= strrchr.c
-.endif
-.if empty(SRCS:Mpopcount32.S)
-SRCS+= popcount32.c
-.endif
-.if empty(SRCS:Mpopcount64.S)
-SRCS+= popcount64.c
-.endif
-
MAN+= bm.3 bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 \
memccpy.3 memchr.3 memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 \
popcount.3 \
