From nobody Sun Jan 28 20:05:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNMq94MG3z59Ccl; Sun, 28 Jan 2024 20:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNMq9306nz3x5H; Sun, 28 Jan 2024 20:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QaDmvErduX6HCYuieEiQEcKr/kk2AcrTpQQp6MqcJtw=; b=aioASrbaQEmTAoeU6cc5mKxSXj44M/NGLkqWnSrktQjaqhrALnJh2W/4Abrf0RWFrR7gOr 3/Hgmg5O2gf+PHorPrtBSEulU4KvXrRrlZzP8TkhoW/YcbjXYssMmhlUnb3EzXnJcX1A/V GAMy10mBk4gx8TQmmjwHt0z6VeOG8/Q4N0EwXwwWj23wzlQDGHrV73iqA1X68CY9S9rIPH pmJkMYiWSAyr0TNYJgLsAtNWbsr8FuFSJ6I6WanIhCVBlixPdLFO2Fx7O1x52lilYtrmfm fs9VcAicM0oUj1FJIdwGgBFd6Nq3m32v0ESPRL2phqlfKi++ZAkRPPOHTtgPQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QaDmvErduX6HCYuieEiQEcKr/kk2AcrTpQQp6MqcJtw=; b=pvW9COLGWAMiL/twP5Jh9y5Oc1i8Rd666IsVr8mTD6qGaVSXelwr7eHzVF/pBiawg7C5bv L+tQM1CGnPXpw0ISwRyAnAjPGPDu3S8cN6MkjGNU6GrAho0LnGm7SLnThWk2wkJ9rx5q62 XBipP+nNBBjd18i4ygYjGw+dhmFBPrCs3WqWC7cFg25VvXYEMqXEWK/13Uk5sRx8EBUKzA xjVt7Wno273YW4n5oo7mc+KTeSbDJ1Rl2DcPFWb6GZg7EUWWvVnbSMkcW9QgOr+lon596g oDHGCxLDkvLLcez8EwGi31pHcKtNH2/mu/TVVPqWrLqsq7E+GrDKkhZviP7W/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472309; a=rsa-sha256; cv=none; b=INcyTtxjDnxCmKMlGrDYe5evUmpq4/5WxqeKHdsZjk8oygxBb01lbf3tiwEFxdxiFVU12h kIWvidu+Ni48ECsc2mckQ2+Jv+dx2li1YUab44ehqudRHuSu9jSIpXQZCM8Qx3zssEj2+3 7SlAm0+ZOzM8F0iZt89eIO/MEcHLMHsj9fSePk9xeF0HU7kqUhNvXbnZ9GgZUr+mVU0Hop vK6+KnL++wTJ8ulKzFNaD1cnWIfXZfnK2rfIVzyIpcut4d4xDplQ5EHTMTem9Pe9O1E9tl iy1FL+y9aJ5s6khwyl4Y0JCu3TVGGHh8DK0QZ4E8BUSL1GS+0OD1Ym7Q2JJang== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNMq91qG2zLww; Sun, 28 Jan 2024 20:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40SK59Cb032640; Sun, 28 Jan 2024 20:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK59bL032637; Sun, 28 Jan 2024 20:05:09 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:09 GMT Message-Id: <202401282005.40SK59bL032637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2e3f49888ec8 - main - kboot: Move system calls to libkboot List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e3f49888ec8851bafb22011533217487764fdb0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2e3f49888ec8851bafb22011533217487764fdb0 commit 2e3f49888ec8851bafb22011533217487764fdb0 Author: Warner Losh AuthorDate: 2024-01-28 19:08:45 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:31 +0000 kboot: Move system calls to libkboot Sponsored by: Netflix --- stand/kboot/Makefile.inc | 2 +- stand/kboot/{kboot => include}/arch/aarch64/stat_arch.h | 0 stand/kboot/{kboot => include}/arch/aarch64/syscall_nr.h | 0 stand/kboot/{kboot => include}/arch/amd64/stat_arch.h | 0 stand/kboot/{kboot => include}/arch/amd64/syscall_nr.h | 0 stand/kboot/{kboot => include}/arch/powerpc64/stat_arch.h | 0 stand/kboot/{kboot => include}/arch/powerpc64/syscall_nr.h | 0 stand/kboot/{kboot => include}/host_syscall.h | 0 stand/kboot/kboot/Makefile | 1 - stand/kboot/libkboot/Makefile | 3 ++- stand/kboot/{kboot => libkboot}/host_syscalls.c | 0 11 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stand/kboot/Makefile.inc b/stand/kboot/Makefile.inc index 02aecdad55f1..90a1b9a17e3e 100644 --- a/stand/kboot/Makefile.inc +++ b/stand/kboot/Makefile.inc @@ -1,7 +1,7 @@ # Bring in the mini-libc that we wrote KBOOTSRC=${BOOTSRC}/kboot -CFLAGS+=-I${KBOOTSRC}/include +CFLAGS+=-I${KBOOTSRC}/include -I${KBOOTSRC}/include/arch/${MACHINE_ARCH} LIBKBOOT=${BOOTOBJ}/kboot/libkboot/libkboot.a .include "../Makefile.inc" diff --git a/stand/kboot/kboot/arch/aarch64/stat_arch.h b/stand/kboot/include/arch/aarch64/stat_arch.h similarity index 100% rename from stand/kboot/kboot/arch/aarch64/stat_arch.h rename to stand/kboot/include/arch/aarch64/stat_arch.h diff --git a/stand/kboot/kboot/arch/aarch64/syscall_nr.h b/stand/kboot/include/arch/aarch64/syscall_nr.h similarity index 100% rename from stand/kboot/kboot/arch/aarch64/syscall_nr.h rename to stand/kboot/include/arch/aarch64/syscall_nr.h diff --git a/stand/kboot/kboot/arch/amd64/stat_arch.h b/stand/kboot/include/arch/amd64/stat_arch.h similarity index 100% rename from stand/kboot/kboot/arch/amd64/stat_arch.h rename to stand/kboot/include/arch/amd64/stat_arch.h diff --git a/stand/kboot/kboot/arch/amd64/syscall_nr.h b/stand/kboot/include/arch/amd64/syscall_nr.h similarity index 100% rename from stand/kboot/kboot/arch/amd64/syscall_nr.h rename to stand/kboot/include/arch/amd64/syscall_nr.h diff --git a/stand/kboot/kboot/arch/powerpc64/stat_arch.h b/stand/kboot/include/arch/powerpc64/stat_arch.h similarity index 100% rename from stand/kboot/kboot/arch/powerpc64/stat_arch.h rename to stand/kboot/include/arch/powerpc64/stat_arch.h diff --git a/stand/kboot/kboot/arch/powerpc64/syscall_nr.h b/stand/kboot/include/arch/powerpc64/syscall_nr.h similarity index 100% rename from stand/kboot/kboot/arch/powerpc64/syscall_nr.h rename to stand/kboot/include/arch/powerpc64/syscall_nr.h diff --git a/stand/kboot/kboot/host_syscall.h b/stand/kboot/include/host_syscall.h similarity index 100% rename from stand/kboot/kboot/host_syscall.h rename to stand/kboot/include/host_syscall.h diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index ae32d878a3f4..475f863b77bd 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -22,7 +22,6 @@ SRCS= \ bootinfo.c \ conf.c \ gfx_fb_stub.c \ - host_syscalls.c \ hostcons.c \ hostdisk.c \ hostfs.c \ diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile index 31f4827e64b9..33674da83661 100644 --- a/stand/kboot/libkboot/Makefile +++ b/stand/kboot/libkboot/Makefile @@ -7,7 +7,8 @@ WARNS?= 4 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} SRCS= crt1.c \ - host_syscall.S + host_syscall.S \ + host_syscalls.c .sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" diff --git a/stand/kboot/kboot/host_syscalls.c b/stand/kboot/libkboot/host_syscalls.c similarity index 100% rename from stand/kboot/kboot/host_syscalls.c rename to stand/kboot/libkboot/host_syscalls.c