From nobody Sun Jan 28 20:05:06 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 4TNMq72Pg9z59CTT; Sun, 28 Jan 2024 20:05:07 +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 4TNMq70mKsz3x9p; Sun, 28 Jan 2024 20:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472307; 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=jsNX6+1WzyXPfLHIhOcR5g19/NVzbObcMU2UA5YFyZU=; b=i6A7XngDFw9T6Gmh9YnCStz14OmO5ZXCL5hYH+CBn5bSNJ8iRRBqkBjUuo0zEoMJXMOPJb gClNqEAWYcVBboTj1zxdfDDoYaEJp+EVHxM/2Vj3ZtEmkotEcLwLbFqxMC+3T8ewQ8WrxH ldZATYfyaIrNJYyS+RMY/iBCzKkRz41AkTpKsRvLDt7tsVtE3kWxrJ/SfvBKT2THL9DHOZ Q97G6wpoxCQBYqglLoWREpWSU4xdZBZJiUyxxAy0ANsVe3mq+2uSKF+8rhPhB54LzRs5vf 7dQmgRHDM08rk8XQhhDbqaUEVvS3W5PPl734dpRWZTDEb0cZa8hl5LlY1I+vyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706472307; 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=jsNX6+1WzyXPfLHIhOcR5g19/NVzbObcMU2UA5YFyZU=; b=jQcr/t9tGwx21WEZngMVH5SAxwbLRfu2+zYi9UWvJ0drs6KnTZRMoYgH9oaRZ9ekbg9rJq 8Rk3R8bMQ9ou/4RatAucHox3Y/Yga/vUwc2AARUoiV5ipaip2lxEDbYZ0Svp57er/b05z0 1pdt7j9jSi9pIjfNjugAK5ghx0q3ncfedcGU9XX+NywiY8+vgKiPtsEsFMHdDJP2TCZI31 nq3skF033g7V3qGEZB7CpXUf+LE/0bnvt4M3oYnr0JhX+lAdu441KXAjqAKoYwOEgo5x5+ xR9IHoEwCDnluaNCweiduAIojeW4VQo2hNoyvROxlHimI2MFchJerL21/Fyy1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706472307; a=rsa-sha256; cv=none; b=RQhXhBhLDbsgwQEOXxv+EQusSIPV011QUCDW+2VjrPOdTF4MeVLPkSYMg/jps9b4AJCPa6 FdGph2k8/c6i9AMVi4iXVHczMRnlUeOMEKwllZeng1ls2dKuEjad33v20XErSDS5TWG4r4 No5ZJ1PCyfr8QgdqkyyUbO5nG+MT3Dwld+MgEqIAbzijED5m/jWxkRJsUzYSO/Bbi2TzyI s3NaBdh+2OMTaxLF1aRm+o5w6dooniyytl86Cc5gKl+JWZS7UI5REfEbGhFnLSMsL/DijB SKq6WRnpNwxMFUuYM/ToYwl/6W92cPPJwHGKE77D9OrTXWP1lou2fwzB5QiVLA== 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 4TNMq66zMJzLwt; Sun, 28 Jan 2024 20:05:06 +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 40SK56dJ032550; Sun, 28 Jan 2024 20:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SK56IB032547; Sun, 28 Jan 2024 20:05:06 GMT (envelope-from git) Date: Sun, 28 Jan 2024 20:05:06 GMT Message-Id: <202401282005.40SK56IB032547@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: 4aabaa1890e9 - main - kboot: Cleanup libkern reference 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 4aabaa1890e927ed3dd34ccc4642268ea6a505ce Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4aabaa1890e927ed3dd34ccc4642268ea6a505ce commit 4aabaa1890e927ed3dd34ccc4642268ea6a505ce Author: Warner Losh AuthorDate: 2024-01-28 18:28:05 +0000 Commit: Warner Losh CommitDate: 2024-01-28 20:04:31 +0000 kboot: Cleanup libkern reference For aarch64 and amd64, we don't pull in anything from libkern, so we don't need it in our path. However, powerpc needs ucmpdi2 from libkern, so bring it into libkboot's build and omit it from loader.kboot. Sponsored by: Netflix --- stand/kboot/kboot/Makefile | 1 - stand/kboot/kboot/arch/powerpc64/Makefile.inc | 3 +-- stand/kboot/libkboot/Makefile | 2 ++ stand/kboot/libkboot/arch/powerpc64/Makefile.inc | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index 4054bb1da9f2..ae32d878a3f4 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -57,7 +57,6 @@ HELP_FILENAME= loader.help.kboot # Always add MI sources .include "${BOOTSRC}/loader.mk" -.PATH: ${SYSDIR}/libkern CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} CFLAGS+= -Wall diff --git a/stand/kboot/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/kboot/arch/powerpc64/Makefile.inc index c29e69970505..338d1222ab65 100644 --- a/stand/kboot/kboot/arch/powerpc64/Makefile.inc +++ b/stand/kboot/kboot/arch/powerpc64/Makefile.inc @@ -1,7 +1,6 @@ CFLAGS+= -mcpu=powerpc64 -SRCS+= ppc64_elf_freebsd.c host_syscall.S kerneltramp.S load_addr.c fdt_arch.c -SRCS+= ucmpdi2.c +SRCS+= ppc64_elf_freebsd.c kerneltramp.S load_addr.c fdt_arch.c LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc diff --git a/stand/kboot/libkboot/Makefile b/stand/kboot/libkboot/Makefile index 415571617d2a..1b030ccfe018 100644 --- a/stand/kboot/libkboot/Makefile +++ b/stand/kboot/libkboot/Makefile @@ -7,4 +7,6 @@ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} SRCS= crt1.c +.sinclude "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" + .include diff --git a/stand/kboot/libkboot/arch/powerpc64/Makefile.inc b/stand/kboot/libkboot/arch/powerpc64/Makefile.inc new file mode 100644 index 000000000000..4cafaee28847 --- /dev/null +++ b/stand/kboot/libkboot/arch/powerpc64/Makefile.inc @@ -0,0 +1,4 @@ +CFLAGS+= -mcpu=powerpc64 + +.PATH: ${SYSDIR}/libkern +SRCS+= ucmpdi2.c