git: 4660d9658710 - main - arm64/vmm: Fix the build with GCC
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 May 2024 13:21:33 UTC
The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4660d9658710f69649018ca7b6b0be4b6d3bdd33 commit 4660d9658710f69649018ca7b6b0be4b6d3bdd33 Author: Andrew Turner <andrew@FreeBSD.org> AuthorDate: 2024-05-16 14:35:00 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> CommitDate: 2024-05-17 13:19:45 +0000 arm64/vmm: Fix the build with GCC - Fix the spelling of handle_el2_el1_irq64 - Add .section before .rodata as the GCC build needs it Sponsored by: Arm Ltd --- sys/arm64/vmm/vmm_hyp_el2.S | 2 +- sys/arm64/vmm/vmm_hyp_exception.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/vmm/vmm_hyp_el2.S b/sys/arm64/vmm/vmm_hyp_el2.S index 7b49d3144dff..7012e238c9c8 100644 --- a/sys/arm64/vmm/vmm_hyp_el2.S +++ b/sys/arm64/vmm/vmm_hyp_el2.S @@ -30,7 +30,7 @@ #include <machine/param.h> - .rodata + .section .rodata .align PAGE_SHIFT .globl vmm_hyp_code vmm_hyp_code: diff --git a/sys/arm64/vmm/vmm_hyp_exception.S b/sys/arm64/vmm/vmm_hyp_exception.S index 0e8b31ae8b12..9a9dc6901f40 100644 --- a/sys/arm64/vmm/vmm_hyp_exception.S +++ b/sys/arm64/vmm/vmm_hyp_exception.S @@ -332,7 +332,7 @@ LENTRY(handle_el2_el1_irq64) 2: ldr x9, [sp], #16 ret -LEND(handle_el2_el1_irq) +LEND(handle_el2_el1_irq64) LENTRY(handle_el2_el1_fiq64) do_world_switch_to_host