From nobody Tue Jan 24 22:12:55 2023 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 4P1h6v55Bfz3bg6k; Tue, 24 Jan 2023 22:12:55 +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 4P1h6v3Dx2z3F5t; Tue, 24 Jan 2023 22:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598375; 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=BsnS0tYYkLGvAhQUoBu+oTg0UfMDN1HtcnYueD4PzJ4=; b=OR+bGIxsXKXe4u2VoQrAgOcjYzyr9R4EuslACnL3kHTlc9yi5I1Jytmypgf0D7x5owRjqy OzKtWWSPwSW6fjoU51MZx9MMTB26Nq2Pb5rz2nH2JeZ6frtEVJZZsGgdTqXAx0GAfGDpHR bw04iiBvE4QNH8j0sQqTMXxZaz64Y03IigItspoukD5uUv6xDSnVEbeHrrLrQhL3q28YhB MaJVctrmZ1dUjPeI3Zxo1qYFoMSKKzNsQJXFcPNXNPT5CFxT7PPFj6yDKHohzwPdUNLvHt 9wh5BkRs48DCswyjBIl+91vit2fn/G6lJxrhrhJMpOzbgKGI4M5aUC8eJUJftA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598375; 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=BsnS0tYYkLGvAhQUoBu+oTg0UfMDN1HtcnYueD4PzJ4=; b=iH3X1S9T4+uTrL73AR+xvC8XXUjn6/PmaGv4z0/HEiiy6NVHgqlAqzf8qFVXRWEAU7fsbE UBz6Zw153PKBFTPmfJW+Aytl7UvEOYAB1iM8nCUzj5Ians00ofGhfFEXLV6/OBSt8k8LIl OwZVCvdknI5siXIM1dLE8NAc9pohSgsvO+4sl8+fhFWYyl6kWefk0nrb8mQkwGMrkWAZE5 DoEhG/KNDFb6xxjyOnerLepAQraixxF3UNbK6Ol2SJ6zslELL0Zk43Z2EF05gGx6UBa+yH z1Op7MP5Z5i3EyX44RcjPlH0jksWmaZlHPOCJko+nxf1anWEoacFpA5oXyfPYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598375; a=rsa-sha256; cv=none; b=pJhN4epE2cX7WQkZLO/PflgLssKJP9LqEVoxRqvYc9eYEOkCdhaYWIZSHtJNyClmINdDLa 2AChzetBI2uXru74vWRGvWAtc1hgO5xtr7Yx2pMYoKHyVj4D6VGcQ0+hIC2dl5wJ2Kwvfu U0QmkbQnn3xvGtnEriYos6mUSRjDquOaTJ7Gqb1GrXG5tQBYXR4JmwuadFi01MiR8pZhUy 850g6pzGKUCWDDIVj7bXeJCoFXtdww2jIwDBC9/Uo/py9Tpo4lYMdAGMPkrZLBBcoc1OEn DX4L16krlbZvlXpRMpAUFwoDk+FAd6L7NEivOCcFtntcJI5f6IqE6L7ZoV+dyw== 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 4P1h6v1WsnzQYV; Tue, 24 Jan 2023 22:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMCtbL087697; Tue, 24 Jan 2023 22:12:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCtjw087696; Tue, 24 Jan 2023 22:12:55 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:55 GMT Message-Id: <202301242212.30OMCtjw087696@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: cc56d139e936 - stable/13 - stand/efi: Simpler construct 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/stable/13 X-Git-Reftype: branch X-Git-Commit: cc56d139e936135ed9077b4aa459dc5ab4d0d049 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cc56d139e936135ed9077b4aa459dc5ab4d0d049 commit cc56d139e936135ed9077b4aa459dc5ab4d0d049 Author: Warner Losh AuthorDate: 2022-10-24 18:11:50 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:36 +0000 stand/efi: Simpler construct Use 'sizeof(long) == 8' for a compile time constant that can be used as an initializer rather than #ifdefs. Sponsored by: Netflix (cherry picked from commit eca818c872f7ad094f8dac143123e7e8d65f3bcc) --- stand/efi/loader/bootinfo.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 99045735e7bb..c5f0291c9e6e 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -318,7 +318,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) vm_offset_t size; char *rootdevname; int howto; - bool is64; + bool is64 = sizeof(long) == 8; #if defined(LOADER_FDT_SUPPORT) vm_offset_t dtbp; int dtb_size; @@ -338,12 +338,6 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) #endif }; #endif -#ifdef __LP64__ - is64 = true; -#else - is64 = false; -#endif - howto = bi_getboothowto(args); /*