From owner-svn-src-head@freebsd.org Tue Dec 5 17:23:34 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 76911E71C16; Tue, 5 Dec 2017 17:23:34 +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 mx1.freebsd.org (Postfix) with ESMTPS id 4353F642DF; Tue, 5 Dec 2017 17:23:34 +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 vB5HNXQO014634; Tue, 5 Dec 2017 17:23:33 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB5HNXwb014633; Tue, 5 Dec 2017 17:23:33 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201712051723.vB5HNXwb014633@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 5 Dec 2017 17:23:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326569 - head/sys/modules/vmm X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/sys/modules/vmm X-SVN-Commit-Revision: 326569 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.25 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: Tue, 05 Dec 2017 17:23:34 -0000 Author: bdrewery Date: Tue Dec 5 17:23:33 2017 New Revision: 326569 URL: https://svnweb.freebsd.org/changeset/base/326569 Log: Fix cyclic dependency after r326552. The OBJS_DEPEND_GUESS mechanism was making vmx_genassym.o depend on all headers along with vmx_assym.h, though vmx_assym.h depends on having vmx_genassym.o present to generate. Moving the headers to DPSRCS is enough to resolve the issue as they will no longer be implicit dependencies for all objects. Because of this we need explicit OBJS_DEPEND_GUESS entries to ensure the headers are generated when needed for the *_support.o files that need them. X-MFC-With: r326552 MFC after: 2 weeks Sponsored by: Dell EMC Modified: head/sys/modules/vmm/Makefile Modified: head/sys/modules/vmm/Makefile ============================================================================== --- head/sys/modules/vmm/Makefile Tue Dec 5 14:46:12 2017 (r326568) +++ head/sys/modules/vmm/Makefile Tue Dec 5 17:23:33 2017 (r326569) @@ -3,8 +3,8 @@ KMOD= vmm SRCS= opt_acpi.h opt_ddb.h device_if.h bus_if.h pci_if.h pcib_if.h acpi_if.h -SRCS+= vmx_assym.h svm_assym.h -DPSRCS= vmx_genassym.c svm_genassym.c +DPSRCS+= vmx_assym.h svm_assym.h +DPSRCS+= vmx_genassym.c svm_genassym.c CFLAGS+= -DVMM_KEEP_STATS -DSMP CFLAGS+= -I${SRCTOP}/sys/amd64/vmm @@ -56,6 +56,9 @@ SRCS+= vmcb.c \ svm_msr.c CLEANFILES= vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o + +OBJS_DEPEND_GUESS.vmx_support.o+= vmx_assym.h +OBJS_DEPEND_GUESS.svm_support.o+= svm_assym.h vmx_assym.h: vmx_genassym.o sh ${SYSDIR}/kern/genassym.sh vmx_genassym.o > ${.TARGET}