From 9fe44df2876d7f82ee666f2f899a528b130313b3 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 2 Mar 2017 17:05:52 +0000
Subject: [PATCH] Correct MDSRCS use in <arch>/string/Makefile.inc.

- Remove .c files which duplicate entries in MISRCS.
- Use the same, less merge conflict prone style in all cases.
- Use MDSRCS for mips (.c and .S files both ended up in SRCS).
- Remove pointless sparc64 Makefile.inc.
- Remove uninformative foreign VCS ID entries.

Reviewed by:	emaste, imp, jhb
MFC after:	1 week
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D9841
---
 lib/libc/aarch64/string/Makefile.inc |  3 ++-
 lib/libc/amd64/string/Makefile.inc   | 13 +++++++++++--
 lib/libc/arm/string/Makefile.inc     | 15 +++++++++++----
 lib/libc/i386/string/Makefile.inc    | 25 +++++++++++++++++++++----
 lib/libc/mips/string/Makefile.inc    | 17 +++++++++++------
 lib/libc/sparc64/string/Makefile.inc |  1 -
 6 files changed, 56 insertions(+), 18 deletions(-)
 delete mode 100644 lib/libc/sparc64/string/Makefile.inc

diff --git a/lib/libc/aarch64/string/Makefile.inc b/lib/libc/aarch64/string/Makefile.inc
index b247c1c28d9c..5ce355f8b0c1 100644
--- a/lib/libc/aarch64/string/Makefile.inc
+++ b/lib/libc/aarch64/string/Makefile.inc
@@ -6,7 +6,8 @@
 
 .PATH: ${SRCTOP}/contrib/cortex-strings/src/aarch64
 
-MDSRCS+=memchr.S \
+MDSRCS+= \
+	memchr.S \
 	memcmp.S \
 	memcpy.S \
 	memmove.S \
diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc
index 46571ab0766e..425de40d66bf 100644
--- a/lib/libc/amd64/string/Makefile.inc
+++ b/lib/libc/amd64/string/Makefile.inc
@@ -1,4 +1,13 @@
 # $FreeBSD$
 
-MDSRCS+= bcmp.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \
-	strcat.S strcmp.S stpcpy.S strcpy.c
+MDSRCS+= \
+	bcmp.S \
+	bcopy.S \
+	bzero.S \
+	memcmp.S \
+	memcpy.S \
+	memmove.S \
+	memset.S \
+	strcat.S \
+	strcmp.S \
+	stpcpy.S
diff --git a/lib/libc/arm/string/Makefile.inc b/lib/libc/arm/string/Makefile.inc
index 0ba43e6c7399..cf3175ea4e8c 100644
--- a/lib/libc/arm/string/Makefile.inc
+++ b/lib/libc/arm/string/Makefile.inc
@@ -1,6 +1,13 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-MDSRCS+=bcmp.c bcopy.S bzero.S ffs.S memchr.c memcmp.S memcpy.S \
-	memmove.S memset.S strcat.c strchr.c strcmp.S strcpy.c strlen.S \
-	strncmp.S strrchr.c swab.c wcschr.c wcscmp.c wcslen.c wmemchr.c
+MDSRCS+= \
+	bcopy.S \
+	bzero.S \
+	ffs.S \
+	memcmp.S \
+	memcpy.S \
+	memmove.S \
+	memset.S \
+	strcmp.S \
+	strlen.S \
+	strncmp.S
diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc
index f574c8f25c8b..17170eeb3859 100644
--- a/lib/libc/i386/string/Makefile.inc
+++ b/lib/libc/i386/string/Makefile.inc
@@ -1,6 +1,23 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-MDSRCS+=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 strncmp.S strrchr.S \
-	swab.S wcschr.S wcscmp.S wcslen.S wmemchr.S
+MDSRCS+= \
+	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 \
+	strncmp.S \
+	strrchr.S \
+	swab.S \
+	wcschr.S \
+	wcscmp.S \
+	wcslen.S \
+	wmemchr.S
diff --git a/lib/libc/mips/string/Makefile.inc b/lib/libc/mips/string/Makefile.inc
index f37b9af51efb..266446c9d132 100644
--- a/lib/libc/mips/string/Makefile.inc
+++ b/lib/libc/mips/string/Makefile.inc
@@ -1,8 +1,13 @@
-#	$NetBSD: Makefile.inc,v 1.2 2000/10/10 21:51:54 jeffs Exp $
 # $FreeBSD$
 
-SRCS+=	bcmp.S bcopy.S bzero.S ffs.S memchr.c memcmp.c memset.c \
-	memcpy.S memmove.S \
-	strcat.c strchr.S strcmp.S strcpy.c strcspn.c strlen.S \
-	strncat.c strncmp.c strncpy.c strrchr.S strpbrk.c strsep.c \
-	strspn.c strstr.c swab.c
+MDSRCS+= \
+	bcmp.S \
+	bcopy.S \
+	bzero.S \
+	ffs.S \
+	memcpy.S \
+	memmove.S \
+	strchr.S \
+	strcmp.S \
+	strlen.S \
+	strrchr.S
diff --git a/lib/libc/sparc64/string/Makefile.inc b/lib/libc/sparc64/string/Makefile.inc
deleted file mode 100644
index e8c0da7a1d7e..000000000000
--- a/lib/libc/sparc64/string/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $FreeBSD$