From nobody Thu Nov 21 18:36:43 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 4XvRlb5vpTz5dRLh; Thu, 21 Nov 2024 18:36:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XvRlb56wLz4br3; Thu, 21 Nov 2024 18:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732214203; 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=xjAJW3ypip37hl7FAwaEiEXCh/ERAFFVp4SfjtWgXPw=; b=nu1SlfMGpLKIhg2HTORW+ELXPxxy0kufJpKRERDs6YPnob1jP+QSXEgDaObgK4z1SGfOrS w4FlS05XVdlAfsfWvCuFwV3YE4tvjvetnWjQIElflO6s96hamgAaEyTUZ1hhyg+AvMnPVh jjstM9lXS/x4dlVAD/C0UkObCo7rd9jF4R235jJ75iWGU5cNfgEpaOI2QXj0svRTZ47KIH LvmQuA26jKVwwPikCvBBHVsJVrd1MDCmR1Dc9heEU2OaahvusbAdukxp5O0minfgAHBWqg NrEbePyBjEA2HxXtJK0aYbmEEeE76v8jS5oLeC3Ay7ZjacXsEauxsHh3exZ5NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732214203; 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=xjAJW3ypip37hl7FAwaEiEXCh/ERAFFVp4SfjtWgXPw=; b=u0LORe1UvH39ZfRPOnuSf2HOaGRYSFWGrk1ODPXA1SQhlALTyGbSe7Du6zpWnr695qUBIw aRjW8Ip0oNIJ2tnfK+nJ6HYhFVw7pkzjlChXrEAr1VmIT/M61hvJLrUjI5t+LdOmdsZz+j hSs1M020gTkjukYc/WiqznZ6Emv6Fp5ZGiJg9GOFVU3vM+5GUU+IK5lcGc7MYgRf6C0s+i vS8SvWiMF9roZr+jmY0ghWwNRmGys3X6EjlTX3+FGqHWGNzYk+tjgnMkdXGM6RNsmlHBo+ 92Ddz2soxkRUYGuDfolnRVYn6l48CUZg7XLa/0aF9LTAn/hLc+g7Rgw+NTSXGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732214203; a=rsa-sha256; cv=none; b=jwFKigTkJc37pT21fS+J2jMOgEQsRU8HJY0U7ckHKEoKp1LRVw5E4CfkQlUDUk6uwWTAAv b3NYWa2hr85TTAfWMn9CA8B6cf+9/gSWt9CJnvCj4t2w5/eHmO6PuiRuW8c+E3YRgo/T1x ATzugb5A6P4dh18I8FgKCd1tjHVVN++R1cIVN3zWEBhOOcH/P+YB4EeS9J5X0HjjT/bF1p EdTpTw4NqK8N8xbWNzW8X1POkmX/mmKp4hjRXgziqMA0YRjjf8LMb0oAs7hLxl8qKs9cdN 6cO8EO92EVe5AvNYkWXzIith6XfHjT9/7H4o76bAuhikuw8gjEhJ4AgAZ+u3/Q== 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 4XvRlb4R2mzqsT; Thu, 21 Nov 2024 18:36:43 +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 4ALIahNL076370; Thu, 21 Nov 2024 18:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ALIahfP076367; Thu, 21 Nov 2024 18:36:43 GMT (envelope-from git) Date: Thu, 21 Nov 2024 18:36:43 GMT Message-Id: <202411211836.4ALIahfP076367@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 59f8f51b118a - main - md: Fix linking of embedded filesystem images on aarch64 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59f8f51b118a64119492837ee8e4973381554277 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=59f8f51b118a64119492837ee8e4973381554277 commit 59f8f51b118a64119492837ee8e4973381554277 Author: John Baldwin AuthorDate: 2024-11-21 18:36:37 +0000 Commit: John Baldwin CommitDate: 2024-11-21 18:36:37 +0000 md: Fix linking of embedded filesystem images on aarch64 embedfs.S needs the right aarch64 features for BTI and/or PAC. Obtained from: CheriBSD Fixes: c2e0d56f5e49 ("arm64: Support BTI checking in most of the kernel") Sponsored by: AFRL, DARPA --- sys/dev/md/embedfs.S | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/md/embedfs.S b/sys/dev/md/embedfs.S index af4f9c08ed3a..62bd118647c0 100644 --- a/sys/dev/md/embedfs.S +++ b/sys/dev/md/embedfs.S @@ -42,3 +42,9 @@ mfs_root: .type mfs_root_end, %object mfs_root_end: .size mfs_root_end, . - mfs_root_end + +#if defined(__aarch64__) +#include +#include +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) +#endif