git: 59f8f51b118a - main - md: Fix linking of embedded filesystem images on aarch64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 21 Nov 2024 18:36:43 UTC
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=59f8f51b118a64119492837ee8e4973381554277 commit 59f8f51b118a64119492837ee8e4973381554277 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2024-11-21 18:36:37 +0000 Commit: John Baldwin <jhb@FreeBSD.org> 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 <machine/asm.h> +#include <sys/elf_common.h> +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) +#endif