commit:     6ee050465a0e1358b5d76197f5194ca5fc3d9ae2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 10:56:26 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 18:41:43 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee05046

llvm-runtimes/compiler-rt: Add 21.1.4

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

 llvm-runtimes/compiler-rt/Manifest                 |   2 +
 .../compiler-rt/compiler-rt-21.1.4.ebuild          | 191 +++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/llvm-runtimes/compiler-rt/Manifest 
b/llvm-runtimes/compiler-rt/Manifest
index 9cac1af47522..36932e76f5b3 100644
--- a/llvm-runtimes/compiler-rt/Manifest
+++ b/llvm-runtimes/compiler-rt/Manifest
@@ -17,6 +17,8 @@ DIST llvm-project-21.1.2.src.tar.xz 158926856 BLAKE2B 
1b5684586297ad637c6da09768
 DIST llvm-project-21.1.2.src.tar.xz.sig 566 BLAKE2B 
6209caf851c681e6f63ed1bd9589ac139c104d6ee21f463aacda472e30a847c32f3bd74a04208af05bb6203d8fa31bdc0028c0e72736a3037940e75eda615415
 SHA512 
dd8aa57451752a9207c276117a4b8a86f41263ea3ccc4fa198cd40d6fec79acd0ba126c4b84a1acbb52bbb2bce029fbc336deac8131be94747dd04e4a0f69331
 DIST llvm-project-21.1.3.src.tar.xz 158943752 BLAKE2B 
ad9ee083584cb72fea3722feb518f6c933c3a34ba91b1ca8b724f461aa744475a783512dd6f0ab60d533c73b37e42b32a06f905d4869f770a68180649656df44
 SHA512 
d3058e7c18ada2a6a6192c7e75970406520e0d2ba390dba3b89e99f05959198fd2976d38c200f8e6af37fb569d866b6367bf6e0e249fe4b340dfab74499e5723
 DIST llvm-project-21.1.3.src.tar.xz.sig 119 BLAKE2B 
675873fb6ce9a6b682d0ecdc5ec6ca8691d7f8f6bc72e6039a90c21f99d753a4b595f06676f9b5c1a23ebce872320cc67bd1687e8324f163ecbc4f22032bdf52
 SHA512 
d218a4071451e32a77890dd2e7de7a3b8a310ca85c7e6d90b88d85bad128979cf6866c9d772b880b50da2ec117832e77ba162049478c1deb7b0299cae008151a
+DIST llvm-project-21.1.4.src.tar.xz 158939036 BLAKE2B 
b87eff4e3cb881d86aafcfdb46d85344ad6ae92d5c1e72c05282f375b4b11844756d0e6b4d0da5e522a348170a5da9842917737e272b758d8dde7e1fb2bee135
 SHA512 
a8c0883abe7c5a3e55ca7ed0fd974fae4351184a0b0df18295a982ca8ddb0f8d167353564204ed00f0cd9a1d8baef7074c0b39a99e0b5c52ced6bbee73dde3da
+DIST llvm-project-21.1.4.src.tar.xz.sig 119 BLAKE2B 
c74a56448ad3e325234fcbe7d62ea888831e1e7696afb5aa5a185ea76a0880abe2d755f9e69a07760bbf9380534c3bb96c920ed6359ffd0f5f51c962d1494dcf
 SHA512 
4812c2e3861aa3b726d842c3ca259b19ef1aa531fed9f6f47099483de91de2b2a165f40d243f6f40f2eea749741d5f8b7090f394399c56db02053f308921077a
 DIST llvm-project-6a0e5b2fd7c340a872ae1e011cfb9de0d188feba.tar.gz 249848364 
BLAKE2B 
5d8eadfd43e1a131d7c061968c7d306b0537c0983c9366973d5b8d1bab4b384d1319604e12f097e235e077aefcd8b9c8395c3e16b53612f9f06fb11ba358aad6
 SHA512 
d931218ca1dafab09525f862f4b993cb6dde2f8738092e84b87542318d05c81fd41499098833f8629501c19f4fa741a35fc6447631f1c8830b2bb0b2cb64cc43
 DIST llvm-project-89ed5255b9ee88119e409a6d986eb1ad0e8f08e3.tar.gz 248431210 
BLAKE2B 
b98dfe5ae46190a5a2460c965f0ec51d2f65a9d1d14f82afa19a10f00a2c29520c52309ee66d71efed6361aa675abcc9bd1b5e61e1c3b1aa9bac4984050c2bc2
 SHA512 
f860f529f4eb67f4a5875d9931accae2f48b88486dd6715a2ca2add7d5aa1541a30e323612394162e65597054d61a879a9ba94e4dbf417c3fb5f8ff069c2d924
 DIST llvm-project-b1e29ec3b73b9dd06656c7e30ace597ff72cde70.tar.gz 248630276 
BLAKE2B 
ea1532ba05661de37f3d6bac6643f2f3000710f4c4b8c508c9b980da64964e60cd46d0b8e18d666b75089f8ad8e2f653ac6098b4054ce8adf7cb0c36220cdf29
 SHA512 
36471abffd9202c637aa89c53072f0f286beffad2d3908ad50bb4c395a1be0c8138ddcbd67e0c764f59842bcc6c6c31f04a14986c7145c369217a156885ac506

diff --git a/llvm-runtimes/compiler-rt/compiler-rt-21.1.4.ebuild 
b/llvm-runtimes/compiler-rt/compiler-rt-21.1.4.ebuild
new file mode 100644
index 000000000000..9d0337799be0
--- /dev/null
+++ b/llvm-runtimes/compiler-rt/compiler-rt-21.1.4.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2025 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 (built-in part)"
+HOMEPAGE="https://llvm.org/";
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux 
~arm64-macos ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +atomic-builtins +clang debug test"
+REQUIRED_USE="atomic-builtins? ( clang )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+       llvm-core/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+       clang? (
+               llvm-core/clang:${LLVM_MAJOR}
+               llvm-core/clang-linker-config:${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 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_pretend() {
+       if ! use clang && ! tc-is-clang; then
+               ewarn "Building using a compiler other than clang may result in 
broken atomics"
+               ewarn "library. Enable USE=clang unless you have a very good 
reason not to."
+       fi
+}
+
+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
+}
+
+test_compiler() {
+       target_is_not_host && return
+       $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+               <<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+       if use clang || use test; then
+               llvm_prepend_path -b "${LLVM_MAJOR}"
+       fi
+
+       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+       # pre-set since we need to pass it to cmake
+       BUILD_DIR=${WORKDIR}/${P}_build
+
+       if use clang && ! is_crosspkg; then
+               # Only do this conditionally to allow overriding with
+               # e.g. CC=clang-13 in case of breakage
+               if ! tc-is-clang ; then
+                       local -x CC=${CHOST}-clang-${LLVM_MAJOR}
+                       local -x CXX=${CHOST}-clang++-${LLVM_MAJOR}
+               fi
+
+               strip-unsupported-flags
+
+               # The full clang configuration might not be ready yet. Given 
that compiler-rt
+               # require runtime, use only the linker configuration.
+               local flags=(
+                       
--config="${ESYSROOT}"/etc/clang/"${LLVM_MAJOR}"/gentoo-linker.cfg
+               )
+               local -x CFLAGS="${CFLAGS} ${flags[@]}"
+               local -x CXXFLAGS="${CXXFLAGS} ${flags[@]}"
+               local -x LDFLAGS="${LDFLAGS} ${flags[@]}"
+       fi
+
+       if ! is_crosspkg && ! test_compiler ; then
+               local nolib_flags=( -nodefaultlibs -lc )
+
+               if test_compiler "${nolib_flags[@]}"; then
+                       local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+                       ewarn "${CC} seems to lack runtime, trying with 
${nolib_flags[*]}"
+               elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
+                       # Avoiding -nostartfiles earlier on for bug #862540,
+                       # and set available entry symbol for bug #862798.
+                       nolib_flags+=( -nostartfiles -e main )
+
+                       local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+                       ewarn "${CC} seems to lack runtime, trying with 
${nolib_flags[*]}"
+               fi
+       fi
+
+       local mycmakeargs=(
+               
-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+               -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
+               -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=$(usex !atomic-builtins)
+               -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+               -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
+
+               -DPython3_EXECUTABLE="${PYTHON}"
+       )
+
+       if use amd64 && ! target_is_not_host; then
+               mycmakeargs+=(
+                       -DCAN_TARGET_i386=$(usex abi_x86_32)
+                       -DCAN_TARGET_x86_64=$(usex abi_x86_64)
+               )
+       fi
+
+       if is_crosspkg; then
+               # Needed to target built libc headers
+               export CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
+               mycmakeargs+=(
+                       # Without this, the compiler will compile a test program
+                       # and fail due to no builtins.
+                       -DCMAKE_C_COMPILER_WORKS=1
+                       -DCMAKE_CXX_COMPILER_WORKS=1
+
+                       # Without this, compiler-rt install location is not 
unique
+                       # to target triples, only to architecture.
+                       # Needed if you want to target multiple libcs for one 
arch.
+                       -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
+
+                       -DCMAKE_ASM_COMPILER_TARGET="${CTARGET}"
+                       -DCMAKE_C_COMPILER_TARGET="${CTARGET}"
+                       -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
+               )
+       fi
+
+       if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+               mycmakeargs+=(
+                       # setting -isysroot is disabled with 
compiler-rt-prefix-paths.patch
+                       # this allows adding arm64 support using SDK in EPREFIX
+                       -DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+                       # Set version based on the SDK in EPREFIX.
+                       # This disables i386 for SDK >= 10.15
+                       -DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath 
"${EPREFIX}/MacOSX.sdk" | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+                       # Use our libtool instead of looking it up with xcrun
+                       -DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+               )
+       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
+}
+
+src_test() {
+       # respect TMPDIR!
+       local -x LIT_PRESERVES_TMP=1
+
+       cmake_build check-builtins
+}

Reply via email to