From nobody Wed Aug 21 10:19:34 2024 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 4Wpj4Q5ww2z5Tckf; Wed, 21 Aug 2024 10:19:34 +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 4Wpj4Q5R9hz4kHb; Wed, 21 Aug 2024 10:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724235574; 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=Ix+cG+D2r58uIpgD06F+CIn0AQlOwd7cNkEISQFwdSI=; b=cuFQVzSSkfBjV6ZoUCaaGOq5QBaUAlV9p/+GJGkJGWRl8TMfTblLzV8nO34rorey09DoTq 96YTXVoY+B4WObqwbhuS4OgSeIxh0EyFl7sK0N4tyOm0Gj1FQ5bOWvDc3lxnmUYKvw0zks VQCBq4gGpn0x4KIsz06yTOy0aj+1gudiAYDAmtNazuA0LfAhHQmjNU4d0JIVgOkEu7QpQe +xBoIZEzPX5LP10lyAJqiSmpMyKuEsO/2dN47/NP6DRzystdjAEeL9ldJCJ7Y+uwcs1ESA pawBzJ/dy8oIpdH2jILpdUoiXYFnlPzcKF5BV8wI9kzm6OYdbsrdlestxIY42w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724235574; a=rsa-sha256; cv=none; b=ug5+BVwHkE1PIMkI6IATtYwIN9mu4FsnVReEWvQvEjCnzXK4V/aimmHHCwykdsjlJN4TyK 5hcqOUFBgmMnsaNXEekccHXbotGUZmdd50WOccGqQ3uxQXLNuNOai0Lebt8CG8Jz11oASZ FmN7Vio5zmxPhJYZFb2W77e1FdetKlaIswg6Sob+th0sDdpl/yrZfra0lj8gqC5QMEmbbx L80+MIjiZTlzlUCKSKWePM1ZA38TjtyK0h+pJRs3E+vLQprewoiLPpW5xmWpVHSaribOeS 8DCgBiKE9VSxvuiYs+guRuaC2jFqxDEiqRKyjl3kafWjc+oF6gEgyVFOymd+vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724235574; 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=Ix+cG+D2r58uIpgD06F+CIn0AQlOwd7cNkEISQFwdSI=; b=vJ8SdFAIPTRInPAUCPYDuSGjEkMtSMoZpOmxP5gzl5Wavd6n4383HokfG+rnIOlZt3mt/+ oIDMlbn6MQVcwKw/yzSJnU0ghXY6iDA+86hhV9Qe10RZPtIH9t2l2k9BuwUwnTZ/2d84tJ DS9Hydw/1+QtGJ3szSASLDfwaSLOpOo87uMX08PMgqWBIDf+YvXwIWCmAiuj/ebYMPA1Xh 7Gt2Syp1MXslEGjqUlF0+tFRtuLlFOyLqLiaHF31gKL2pSVQJFaentNLwGiV0BH5tgz1aO y3TW9TgaQ+gKFZqh759qTCZz+6YwWQ6SstjQ14tCA5mz85EhYYhwBGrKHuZ+QA== 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 4Wpj4Q4hhFzgHg; Wed, 21 Aug 2024 10:19:34 +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 47LAJYed044202; Wed, 21 Aug 2024 10:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47LAJYn5044199; Wed, 21 Aug 2024 10:19:34 GMT (envelope-from git) Date: Wed, 21 Aug 2024 10:19:34 GMT Message-Id: <202408211019.47LAJYn5044199@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: 78d69d0a3c7f - main - arm64: Fix the kernel with options VMM 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: 78d69d0a3c7f17944a7ecb84509fca6d0aa8545e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=78d69d0a3c7f17944a7ecb84509fca6d0aa8545e commit 78d69d0a3c7f17944a7ecb84509fca6d0aa8545e Author: Andrew Turner AuthorDate: 2024-08-21 09:06:57 +0000 Commit: Andrew Turner CommitDate: 2024-08-21 10:16:10 +0000 arm64: Fix the kernel with options VMM * We can build the non-VHE code with branch protection, it is already build as such in the module. * Use the correct file name for the non-VHE exception .o file. --- sys/conf/files.arm64 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index b105ce873d24..1c863ff98998 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -125,13 +125,13 @@ arm64/vmm/vmm_reset.c optional vmm arm64/vmm/vmm_handlers.c optional vmm arm64/vmm/vmm_call.S optional vmm arm64/vmm/vmm_nvhe_exception.S optional vmm \ - compile-with "${NOSAN_C:N-mbranch-protection*} -fpie" \ + compile-with "${NOSAN_C} -fpie" \ no-obj arm64/vmm/vmm_nvhe.c optional vmm \ - compile-with "${NOSAN_C:N-mbranch-protection*} -fpie" \ + compile-with "${NOSAN_C} -fpie" \ no-obj vmm_hyp_blob.elf.full optional vmm \ - dependency "vmm_nvhe.o vmm_hyp_exception.o" \ + dependency "vmm_nvhe.o vmm_nvhe_exception.o" \ compile-with "${SYSTEM_LD_BASECMD} -o ${.TARGET} ${.ALLSRC} --defsym=_start='0x0' --defsym=text_start='0x0'" \ no-obj no-implicit-rule vmm_hyp_blob.elf optional vmm \