From nobody Thu Aug 01 05:49:29 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 4WZJ2137CHz5S9TS; Thu, 01 Aug 2024 05:49:29 +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 4WZJ212Zygz4NN4; Thu, 1 Aug 2024 05:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722491369; 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=zzjPJSi2lZ4ED0il0YQrSLN4e5gnuFfC52yO1w71tYQ=; b=x+ZNKE25LycQuHvd9xj7x/v/d1kmdWJNcFKs1APLfAeKNUXSCI1SRHklQrR6cSOBzSZswX sQ5DT9MitVlegiCaAq2RVNIeKOUZrFBec4zSIyxxItv0Qf9LTu6g60DvqvaREOrPFwvXh2 J9WwYvycEM2yyQLO8Cbq/NK54MxtORPotQ5zRu9tPCsgxPRehxMaxLq2ldFRoqXYd/xqFo c5eCehg2yhJ9bSFo5BudTC8W+UjiK6WKVa70ZuXdFuLiYORgWY4mFp4CJMgBFKbq1qDAfz BwyFugWj2O8NDLSZlR9Svbva/fOUYf5RIdEu5K4Q0sINsMgrho7v3sLNcBsgSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722491369; a=rsa-sha256; cv=none; b=nShJOkAuSe7x4a2L0qhA5YKuiSN1Mv1hQ4pQEtBlQupv1wcvYfKd6RKmeVmUXDxhIk8R35 xOxaVpdMq56v6C+mUwWfSjwwt8fjVhcNMIX/h7zPkZa0iAbJVs9R1cYuJojiG8ztojMrzm DqWW3qLH8uaGCC+mdJelbCwSjyMo3Ft4NB9puwFqa0K8C/2oTYqab74Nyp86YcuM6f8Qul muSts1biDAo81nRbsA8WaZS3DOwFHgxvYM+6+pjS1VQK8kwHi6V8I5Vq7aAezs8+ywFx9/ HolfE6jS0Ew9aHtupy3hu9+zX/vRe2j8+2HHK15z14EC2bQtB/1Qs+S45HgTgw== 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=1722491369; 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=zzjPJSi2lZ4ED0il0YQrSLN4e5gnuFfC52yO1w71tYQ=; b=k2p+GgyNjLVO1LhoLvx3WyfdN6igSsHSnggNP6WsFcA5yNUEHqcOPb8SZhp+LEYlM/KXFa HnuaUlS/5uJIvc+bn81P/g1GYQTlYsA80dbxPc3o7rRWeVKs0etst5YtocjtT0a9yRM2/C ez1pbAGTx1Oxo2QBvTHlGuH/w8x6JqWBXrz0o4kMKNmQ8UYB2ytvrjE7wFtHuCkqUvdD/0 CaGSLX4p/GFdAf+nB7t4ndSpZVKnl5OH9qbdtzcqmn0vmj/kt/2NVrRpAdmuh3WjW7zOFJ 4KyWzdVI308Ae1M8K0nviTZzj5amFSxpojQlGVHNzX30QMb6szlkr5bt+mgMBA== 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 4WZJ212B6PzY5K; Thu, 1 Aug 2024 05:49:29 +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 4715nT8r026893; Thu, 1 Aug 2024 05:49:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4715nTHG026890; Thu, 1 Aug 2024 05:49:29 GMT (envelope-from git) Date: Thu, 1 Aug 2024 05:49:29 GMT Message-Id: <202408010549.4715nTHG026890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f21a6a6a8fc5 - main - vmm: Build with proper ldscript on aarch64 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f21a6a6a8fc59393173d9a537ed8cebbdbd6343c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f21a6a6a8fc59393173d9a537ed8cebbdbd6343c commit f21a6a6a8fc59393173d9a537ed8cebbdbd6343c Author: Warner Losh AuthorDate: 2024-08-01 05:47:13 +0000 Commit: Warner Losh CommitDate: 2024-08-01 05:47:13 +0000 vmm: Build with proper ldscript on aarch64 A new instance of using ld with -T to bring in the kernel ld script crept into the tree after I originally did the refactoring. It too needs -L ${SYSDIR}/conf added. Fixes: 37d6d682af59 Sponsored by: Netflix --- sys/modules/vmm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index fc9340e9cd86..88586a39bf96 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -52,7 +52,7 @@ vmm_hyp.o: vmm_hyp.c ${.IMPSRC} -o ${.TARGET} -fpie vmm_hyp_blob.elf.full: vmm_hyp_exception.o vmm_hyp.o - ${LD} -m ${LD_EMULATION} -Bdynamic -T ${SYSDIR}/conf/ldscript.arm64 \ + ${LD} -m ${LD_EMULATION} -Bdynamic -L ${SYSDIR}/conf -T ${SYSDIR}/conf/ldscript.arm64 \ ${_LDFLAGS:N-zbti-report*} --no-warn-mismatch --warn-common --export-dynamic \ --dynamic-linker /red/herring -X -o ${.TARGET} ${.ALLSRC} \ --defsym=_start='0x0' --defsym=text_start='0x0'