From nobody Fri May 17 16:12:17 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 4VgsRl54Pgz5LPBH; Fri, 17 May 2024 16:12:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgsRl4Pnjz4PdQ; Fri, 17 May 2024 16:12:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715962339; 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: in-reply-to:in-reply-to:references:references; bh=91hwtCL1WGOq3wN3/o14a5zigfpuV3ZxN6PCsFPt9Bs=; b=fiYFzOyUCl9MUrq6F/LfLzKTfTnuCeLJ2XmbBVIoy3Ym6CH0FkKjKr8S0CEVjC3T4MuFcl 2/OsBG0duaBzdUyWIIhoo2zPSV+G52hFlVi4g9DTEjK2hIeOOo46ccwhd0vEpevTU9ZERc LRNaM0jTXxGnyPyIxd8WtsGes0jPf5r9OydMMD3n5R/V16RPRuf2b/kZRrYpIE/lIQ2tNW urMtaDpwvvnKrS4yEUVvU27+w99z8LO2IwokzjhKld7co107RhVi7H12UAeQ5xzZvr2d2w tkdn0v0SsCGfpDGVIGqzOgqlX35aFSv1RebNXOspVMObt5HjSK25zBccoikF0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715962339; a=rsa-sha256; cv=none; b=pDk5t4/5Fyc9YFJ90hWQYW1lp+3OBuxpeAAHAsIsLS1orak3lxPEyqlH4J9DjxX1+W/uXq qAYkSpPLwCm1ri8FIWlyDLNBf5IpThCzr3EmCtsqAb8FMhjuX7OcvlhaVWdW1W0x1UpOF+ xrIyv3SrdEliQSrTmPRmv95MU+fE+g/HnncA+9CAbcRLUDn0bs9rD6vaceHRiwm8iUTfJP AOHV2NiNayU5zyrMCcXPFn7zBDswOdGIR4VNT5iv14zxvyIOCyTcqxg3/2jdxSBjD7dEPd tpQaphUx5WG7J5qY9g1pHpsRuGvcq2E/fHaMbJpTsPsnACACb5AsSvThZMap4w== 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=1715962339; 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: in-reply-to:in-reply-to:references:references; bh=91hwtCL1WGOq3wN3/o14a5zigfpuV3ZxN6PCsFPt9Bs=; b=nXvetovcdAEi//smCkyiTzgvin2axPc2W8vgOLXK43jsIUlobkDBrM4Oogt0/3z/Gu+hwB Hg4M21TqtKTwXEGpOj7H8RawUl3X4FcrbRcc32z3Y5L/PcZc36W+9vVcAtFI7NAAQm0ioX UD6T3NONmX0nMai57rp6b2OI9Vf5twu2l/if3bIg5TxyiraFZv5CXJ4SalVcGqzRDEcv35 kBJ75e6Pq5TsehDd3L5Q9DmnyFWDqfqvuBuoaGTcEdhPsjxrGs8chMxKaQbNQ0EB+VcUGI a8Z7DR1csGNtBZjrg4qu1g9y7syfG9rlrmauASk1zT5ECFojFGDxCRxbOi/F7A== Received: from [IPV6:2601:644:937f:4c50:b5f7:9ebf:56fb:a04d] (unknown [IPv6:2601:644:937f:4c50:b5f7:9ebf:56fb:a04d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VgsRl13JtzHVv; Fri, 17 May 2024 16:12:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <55ef7d2e-e01b-42a2-acc9-b7351b1aa1f2@FreeBSD.org> Date: Fri, 17 May 2024 09:12:17 -0700 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 16d8dfde0c0f - main - aarch64: disable LIB32 with gcc Content-Language: en-US To: Brooks Davis , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202405171601.44HG1RH4047215@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202405171601.44HG1RH4047215@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/17/24 9:01 AM, Brooks Davis wrote: > 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 I'd rather fix the compiler port? aarch64 still doesn't build world at all (though might build some more after Andrew's commits today). -- John Baldwin