From nobody Sun Nov 23 18:40:10 2025 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 4dDySC4z67z6HST4 for ; Sun, 23 Nov 2025 18:40:11 +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 4dDySC2GpMz3QG2 for ; Sun, 23 Nov 2025 18:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763923211; 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=HVZmFYSAXGN7wYGJKf9g0Z6HpjHApoByLHT6Ba4LlU8=; b=JGUUIJzE8V4jAVPtDGCT7kHwX7pwHDeD5mlkgpouKMvnP5uV3vxemHEa5fOOgdOKuulctC MgB3CfABcif5+IMqA9iq+0Z0RrPq4QcxQr07b5O5JXjNe6TXbwsfK6qxv4Tcf10L+qRrRT 1wn7uYR8uVA8KIZJiMAOIPrxrE2KBxtCL1MtqcwYaTGaH9L1rv67bmNwbrsxYEECOQLm8H kANdc8hbMHn5jc7/Ld/hLtqgWuE8kRYeP1Yb7tnAxTJeUIbBxU6JFzMVFKz1r+T1U5+lLc 43Uk7vU5ZvjH2ZUvgi0Gvk+s1XDo8Jv0it04L171TC+CLMmVyNlVJ5e9CzLcKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763923211; 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=HVZmFYSAXGN7wYGJKf9g0Z6HpjHApoByLHT6Ba4LlU8=; b=DvVmp1p9x5pNpnzm6ytTnG7E2UWFnp/3dSyowEAOKMB/mLqjOw6YNHId7AiKenuhVEV2iS 58z4xev6DY4AoPD4x+f9hBzSs+/I0RUmatsCYCpJw1W3q0zFIS3iN4DtASin4Egb5kn7LK W3oqs4FeyHi1PHG5Vt64rBmX6LKi4acCelCbHTn+W53yBk94Y/BYqHg2gHYBNEzkcPcgDI 4/+3IQouml2u/Q2jxmyVFZq7tVPvG30ZvtLHDFQ8WmVdJasMDpLvhxQxBoE/INfFvZclza HLwGnVM9jAi7SzYZh5BECLKCeFgaZQdLL+Lh976e2x7eoKJGbZNWK4AWypQW7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763923211; a=rsa-sha256; cv=none; b=cimkCb0qVK5YxKbIW2elk6yhKCHQa9SBGVp0qnOe7pXV56+q38CZ3MskbKSiJL8T7KDxHC he+zKtdhTzHt0sl+Ljc5NpoZad6qm2YooLO7vXqhJ/SKUrNdXot7r+u+1xzlfTyrnFY4+8 Xa072s8o8kUoWdtQe5zp71c1Ot/hW5B6flmnDvrfxTIM/liRbU/FPdH5h70+2qbvLX8YZu Np8NevAehjDyLzE+G+Kas0chENVqf2j5d3tLXCLSH1Y5TV/30OPywB1fEsrUrjM7blK+yM 2Pnw0Cygh6X3LbdPAyOOp8REDjkQ2+jjG45Pp7X4IsnvpN/AJLThGvi2OYCn9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDySC0fZ0zgX7 for ; Sun, 23 Nov 2025 18:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2519a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 18:40:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3289bace53f3 - main - Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3289bace53f31545976fec310b41fa784de75e64 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 18:40:10 +0000 Message-Id: <6923550a.2519a.b8a7de4@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3289bace53f31545976fec310b41fa784de75e64 commit 3289bace53f31545976fec310b41fa784de75e64 Author: Dimitry Andric AuthorDate: 2025-11-23 15:52:46 +0000 Commit: Dimitry Andric CommitDate: 2025-11-23 18:40:00 +0000 Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):" [Driver] Enable outline atomics for FreeBSD/aarch64 (#156089) The compiler_rt helper functions have been built since 12.4, 13.1, 14 and anything newer. This reverts commit bd27bd1f51d049538cc7a0053be9d99110a53ae1. Only some people (including the release manager, unfortunately) ran into build issues with the previous iteration of this commit, because they were bootstrapping the compiler, either via the WITHOUT_SYSTEM_COMPILER src.conf(5) setting, or because the build system determined that their base system compiler was out of date. The bootstrapped compiler would then enable outline atomics and compile libgcc_s with these, but because libgcc_s is linked with -nodefaultlibs, it could not find the helper routines in libcompiler_rt.a. In contrast, people who did not bootstrap the compiler never saw any issues, because libgcc_s was built using their 'old' base system compiler, and so libgcc_s would not contain any calls to those helper routines. Fix this by ensuring that libgcc_s is linked against libcompiler_rt.a explicitly, similar to some other binaries and libraries that are built with -nodefaultlibs. Also, bump FREEBSD_CC_VERSION to ensure that everybody gets the updated compiler with outline atomics enabled. (This should have been done in the first iteration of this commit, because the error would have shown up right away then.) MFC after: 3 days --- contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h | 5 +++++ lib/clang/freebsd_cc_version.h | 2 +- lib/libgcc_s/Makefile | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h index 7ab63905ed4f..7d090ba682b3 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/FreeBSD.h @@ -78,6 +78,11 @@ public: void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; + bool IsAArch64OutlineAtomicsDefault( + const llvm::opt::ArgList &Args) const override { + return true; + } + UnwindTableLevel getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override; bool isPIEDefault(const llvm::opt::ArgList &Args) const override; diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h index b493dc96db5e..cf525916fe29 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1 +1 @@ -#define FREEBSD_CC_VERSION 1600000 +#define FREEBSD_CC_VERSION 1600001 diff --git a/lib/libgcc_s/Makefile b/lib/libgcc_s/Makefile index 992fc930ee9f..7e3911043843 100644 --- a/lib/libgcc_s/Makefile +++ b/lib/libgcc_s/Makefile @@ -11,7 +11,9 @@ MK_SSP= no WARNS?= 2 LDFLAGS+= -nodefaultlibs +LDFLAGS+= -Wl,-Bsymbolic LIBADD+= c +LIBADD+= compiler_rt VERSION_DEF= ${.CURDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map