git: 099335814d5a - main - kboot: Move syscall stubs to libkboot

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=099335814d5aafefb3603b1a0901a1432895455c

commit 099335814d5aafefb3603b1a0901a1432895455c
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-01-28 19:34:13 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-01-28 20:04:31 +0000

    kboot: Move syscall stubs to libkboot
    
    Sponsored by:           Netflix
---
 stand/kboot/kboot/arch/aarch64/Makefile.inc                   | 2 +-
 stand/kboot/kboot/arch/amd64/Makefile.inc                     | 2 +-
 stand/kboot/libkboot/Makefile                                 | 4 +++-
 stand/kboot/{kboot => libkboot}/arch/aarch64/host_syscall.S   | 0
 stand/kboot/{kboot => libkboot}/arch/amd64/host_syscall.S     | 0
 stand/kboot/{kboot => libkboot}/arch/powerpc64/host_syscall.S | 0
 6 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/stand/kboot/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc
index 50388d38dbf2..744a15f363d3 100644
--- a/stand/kboot/kboot/arch/aarch64/Makefile.inc
+++ b/stand/kboot/kboot/arch/aarch64/Makefile.inc
@@ -1,4 +1,4 @@
-SRCS+=		host_syscall.S tramp.S exec.c load_addr.c fdt_arch.c
+SRCS+=		tramp.S exec.c load_addr.c fdt_arch.c
 
 .PATH:	${BOOTSRC}/arm64/libarm64
 CFLAGS+=-I${BOOTSRC}/arm64/libarm64
diff --git a/stand/kboot/kboot/arch/amd64/Makefile.inc b/stand/kboot/kboot/arch/amd64/Makefile.inc
index fdd40fe9bc5a..55b1819ccdee 100644
--- a/stand/kboot/kboot/arch/amd64/Makefile.inc
+++ b/stand/kboot/kboot/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-SRCS+=		host_syscall.S amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c
+SRCS+=		amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c
 
 CFLAGS+=	-I${SYSDIR}/contrib/dev/acpica/include
 
diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile
index 1b030ccfe018..31f4827e64b9 100644
--- a/stand/kboot/libkboot/Makefile
+++ b/stand/kboot/libkboot/Makefile
@@ -3,9 +3,11 @@
 LIB=	kboot
 WARNS?= 4
 
+.PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
 
-SRCS=	crt1.c
+SRCS=	crt1.c \
+	host_syscall.S
 
 .sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
 
diff --git a/stand/kboot/kboot/arch/aarch64/host_syscall.S b/stand/kboot/libkboot/arch/aarch64/host_syscall.S
similarity index 100%
rename from stand/kboot/kboot/arch/aarch64/host_syscall.S
rename to stand/kboot/libkboot/arch/aarch64/host_syscall.S
diff --git a/stand/kboot/kboot/arch/amd64/host_syscall.S b/stand/kboot/libkboot/arch/amd64/host_syscall.S
similarity index 100%
rename from stand/kboot/kboot/arch/amd64/host_syscall.S
rename to stand/kboot/libkboot/arch/amd64/host_syscall.S
diff --git a/stand/kboot/kboot/arch/powerpc64/host_syscall.S b/stand/kboot/libkboot/arch/powerpc64/host_syscall.S
similarity index 100%
rename from stand/kboot/kboot/arch/powerpc64/host_syscall.S
rename to stand/kboot/libkboot/arch/powerpc64/host_syscall.S