From owner-svn-src-head@freebsd.org Fri May 26 00:51:06 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F253D82595; Fri, 26 May 2017 00:51:06 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 311B31B44; Fri, 26 May 2017 00:51:06 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4Q0p5uR013301; Fri, 26 May 2017 00:51:05 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4Q0p5XM013300; Fri, 26 May 2017 00:51:05 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201705260051.v4Q0p5XM013300@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Fri, 26 May 2017 00:51:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r318912 - head X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 May 2017 00:51:06 -0000 Author: emaste Date: Fri May 26 00:51:05 2017 New Revision: 318912 URL: https://svnweb.freebsd.org/changeset/base/318912 Log: libc: rm stale generated files which are no longer syscalls This is an attempt to help -DNO_CLEAN builds after r302092 (which removed the pipe libc syscall wrapper) and r318736 (which removed getdents, lstat, mknod, and stat). Dependencies cannot cope with certain source tree changes, particularly with respect to removing source files and replacing generated files. Handle these cases from _worldtmp in an ad-hoc fashion. Reviewed by: bdrewery, cem Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D10876 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri May 26 00:48:21 2017 (r318911) +++ head/Makefile.inc1 Fri May 26 00:51:05 2017 (r318912) @@ -707,6 +707,21 @@ _worldtmp: .PHONY .else rm -rf ${WORLDTMP}/legacy/usr/include .endif +# Dependencies cannot cope with certain source tree changes, particularly +# with respect to removing source files and replacing generated files. +# Handle these cases here in an ad-hoc fashion. +# 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 exists(${OBJTREE}${.CURDIR}/lib/libc/${f}.s) || \ + exists(${OBJTREE}${.CURDIR}/lib/libc/${f}.S) + @echo Removing stale generated ${f} syscall files + @rm -f ${OBJTREE}${.CURDIR}/lib/libc/${f}.* \ + ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \ + ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/${f}.* \ + ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.* +.endif +.endfor .for _dir in \ lib lib/casper usr legacy/bin legacy/usr mkdir -p ${WORLDTMP}/${_dir}