From nobody Sun Sep 21 14:53:03 2025 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 4cV8PD0CvSz68D9f; Sun, 21 Sep 2025 14:53:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cV8PC2nzwz3vPT; Sun, 21 Sep 2025 14:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466383; 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=tHJvaP4TN7QBfBaLS0JrijU0xD57VqJrGP9L2140npg=; b=mITWBttEDZlxjcKJPuZwXWEAEuTVEw1rzdhg/uCR8LRRKowG0ErrkxYZb1rPdXEOyzA9Iy 8QYbYlM3mYdNjhtCuvF/sqHzrfVC0viuDbeMr5PeUNhLLy2OEeZlTlhdnpCbGzLKujMSvB 2TNLJeUcXrEXSk7sRZFYoDTh+OQJr0SdMKFZMbcnWeCNvszNKIPt4ve/11g1oi+V7HnI1n e22TNp++9FQ+NMeayy2GcxE9qMOGgrksRKh9XwXgQSmr9EdC3QLlzNb80aIOkk3GteS/7I bP7Q7uSgL6sQ1Bjf5ns8Udri/Ji3oMYGJcReTIMkq397YQ7U1p8arkhVhllPVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758466383; 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=tHJvaP4TN7QBfBaLS0JrijU0xD57VqJrGP9L2140npg=; b=kIuLPlJq7+5ElETC/wybaa6gMr/6XMfn75bZI4dfxuJZvN95yxb47UAYEicxGHRSiaGuIF I7Lxu2cr42PnVvcAUfENtVb1SBA9cJvWmzwSGhfLEghbHtztlIwiSRwCImVx8Jd6CCLWS1 O/6AtL8yeJmkVVWT/tWhSMdUvjCr7buLKWFeokLgVvjg9hOpdLbuCB7qQwMJ5gLFJw0be+ F0vnpQ8iSSlgmQTpa4TIqvI+IbHUXfCL5kvItPgCe2Litlk/YPN8nYWFbMfN/LTln12XaY KongWhS5GBQf7ee39XjAcPaJsbBOhYQZ7Enggj0Gy/GcXCfBp2IEnqI+Brk+Jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758466383; a=rsa-sha256; cv=none; b=NfJjmTeCr7tcSwBBpW1R8cW/ambclFTj6i8r8ABFn7ypLfKjmBblNpecoujGV1StuQAN2g whTMnnHbJBbECo7tjmol4WmqaOF1QC3fzVbYATp4Lvt3KlsUPKUg6sR1281rTXU4+5LS0L LLvsCmgF3VdE5PCQGB95p3GB47WpizlFFUddcMU+5cKtKaD238YIDaooEgJj5iNP1aegy5 j1uXmL6NDuyJAuYPDVOhzHiIVOjEuK1YuOOfH3+sygveLFzTmo2iypM7SO0CY2qiDeFLE/ FuHXJ1/9YnFiO/55lIxiKTWdKpzFrtPkEZnHZiOeviVjN07kdykabYevn2ZxKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cV8PC238Rz3km; Sun, 21 Sep 2025 14:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58LEr3bw017638; Sun, 21 Sep 2025 14:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58LEr3PA017635; Sun, 21 Sep 2025 14:53:03 GMT (envelope-from git) Date: Sun, 21 Sep 2025 14:53:03 GMT Message-Id: <202509211453.58LEr3PA017635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a24fa22bf03c - stable/14 - share/mk: Fix a heuristic in bsd.cpu.mk 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a24fa22bf03c78f7b2d78990d27663af29d6ba36 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a24fa22bf03c78f7b2d78990d27663af29d6ba36 commit a24fa22bf03c78f7b2d78990d27663af29d6ba36 Author: Mark Johnston AuthorDate: 2025-09-07 16:07:32 +0000 Commit: Mark Johnston CommitDate: 2025-09-21 14:52:38 +0000 share/mk: Fix a heuristic in bsd.cpu.mk When cross-building from MacOS we have MACHINE=arm64 MACHINE_ARCH=arm, so bsd.cpu.mk infers that sizeof(long) == 4, but of course it isn't. This breaks the bootstrap build of openssl, which tests MACHINE_ABI:Mlong64 to decide whether to build ecp_nistp224.c. It doesn't, and crypto/openssl/freebsd/include/openssl/configuration.h undefines OPENSSL_NO_EC_NISTP_64_GCC_128, so we end up with a link error. Reviewed by: ngie, emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D52340 (cherry picked from commit 4341f92251ae00c3f82904623bfd561bb8ea49fb) --- share/mk/bsd.cpu.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 730e4b4aa152..053069801439 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -402,8 +402,11 @@ MACHINE_ABI+= soft-float .else MACHINE_ABI+= hard-float .endif -# Currently all 64-bit architectures include 64 in their name (see arch(7)). -.if ${MACHINE_ARCH:M*64*} +# Currently all 64-bit FreeBSD architectures include 64 in their name +# (see arch(7)). We need a special case for cross-building from macOS +# (which uses arm64/arm). +.if ${MACHINE_ARCH:M*64*} || \ + (defined(BOOTSTRAPPING) && ${.MAKE.OS} == "Darwin" && ${MACHINE} == "arm64") MACHINE_ABI+= long64 .else MACHINE_ABI+= long32