@@ -1995,7 +1995,6 @@ F: package/bridge-utils/
F: package/checkpolicy/
F: package/checksec/
F: package/cgroupfs-mount/
-F: package/compiler-rt/
F: package/crda/
F: package/cunit/
F: package/dacapo/
@@ -2033,6 +2032,7 @@ F: package/libssh2/
F: package/libtalloc/
F: package/libqmi/
F: package/lighttpd/
+F: package/llvm-project/compiler-rt/
F: package/logrotate/
F: package/makedevs/
F: package/memtester/
@@ -2007,7 +2007,6 @@ menu "Other"
source "package/cctz/Config.in"
source "package/cereal/Config.in"
source "package/cmocka/Config.in"
- source "package/compiler-rt/Config.in"
source "package/cppcms/Config.in"
source "package/cracklib/Config.in"
source "package/dawgdic/Config.in"
@@ -2107,6 +2106,7 @@ comment "linux-pam plugins"
endif
source "package/liquid-dsp/Config.in"
source "package/llvm-project/clang/Config.in"
+ source "package/llvm-project/compiler-rt/Config.in"
source "package/llvm-project/llvm/Config.in"
source "package/lttng-libust/Config.in"
source "package/matio/Config.in"
similarity index 100%
rename from package/compiler-rt/Config.in
rename to package/llvm-project/compiler-rt/Config.in
similarity index 100%
rename from package/compiler-rt/compiler-rt.hash
rename to package/llvm-project/compiler-rt/compiler-rt.hash
similarity index 85%
rename from package/compiler-rt/compiler-rt.mk
rename to package/llvm-project/compiler-rt/compiler-rt.mk
@@ -4,11 +4,9 @@
#
################################################################################
-# Compiler-RT should be bumped together with LLVM and Clang as the run-time is
-# tied to the version of those tools
-COMPILER_RT_VERSION = 11.1.0
+COMPILER_RT_VERSION = $(LLVM_PROJECT_VERSION)
COMPILER_RT_SOURCE = compiler-rt-$(COMPILER_RT_VERSION).src.tar.xz
-COMPILER_RT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(COMPILER_RT_VERSION)
+COMPILER_RT_SITE = $(LLVM_PROJECT_SITE)
COMPILER_RT_LICENSE = NCSA MIT
COMPILER_RT_LICENSE_FILES = LICENSE.TXT
COMPILER_RT_DEPENDENCIES = host-clang llvm