From nobody Wed Nov 26 06:07:41 2025 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 4dGTcZ1DZrz6HVxh for ; Wed, 26 Nov 2025 06:07:42 +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 4dGTcZ0XwMz3XSp for ; Wed, 26 Nov 2025 06:07:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764137262; 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=btQFN4Ioywax9fc7w2hPwXX57rbqwhBnQOKHg62KXi4=; b=PjmMeus795oLx34/AOJ8giZmuzyws+Ihu+WxujQyCA14ccO9Hby0qBDRyZv3iu661YidyQ +7NJY5KIHXvZRu/z4FVDfT243cAWl0W7M4YjcvTqNuQATjnFffgH4Bd4SAAgSBkvpVcbf3 5kWgldA3C2T6QrcsfiML71uaPerfrac7RoFwV9atB0tFb3Iw31TyhuVrW/a6rT9iHJct8E mxncqXlsWowAO7G1zoARk1XxQwpOmBmZ0pOKIwyNWiDBudzuMdhldqGSqEarPp4C113Tup +tmc0l7Alvh3SnUFLttRPMfS/b6UCoCoAI5t8agtWCuaLe+bE5hnelvic96bKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764137262; 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=btQFN4Ioywax9fc7w2hPwXX57rbqwhBnQOKHg62KXi4=; b=bhdU3o5CMON7oUwJ2cE6Of4wv391Z2G15aC9DnCCgFhqTL3Ml6taF/6n5A10OEoxiPdD/5 ioWosu6bw9jEn4yJEL+GpuKoWcPDleWvtWUTfq62oGxJ3k0gEBwfJjmoMdqaXZHKzoK/qE dqvFzUcoRWc9TErmwDw6YmdN5q4owbfi2dCO/IXpTI/D92DHVUwmBFH/a+Ufbew9bwK0fM lXB12n8lWyfrJfhr8WdY9zbBAqvtLIF3Rjl/JqeEW2tDvwUsrN8lc9i6AIKPEkyh+1AIl+ ch3uAEdPQejA0zhxbFbnHhGACeLjJUCJF9zhVLZ7NqTH+lUCRmEShYzSHjYQxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764137262; a=rsa-sha256; cv=none; b=ytNubvJAxcAWQu0/4WQW6H6O87y/gftN+mVUGvFOWm4gLSPqxFs/yBWONMPH7iE0QWYVrs z9/Ezisc3l3d2fVGIWalcF5UZVhwl2VL6pgBFDLH7Y98a9WtC+L1//x6sl7wWXTyHq3Dtj gQRKCS/91JKrJM8rF1GiJkqvCEzFMuTSSsJP5l4u+tmuT6+dvkVAWGlYRFPYagwcH7oc/F sjLmWMIkuD3kCQlnZGwkXvSoOLqUo6JdYnBjrXbWc0PIeMiYhx5S4q7OEwNQWObOEvrpO4 hmug/D+VSlRZZi0qRI/Ffm2eE4Qy/E5q2VoRfxXqQtPPoffJQjGKtyo+BhpMww== 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 4dGTcY6rfczb6t for ; Wed, 26 Nov 2025 06:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f4f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 06:07:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e4e5e7da092e - stable/14 - Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):" 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e4e5e7da092eef1f0e1af70dd596a4ab9b75cb7a Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 06:07:41 +0000 Message-Id: <6926992d.f4f5.5872eeb7@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e4e5e7da092eef1f0e1af70dd596a4ab9b75cb7a commit e4e5e7da092eef1f0e1af70dd596a4ab9b75cb7a Author: Dimitry Andric AuthorDate: 2025-11-23 15:52:46 +0000 Commit: Dimitry Andric CommitDate: 2025-11-26 06:06:19 +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 (cherry picked from commit 3289bace53f31545976fec310b41fa784de75e64) --- 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 e9737b10d337..a01612cc323f 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1 +1 @@ -#define FREEBSD_CC_VERSION 1400006 +#define FREEBSD_CC_VERSION 1400007 diff --git a/lib/libgcc_s/Makefile b/lib/libgcc_s/Makefile index fdf5a67d8045..d0b9a799af1f 100644 --- a/lib/libgcc_s/Makefile +++ b/lib/libgcc_s/Makefile @@ -12,7 +12,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