From 78f3a2d48ebd004d209f395ac84bc5c5e081b228 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 28 Jan 2024 12:34:13 -0700
Subject: [PATCH] kboot: Move syscall stubs to libkboot

Sponsored by:		Netflix

(cherry picked from commit 099335814d5aafefb3603b1a0901a1432895455c)
---
 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(-)
 rename stand/kboot/{kboot => libkboot}/arch/aarch64/host_syscall.S (100%)
 rename stand/kboot/{kboot => libkboot}/arch/amd64/host_syscall.S (100%)
 rename stand/kboot/{kboot => libkboot}/arch/powerpc64/host_syscall.S (100%)

diff --git a/stand/kboot/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc
index 50388d38dbf..744a15f363d 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 fdd40fe9bc5..55b1819ccde 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 1b030ccfe01..31f4827e64b 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