From nobody Tue May 07 14:54:25 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 4VYhBT3BQpz5J0Tq; Tue, 07 May 2024 14:54:25 +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 4VYhBT2KTfz4GpK; Tue, 7 May 2024 14:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715093665; 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=ppDyV7rzdWQFI1fZ0r7Hcplsc5QmQ+EHBqJ1/wSoXdc=; b=xLwCi6tpDliUjGnuJM8zFp0elkNz8g2GAmLu2AlZSz5iSt2s8/vcmI/bszoOLK5L35p2Mf zxjTDc/xfHW2ZXEVgBEs9QBggaATUK3i0ua1YO01HBnNnpbnpxjPkMfsJA0jHDcMtrihYv EHCW+XsoaXiH/Usvf6+sq51myLpVLDVprvqkbURRQKy2iZysnQ2jUZa+dfqfzUHzt/Ueq/ VMAOngqFSZTUbqDlsp0CNYaWuk3F9awHH0Qt7vF6PTw77nCROidJNmo3yMrItR7xpmnYzl HtIGYqEjIqkp12wRql4N9KQe61zBspzuIqSgSuuX3ccXEsJzXjsyr/EBY9kKEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715093665; a=rsa-sha256; cv=none; b=fe6Vl8CEZ1DDLpe9xz7tyW4LqXFuBRnbGD4i2EE71l8XmZM4O/z+aehJ94hKhgNx0js1b0 ucLmZUgAVRguqtn0X/UG1+f/9j+C18DDL5TNI9D56LTKmDm8MvYqz+2Vs4lpCGvdOLCyBc zwxYePnzl7sxADTuRXwuNoSodLrveQxhpBwslSb8Oapm2B34OrzNUycJh3K6Oz5bL0xmWT 46ZeRvEDJwaO/qb818j6PGexgepkreKkh2H9esh3aE0hZYU3vjfVhwDyn9+zTld7kp7QDQ KAYnqB/W7DH+mpRnEg2zhkxksyHbex05X85UTAoEQgZxy3P+gvf+CkuC5RqGkw== 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=1715093665; 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=ppDyV7rzdWQFI1fZ0r7Hcplsc5QmQ+EHBqJ1/wSoXdc=; b=kQoCXylCB5aZICtOYpxEfFnZE/7cepolRJEhGaGQijRC8NkDfqPTcK64crc3u9XZ7QyZyD bayHVLH+oULEhPnsFmipiO+QRgKNLs8RSxo0EuhUYpRrqA3LEYoo6NDUN8wnaIS/z18v2G C8b2/0kctC+raIHE8deaPofz3cmNlb5kDjhdGCMfIeO65jIM/X9LsaRKyDrYuaOHAU+ziL vGKR3ojzKzoutUdd10U7LlVPX53R9GMcsAPRP3B298Uo/8BUz6YKKDIyBMGI2Rt5tIXl35 rjltlb6dmrWq+K/NNDE1MfdKtaJNuAHkKEFzuJSByIFWc//QY1pS60+G8YlPdA== 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 4VYhBT1xVNzlqv; Tue, 7 May 2024 14:54:25 +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 447EsPP4029893; Tue, 7 May 2024 14:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 447EsPVr029890; Tue, 7 May 2024 14:54:25 GMT (envelope-from git) Date: Tue, 7 May 2024 14:54:25 GMT Message-Id: <202405071454.447EsPVr029890@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: 75e5f5916e0e - main - boot1.efi: Don't redundantly include devpath.c 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/main X-Git-Reftype: branch X-Git-Commit: 75e5f5916e0eb01f573c1dfcb4625b16eec30124 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=75e5f5916e0eb01f573c1dfcb4625b16eec30124 commit 75e5f5916e0eb01f573c1dfcb4625b16eec30124 Author: Warner Losh AuthorDate: 2024-05-07 02:06:54 +0000 Commit: Warner Losh CommitDate: 2024-05-07 14:53:50 +0000 boot1.efi: Don't redundantly include devpath.c devpath.c is on both the comand line and in libefi. This is redundant and was a mistake in 4cf36aa1017f9. It never should have been here. In practice, this just means that the devpath.o from libefi.a goes unused. This will cause problems with some upcoming changes (D44872) to enable LTO to reduce the size of the binaries, so go ahead and make the change now to reduce the changeset for that. No functional change indended. Fixes: 4cf36aa1017f9 Co-authored-by: sobomax Sponsored by: Netflix --- stand/efi/boot1/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index fd5069004dff..fb1c7d74eec1 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -29,7 +29,7 @@ CWARNFLAGS.zfs_module.c += -Wno-unused-parameter CWARNFLAGS.zfs_module.c += -Wno-unused-function # architecture-specific loader code -SRCS+= boot1.c proto.c self_reloc.c start.S ufs_module.c devpath.c +SRCS+= boot1.c proto.c self_reloc.c start.S ufs_module.c .if ${MK_LOADER_ZFS} != "no" SRCS+= zfs_module.c CFLAGS.zfs_module.c+= -I${ZFSSRC} @@ -58,7 +58,6 @@ CFLAGS+= -DEFI_DEBUG .PATH: ${EFISRC}/loader/arch/${MACHINE} .PATH: ${EFISRC}/loader .PATH: ${LDRSRC} -.PATH: ${EFISRC}/libefi CFLAGS+= -I${LDRSRC} FILES= ${BOOT1}.efi