gentoo auto-resync : 21:02:2025 - 00:15:53

4 files changed, 214 insertions, 6 deletions

diff --git a/llvm-runtimes/libgcc/Manifest b/llvm-runtimes/libgcc/Manifest
index c3b0bec0d573..7107f0383bd5 100644
--- a/llvm-runtimes/libgcc/Manifest
+++ b/llvm-runtimes/libgcc/Manifest
@@ -4,9 +4,10 @@ DIST llvm-project-20.1.0-rc2.src.tar.xz 147160684 BLAKE2B 6adc1226f022272d78fb0e
 DIST llvm-project-20.1.0-rc2.src.tar.xz.sig 566 BLAKE2B aa91f7be228e51b0f2234bb5e0df173e3ddc90b6db4350a9008c2f8ba53220da6eef0c69778aecac3caecf918a0c54a0d910177ffe7643ad7fc5624a97262b7f SHA512 e5563a8a79b5e9ef26d62dc6d4385c1c86d12a652b4b1e7fc9ce45a2ea66e5118112746a61b439823bf99d65aea82285eabf5e07714eec77e6e5cd02feab82ce
 DIST llvm-project-2cd8207b26ea4269630feba661f68554d7ae3c15.tar.gz 227261597 BLAKE2B 51ce992b651fcf08b7fd520420040803b59f1260947953325400c50bec576c418b162d8ae2d2307e70b885b1185c302a97409bcfe48cdb14b8e1384f4e2dfa9e SHA512 a41749943508ea4a18b47c4e947917b5268544e64372c0c3347f9ab8172a2c229d8b1d813d1e842be1b98aedd624524857ed3bb23fe98ad5f36e7a71581abb4b
 DIST llvm-project-c30a7f459452d5766da244564bc1d5888346c364.tar.gz 227560986 BLAKE2B c1c833aa6d488530826d96db81ca8be2fcf842ccf5b10a65ff18269fdfa32fa2742fb0a547eb315c2a9ee383e1b6b6cce4a78136e1740e04d322c79fb6a66a86 SHA512 0b68d3462e5eac89f50cff5e64603758ab74c701ff2de88c8569dd45b7e702b5d13b26c2745615c0c355d46d13765f47e4d43e61cde735240c6f386c0090becb
+EBUILD libgcc-19.1.7-r1.ebuild 4571 BLAKE2B 96646eede20a4ea407f22eafe5e8b26632aad0563293466ffcbdd5752a396fd667dfb200356e221d296681cd22ccf3cc263d275e28122b48338e206875ab161e SHA512 8392e31e1f3bb813b6a2565bd4d695139ff246be10163a7a451b364e1892d2026a25d42a717129b6488589882548d37dce809b340ebbbe7d47cc8404c7a34564
 EBUILD libgcc-19.1.7.ebuild 4045 BLAKE2B 0652485ecb35eb096883accd91d8ac571fdc06d32833d979b078139710357a9a8f2fdca2f39277691e116a8da0abeeed554418f403e865cb99387556e3de393a SHA512 d1de13cbc904e156f1e6f50c2afab045d92cc0fc99f943a935f161c9f6a0fc47811b322ec71858866e6767d0a634025cbd81519c34aa78bb5f72737b3790364e
-EBUILD libgcc-20.1.0_rc2.ebuild 4027 BLAKE2B 57ce1132135527807f141f447e5868339d962c06935020d6d74be25845e4641bacfe74fec49fbb31267174b2b57f1b9f698ee64c035faa3b7a81076885604bf2 SHA512 84a21baa57a21bb60261139b68d5a4d615f91aeec5f330a37cd081ade278804e15f60216cef4a723b84f6b2cca6019dfb19ccc687528ccaa7d95351fe4433189
-EBUILD libgcc-21.0.0.9999.ebuild 4027 BLAKE2B 57ce1132135527807f141f447e5868339d962c06935020d6d74be25845e4641bacfe74fec49fbb31267174b2b57f1b9f698ee64c035faa3b7a81076885604bf2 SHA512 84a21baa57a21bb60261139b68d5a4d615f91aeec5f330a37cd081ade278804e15f60216cef4a723b84f6b2cca6019dfb19ccc687528ccaa7d95351fe4433189
+EBUILD libgcc-20.1.0_rc2.ebuild 4553 BLAKE2B 48481d0c499838276b0be90366c4ff19c0cf6f97fc2d35bf5eb4f794cd558f90cc8e9c9e1a673353626c40e266cc152c4548349b1636f6c34a0314d541d7349b SHA512 f0ba06884ab14ef4eb9d74a34665369bfcdadd246c050aef06c6a57c38d1bbae8f2b4fe35a11cb1a1711f3118cd965df9e10b77e912f92ab79c1fd071c75359f
+EBUILD libgcc-21.0.0.9999.ebuild 4553 BLAKE2B 48481d0c499838276b0be90366c4ff19c0cf6f97fc2d35bf5eb4f794cd558f90cc8e9c9e1a673353626c40e266cc152c4548349b1636f6c34a0314d541d7349b SHA512 f0ba06884ab14ef4eb9d74a34665369bfcdadd246c050aef06c6a57c38d1bbae8f2b4fe35a11cb1a1711f3118cd965df9e10b77e912f92ab79c1fd071c75359f
 EBUILD libgcc-21.0.0_pre20250211.ebuild 4027 BLAKE2B 57ce1132135527807f141f447e5868339d962c06935020d6d74be25845e4641bacfe74fec49fbb31267174b2b57f1b9f698ee64c035faa3b7a81076885604bf2 SHA512 84a21baa57a21bb60261139b68d5a4d615f91aeec5f330a37cd081ade278804e15f60216cef4a723b84f6b2cca6019dfb19ccc687528ccaa7d95351fe4433189
 EBUILD libgcc-21.0.0_pre20250215.ebuild 4027 BLAKE2B 57ce1132135527807f141f447e5868339d962c06935020d6d74be25845e4641bacfe74fec49fbb31267174b2b57f1b9f698ee64c035faa3b7a81076885604bf2 SHA512 84a21baa57a21bb60261139b68d5a4d615f91aeec5f330a37cd081ade278804e15f60216cef4a723b84f6b2cca6019dfb19ccc687528ccaa7d95351fe4433189
 MISC metadata.xml 416 BLAKE2B 05a5a2fdfc857b5a522141deb8ee7f20f82773021ffc583cd869b129cf34fc809900ad90a01c049d5e108ca3fbf297208733ed0c49849b139e591afbdfa2a933 SHA512 866c5ea5585a8229eda9fdb4f6dba1453d3cff86083b51b115edc766aea7c02b4b306bd113b28cb5b3f2306951530ab0a2947681d0ffd1e6cee7b572d282f97d
diff --git a/llvm-runtimes/libgcc/libgcc-19.1.7-r1.ebuild b/llvm-runtimes/libgcc/libgcc-19.1.7-r1.ebuild
new file mode 100644
index 000000000000..d0a3126ebcf1
--- /dev/null
+++ b/llvm-runtimes/libgcc/libgcc-19.1.7-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+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"
+KEYWORDS="~amd64"
+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 )
+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 "${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}"
+
+		-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"
+}
diff --git a/llvm-runtimes/libgcc/libgcc-20.1.0_rc2.ebuild b/llvm-runtimes/libgcc/libgcc-20.1.0_rc2.ebuild
index c1ca1f41c22a..2c2ae9d40376 100644
--- a/llvm-runtimes/libgcc/libgcc-20.1.0_rc2.ebuild
+++ b/llvm-runtimes/libgcc/libgcc-20.1.0_rc2.ebuild
@@ -103,6 +103,21 @@ src_configure() {
 	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
 
@@ -135,6 +150,9 @@ src_compile() {
 		-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
 }
 
@@ -147,9 +165,8 @@ src_test() {
 
 src_install() {
 	local libdir=$(get_libdir)
-	dolib.so libgcc_s.so.1.0
+	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 libgcc_s.so.1 "/usr/${libdir}/libgcc_s.so"
 	dosym libunwind.a "/usr/${libdir}/libgcc_eh.a"
 }
diff --git a/llvm-runtimes/libgcc/libgcc-21.0.0.9999.ebuild b/llvm-runtimes/libgcc/libgcc-21.0.0.9999.ebuild
index c1ca1f41c22a..2c2ae9d40376 100644
--- a/llvm-runtimes/libgcc/libgcc-21.0.0.9999.ebuild
+++ b/llvm-runtimes/libgcc/libgcc-21.0.0.9999.ebuild
@@ -103,6 +103,21 @@ src_configure() {
 	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
 
@@ -135,6 +150,9 @@ src_compile() {
 		-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
 }
 
@@ -147,9 +165,8 @@ src_test() {
 
 src_install() {
 	local libdir=$(get_libdir)
-	dolib.so libgcc_s.so.1.0
+	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 libgcc_s.so.1 "/usr/${libdir}/libgcc_s.so"
 	dosym libunwind.a "/usr/${libdir}/libgcc_eh.a"
 }