From nobody Sun Sep 7 16:08:04 2025 X-Original-To: dev-commits-src-main@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 4cKZkD4dhDz66QGt; Sun, 07 Sep 2025 16:08: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 4cKZkD43F9z3jp5; Sun, 07 Sep 2025 16:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757261284; 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=i677iLjQYuqqhU2Crw5+yoA6oCHYyjGIhmnXYH2EpOw=; b=p46QtlDN3AbBqcZhaVNNlnHjsXlhtsQwORkcPDbp3lyBVWzdjg2UJBCx8oDC+OpgE/A5J9 ScZFG/MJUWGzgd6BS2xySPjRIgEdBIyXEl6XKGKT7KCmBQFeP47k4R0hYc5eVV1Ef6dhup T64tnOih2Rk9LdkWd6VfYOznFCDFNHeqjJCgcw5pybTZy391Dj/rRvxypMDKpBQEr8RQwS UDlrHK5rY6FuRe+1l/1eNnTdVGpB1fX4ToKgLa/xzaOq7JxGOx7PbT5PljYA5UgnYqA5Pt XMK/ITYWfCvuOdpyqyHixmNu44F0jo4my+I/TtQC9eA/CAco31uXK3Tkd2lqRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757261284; 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=i677iLjQYuqqhU2Crw5+yoA6oCHYyjGIhmnXYH2EpOw=; b=gQ9Y2T/1K7fILF6pkLjstAttR48espwK/JbTOGGpFx8znM0fI2/JCV0nu7U9qysboaIbuZ oQ7JIOTOsAWQ6NlgaCDRWyZrbWwl9Qp7mrouEis/WmYXFMuKkmhum/01eJc6ZFIlik9QqK KPCCRpSKr+xJB+QmMFP3R+2UYIwn9ihvzgt0AQC5xzX0D5MHXhbdrBOmzPhFYm8/O3Pnhf ZElLW9sFMnvynmHS+Z2T/iTSZjLpC2i+tQ5/d8UEWMX3rcfpAb6FU6+xebMAsyCMozkp67 r6OEapEbpovwxUYDc2sP1kM06vNXZCH/HSrEEiKK0gvRJjNYfoOFTwscDTjYVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757261284; a=rsa-sha256; cv=none; b=Mwx66c07vqg7W9MWiXP8Q3dCP0sIQklFIA88JEVNz5s9q6O4Joi6ShGWbW2naZB+aW3qGL eel2jyOs/YDvuP5FfPlc5VgjKoF22Gzoif1GaBX3OekR/JuWmtpZTNYQ/KrXFGr5BEJrDe o01dAhe/Lnas1+/bj4vMJZJ9bZqkgELbyBxoZAwx6Nm2urnPqunB5sIY3uRtNYZWeyNSV2 mfCkgiKsZCqzPDKxBrNEtb7NR5i8liLo1H1x9Iw9qnBiWokpREy7JnNMQaEuXir5lvm+B6 2mmFtm7Jv8DZJtoR6DVOCRyuPJU32bErS7EwLBkxK4O4b6zFe6l9xulF9ePwtA== 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 4cKZkD3Qh7zBLh; Sun, 07 Sep 2025 16:08:04 +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 587G84iN004326; Sun, 7 Sep 2025 16:08:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 587G84tM004323; Sun, 7 Sep 2025 16:08:04 GMT (envelope-from git) Date: Sun, 7 Sep 2025 16:08:04 GMT Message-Id: <202509071608.587G84tM004323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4341f92251ae - main - share/mk: Fix a heuristic in bsd.cpu.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4341f92251ae00c3f82904623bfd561bb8ea49fb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4341f92251ae00c3f82904623bfd561bb8ea49fb commit 4341f92251ae00c3f82904623bfd561bb8ea49fb Author: Mark Johnston AuthorDate: 2025-09-07 16:07:32 +0000 Commit: Mark Johnston CommitDate: 2025-09-07 16:07:46 +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 --- 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 f6599a0ad802..1225d690e908 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -391,8 +391,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