From owner-svn-src-head@freebsd.org Fri Jan 10 18:24:19 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C11041EE993; Fri, 10 Jan 2020 18:24:19 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47vWbR4jqyz3PpJ; Fri, 10 Jan 2020 18:24:19 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D0151E25C; Fri, 10 Jan 2020 18:24:19 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00AIOJCN052269; Fri, 10 Jan 2020 18:24:19 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00AIOHBZ052259; Fri, 10 Jan 2020 18:24:17 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202001101824.00AIOHBZ052259@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 10 Jan 2020 18:24:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356604 - in head/sys: amd64/linux amd64/linux32 arm/linux arm64/linux compat/cloudabi32 compat/cloudabi64 compat/freebsd32 i386/linux kern X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/sys: amd64/linux amd64/linux32 arm/linux arm64/linux compat/cloudabi32 compat/cloudabi64 compat/freebsd32 i386/linux kern X-SVN-Commit-Revision: 356604 X-SVN-Commit-Repository: base 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.29 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, 10 Jan 2020 18:24:19 -0000 Author: kevans Date: Fri Jan 10 18:24:17 2020 New Revision: 356604 URL: https://svnweb.freebsd.org/changeset/base/356604 Log: Set .ORDER for makesyscalls generated files When either makesyscalls.lua or syscalls.master changes, all of the ${GENERATED} targets are now out-of-date. With make jobs > 1, this means we will run the makesyscalls script in parallel for the same ABI, generating the same set of output files. Prior to r356603 , there is a large window for interlacing output for some of the generated files that we were generating in-place rather than staging in a temp dir. After that, we still should't need to run the script more than once per-ABI as the first invocation should update all of them. Add .ORDER to do so cleanly. Reviewed by: brooks Discussed with: sjg Differential Revision: https://reviews.freebsd.org/D23099 Modified: head/sys/amd64/linux/Makefile head/sys/amd64/linux32/Makefile head/sys/arm/linux/Makefile head/sys/arm64/linux/Makefile head/sys/compat/cloudabi32/Makefile head/sys/compat/cloudabi64/Makefile head/sys/compat/freebsd32/Makefile head/sys/i386/linux/Makefile head/sys/kern/Makefile Modified: head/sys/amd64/linux/Makefile ============================================================================== --- head/sys/amd64/linux/Makefile Fri Jan 10 18:22:14 2020 (r356603) +++ head/sys/amd64/linux/Makefile Fri Jan 10 18:24:17 2020 (r356604) @@ -19,6 +19,9 @@ GENERATED= linux_proto.h \ all: @echo "make sysent only" +# We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than +# potentially once for each ${GENERATED} file. +.ORDER: ${GENERATED} sysent: ${GENERATED} ${GENERATED}: ${MAKESYSCALLS} ${SRCS} Modified: head/sys/amd64/linux32/Makefile ============================================================================== --- head/sys/amd64/linux32/Makefile Fri Jan 10 18:22:14 2020 (r356603) +++ head/sys/amd64/linux32/Makefile Fri Jan 10 18:24:17 2020 (r356604) @@ -19,6 +19,9 @@ GENERATED= linux32_proto.h \ all: @echo "make sysent only" +# We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than +# potentially once for each ${GENERATED} file. +.ORDER: ${GENERATED} sysent: ${GENERATED} ${GENERATED}: ${MAKESYSCALLS} ${SRCS} Modified: head/sys/arm/linux/Makefile ============================================================================== --- head/sys/arm/linux/Makefile Fri Jan 10 18:22:14 2020 (r356603) +++ head/sys/arm/linux/Makefile Fri Jan 10 18:24:17 2020 (r356604) @@ -19,6 +19,9 @@ GENERATED= linux_proto.h \ all: @echo "make sysent only" +# We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than +# potentially once for each ${GENERATED} file. +.ORDER: ${GENERATED} sysent: ${GENERATED} ${GENERATED}: ${MAKESYSCALLS} ${SRCS} Modified: head/sys/arm64/linux/Makefile ============================================================================== --- head/sys/arm64/linux/Makefile Fri Jan 10 18:22:14 2020 (r356603) +++ head/sys/arm64/linux/Makefile Fri Jan 10 18:24:17 2020 (r356604) @@ -19,6 +19,9 @@ GENERATED= linux_proto.h \ all: @echo "make sysent only" +# We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than +# potentially once for each ${GENERATED} file. +.ORDER: ${GENERATED} sysent: ${GENERATED} ${GENERATED}: ${MAKESYSCALLS} ${SRCS} Modified: head/sys/compat/cloudabi32/Makefile ============================================================================== --- head/sys/compat/cloudabi32/Makefile Fri Jan 10 18:22:14 2020 (r356603) +++ head/sys/compat/cloudabi32/Makefile Fri Jan 10 18:24:17 2020 (r356604) @@ -17,6 +17,9 @@ GENERATED= cloudabi32_proto.h \ all: @echo "make sysent only" +# We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than +# potentially once for each ${GENERATED} file. +.ORDER: ${GENERATED} sysent: ${GENERATED} ${GENERATED}: ${MAKESYSCALLS} ${SRCS} Modified: head/sys/compat/cloudabi64/Makefile ============================================================================== --- head/sys/compat/cloudabi64/Makefile Fri Jan 10 18:22:14 2020 (r356603) +++ head/sys/compat/cloudabi64/Makefile Fri Jan 10 18:24:17 2020 (r356604) @@ -17,6 +17,9 @@ GENERATED= cloudabi64_proto.h \ all: @echo "make sysent only" +# We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than +# potentially once for each ${GENERATED} file. +.ORDER: ${GENERATED} sysent: ${GENERATED} ${GENERATED}: ${MAKESYSCALLS} ${SRCS} Modified: head/sys/compat/freebsd32/Makefile ============================================================================== --- head/sys/compat/freebsd32/Makefile Fri Jan 10 18:22:14 2020 (r356603) +++ head/sys/compat/freebsd32/Makefile Fri Jan 10 18:24:17 2020 (r356604) @@ -20,6 +20,9 @@ GENERATED= freebsd32_proto.h \ all: @echo "make sysent only" +# We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than +# potentially once for each ${GENERATED} file. +.ORDER: ${GENERATED} sysent: ${GENERATED} ${GENERATED}: ${MAKESYSCALLS} ${SRCS} Modified: head/sys/i386/linux/Makefile ============================================================================== --- head/sys/i386/linux/Makefile Fri Jan 10 18:22:14 2020 (r356603) +++ head/sys/i386/linux/Makefile Fri Jan 10 18:24:17 2020 (r356604) @@ -19,6 +19,9 @@ GENERATED= linux_proto.h \ all: @echo "make sysent only" +# We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than +# potentially once for each ${GENERATED} file. +.ORDER: ${GENERATED} sysent: ${GENERATED} ${GENERATED}: ${MAKESYSCALLS} ${SRCS} Modified: head/sys/kern/Makefile ============================================================================== --- head/sys/kern/Makefile Fri Jan 10 18:22:14 2020 (r356603) +++ head/sys/kern/Makefile Fri Jan 10 18:24:17 2020 (r356604) @@ -21,6 +21,9 @@ GENERATED= init_sysent.c \ all: @echo "make sysent only" +# We .ORDER these explicitly so that we only run MAKESYSCALLS once, rather than +# potentially once for each ${GENERATED} file. +.ORDER: ${GENERATED} sysent: ${GENERATED} ${GENERATED}: ${MAKESYSCALLS} ${SRCS}