From owner-svn-src-stable-12@freebsd.org Thu Sep 5 20:31:27 2019 Return-Path: Delivered-To: svn-src-stable-12@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 01575D2BC3; Thu, 5 Sep 2019 20:31:27 +0000 (UTC) (envelope-from bdrewery@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 46PXQk5nkQz4L5R; Thu, 5 Sep 2019 20:31:26 +0000 (UTC) (envelope-from bdrewery@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 AAFC49C9D; Thu, 5 Sep 2019 20:31:26 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x85KVQDC035758; Thu, 5 Sep 2019 20:31:26 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x85KVQo0035755; Thu, 5 Sep 2019 20:31:26 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201909052031.x85KVQo0035755@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 5 Sep 2019 20:31:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r351892 - in stable/12/sys: conf modules/efirt X-SVN-Group: stable-12 X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in stable/12/sys: conf modules/efirt X-SVN-Commit-Revision: 351892 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Sep 2019 20:31:27 -0000 Author: bdrewery Date: Thu Sep 5 20:31:25 2019 New Revision: 351892 URL: https://svnweb.freebsd.org/changeset/base/351892 Log: MFC r347458,r348975,r348976: r347458: Fix build race with machine links and genoffset.o. r348975: Restore genassym.o to CLEANFILES. r348976: Add missing DPSRCS entry for assym.inc. Modified: stable/12/sys/conf/kern.post.mk stable/12/sys/conf/kmod.mk stable/12/sys/modules/efirt/Makefile Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/conf/kern.post.mk ============================================================================== --- stable/12/sys/conf/kern.post.mk Thu Sep 5 20:27:44 2019 (r351891) +++ stable/12/sys/conf/kern.post.mk Thu Sep 5 20:31:25 2019 (r351892) @@ -329,7 +329,7 @@ _ILINKS+= x86 # Ensure that debug info references the path in the source tree. .for _link in ${_ILINKS} .if !exists(${.OBJDIR}/${_link}) -${SRCS} ${CLEAN:M*.o}: ${_link} +${SRCS} ${DEPENDOBJS}: ${_link} .endif .if defined(_MAP_DEBUG_PREFIX) .if ${_link} == "machine" Modified: stable/12/sys/conf/kmod.mk ============================================================================== --- stable/12/sys/conf/kmod.mk Thu Sep 5 20:27:44 2019 (r351891) +++ stable/12/sys/conf/kmod.mk Thu Sep 5 20:31:25 2019 (r351892) @@ -476,7 +476,7 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk ${SYS .endif .if !empty(SRCS:Massym.inc) || !empty(DPSRCS:Massym.inc) -CLEANFILES+= assym.inc +CLEANFILES+= assym.inc genassym.o DEPENDOBJS+= genassym.o DPSRCS+= offset.inc .endif Modified: stable/12/sys/modules/efirt/Makefile ============================================================================== --- stable/12/sys/modules/efirt/Makefile Thu Sep 5 20:27:44 2019 (r351891) +++ stable/12/sys/modules/efirt/Makefile Thu Sep 5 20:31:25 2019 (r351892) @@ -11,6 +11,7 @@ SRCS+= device_if.h bus_if.h clock_if.h .if ${MACHINE_CPUARCH} == "amd64" SRCS+= opt_hwpmc_hooks.h opt_kstack_pages.h SRCS+= efirt_support.S +DPSRCS+= assym.inc efirt_support.o: efirt_support.S assym.inc ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET}