MFC r314556-r314558

r314556:
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

r314557:
Correct an misunderstanding of MDSRCS.

MDSRCS it intended to allow assembly versions of funtions with C
implementations listed in MISRCS. The selection of the correct
machdep_ldis?.c for a given architecture does not follow this pattern
and the file should be added to SRCS directly.

Reviewed by:	emaste, imp, jhb
MFC after:	1 week
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D9841

r314558:
Garbage collect unused gdtoa related files on mips.

Reviewed by:	emase, imp, jhb
MFC after:	1 week
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D9841

16 files changed, 63 insertions, 40 deletions

diff --git a/lib/libc/aarch64/Makefile.inc b/lib/libc/aarch64/Makefile.inc
index 5f17200..f059154 100644
--- a/lib/libc/aarch64/Makefile.inc
+++ b/lib/libc/aarch64/Makefile.inc
@@ -5,5 +5,5 @@
 
 # Long double is quad precision
 GDTOASRCS+=strtorQ.c
-MDSRCS+=machdep_ldisQ.c
+SRCS+=machdep_ldisQ.c
 SYM_MAPS+=${LIBC_SRCTOP}/aarch64/Symbol.map
diff --git a/lib/libc/amd64/Makefile.inc b/lib/libc/amd64/Makefile.inc
index 95fddef..cd8f0f1 100644
--- a/lib/libc/amd64/Makefile.inc
+++ b/lib/libc/amd64/Makefile.inc
@@ -5,5 +5,5 @@
 
 # Long double is 80 bits
 GDTOASRCS+=strtorx.c
-MDSRCS+=machdep_ldisx.c
+SRCS+=machdep_ldisx.c
 SYM_MAPS+=${LIBC_SRCTOP}/amd64/Symbol.map
diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc
index 46571ab..425de40 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/Makefile.inc b/lib/libc/arm/Makefile.inc
index c263ae7..eaf361e 100644
--- a/lib/libc/arm/Makefile.inc
+++ b/lib/libc/arm/Makefile.inc
@@ -6,7 +6,7 @@
 SOFTFLOAT_BITS=32
 
 # Long double is just double precision.
-MDSRCS+=machdep_ldisd.c
+SRCS+=machdep_ldisd.c
 SYM_MAPS+=${LIBC_SRCTOP}/arm/Symbol.map
 
 .include "${LIBC_SRCTOP}/arm/aeabi/Makefile.inc"
diff --git a/lib/libc/arm/string/Makefile.inc b/lib/libc/arm/string/Makefile.inc
index 0ba43e6..cf3175e 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/Makefile.inc b/lib/libc/i386/Makefile.inc
index 627311c..4470cdb 100644
--- a/lib/libc/i386/Makefile.inc
+++ b/lib/libc/i386/Makefile.inc
@@ -2,5 +2,5 @@
 
 # Long double is 80 bits
 GDTOASRCS+=strtorx.c
-MDSRCS+=machdep_ldisx.c
+SRCS+=machdep_ldisx.c
 SYM_MAPS+=${LIBC_SRCTOP}/i386/Symbol.map
diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc
index f574c8f..17170ee 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/Makefile.inc b/lib/libc/mips/Makefile.inc
index 4ec20d4..4b18097 100644
--- a/lib/libc/mips/Makefile.inc
+++ b/lib/libc/mips/Makefile.inc
@@ -3,5 +3,5 @@
 
 CFLAGS+=-DSOFTFLOAT
 
-MDSRCS+= machdep_ldisd.c
+SRCS+= machdep_ldisd.c
 SYM_MAPS+= ${LIBC_SRCTOP}/mips/Symbol.map
diff --git a/lib/libc/mips/gdtoa/Makefile.inc b/lib/libc/mips/gdtoa/Makefile.inc
deleted file mode 100644
index dd6268c..0000000
--- a/lib/libc/mips/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-# $FreeBSD$
-
-SRCS+=	strtof.c
diff --git a/lib/libc/mips/gdtoa/arith.h b/lib/libc/mips/gdtoa/arith.h
deleted file mode 100644
index 8b700f8..0000000
--- a/lib/libc/mips/gdtoa/arith.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-/* $FreeBSD$ */
-
-#include <machine/endian.h>
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IEEE_BIG_ENDIAN
-#else
-#define IEEE_LITTLE_ENDIAN
-#endif
diff --git a/lib/libc/mips/string/Makefile.inc b/lib/libc/mips/string/Makefile.inc
index f37b9af..266446c 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/powerpc/Makefile.inc b/lib/libc/powerpc/Makefile.inc
index 42982671..afc403d 100644
--- a/lib/libc/powerpc/Makefile.inc
+++ b/lib/libc/powerpc/Makefile.inc
@@ -3,5 +3,5 @@
 SRCS+=	trivial-vdso_tc.c
 
 # Long double is 64-bits
-MDSRCS+=machdep_ldisd.c
+SRCS+=machdep_ldisd.c
 SYM_MAPS+=${LIBC_SRCTOP}/powerpc/Symbol.map
diff --git a/lib/libc/powerpc64/Makefile.inc b/lib/libc/powerpc64/Makefile.inc
index 8e9bcc5..a00ad71 100644
--- a/lib/libc/powerpc64/Makefile.inc
+++ b/lib/libc/powerpc64/Makefile.inc
@@ -3,5 +3,5 @@
 SRCS+=	trivial-vdso_tc.c
 
 # Long double is 64-bits
-MDSRCS+=machdep_ldisd.c
+SRCS+=machdep_ldisd.c
 SYM_MAPS+=${LIBC_SRCTOP}/powerpc64/Symbol.map
diff --git a/lib/libc/riscv/Makefile.inc b/lib/libc/riscv/Makefile.inc
index b221903..9df72b4 100644
--- a/lib/libc/riscv/Makefile.inc
+++ b/lib/libc/riscv/Makefile.inc
@@ -5,5 +5,5 @@
 
 # Long double is quad precision
 GDTOASRCS+=strtorQ.c
-MDSRCS+=machdep_ldisQ.c
+SRCS+=machdep_ldisQ.c
 SYM_MAPS+=${LIBC_SRCTOP}/riscv/Symbol.map
diff --git a/lib/libc/sparc64/Makefile.inc b/lib/libc/sparc64/Makefile.inc
index 74fb7cd..da507d2 100644
--- a/lib/libc/sparc64/Makefile.inc
+++ b/lib/libc/sparc64/Makefile.inc
@@ -9,5 +9,5 @@ SRCS+=	trivial-vdso_tc.c
 
 # Long double is quad precision
 GDTOASRCS+=strtorQ.c
-MDSRCS+=machdep_ldisQ.c
+SRCS+=machdep_ldisQ.c
 SYM_MAPS+=${LIBC_SRCTOP}/sparc64/Symbol.map
diff --git a/lib/libc/sparc64/string/Makefile.inc b/lib/libc/sparc64/string/Makefile.inc
deleted file mode 100644
index e8c0da7..0000000
--- a/lib/libc/sparc64/string/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $FreeBSD$