From owner-svn-src-head@freebsd.org  Fri May 26 16:03:30 2017
Return-Path: <owner-svn-src-head@freebsd.org>
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 216B4D83D80;
 Fri, 26 May 2017 16:03:30 +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 E2501121E;
 Fri, 26 May 2017 16:03:29 +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 v4QG3SZr092577;
 Fri, 26 May 2017 16:03:28 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4QG3SH0092576;
 Fri, 26 May 2017 16:03:28 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201705261603.v4QG3SH0092576@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 26 May 2017 16:03:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318957 - 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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 May 2017 16:03:30 -0000

Author: emaste
Date: Fri May 26 16:03:28 2017
New Revision: 318957
URL: https://svnweb.freebsd.org/changeset/base/318957

Log:
  rm stale ptrace dependencies after r305012
  
  This is similar to r318912, except that ptrace.[sS] was previously a
  file in the source tree, not a generated assembly wrapper.
  
  Check for the existence of ptrace.[sS] in the .depend file to determine
  if we have to clean it up.  This is a bit hackish and will not be left
  in place indefinitely, but provides a useful example case when
  investigating a better solution in bmake.
  
  Reviewed by:	bdrewery
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D10930

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri May 26 15:57:54 2017	(r318956)
+++ head/Makefile.inc1	Fri May 26 16:03:28 2017	(r318957)
@@ -710,6 +710,18 @@ _worldtmp: .PHONY
 # 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.
+# 20160829 remove stale dependencies for ptrace stub, rewritten in C
+# in r305012
+.for f in ptrace
+.if exists(${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o)
+	@if egrep -q '/${f}.[sS]' \
+	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \
+		echo Removing stale dependencies for ${f} syscall wrappers; \
+		rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
+		   ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*; \
+	fi
+.endif
+.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