From nobody Thu Apr 11 15:05:19 2024 X-Original-To: dev-commits-src-main@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 4VFjg40QK8z5HYp5; Thu, 11 Apr 2024 15:05:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VFjg372vlz45T0; Thu, 11 Apr 2024 15:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712847920; 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=Uqtrfq3mukNVeq3U9TUQ7PggdeKg6jTq8O3TxUCwvWs=; b=WPeehPkJGSF4sAJCvK2ARfgvJUVFpJx3quiXnDviSzqetjg6WpqelMCVVIlRDb9nMEESdI ZlqUWHG87Urii7Ise/VVNajANi9UBJ6Re43vpvwZN4PAIF1zacbWfyio6Xg6skhtryh5cG Dj4GzmXFYeJ9j2nAM85KOeZGLdnDOrfUgg4d8+VV6EgOr0knVwSEmMOodn93Vl+tkLMwht VupW5UjYbNVvCZoC+ai0HZLBdGt1l4QXiVHI5EG1PykaYLBjNYFsAueQptoQ1pKxBQx1VW VdFoECktEXjc5QpoMp/KH8OK4x1ZL49fC/keXJsUNyEKLK83vEDH2QlU57Et5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712847920; a=rsa-sha256; cv=none; b=OWSZFTWbfvNMKTx1DHyh9bFEElDHcLDDGX8u6GEgyW0BS804YLDVEoB9Ds6wzYOO7riqbJ n8XAKw7S8u9FKtuEAQfK0P291RGJ39MGm6SUtNKVuNUxRylraU1CX+6agJYqfddUELNCKy Pc1IV8kRJ3Y4tirwqW9LnOilgFyVJQrnmhjuN6Fz1pJBCIRPet6vsPsqKjB3wfWbzTQdBs zKQqoddiZiBnq5MAiTJfEI5Pz4PmGGyBghiAoW+tIMmaONSUcWWyqmQ7cJJlr/p/BvFYcr 7/oNPVknKVVQQFzGJGaKc6f+fcKnRuEW8KMies9f1A0PGzBRIZAcmukAsGNytA== 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=1712847920; 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=Uqtrfq3mukNVeq3U9TUQ7PggdeKg6jTq8O3TxUCwvWs=; b=e4A6mDa7mF6DhTenP8TAmO88wgzabcQROJ6oeCnsGJLjUbMwJPutx0nehYlxWfdTBV4jH0 MdBmCJKrAVWYmSQPpxlSKUcgMj5IRT4BKE3hHhX8boCd9dtJYH6l/BQBI1ll1kqyMGsey6 HRtdSRaNE6SRM26QVdcgdPYYaFrJZrS4B3dsuptIVRGRsxWLSJEXVRvcAH7Zxz1iN8Rvym O3s9VAa9ftOWNiBPF5jPRIvb4euqRVs0nIaC40a9TGvKeQgRKcGm+xZF3BI9dWbe3N3cj7 7L+CXEPPXJ+L7QuSmstMhb8lc5e5yMz0KDh4PQRU67xhZotLAkk+z3sY6JSuQQ== 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 4VFjg36X2fz1Q2C; Thu, 11 Apr 2024 15:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43BF5JgD016706; Thu, 11 Apr 2024 15:05:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BF5J37016703; Thu, 11 Apr 2024 15:05:19 GMT (envelope-from git) Date: Thu, 11 Apr 2024 15:05:19 GMT Message-Id: <202404111505.43BF5J37016703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 52f3d650894d - main - arm64/vmm: Define a dummy _start symbol in vmm_hyp_blob.elf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-src-main+owner@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52f3d650894d84a7986f915dba75823c5b3c1249 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=52f3d650894d84a7986f915dba75823c5b3c1249 commit 52f3d650894d84a7986f915dba75823c5b3c1249 Author: Mark Johnston AuthorDate: 2024-04-10 14:10:10 +0000 Commit: Mark Johnston CommitDate: 2024-04-11 15:04:22 +0000 arm64/vmm: Define a dummy _start symbol in vmm_hyp_blob.elf To silence a linker warning about _start being missing. This blob contains code executed at EL2 and is only meant to be entered via exception handlers. Reviewed by: bz, emaste Fixes: 47e073941f4e ("Import the kernel parts of bhyve/arm64") Differential Revision: https://reviews.freebsd.org/D44735 --- sys/conf/files.arm64 | 2 +- sys/modules/vmm/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 632fbab5070d..c7468b577dd8 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -131,7 +131,7 @@ arm64/vmm/vmm_hyp.c optional vmm \ no-obj vmm_hyp_blob.elf.full optional vmm \ dependency "vmm_hyp.o vmm_hyp_exception.o" \ - compile-with "${SYSTEM_LD_BASECMD} -o ${.TARGET} ${.ALLSRC} --defsym=text_start='0x0'" \ + 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 \ dependency "vmm_hyp_blob.elf.full" \ diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 1ef9e264ee97..a98f0f27e25b 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -50,9 +50,9 @@ vmm_hyp.o: vmm_hyp.c vmm_hyp_blob.elf.full: vmm_hyp_exception.o vmm_hyp.o ${LD} -m ${LD_EMULATION} -Bdynamic -T ${SYSDIR}/conf/ldscript.arm64 \ - ${_LDFLAGS} --no-warn-mismatch --warn-common --export-dynamic \ - --dynamic-linker /red/herring -X -o ${.TARGET} ${.ALLSRC} \ - --defsym=text_start='0x0' + ${_LDFLAGS} --no-warn-mismatch --warn-common --export-dynamic \ + --dynamic-linker /red/herring -X -o ${.TARGET} ${.ALLSRC} \ + --defsym=_start='0x0' --defsym=text_start='0x0' vmm_hyp_blob.elf: vmm_hyp_blob.elf.full ${OBJCOPY} --strip-debug ${.ALLSRC} ${.TARGET}