From nobody Tue Apr 16 20:12:22 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 4VJwF32gQwz5H00X; Tue, 16 Apr 2024 20:12:23 +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 4VJwF26h0Fz4s97; Tue, 16 Apr 2024 20:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298343; 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=aHtVrR0oIEwEQCThtNqh6Nhs/Q8QHGD4bNXn4sxGhFM=; b=P1hxnHBhOKDQfNvD3a2Z51yS3Dnx3YruLFge/pfmEdPPvTDVrwbCv/q28QrQhWHjks98HY nMdNvXB/m6fw7fKY06S1TfI7LVuCTArAQJhQKt5RWud1LtrXIIg0IBTAPLMlGobpDJ7lL/ MLwUNnSo7DNcwebtokPwgFyAwd4YJlKxqpA9KCOZYHpeIn5inDNiiUPGUbksHsg9pON5QD KkzpBzLKhr/l9s68FypYaQTrJPO3Kwa0UivUHwd8aFMqbo4z7/8D0vuNchhKb8fcMKmAIZ a/gFxsKZWEBlcGFu+WKxXzq0UmJNiJv4Rdxrb2UgIllFLlIvzoFTMNX+6sPvsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298343; a=rsa-sha256; cv=none; b=X//EZf7e+rDK/eaXIOAFnGx7zrATDARufuVzA+M8A64vOTuMrNyu/Q3YpFCyM/vF3rfFC2 A0Yy87Ow57hG4QRdM59BMUxOPj/HOEHC44jY8M32VX0SB64w/MrUvA9YvFx5joJBsYBsgZ jYpjG2QvXhfyR8GH/B8ZuvqEz4S2WQEDKWrUS+4+43e6nDbXo8WN5DRdNW7fznDAPZkz3g j9+Z0dysSP6EFlIy5RSY3SqAN2N/2o/FSWHMZMnqJ2qVt04C6XVgNYx5Rz8uhDSAWzXOSQ DwJb7Ksdju8AT7iA5koacqbktSfaKQDUt/CHvdt5/gYQQpu5EKHFSjjims9GBw== 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=1713298343; 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=aHtVrR0oIEwEQCThtNqh6Nhs/Q8QHGD4bNXn4sxGhFM=; b=YF8hsW081wPEAjqIEDcd8tGQdBZUFBNreaE5nA0Pnyzw4AGeCnZJDl8ogire2ZZpwnXtwU 9MPMfTBb694SSgshM4oSLE9SQgnk+uTjLmwp+zOrYQx85q/Ch0R8A5sfWwXO+zViIG0waM FpEfCYZfPTcaAepX7a30tlvMDa9wn88hc48XOSSjwbUIPQ9a9xWy1YgECV1MEcmdi2/Zk2 NesrjGH8vmY8dG1lCSG9MOGuaEkSEcptauFXLd6yAcaE4hQZTuiccKyZlVWbK1Ihjs/3rj 99KQbHtw6vo95zJTZhncMWPLmRcIUlV3ihvMBXWL1SiYim6CNkcPB2FLwTbfMg== 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 4VJwF26CbCzxdS; Tue, 16 Apr 2024 20:12:22 +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 43GKCM77036800; Tue, 16 Apr 2024 20:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKCMDk036797; Tue, 16 Apr 2024 20:12:22 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:12:22 GMT Message-Id: <202404162012.43GKCMDk036797@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: 78f3a2d48ebd - stable/14 - kboot: Move syscall stubs 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: 78f3a2d48ebd004d209f395ac84bc5c5e081b228 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=78f3a2d48ebd004d209f395ac84bc5c5e081b228 commit 78f3a2d48ebd004d209f395ac84bc5c5e081b228 Author: Warner Losh AuthorDate: 2024-01-28 19:34:13 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:20 +0000 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(-) 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