From nobody Wed Nov 26 06:08:09 2025 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 4dGTd51Kmrz6HWDY for ; Wed, 26 Nov 2025 06:08:09 +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 4dGTd50bvWz3Xp7 for ; Wed, 26 Nov 2025 06:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764137289; 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=htCEq8PIfRsoxJHxCsHXFPiOM9nd7f80EnucGstShOk=; b=iNpufKFWIp8zlYENTEXLcHZnQ90Li7VD8yuAMQsHAkaLNXeO/Zo8/iQYbNJE1CigZvnKNk S6obrXzRcZvKHsUaSGqowQA5zPa0uTlYdckFMTarnLVP58NGIC77rxfWPSQx+JsOHbgnrE itGBl3zC8ECqMxKki1DhUW1zy8pIQsbeDBTaCqzHjjjUAJMIxguaek4z+/zhtg6YfMPUaf TeDBco8mQHqBYOltOSI29+rZR+xVyvOYVQkCn5nGijKUprf9LmiBmfDq8DxbMUUNJpLdrJ bng1PnxhWUbyxdzo0tmsoSz8enNPSGdqbjWz8yd5b1kVjmGHVbaVR0KKi+tTNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764137289; 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=htCEq8PIfRsoxJHxCsHXFPiOM9nd7f80EnucGstShOk=; b=ekZJqJkxbomruYgCOXM6TdRxhjHsqzhU6bZLAEhAxMeF6zsFkvBmd7M+IZDWLMvlghUgLd tGQU+6d2iEWwYS8MLn6jddO7tjZllhZVll/002gmAbbqpj7nVJb9xjlGv7LPQoUoz/M5se bzbLdzaOYJZlD7IUtnpT5ae/Blj8Y+whGUWglUXk1O5dnovjH2YP6QfVEw/MGOTfmpsnZx U+p5fxUEA9Cw21SPoqsAEfRo1Zf+hqJGQskJT/zGdDMDnfAgcmuEGecNvTXmDoAlsq6Ms5 apNRamGDyF66h8JZBUMqtr67VUEZQiwX/t/vaoqmXj7HVsxrK56L6k1tCzl6fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764137289; a=rsa-sha256; cv=none; b=CTC7qPZ30tWCU/AUgh9tBWFovMv/C1yiNU7LHLMNjPEishiNiFVBAfSiQ6JirhZmWXe4Pj 3BHSreSkxCIioxshk7a0ubXzx7bs5wJuZNkNFXLhV2eb/BQxnPcSXEH11afSdM8mK3PfR9 wejuXc93hjCyL8iTFpoYx9IHVfRp06ZIQTFhFAnwxWsjCUJH42FCcS7ox9N84fFI/EFbIp ZPwz15ycqdnYpfl6WDOsHbPyP7s93zant9DCaEutl0HPfP/6wuwX8am0P6pFlv4q42JcIw Hdy2YqlOt1idfb2Ias/f1jOJ0hfr4yUaL1OmmF59nh5fKj4MTbA0GRWC2uP12g== 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 4dGTd505s5zb6w for ; Wed, 26 Nov 2025 06:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f4f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 06:08:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e0c79f13d755 - stable/13 - Reapply "Merge commit e24f90190c77 from llvm git (by Brad Smith):" 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: e0c79f13d755c480ff6c3ca1f5c78ed1c04db400 Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 06:08:09 +0000 Message-Id: <69269949.f4f9.7140792c@gitrepo.freebsd.org> The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c79f13d755c480ff6c3ca1f5c78ed1c04db400 commit e0c79f13d755c480ff6c3ca1f5c78ed1c04db400 Author: Dimitry Andric AuthorDate: 2025-11-23 15:52:46 +0000 Commit: Dimitry Andric CommitDate: 2025-11-26 06:06:40 +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 758b8295d012..33f11e855524 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1 +1 @@ -#define FREEBSD_CC_VERSION 1300013 +#define FREEBSD_CC_VERSION 1300014 diff --git a/lib/libgcc_s/Makefile b/lib/libgcc_s/Makefile index 62c69cec4901..ecd9c4511247 100644 --- a/lib/libgcc_s/Makefile +++ b/lib/libgcc_s/Makefile @@ -9,7 +9,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