From nobody Tue Apr 16 20:12:23 2024 X-Original-To: dev-commits-src-all@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 4VJwF42D1Nz5HT4t; Tue, 16 Apr 2024 20:12:24 +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 4VJwF40kxMz4s4x; Tue, 16 Apr 2024 20:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298344; 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=R5AFlX90EFBcbJVOgL0L4J4f0+bSFz1JO9PhGb0BQ/0=; b=S+VR/dcfjh2w9K1BUG1CtAK/MxTqUSoUYIFWdqKiPJePw412TuVPx+pzzKUyftmdupRypN wMwV7bUR+GNdegWu0MVtuoXErmhx4iLPGC5L10LV5TKplIgqIdcbf+w7C3b3xKExpnBOfp yilpuGslE46O0/jgJ84lg5NE+z74KZbWD3/BihEbpIldrzIDqq6hClb982k8mi7AMSwLOi 8eNrFpKfRGuR/QIZq5hOiP/y1W2z5XiwnB16DdIfClveDchlkzAK/iTluaWLBeUUhEWJ2g lonYl45zrMwQpn7GnTgwsstu27mjgVPESq49b/MIdpVRirpdtreskz8ckppggQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298344; a=rsa-sha256; cv=none; b=JoqAXMek41DfbDDM3jrL8d8sWBOdFCtPWM+vZqMRasgySzJo6P0zuU1PfWMLFQmzPI+cV7 bS3M4oTV9z1RXEWxQVRoym7pI/Ma4xAtcJK9egWp4221wuCFrhq5Ktu+N0bcXBZPEUTT3g 6VGKf0dSYk4jiCaMLF2AqQ5FcweA+6KPXTUY0wtO+wtom4y4Ip5BR9xcK1kl0lH3koWhVd nsvQbjoojDc9lyCiEwIk8xJJLZmj4smU8HDtE0tzXymdVSCkSm0QoTexTHmqJGmovr3M8y FjHGW768UM25r2c10kuuuJor9KSSOq4G12+v0/QAJgj0HI2n8eHdehgBe9bYbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298344; 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=R5AFlX90EFBcbJVOgL0L4J4f0+bSFz1JO9PhGb0BQ/0=; b=IuGByOoKFGm7s6OjtqsYnVv8ZOtuDGN7IoNx2vNuNO2NomIWTIDeLJxQ9WuVh0KFW4NIL/ 5maRG0+wEVEGFyGPVg+7lrdv5Ndox8Aas3VWRQAaZsuuzf16YBwxpyg88DwFk7YIKsVO4u pfVSSAyLjBOf5XhbEO499ToIVIi7lf9ONdcALU4OUqtd3HKzhCH4JrQ3cjJ2NK8VZWJ9Ly 3zc9c5zaz1fpJRa3FFAdLKUqrfZMphHPQEDNfWV+bqtDUP/PwtPjOQSwLZ64DtsTOC7dcW 3B7KBgYb30XcyfRXu1QoS8VtvUH25TmNw1KSzQ+O0UsoroM5MrRIWiycqtmP7w== 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 4VJwF408lVzxPJ; Tue, 16 Apr 2024 20:12:24 +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 43GKCNHS036845; Tue, 16 Apr 2024 20:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKCNdS036842; Tue, 16 Apr 2024 20:12:23 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:12:23 GMT Message-Id: <202404162012.43GKCNdS036842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 29f9f6b9800d - stable/14 - kboot: Move system calls to libkboot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 29f9f6b9800d721330d8326a60780077b1d3779e Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=29f9f6b9800d721330d8326a60780077b1d3779e commit 29f9f6b9800d721330d8326a60780077b1d3779e Author: Warner Losh AuthorDate: 2024-01-28 19:08:45 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:21 +0000 kboot: Move system calls to libkboot Sponsored by: Netflix (cherry picked from commit 2e3f49888ec8851bafb22011533217487764fdb0) --- 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