From nobody Fri May 17 16:01:27 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 4VgsCC2CK5z5LN9P; Fri, 17 May 2024 16:01:27 +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 4VgsCC1lRbz4LW9; Fri, 17 May 2024 16:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715961687; 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=UFroMfW8AmhESOFpMCfRa/0p+zTb61nR6CWFvPcvyBs=; b=WKYfPI5fpAx1RQ2Ts0HCC/m8MV3olbHkZJCRNEQNSwB4kkTRFKb81OL0KG5/tPK2T8fHOS uhqNTV4GorwyZ67dPdQraXR62gJw0Qj+2hhP98sfbunG8MARrqun/XAWmeelC/k+i2bGrs DraZPMFRJ4BYqcAhSRHbtm6joP6K8Nbi/NZcSRBH9rfrcchEG/VB0tV4dXunWGWMqhSy4q LBpJm5JSznXDwIRnGUDqFZvqovC4f1whjsS13qg93l1RCCyDaELJ1aRjrycAWiRvl6Z7Rq he4HKEhHw8kIViDoPOGMBAGkUjut65kY4PqLEOwGqdrb89PrZn0bCNKQ3aTlbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715961687; a=rsa-sha256; cv=none; b=GrpFht9Pka85P2xVMl4Z+4ayVrUJWkeY7bNvznHvTLHQeKQVjcdi6s8ttf/aRFcRowslIz D/aUOpFTELcodBmyHc75rD/3FIe43PFaWMCJVg71Y6ZHcuJw0gQE7uOOHwpBDFLV97WO2s +/pSkAzGoqI16/TWBknd6PoWZ1XTvNdKWy9kl1l+dXr+EYQ3b4WTW4eOBL6RDBWoxZWPeN udJq3+HRRB1HoeyoK+ZjODFOeoAcxGcPQR9SFl+MIqKDaa3HjGSK+L2D7LRoBgftNH7ENB ABAupTc1g9kV8acz/bZ9KwdLw7xKFnH9toRTOUQSJ+8gA7xax+5gYKm9p4BXLg== 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=1715961687; 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=UFroMfW8AmhESOFpMCfRa/0p+zTb61nR6CWFvPcvyBs=; b=vVJDhQoTF5pIzDSapKvUg51Eh8POAGL33CE9FlunCtnW9VTL0GDfI7hJObN0FNWhtxR/OI 26ciAsieoNNHPG0xi4FXr90jAaMKsCLXJu0O6DtaJKMLayQ7hid9yP+IZMMqH9IVPiJXSz lEEIEI9zqxtkkftJGztdRRC0qZE/lzP83gF3vzfZXz9ohbEb2PBR6hphYLy283UF/gQODh TtZLd+RGUoWzf5QkGahaS80XkD53sBknXTWkY8STVkvPs7A3PnVNZ9zkINtKUKjMTE7Njq ehzExkf4nAXIvPNdBBAN5RARBjsnqqiP2JpVlfBoyqGv8VNw5JA+nZ+pXsqNhA== 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 4VgsCC1Lpmzpfq; Fri, 17 May 2024 16:01:27 +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 44HG1R6I047218; Fri, 17 May 2024 16:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HG1RH4047215; Fri, 17 May 2024 16:01:27 GMT (envelope-from git) Date: Fri, 17 May 2024 16:01:27 GMT Message-Id: <202405171601.44HG1RH4047215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 16d8dfde0c0f - main - aarch64: disable LIB32 with gcc 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16d8dfde0c0fb2eb95f2dd8c350ae652fa2c68fa Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=16d8dfde0c0fb2eb95f2dd8c350ae652fa2c68fa commit 16d8dfde0c0fb2eb95f2dd8c350ae652fa2c68fa Author: Brooks Davis AuthorDate: 2024-05-17 15:47:06 +0000 Commit: Brooks Davis CommitDate: 2024-05-17 16:01:18 +0000 aarch64: disable LIB32 with gcc gcc doesn't have -m32 support on aarch64 so mark LIB32 broken there. We have to check both COMPILER_TYPE and X_COMPILER_TYPE becuase X_COMPILER_TYPE is only conditionally set and COMPILER_TYPE is the host compiler in Makefile.inc1. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D45089 --- share/mk/src.opts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 00405e3f934f..501df88cd776 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -303,7 +303,7 @@ __DEFAULT_YES_OPTIONS+=LLDB __DEFAULT_NO_OPTIONS+=LLDB .endif # LIB32 is not supported on all 64-bit architectures. -.if (${__T} == "amd64" || ${__T:Maarch64*} != "" || ${__T} == "powerpc64") +.if (${__T:Maarch64*} != "" && ((defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} != "gcc") || (!defined(X_COMPILER_TYPE) && ${COMPILER_TYPE} != "gcc"))) || ${__T} == "amd64" || ${__T} == "powerpc64" __DEFAULT_YES_OPTIONS+=LIB32 .else BROKEN_OPTIONS+=LIB32