From nobody Sun Jan 28 20:05:08 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 4TNMq83Tkbz59Cch; Sun, 28 Jan 2024 20:05:08 +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 4TNMq81zjXz3xCZ; Sun, 28 Jan 2024 20:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472308; 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=KSsN3SfOKF80A6TTNm/JQC4bHCKunzMwKeswL02HYl8=; b=eXIOTp2KFlXYDVEQuc4PQmAfPFBjF1j2K22GBKndZHv4WUOP//HrWGd+9B9IHO5f6iqTnl Wx+KYbxN8YRoeZEx20c9+liLuBcdTH0u1jLOFKES0rRwCZgOLQ9XpOjYQZIpNxPGXFBwkH 4IFdGa5f/gMpybe46U1+tVcbYsOIN3iTkUChGSnIv0KrsMVW/s7+TQNLYpYpZ/sOm3pDna qUL7uirLtDy78lyd4ZSOKBjQ1+Rfil1QlaKi8yt8IxY4TqDyXLu6nVPb/VIE+Aig2uY141 BbjiYL8gI2m8Jfk6TzLOhvi0Ml8+fu60+nHz6Aqx+b/u+lKI8Dj1A8ocMFKdcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472308; 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=KSsN3SfOKF80A6TTNm/JQC4bHCKunzMwKeswL02HYl8=; b=RClBxU3jZyCNT1P4ypYJoefngsoeGVl5+eXwRq7b81P4ORtjiAG8S4XAoLct/FGvO/dHFO I/uxhT/N63j5TZjsxX4yt7P1ErF5cbxVHq8vOSposQ/EEBoOCtHpv38cE1TSBvtEuXKQeI 4pjc1yEJaZY8P5WG1NRQ6KX//vnD9C8B2Bv7x64ru6z5yd9aSG6DqS4nTiE2YyKKRnrYuu F9btCnRehX+orV7Zyr0TkugFCL9WA9VAtAExkDJRbjf/3JCqV7cgrKry9Y1kG74YAlw4n2 6MLlMW7QDoL4KteKFZDCCE7Or2BqXsDm5V/hxL0rlrYp4Q7r4+cOzBL8j3JJjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472308; a=rsa-sha256; cv=none; b=r6yt6BOZC9MSQDT9f97jnn76Lsr/uFh/pfJy6u7BAgqgCiIvreef+ykuzVZE2e/ce6hGBg Oyyp6sBv74t9qIJBMBsfClIz2embUOpNlWf96EL9YbT0kOvSNDaKpzDmHbBZu94tyAfIR7 2jF68HZ9MUpSxtfNxN+nnzcc7sRRpGsUif4QAo7s6rLt7LibfxlXrxVscKdUgRrz1LZHVw 0TrDkWow6oObFXtry8plkEGO00vmAKPKyZFhje2jm9vSQDorU1bypBi6ICicQwcypp38su AdaJykY9aCg1N5X+TQZaFcVs1tONeeKa8w72/KkQiWvTTMInCIN2M3PZL1gNrw== 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 4TNMq80wQzzLwv; Sun, 28 Jan 2024 20:05:08 +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 40SK58b7032595; Sun, 28 Jan 2024 20:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK58u8032592; Sun, 28 Jan 2024 20:05:08 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:08 GMT Message-Id: <202401282005.40SK58u8032592@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: 099335814d5a - main - kboot: Move syscall stubs 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: 099335814d5aafefb3603b1a0901a1432895455c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=099335814d5aafefb3603b1a0901a1432895455c commit 099335814d5aafefb3603b1a0901a1432895455c Author: Warner Losh AuthorDate: 2024-01-28 19:34:13 +0000 Commit: Warner Losh 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