From nobody Tue Sep 30 15:23:38 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 4cbhfL4S5dz69Djl; Tue, 30 Sep 2025 15:23:38 +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 4cbhfL2R3qz3Ll4; Tue, 30 Sep 2025 15:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245818; 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=QVNswpX8mZtgPIuzJX34N9LAuNPbb9oEziSMvyYxZZU=; b=R+mC2QvyUo3y+TtYw5YJQZ5fbpzPWMxzcZYQl3U0kQGyOL7xG8MKFrzgZHU75NogmtbAbX hewG2a7173D4vVXEuKBEmKAcQ35X3KlTS6HWGRKb4rS31rp7BkZJSsMTTqgQisKzEFxzHX lWby1sCkQvsF3hw5Og72NsNH2aPETgOg+aPGz17XrR9/inNodeqGnFjTc3/uQxHtS+EY5h GGAaC/XuMVI6HHnlSc983MqtczDrsgaYqyKsfFAgyIUudoG3yoGUIKIoaqbWH8i6ybKzvG bWDpdjtuDAStK1HX0rFXG3MHGP0X2VCD31yqHU+i9Ko2P+sYFBlhMzI5RrkRWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245818; 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=QVNswpX8mZtgPIuzJX34N9LAuNPbb9oEziSMvyYxZZU=; b=xQT/a7bDs0fNzteAPwaG6rpYvdK3karR6TnGW37RuzzHmxBYJgIXmK9+jhgvnJHVSmsnad yVGG0bFXRkEY9upSfjcSmQ1FOOp08o0fpisV60N7Fqgm7hOdXSbxZxOad2l99a2bJtzxGM GZ77s3JhPcyAauSrk0NjUMF8VQ97YVBYjGuFZEhcpl+YnMFJ3k7m15TVZjahMu6D6XwVX/ /VRZEqATX+ySZbm6h8/jF5TifRvO6RNErNxdf/mDpa+DGC/SIzE0jJN0tieSQ/sQ+pGrqo G67MsAA3FpJ3smHRNI9Eztq/9D192kBpIQaENwWS1M2KCI20e7JHjoVkgqDEuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759245818; a=rsa-sha256; cv=none; b=s+VCW+jOrk4/9ToPOHy/A5PMXRdp/jpfQ/0a0Pz1SUEgz+LFlvo5GgkN42iS/hRkYdR357 5aFAuyGuXYbLz21ZkBKOnQ4TMIM7lHsgfwjTD0Om7fi6eydqquKTsczsgdGm4OHr0dludc ybwI+vGMRDyb6vU598xW4DEYoFiT9OEhr+MauulbNXEFrrjoYWhAUXI+53h5z5app2GPap Nf2fcAppMGeweVLQUKSoWVBf8cxiFWAPay5VQ82ue4Ww6/Gu6ci4TEBnOqu2WArQH04KwT mI59eZ+je9XzbtIVUmlrEeZqU4fMpf3Y/wcu7EndvCOYpC2BQq5hs1mzIGVJmQ== 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 4cbhfL1zTPzj04; Tue, 30 Sep 2025 15:23:38 +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 58UFNcjx045697; Tue, 30 Sep 2025 15:23:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UFNcFc045694; Tue, 30 Sep 2025 15:23:38 GMT (envelope-from git) Date: Tue, 30 Sep 2025 15:23:38 GMT Message-Id: <202509301523.58UFNcFc045694@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: e338aab61374 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: e338aab61374958acb67838d35b95d792f7c79e3 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e338aab61374958acb67838d35b95d792f7c79e3 commit e338aab61374958acb67838d35b95d792f7c79e3 Author: Mark Johnston AuthorDate: 2025-09-07 16:07:32 +0000 Commit: Mark Johnston CommitDate: 2025-09-30 09:43:08 +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 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