From nobody Tue Apr 16 20:12:21 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 4VJwF21MmPz5H00T; Tue, 16 Apr 2024 20:12:22 +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 4VJwF15brYz4s8y; Tue, 16 Apr 2024 20:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298341; 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=KsaiZyMx/96MZWAeqvCKqog9xMpRn/5jbnpk5hGTZV8=; b=H53iNTg8dlLIOXtx4pwEJEWMfHmv/thMMY35g7xDruoiqfyWP0hEZ9P8PnlVKdayikgzTN e6dtSLK6YBgLxU9IuRiM9PCFP5sf3X5SAEsHT+DkY33wmjVMdrlsSfOfqD8irm27uBR3Wy r/NsUReij0iDjcTs0UMhu1ZiWqzZYeQt0DuNmK9SE2bTIl8BbTQVUXsQE3I/HKxriktqoz xVZqZhBPanlZulzZ4VIUBd1GILFQcQ9aDgs0kTDqu3S2Y5cs9MOq4ARrxDkgF25J2NcH5C pVsivVW7Zi7mzb423xQMLpsUJW+6oq93+S0v3VmrHVbVJWI/jaS+IJaCpY9zXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298341; a=rsa-sha256; cv=none; b=KRU5GYOJl893Sd6NJV8p480PafCV5vJrG2U9/H3Pni+x2SoHjQa+Y/ll5tjBS65dOS8nci AE14KUVw5zyI/nt9CEYI9XqSf1C0h9Nl6T0iAp0hKKH7jKYzlUixCvbwzDzSlfiUMG53ON 2wZspKGIpwV5OZlEu+pJR7pGASZAwW5DhyfzRMDEciaLHNV+wtgUjzaJ/Q/dvahyfKT0tf XZKaHRPoM4bSz5+0fU+h9LsBBjqW+PR0LaubNdmmDBQA3U08HGmqE2cmdYgahBTpSKmi39 7RGwSBBQO/jzLhgVxQ9Lle1TgXnCJdMk4pMeqJnEcJY9h5WyxiEloVpSxDenWA== 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=1713298341; 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=KsaiZyMx/96MZWAeqvCKqog9xMpRn/5jbnpk5hGTZV8=; b=KGIj4MnYoBYH5mxqH22EvNE47d0F+Epxd3cFRVESX3ysasJMgqzItYkd2zOpE0lBUshP5k HRlcx9nlHfroCGVKCr+/aE0wPxJf5urC+I4WQcOAg/LP0ZJHup6jQQQmsKEgNb85aEgckb 129I2SouOOwxzyY4wpb8qzLj5oRFXKaG4lI+R0/UoJupxUF8rT0FI16up9SoL0OTxvvmY5 RsEv+hIGwpzyNCShO9DUi00X9nxkHoiCkou1RKOmJ2LYwuoexjCnxEexVWTsyS3qOAegny zWgLQglT1YGQscn9XtwDEHAMU4P6umuLpzRIZ94hRbRBwVCGBSG/aZlok8+u1Q== 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 4VJwF15DHczxdR; Tue, 16 Apr 2024 20:12:21 +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 43GKCLWi036747; Tue, 16 Apr 2024 20:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKCLhM036744; Tue, 16 Apr 2024 20:12:21 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:12:21 GMT Message-Id: <202404162012.43GKCLhM036744@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: edf8a9a42d30 - stable/14 - 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: 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: edf8a9a42d3057f701228f37e73c0c551a47225e Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=edf8a9a42d3057f701228f37e73c0c551a47225e commit edf8a9a42d3057f701228f37e73c0c551a47225e Author: Warner Losh AuthorDate: 2024-01-28 18:28:05 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:20 +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 (cherry picked from commit 4aabaa1890e927ed3dd34ccc4642268ea6a505ce) --- 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