commit:     8f03e81b30a136608fa7d18948e6ac840c2b32a7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 27 10:54:21 2026 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan 27 14:54:30 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f03e81b

llvm-runtimes/libgcc: Bump to 22.1.0_rc2

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 llvm-runtimes/libgcc/Manifest                 |   2 +
 llvm-runtimes/libgcc/libgcc-22.1.0_rc2.ebuild | 173 ++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/llvm-runtimes/libgcc/Manifest b/llvm-runtimes/libgcc/Manifest
index 308a0f015a7a..32ba3deac81a 100644
--- a/llvm-runtimes/libgcc/Manifest
+++ b/llvm-runtimes/libgcc/Manifest
@@ -6,4 +6,6 @@ DIST llvm-project-21.1.8.src.tar.xz 158958576 BLAKE2B 
0d3d4ee920f8e5db50e9815261
 DIST llvm-project-21.1.8.src.tar.xz.sig 119 BLAKE2B 
cffc1825f5778a3e3c128ec3e856ff6ee50687319d621cdf42e895abf67e05cc51cb7493308e2b506ab60dbdbaca7aa75eb9f78d91d42c81f9682a36f4042e9d
 SHA512 
10f58eff58ed6e701d0f123b15e68c82ab8cbdf99b1c86c0d83e3b8553e90ea51055e30327e8e442ded57c8f503e2a2de9ee075e9c28b5ba815a0f8922f8671c
 DIST llvm-project-22.1.0-rc1.src.tar.xz 166976000 BLAKE2B 
eec2cf8822aa6937c751d94f07c6505a3cebda83c544299ff8eaeeedbadc36054b32fb1a0b655993bd604f9c82ac6fa419e974b1dc9c3f4b6c35aa94e9f4e929
 SHA512 
545ca31b2a24cab3d3a8d5ebfa2a25439eab4258cef01b53706a7a9e5174a75050fb3d36ad2ac4ebb9a23e34a005707c73383cd3cddd78f6789f5b1d4d446e7c
 DIST llvm-project-22.1.0-rc1.src.tar.xz.sig 119 BLAKE2B 
e3d5a6c00d7960b0694919ff083e02f0273e97da6a40ad452fbb8261b9edfc52d4262733d82a59f03ad7d15b3b62de743b37a1b2e191417443ecb730520be376
 SHA512 
51326b9402d7719c491ac5c6ab80a678896743dd88e3f997245adb77e7b3f5e0f84f6389c75872aea268de8a7a049684c84cdf575c1f19c4971bb280a9374de6
+DIST llvm-project-22.1.0-rc2.src.tar.xz 166979860 BLAKE2B 
d4d58b2615ce596f97ad743ba43a774a7b1e69f8aa394411cfdfdae6abf76ef23c9f483a8db590eac6012a965dbe720111c3c779cf20d1483bd216a3fe5111a0
 SHA512 
2690f582950a2b8b4dccfce849080b841b34068bbd07acd25ae7d18ef0bc6919f83cd57edda8b90a00327b73aa5cb3411d413ea800247cf541c89143ca26ef98
+DIST llvm-project-22.1.0-rc2.src.tar.xz.sig 119 BLAKE2B 
797d0fb36d5ff979504bf094c574ab6473d6d428b0ee0f80c95f6b700c534b8d390f0685e01bd9681fd0b33c0fe39af2d6a8b79372d05af1d87b0a602ba7ff2f
 SHA512 
619a9ef733d7f89ed1e7564d027b4d1ad714dbe7912cd7ff258436e9ee6b878cc806d2856f00b600f982a472644cd9ba54739f8d034f5b5033c1036fcddf9a09
 DIST llvm-project-9eaa1ff11ccde52f2e3bf86f253b6b646548c7cc.tar.gz 259436517 
BLAKE2B 
effc5d342ef8440834d03ca7f9d56dc9f5a0aaa10f62aa81fb3d468cfcd0f28a41b343dc12d91e087a5e509a8bb6aa00b477582f42b87efbf22ea580b48a981e
 SHA512 
fda87f688a8a3626c3b025d2a783d7deb0c64ae83cb9c9c89adb73eba764435981545844eb654d7094361fb3786ea955101ba261f0e4af5ee4beffdd9c2449d7

diff --git a/llvm-runtimes/libgcc/libgcc-22.1.0_rc2.ebuild 
b/llvm-runtimes/libgcc/libgcc-22.1.0_rc2.ebuild
new file mode 100644
index 000000000000..17722edc37c5
--- /dev/null
+++ b/llvm-runtimes/libgcc/libgcc-22.1.0_rc2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+
+inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1
+inherit toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang, compatible with libgcc_s"
+HOMEPAGE="https://llvm.org/";
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+IUSE="debug test"
+
+DEPEND="
+       ~llvm-runtimes/libunwind-${PV}[static-libs]
+"
+RDEPEND="
+       ${DEPEND}
+       !sys-devel/gcc
+"
+BDEPEND="
+       llvm-core/clang:${LLVM_MAJOR}
+       test? (
+               $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+               =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+       )
+       !test? (
+               ${PYTHON_DEPS}
+       )
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake llvm-libgcc third-party/siphash 
)
+LLVM_TEST_COMPONENTS=( llvm/include/llvm/TargetParser )
+llvm.org_set_globals
+
+python_check_deps() {
+       use test || return 0
+       python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+       if target_is_not_host || tc-is-cross-compiler ; then
+               # strips vars like CFLAGS="-march=x86_64-v3" for non-x86 
architectures
+               CHOST=${CTARGET} strip-unsupported-flags
+               # overrides host docs otherwise
+               DOCS=()
+       fi
+       python-any-r1_pkg_setup
+}
+
+src_configure() {
+       # We need to build a separate copy of compiler-rt, because we need to 
disable the
+       # COMPILER_RT_BUILTINS_HIDE_SYMBOLS option - compatibility with libgcc 
requires
+       # visibility of all symbols.
+
+       llvm_prepend_path -b "${LLVM_MAJOR}"
+
+       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+       export CC=${CTARGET}-clang CXX=${CTARGET}-clang++
+       strip-unsupported-flags
+
+       local mycmakeargs=(
+               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+               -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+               -DCOMPILER_RT_BUILD_CRT=OFF
+               -DCOMPILER_RT_BUILD_CTX_PROFILE=OFF
+               -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+               -DCOMPILER_RT_BUILD_MEMPROF=OFF
+               -DCOMPILER_RT_BUILD_ORC=OFF
+               -DCOMPILER_RT_BUILD_PROFILE=OFF
+               -DCOMPILER_RT_BUILD_SANITIZERS=OFF
+               -DCOMPILER_RT_BUILD_XRAY=OFF
+
+               -DCOMPILER_RT_BUILTINS_HIDE_SYMBOLS=OFF
+
+               -DPython3_EXECUTABLE="${PYTHON}"
+       )
+
+       # disable building non-native runtimes since we don't do multilib
+       if use amd64; then
+               mycmakeargs+=(
+                       -DCAN_TARGET_i386=OFF
+               )
+       fi
+
+       if use test; then
+               mycmakeargs+=(
+                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+                       
-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+                       
-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+               )
+       fi
+
+       cmake_src_configure
+}
+
+# Usage: deps
+gen_ldscript() {
+       local output_format
+       output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | 
sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+       [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( 
${output_format} )"
+
+       cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+src_compile() {
+       cmake_src_compile
+
+       local rtlib=$(
+               "${CC}" -rtlib=compiler-rt -resource-dir="${BUILD_DIR}" \
+                       -print-libgcc-file-name || die
+       )
+
+       # Use the llvm-libgcc's version script to produce libgcc.{a,so}, which
+       # combines compiler-rt and libunwind into a libgcc replacement.
+       #
+       # What we do here is similar to what upstream does[0], with the 
following
+       # differences:
+       #
+       # * We build the local copy of compiler-rt manually, to have a full 
control
+       #   over CMake options.
+       # * Upstream links the locally built copy of libunwind statically. We 
link the
+       #   system-wide libunwind dynamically.
+       #
+       # [0] 
https://github.com/llvm/llvm-project/blob/llvmorg-19.1.7/llvm-libgcc/CMakeLists.txt#L102-L120
+       "${CC}" -E -xc \
+               "${WORKDIR}/llvm-libgcc/gcc_s.ver.in" \
+               -o gcc_s.ver || die
+       "${CC}" -nostdlib \
+               ${LDFLAGS} \
+               -Wl,--version-script,gcc_s.ver \
+               -Wl,--undefined-version \
+               -Wl,--whole-archive \
+               "${rtlib}" \
+               -Wl,-soname,libgcc_s.so.1.0 \
+               -lc -lunwind -shared \
+               -o libgcc_s.so.1.0 || die
+       # Generate libgcc_s.so ldscript for inclusion of libunwind as a
+       # dependency so that `clang -lgcc_s` works out of the box.
+       gen_ldscript libgcc_s.so.1.0 libunwind.so.1.0 > libgcc_s.so || die
+       cp "${rtlib}" libgcc.a || die
+}
+
+src_test() {
+       # respect TMPDIR!
+       local -x LIT_PRESERVES_TMP=1
+
+       cmake_build check-builtins
+}
+
+src_install() {
+       local libdir=$(get_libdir)
+       dolib.so libgcc_s.so.1.0 libgcc_s.so
+       dolib.a libgcc.a
+       dosym libgcc_s.so.1.0 "/usr/${libdir}/libgcc_s.so.1"
+       dosym libunwind.a "/usr/${libdir}/libgcc_eh.a"
+}

Reply via email to