From nobody Wed Nov 26 06:07:16 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 4dGTc4675qz6HVxT for ; Wed, 26 Nov 2025 06:07:16 +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 4dGTc43wHGz3XNS for ; Wed, 26 Nov 2025 06:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764137236; 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=hvHzl/E3L1RJhh6xagbbrsdbUD+15pF1wISguly7Wr8=; b=QdZm0ueFREqNLoWk+ZwLKiAbG7Dy/ejRHUGtG0zLqJd9DXFuKhcqPPkDeL4VQ2JmXzonPn qPIOS1w+9c2pK90UY5urpk3p/MVI/OYOVoGejU1gTSDvT1nLaMOMgiG40UJWgPxo8048vb gTlcegKL6TSJtkENzaDMS0V6JbvwpK9Vcrt1sApk0HGZQ2oqkHcuM8zlE2jZ1xt0K5KgVi zYP46+0bsqkZXQg2CM3+d4WYKlw3R970yjbRiuwH008Om5JqRWrEbKiZXWsE3ZX2jrT1ZC c9s0mlAnLNBcEZEapUr02415HSqI6IQr4sODAoxuk75jlixPktxJaIPi/0LA+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764137236; 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=hvHzl/E3L1RJhh6xagbbrsdbUD+15pF1wISguly7Wr8=; b=Cjx79OJ1XUrTGh1MmyEyiS18puDggahAFPY/Q0o3m6fh9XjJJkMz+kaJHx7eiy4ibTBlBg V2lLyrZ5PWDRZSW6Ps+o/WZfX1l5hBuvRej+RyvCmWDO0x3iy7ZpYU+WI/I5AoLGjHto2n AMKfZbNKiT5yc/Z2zVOsZrPY+Acl94gKl+nLeE0uygP9Oh0tT1iLkFdWqCMEeoqC5CZufm iejNEy8a5uzcw8HIqCC3ZebKFKKEm7dnNMHj4jn5ChxIhSDIwJqv6Cq6KLFDxkRYJ1Tgq4 fkx70RKJfywi2s5NXo47wTd1qvIsKcpUZjyNfn0FRd+ZARMc0Jt3PGW5qDaavw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764137236; a=rsa-sha256; cv=none; b=wA6Txx28mMxSjocWpuA7rF3M/eW9Evz9P5ghoM+ogLGiXjBuLo4oFbZXEsMgK/6kArL3t2 ul25qeOdRcni67foo+PxYK0r5yXrqxSpPeHsqWeZyOIojCuNRrek8EO+0/4HjsVJ/C/23C 4kCkAaZSxwcjt2Wi1lMhorWBpPzse8Qbyj8Q0JhHGDILMUxn1MKd+Dq45NetJ0qQlIK36P rQwaBYg0S4brTTb4pqZcMD5XHnKCSyqffjkc4bs1ULBfu5yQd6Z4XoVVxEqzJHI57Toal4 3tut1ExkrNKQr8MXE5R3lArtFnOvZcgHyXEcIx2a4SZqY6wG3YOIUfgIWM0juw== 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 4dGTc42gzpzb6s for ; Wed, 26 Nov 2025 06:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f2d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 06:07:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a48358d78e87 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: a48358d78e87380c8498739bc4c82061e6c39a47 Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 06:07:16 +0000 Message-Id: <69269914.f2d9.5df9b8c1@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a48358d78e87380c8498739bc4c82061e6c39a47 commit a48358d78e87380c8498739bc4c82061e6c39a47 Author: Dimitry Andric AuthorDate: 2025-11-23 15:52:46 +0000 Commit: Dimitry Andric CommitDate: 2025-11-26 06:05:48 +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 277744ae8624..e272ca160b84 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1 +1 @@ -#define FREEBSD_CC_VERSION 1500000 +#define FREEBSD_CC_VERSION 1500001 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