diff --git a/files.compiler-rt.spec.inc b/files.compiler-rt.spec.inc
deleted file mode 100644
index 5afca2b..0000000
--- a/files.compiler-rt.spec.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-# Files that appear both in x86_64 and i686
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtbegin.o
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtend.o
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan_cxx.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan-preinit.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan.so
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan_static.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.builtins.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.cfi.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.cfi_diag.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.fuzzer.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.fuzzer_interceptors.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.fuzzer_no_main.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.gwp_asan.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.lsan.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.profile.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.safestack.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.scudo_standalone.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.scudo_standalone_cxx.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.scudo_standalone.so
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.stats.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.stats_client.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_minimal.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_minimal.so
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone_cxx.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone.so
-
-# Files that don't appear in i686
-%ifnarch %{ix86}
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan_cxx.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dd.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dfsan.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dfsan.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dyndd.so
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases_cxx.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases_cxx.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases.so
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_cxx.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_cxx.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan-preinit.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan.so
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof_cxx.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof_cxx.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof-preinit.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof.so
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan_cxx.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan_cxx.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan_cxx.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan_cxx.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan.so
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_minimal.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone_cxx.a.syms
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray-basic.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray-fdr.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray-profiling.a
-%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/liborc_rt.a
-%endif
\ No newline at end of file
diff --git a/files.spec.inc b/files.spec.inc
index 8f50a24..aa4deed 100644
--- a/files.spec.inc
+++ b/files.spec.inc
@@ -503,7 +503,7 @@
 
 %if %{without compat_build}
 
-%files -n %{pkg_name_compiler_rt} -f %{_sourcedir}/files.compiler-rt.spec.inc
+%files -n %{pkg_name_compiler_rt}
 %license compiler-rt/LICENSE.TXT
 %ifarch x86_64 aarch64 %{ix86}
 %{_prefix}/lib/clang/%{maj_ver}/bin/hwasan_symbolize
@@ -527,6 +527,79 @@
 %{_prefix}/lib/clang/%{maj_ver}/share/hwasan_ignorelist.txt
 %{_prefix}/lib/clang/%{maj_ver}/share/msan_ignorelist.txt
 
+# Files that appear both in x86_64 and i686
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtbegin.o
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtend.o
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan_cxx.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan-preinit.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan.so
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan_static.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.builtins.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.cfi.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.cfi_diag.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.fuzzer.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.fuzzer_interceptors.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.fuzzer_no_main.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.gwp_asan.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.lsan.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.profile.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.safestack.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.scudo_standalone.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.scudo_standalone_cxx.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.scudo_standalone.so
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.stats.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.stats_client.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_minimal.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_minimal.so
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone_cxx.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone.so
+
+# Files that don't appear in i686
+%ifnarch %{ix86}
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.asan_cxx.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dd.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dfsan.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dfsan.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.dyndd.so
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases_cxx.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases_cxx.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_aliases.so
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_cxx.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan_cxx.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan-preinit.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.hwasan.so
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof_cxx.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof_cxx.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof-preinit.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.memprof.so
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan_cxx.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.msan_cxx.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan_cxx.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan_cxx.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.tsan.so
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_minimal.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.ubsan_standalone_cxx.a.syms
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray-basic.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray-fdr.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.xray-profiling.a
+%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/liborc_rt.a
+%endif
+
 %endif
 
 #endregion
diff --git a/sources.spec.inc b/sources.spec.inc
index da180e0..5b1e64c 100644
--- a/sources.spec.inc
+++ b/sources.spec.inc
@@ -18,7 +18,6 @@ Source1001: build.spec.inc
 Source1002: changelog.spec.inc
 Source1003: check.spec.inc
 Source1004: files.spec.inc
-Source1014: files.compiler-rt.spec.inc
 Source1005: globals.spec.inc
 Source1006: install.spec.inc
 Source1008: patches.spec.inc