diff options
author | brooks <brooks@FreeBSD.org> | 2017-03-11 02:51:29 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2017-03-11 02:51:29 +0000 |
commit | e0bd5e4b48a6d7bdcdb5e67c9695ebb4c8c71e24 (patch) | |
tree | 4dfe8e03b65b220d1a15ab66fab318160065c16b /lib/libc/i386 | |
parent | 17c454443d97bebf21610d9d5954865c8be28408 (diff) | |
download | FreeBSD-src-e0bd5e4b48a6d7bdcdb5e67c9695ebb4c8c71e24.zip FreeBSD-src-e0bd5e4b48a6d7bdcdb5e67c9695ebb4c8c71e24.tar.gz |
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
Diffstat (limited to 'lib/libc/i386')
-rw-r--r-- | lib/libc/i386/Makefile.inc | 2 | ||||
-rw-r--r-- | lib/libc/i386/string/Makefile.inc | 25 |
2 files changed, 22 insertions, 5 deletions
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 |