From nobody Sun Jan 07 23:08:06 2024 X-Original-To: dev-commits-src-branches@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 4T7Xsz2Fhmz56F3f; Sun, 7 Jan 2024 23:08:07 +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 4T7Xsz0rlPz4P4d; Sun, 7 Jan 2024 23:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704668887; 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=T/w6kEzFYOZBUp2CKUOINut4lQprJfEdP4kPxoeLNbU=; b=dPQ1x+o0Mq68fLWP8KVBE/3DPafAOnwd6llACd3wfTkk7kOva4n37r2N2q5hCzzsGta6tP 2s8bd4bgR08yAavRt3rUdpXv/BCLOIzoMhoKRDh8F7u7YIVVni/kSsb1TtISrWx2I/kVUE kEqLNzQdNL61NT58qiZf10ZzFDEqf7abMELSlUxIqoYjJrIa2ved0CSBuAirjlgRxojRE/ i5VEH/Ya/RXayc0APrsi5PYl/nLvGqj9lscOlTQaXAqFb0ryAd68BjZloU8UcaoY+Hc/Z+ WKYEy7DLfNe0hc3aV7Pc2F89IW5UGeKWdEjfxGXQqErAH3QVBeCaD3/qQunSmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704668887; 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=T/w6kEzFYOZBUp2CKUOINut4lQprJfEdP4kPxoeLNbU=; b=Btf6IA+azkusf7JElbbSX6zPADT/mmPKSp7RQds9H0L4QXGglW7DftpTRAiKpkfwCLB0UP R7m2mwfLXUIIn4sC3WLtbHoGAOigzd1mCA8b0dSgO27JiqjOTlha77NYhJJxoDeLcHrNGH 8Zt7I85ft6IF6sXrI+AtIz7UmUpdbgeRQv0kFAJ3fy/czBqXX/j2Y8ZRwUjCmetF9YDivW qnDXWX8efbH9f3AkLIBPNpnCszPW/LC80ZYlxRS2zwyhBdRSgBZE8UTJVW24p3i8UuzjvE Npjc9EhEEol1G5fIobi8LgyJqLunsAJITvBjPiWcD/wwYtCCcVdvWx/Wnhwc1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704668887; a=rsa-sha256; cv=none; b=sf2f61yy5toucPhQOlUpHbiRdr0r0IcogjVhFJ1+as8flCMX3sLTVPY+2AkPn/9M0LB3PL zfG0VdAO5tJQTxHt+aecpOWEgLRP2l4g9IN2OfBSJkOB61vC3O51MH7sAub+c7I5rjQnXI kwSblo392F81IgMjki9+qKyiBiR4JNXzaTpXUBgtPXxgBhh454yTMUC7++83IW5wYWjZK6 R7xWa7gpfeHMh4dumMOzm30i8bUwxFYigykEUcesAyczH/qZZS4LBPkRWShCHH/tZ3XiD4 J0ueYcFnWbaCUrtC/prq4wXLel5sKuK1CKjrZFloCbA8oc+BMiHgE7FEefGKsg== 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 4T7Xsy6qTczkNN; Sun, 7 Jan 2024 23:08:06 +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 407N86Bk052944; Sun, 7 Jan 2024 23:08:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407N86EA052941; Sun, 7 Jan 2024 23:08:06 GMT (envelope-from git) Date: Sun, 7 Jan 2024 23:08:06 GMT Message-Id: <202401072308.407N86EA052941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a2e0c77f941d - stable/13 - arm64 lib32: change clang to allow -m32 on arm64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a2e0c77f941d7fc7fe5e2229124a551c08793052 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a2e0c77f941d7fc7fe5e2229124a551c08793052 commit a2e0c77f941d7fc7fe5e2229124a551c08793052 Author: Mike Karels AuthorDate: 2023-07-25 23:58:51 +0000 Commit: Dimitry Andric CommitDate: 2024-01-07 23:04:33 +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 (cherry picked from commit f1d5183124d3e18d410ded61e45adb9a23b23c83) --- 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 e0441ae866f5..758b8295d012 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1 +1 @@ -#define FREEBSD_CC_VERSION 1300012 +#define FREEBSD_CC_VERSION 1300013