mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-09 17:03:35 -09:00
aef531162c
The jailhouse runtime test doesn't build since the last ARM aarch64
toolchain version bump [1]. This new gcc 15 compiler use a new C
standard by default (c23) but since the jailhouse build system
doesn't specify any versions of the C standard, so it doesn't build
with gcc 15.
As reported by John Ernberg on the mailing list [2], jailhouse git
repository has not seen any activity since 2023.
As suggested by Julien Olivain and Peter Korsgaard [3] backport gcc-15/stdc
23 fix from imx-jailhouse fork as a short term solution.
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/14622843463
[1] 8d413d6179
[2] https://lore.kernel.org/buildroot/20260601204735.888967-8-j@j-ernberg.se/
[3] https://lore.kernel.org/buildroot/878q8uk9qf.fsf@dell.be.48ers.dk/
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From bc09bd33a23f9599b0cb4596a0b7f5c601a74c75 Mon Sep 17 00:00:00 2001
|
|
From: Peng Fan <peng.fan@nxp.com>
|
|
Date: Mon, 25 Aug 2025 09:48:05 +0800
|
|
Subject: [PATCH] YOCIMX-9281-2: hypervisor: arm64: fix strh usage
|
|
|
|
hypervisor/arch/arm64/entry.S:555: Error: immediate offset out of range
|
|
|
|
Per ARM spec:
|
|
STRH (immediate)
|
|
<pimm> Is the optional positive immediate byte offset, a multiple of 2 in
|
|
the range 0 to 8190, defaulting to 0 and encoded in the "imm12" field
|
|
as <pimm>/2.
|
|
|
|
So align sdei_event to 2 bytes aligned.
|
|
|
|
Upstream: https://github.com/nxp-imx/imx-jailhouse/commit/98f6f8dc23d6b3d4fe5b15045ccb3d3ef36747be
|
|
|
|
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
|
[Romain: rebase on top of latest commit on upstream repo
|
|
https://github.com/siemens/jailhouse/commit/e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560]
|
|
Signed-off-by: Romain Naour <romain.naour@smile.fr>
|
|
---
|
|
hypervisor/arch/arm64/include/asm/percpu_fields.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hypervisor/arch/arm64/include/asm/percpu_fields.h b/hypervisor/arch/arm64/include/asm/percpu_fields.h
|
|
index 67573fd6..118d69d0 100644
|
|
--- a/hypervisor/arch/arm64/include/asm/percpu_fields.h
|
|
+++ b/hypervisor/arch/arm64/include/asm/percpu_fields.h
|
|
@@ -13,4 +13,4 @@
|
|
#define ARCH_PERCPU_FIELDS \
|
|
ARM_PERCPU_FIELDS \
|
|
unsigned long id_aa64mmfr0; \
|
|
- bool sdei_event;
|
|
+ bool sdei_event __attribute__((aligned(2)));
|
|
--
|
|
2.54.0
|
|
|