From nobody Fri Jan 24 16:22:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yfjkc6jjKz5lcG8; Fri, 24 Jan 2025 16:22:00 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yfjkc5yN3z4F4C; Fri, 24 Jan 2025 16:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737735720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eYYJWDkAMFLGGuih2vv35w63nkMv/vaSeRSNC8zfXxc=; b=opVxil5aKKFJRpiwH2RZ7iz+p/vII3jsCS64PLZb+tX2ca28cppaWdX8Z9QDncluM3m+yr GKhwGBGozQEpmntZqJMceSj/Bz+GtmRp9SPxafaanezKC4AE7bwW1yVegDMJ6L5FyoTQJl 5wkoor8p7qPZOgfwJdRbo0DKXghlLLtnH4McGWQqxlwqFgZVKc69VGSvmSck+ul8aYP/JP SQy+Ww34aCaN0SIaJploODE2EMpd7/uc3s3bZ7w5gcQTAF2SaSH4hfGiSJrEqWdhlcEVUe 4jFGMfTJagWJW1MEKdOMO9Qo3usxSqiQVr4QdGhEjX1JwIR684WZBq3jiDVZXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737735720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eYYJWDkAMFLGGuih2vv35w63nkMv/vaSeRSNC8zfXxc=; b=D3sLzZ2cKdTsMitMGBFS4aukMjVJmQUuRGdM3Oup+1WgC5/C/2+R6j9ShVZKfQV0nLU0oY R3G9aKdr7zjtHITjgbk5opVCCBlyztUnWnOE/unJJDu2fA2bcZbxPy1OXEKw/iqYX9aP3G dRiXk0mOxVbRiHQj3y3cdh1mtBNJDJxF4M56RJXH5u/YTrrLmJV1e9FB6Zxc0c2Gaf+AMw vlq9+p4vU6iQyo2ve/AT9jLbb3oFgH8e1T4xhJ6WZDc192/yALfCLsPxWCt2Cz+1vr3fsm TFV66b5aK5xi1weVMYDjq+TQO+GAAUtj8FlQU0lr9nvraXi3VfUcDPzYZmMrbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737735720; a=rsa-sha256; cv=none; b=O89fjqc2oCNI6llHfGsEuDNiaEDbyVQfRvEf2wKss0a3mcwBNWIWZ2GsPaGfueRlt56MOu I4A6CQFi4aX9KD4dDs6kR5A7ayMlgEapfH16sfG+6Pw2URtjvTq7vRG3SjJCkL22MHoItW WjwBHYH38OxXYIbxzPtpHJPFuV+v/2PjJgGtyrq7sQg9ynklrJiHIsqcZy4fgRiIyB2Jab mrQxaZM2pspgfMwCXNmZc7g+JSLt03quNwoH+Cwp4vQxYyeDyDhRqmHVeZKePqvcv4vyPj 3nzVULCR+xrZcGhHNZLkkL45XJHyaNznJGeAXfBp9YbaPMNg+pbUhpfmCcD3RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yfjkc5SWWzYqx; Fri, 24 Jan 2025 16:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50OGM0Kn011979; Fri, 24 Jan 2025 16:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50OGM0FA011976; Fri, 24 Jan 2025 16:22:00 GMT (envelope-from git) Date: Fri, 24 Jan 2025 16:22:00 GMT Message-Id: <202501241622.50OGM0FA011976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c6170b00f44e - main - vmm: Depend on vmm_hyp* files as needed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6170b00f44e97f054a3e318744729d05d5360f9 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c6170b00f44e97f054a3e318744729d05d5360f9 commit c6170b00f44e97f054a3e318744729d05d5360f9 Author: Andrew Turner AuthorDate: 2025-01-24 16:09:03 +0000 Commit: Andrew Turner CommitDate: 2025-01-24 16:21:06 +0000 vmm: Depend on vmm_hyp* files as needed The arm64 vmm_nvhe* files depend on a vmm_hyp file to provide most of the implementation. As these are built with custom rules the normal generated dependency information is not used, even if generated. Add a dependency between these two sets of files to ensure when the implementation is updated the file will be rebuilt. Sponsored by: Arm Ltd --- sys/modules/vmm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 7c34dd92939b..c990852ae441 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -45,11 +45,11 @@ CLEANFILES+= vmm_nvhe_exception.o vmm_nvhe.o CLEANFILES+= vmm_hyp_blob.elf.full CLEANFILES+= vmm_hyp_blob.elf vmm_hyp_blob.bin -vmm_nvhe_exception.o: vmm_nvhe_exception.S +vmm_nvhe_exception.o: vmm_nvhe_exception.S vmm_hyp_exception.S ${CC} -c -x assembler-with-cpp -DLOCORE \ ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} -o ${.TARGET} -fpie -vmm_nvhe.o: vmm_nvhe.c +vmm_nvhe.o: vmm_nvhe.c vmm_hyp.c ${CC} -c ${NOSAN_CFLAGS:N-mbranch-protection*} ${.IMPSRC} \ -o ${.TARGET} -fpie