aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2018-10-22 18:40:21 +0000
committerEd Maste <emaste@FreeBSD.org>2018-10-22 18:40:21 +0000
commit730a7ce9d6d1aaf84a0a95291f06bd523abce759 (patch)
tree99c8dc9ba192572d6760639d408a599e47d6371a
parent0f743729abbfc5c9d78a713f72241a4d4bd601ec (diff)
downloadsrc-730a7ce9d6d1aaf84a0a95291f06bd523abce759.tar.gz
src-730a7ce9d6d1aaf84a0a95291f06bd523abce759.zip
Makefile.inc1: clean up stale dependency hacks
Our dependency tracking cannot directly cope with certain source tree changes, particularly with respect to removing or moving source files or replacing generated files. We have a collection of ad-hoc workarounds to handle these cases. As there is a (small) build-time cost inherent in these workarounds, we do not want to keep them indefinitely. Thus, remove workarounds from 2017. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=339607
-rw-r--r--Makefile.inc124
1 files changed, 1 insertions, 23 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index bbbf7e46300d..6f21ef9f634c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -903,14 +903,13 @@ _sanity_check: .PHONY .MAKE
_cleanobj_fast_depend_hack: .PHONY
# Syscall stubs rewritten in C and obsolete MD assembly implementations
# Date SVN Rev Syscalls
-# 20170624 r320278 fstat fstatat fstatfs getdirentries getfsstat statfs
# 20180404 r332048 sigreturn
# 20180405 r332080 shmat
# 20180406 r332119 setlogin
# 20180411 r332443 exect
# 20180525 r334224 vadvise
# 20180604 r334626 brk sbrk
-.for f in brk exect fstat fstatat fstatfs getdirentries getfsstat sbrk setlogin shmat sigreturn statfs vadvise
+.for f in brk exect sbrk setlogin shmat sigreturn vadvise
@if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \
egrep -qw '${f}\.[sS]' ${OBJTOP}/lib/libc/.depend.${f}.o; then \
echo "Removing stale dependencies for ${f} syscall wrappers"; \
@@ -918,27 +917,6 @@ _cleanobj_fast_depend_hack: .PHONY
${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
fi
.endfor
-# 20170607 remove stale dependencies for utimens* wrappers removed in r319663
-.for f in futimens utimensat
- @if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \
- egrep -q '/${f}.c' ${OBJTOP}/lib/libc/.depend.${f}.o; then \
- echo "Removing stale dependencies for ${f} syscall wrappers"; \
- rm -f ${OBJTOP}/lib/libc/.depend.${f}.* \
- ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
- fi
-.endfor
-# 20170523 remove stale generated asm files for functions which are no longer
-# syscalls after r302092 (pipe) and r318736 (others)
-.for f in getdents lstat mknod pipe stat
- @if [ -e "${OBJTOP}/lib/libc/${f}.s" ] || \
- [ -e "${OBJTOP}/lib/libc/${f}.S" ] ; then \
- echo "Removing stale generated ${f} syscall files"; \
- rm -f ${OBJTOP}/lib/libc/${f}.* \
- ${OBJTOP}/lib/libc/.depend.${f}.* \
- ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/${f}.*} \
- ${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
- fi
-.endfor
# 20181013 r339348 bcopy reimplemented as .c
.for f in bcopy memcpy memmove
@if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \