From nobody Wed Jul 26 00:00:21 2023 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 4R9Yts3JHjz4pMm2; Wed, 26 Jul 2023 00:00:21 +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 4R9Yts2XdGz45Dt; Wed, 26 Jul 2023 00:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690329621; 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=rvPhEatwXA+MTY6Or38TTVdBv/AX9vJwBAuMdhL/+Y4=; b=u8Yf2+qdetB9j73wOdVX9MrxM8RcrvncZUVbzPjRtRoPUAga8wf6kmLmpXkj67SbF8RssT 5j/hzY0YajXvz3jY5nlEOgHNZ4b+AbHp8yvHX0Bsrwrn7tzbpOJ+BnWcaIrpqsYg0u/7AE D8pCSDeYpa+Y8wUZQmD7IwqSBUcZUQ5Z6sxFq9cevukGxCLWpnfM1cd/Ea1o0ShNxDs3Zq G4hDg55qmQpracNn3CnOIeJhYfDOCBwfKmQFZBzGnSVe4DB252+havCJQIDcZlfhROVgw0 R6gxAd4sOtUiX+X2UjMKp13NcU6fDUFYfWcYx1DfAY3cA3Xc3DotbDunPhUbrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690329621; 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=rvPhEatwXA+MTY6Or38TTVdBv/AX9vJwBAuMdhL/+Y4=; b=tsRBYyI9fV0+j2ctVsjZJijD6MGQGJVpditD5j6Lgdd/cRgEqayyBhiSah1OSbaf0KPMpo gAOt+dRoM1hnO2bcBPo10tpgXui4j6JaZvQ2PJB46Cd+vuvAgYzOyhwNmfq5bwRe0QPsKH a2CF0tTQLXMQT1cZewuEtJYOlAyBekuFf1+22fh5c0WMerJM4mNRcHNO2LzepjF3GLULBb OTMgh+BvfxJYv22BYzvwkOCrUqMu6SrHbQ+d7Q/wy/oANZpJd7YFD6lfKOy0VMyhdK2bk8 NYpMv5e+W80qv9sPEuo88mEnJlszppk5xHU52Izl65MfqDGZ3534JP8JoCoTGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690329621; a=rsa-sha256; cv=none; b=WmdejpV32boZdP7tz3piTZHqhPoRhTAsWFfjmGIzySMQV+AJNT3rENbp/vYWB0GqVhASDH 6cGEMQhyWBKlaCvXhMTO9c4nQnMFmcZpXhdvrjSoEqM85L1nZN8WS5fHsHnUavM3R9C9dF +k5JDvWiZMGUg0QLfya1SmXgTlNpVtU3dziI2mCl6lcb4VZxMyImJj1efDAdR8TYvAEfwR t589Nw8sTYzQ7sQJVqvJFhKkmjA3iX2AoeL1XTSZkOHxThksJXKyuVWLS5EIGOEQC4IoWz a5mA11wYApYcE1zOQlxR7hV9sYaSryVxkAb/cD+YAj4TCp40c0CU18CZ3exF6w== 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 4R9Yts0v41zLMh; Wed, 26 Jul 2023 00:00:21 +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 36Q00LtU087378; Wed, 26 Jul 2023 00:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36Q00LMa087377; Wed, 26 Jul 2023 00:00:21 GMT (envelope-from git) Date: Wed, 26 Jul 2023 00:00:21 GMT Message-Id: <202307260000.36Q00LMa087377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: f1d5183124d3 - main - arm64 lib32: change clang to allow -m32 on arm64 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1d5183124d3e18d410ded61e45adb9a23b23c83 Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=f1d5183124d3e18d410ded61e45adb9a23b23c83 commit f1d5183124d3e18d410ded61e45adb9a23b23c83 Author: Mike Karels AuthorDate: 2023-07-25 23:58:51 +0000 Commit: Mike Karels CommitDate: 2023-07-25 23:58:51 +0000 arm64 lib32: change clang to allow -m32 on arm64 The FreeBSD driver support for clang tested explicitly for 32-bit Intel, MIPS, or PowerPC targets where /usr/lib32/libcrt1.o was present to decide whether -m32 should use /usr/lib32. At jrtc27's suggestion, simply test for a 32-bit platform rather than adding arm to the list. Upstreamed as https://github.com/llvm/llvm-project/commit/3450272fc281979388bb845a9fffb59b42cc2e7e Bump the freebsd version to force a bootstrap build. This is one step in adding support for -m32 on arm64. Reviewed by: jrtc27, brooks, dim Differential Revision: https://reviews.freebsd.org/D40943 --- contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.cpp | 3 +-- lib/clang/freebsd_cc_version.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.cpp index 2230295ccd74..80d49c28f497 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.cpp @@ -377,8 +377,7 @@ FreeBSD::FreeBSD(const Driver &D, const llvm::Triple &Triple, // When targeting 32-bit platforms, look for '/usr/lib32/crt1.o' and fall // back to '/usr/lib' if it doesn't exist. - if ((Triple.getArch() == llvm::Triple::x86 || Triple.isMIPS32() || - Triple.isPPC32()) && + if (Triple.isArch32Bit() && D.getVFS().exists(concat(getDriver().SysRoot, "/usr/lib32/crt1.o"))) getFilePaths().push_back(concat(getDriver().SysRoot, "/usr/lib32")); else diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h index 82830fe2baee..e9737b10d337 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1 +1 @@ -#define FREEBSD_CC_VERSION 1400005 +#define FREEBSD_CC_VERSION 1400006