Date: Sat, 11 Mar 2017 02:51:29 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r315044 - in stable/11/lib/libc: aarch64 amd64 amd64/string arm arm/string i386 i386/string mips mips/gdtoa mips/string powerpc powerpc64 riscv sparc64 sparc64/string Message-ID: <201703110251.v2B2pTFC092177@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Sat Mar 11 02:51:29 2017 New Revision: 315044 URL: https://svnweb.freebsd.org/changeset/base/315044 Log: 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 Deleted: stable/11/lib/libc/mips/gdtoa/ stable/11/lib/libc/sparc64/string/ Modified: stable/11/lib/libc/aarch64/Makefile.inc stable/11/lib/libc/amd64/Makefile.inc stable/11/lib/libc/amd64/string/Makefile.inc stable/11/lib/libc/arm/Makefile.inc stable/11/lib/libc/arm/string/Makefile.inc stable/11/lib/libc/i386/Makefile.inc stable/11/lib/libc/i386/string/Makefile.inc stable/11/lib/libc/mips/Makefile.inc stable/11/lib/libc/mips/string/Makefile.inc stable/11/lib/libc/powerpc/Makefile.inc stable/11/lib/libc/powerpc64/Makefile.inc stable/11/lib/libc/riscv/Makefile.inc stable/11/lib/libc/sparc64/Makefile.inc Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/aarch64/Makefile.inc ============================================================================== --- stable/11/lib/libc/aarch64/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/aarch64/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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 Modified: stable/11/lib/libc/amd64/Makefile.inc ============================================================================== --- stable/11/lib/libc/amd64/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/amd64/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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 Modified: stable/11/lib/libc/amd64/string/Makefile.inc ============================================================================== --- stable/11/lib/libc/amd64/string/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/amd64/string/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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: stable/11/lib/libc/arm/Makefile.inc ============================================================================== --- stable/11/lib/libc/arm/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/arm/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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" Modified: stable/11/lib/libc/arm/string/Makefile.inc ============================================================================== --- stable/11/lib/libc/arm/string/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/arm/string/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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: stable/11/lib/libc/i386/Makefile.inc ============================================================================== --- stable/11/lib/libc/i386/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/i386/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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 Modified: stable/11/lib/libc/i386/string/Makefile.inc ============================================================================== --- stable/11/lib/libc/i386/string/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/i386/string/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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: stable/11/lib/libc/mips/Makefile.inc ============================================================================== --- stable/11/lib/libc/mips/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/mips/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -3,5 +3,5 @@ CFLAGS+=-DSOFTFLOAT -MDSRCS+= machdep_ldisd.c +SRCS+= machdep_ldisd.c SYM_MAPS+= ${LIBC_SRCTOP}/mips/Symbol.map Modified: stable/11/lib/libc/mips/string/Makefile.inc ============================================================================== --- stable/11/lib/libc/mips/string/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/mips/string/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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 Modified: stable/11/lib/libc/powerpc/Makefile.inc ============================================================================== --- stable/11/lib/libc/powerpc/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/powerpc/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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 Modified: stable/11/lib/libc/powerpc64/Makefile.inc ============================================================================== --- stable/11/lib/libc/powerpc64/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/powerpc64/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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 Modified: stable/11/lib/libc/riscv/Makefile.inc ============================================================================== --- stable/11/lib/libc/riscv/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/riscv/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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 Modified: stable/11/lib/libc/sparc64/Makefile.inc ============================================================================== --- stable/11/lib/libc/sparc64/Makefile.inc Sat Mar 11 02:20:11 2017 (r315043) +++ stable/11/lib/libc/sparc64/Makefile.inc Sat Mar 11 02:51:29 2017 (r315044) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703110251.v2B2pTFC092177>