Author: brooks Date: Thu Mar 2 17:05:52 2017 New Revision: 314556 URL: https://svnweb.freebsd.org/changeset/base/314556
Log: 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 Deleted: head/lib/libc/sparc64/string/ Modified: head/lib/libc/aarch64/string/Makefile.inc head/lib/libc/amd64/string/Makefile.inc head/lib/libc/arm/string/Makefile.inc head/lib/libc/i386/string/Makefile.inc head/lib/libc/mips/string/Makefile.inc Modified: head/lib/libc/aarch64/string/Makefile.inc ============================================================================== --- head/lib/libc/aarch64/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/aarch64/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -6,7 +6,8 @@ .PATH: ${SRCTOP}/contrib/cortex-strings/src/aarch64 -MDSRCS+=memchr.S \ +MDSRCS+= \ + memchr.S \ memcmp.S \ memcpy.S \ memmove.S \ Modified: head/lib/libc/amd64/string/Makefile.inc ============================================================================== --- head/lib/libc/amd64/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/amd64/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -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 Modified: head/lib/libc/arm/string/Makefile.inc ============================================================================== --- head/lib/libc/arm/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/arm/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -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 Modified: head/lib/libc/i386/string/Makefile.inc ============================================================================== --- head/lib/libc/i386/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/i386/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -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 Modified: head/lib/libc/mips/string/Makefile.inc ============================================================================== --- head/lib/libc/mips/string/Makefile.inc Thu Mar 2 16:14:15 2017 (r314555) +++ head/lib/libc/mips/string/Makefile.inc Thu Mar 2 17:05:52 2017 (r314556) @@ -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 _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
