README.en.md

@@ -1,23 +1,8 @@
-# compiler-rt-latest
+# compiler-rt
 
 #### Description
 The llvm compiler support routines
 
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
 #### Contribution
 
 1.  Fork the repository

README.md

@@ -1,24 +1,8 @@
-# compiler-rt-latest
+# compiler-rt
 
 #### 介绍
 The llvm compiler support routines
 
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
 #### 参与贡献
 
 1.  Fork 本仓库

compiler-rt.spec

@@ -1,24 +1,23 @@
+%bcond_without sys_llvm
 %bcond_without check
-%bcond_without toolchain_clang
 
-%if %{with toolchain_clang}
+%global maj_ver 17
-%global toolchain clang
+%global min_ver 0
-%endif
+%global patch_ver 6
-
-%global maj_ver 18
-%global min_ver 1
-%global patch_ver 8
 %global crt_version %{maj_ver}.%{min_ver}.%{patch_ver}
 %global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
 %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE)
 %global optflags %(echo %{optflags} -Dasm=__asm__)
 
-%global _scl_prefix /opt/openEuler
+%if %{with sys_llvm}
-%{?scl:%scl_package %scl}
+%global pkg_name compiler-rt
-%{!?scl:%global scl_prefix llvm-toolset-%{maj_ver}-}
+%global install_prefix %{_prefix}
-%{!?scl:%global pkg_name %{name}}
+%global install_datadir %{_datadir}
-%global install_prefix %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_prefix}
+%else
-%global install_datadir %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_datadir}
+%global pkg_name compiler-rt%{maj_ver}
+%global install_prefix %{_libdir}/llvm%{maj_ver}
+%global install_datadir %{install_prefix}/share
+%endif
 
 %if 0%{?__isa_bits} == 64
 %global install_libdir %{install_prefix}/lib64
@@ -26,9 +25,9 @@
 %global install_libdir %{install_prefix}/lib
 %endif
 
-Name:		%{?scl_prefix}compiler-rt
+Name:		%{pkg_name}
 Version:	%{crt_version}
-Release:	1
+Release:	2
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	NCSA or MIT
@@ -43,13 +42,16 @@ BuildRequires:	ninja-build
 BuildRequires:	python3
 # We need python3-devel for pathfix.py.
 BuildRequires:	python3-devel
-%if %{with toolchain_clang}
-BuildRequires:	clang
-%endif
 
-BuildRequires:	%{?scl_prefix}llvm-devel = %{version}
+%if %{with sys_llvm}
-BuildRequires:	%{?scl_prefix}llvm-test = %{version}
+BuildRequires:	llvm-devel = %{version}
-BuildRequires:  %{?scl_prefix}llvm-cmake-utils = %{version}
+BuildRequires:	llvm-test = %{version}
+BuildRequires:  llvm-cmake-utils = %{version}
+%else
+BuildRequires:	llvm%{maj_ver}-devel = %{version}
+BuildRequires:	llvm%{maj_ver}-test = %{version}
+BuildRequires:	llvm%{maj_ver}-cmake-utils = %{version}
+%endif
 
 %description
 The compiler-rt project is a part of the LLVM project. It provides
@@ -70,9 +72,6 @@ export ASMFLAGS=$CFLAGS
 mkdir -p _build
 cd _build
 %cmake  .. \
-    -DCMAKE_INSTALL_PREFIX=%{install_prefix} \
-    -DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \
-    -DLLVM_MAIN_SRC_DIR=%{install_prefix}/src \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_MODULE_PATH=%{install_libdir}/cmake/llvm \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
@@ -82,10 +81,6 @@ cd _build
 	-DLLVM_LIBDIR_SUFFIX=64 \
 %else
 	-DLLVM_LIBDIR_SUFFIX= \
-%endif
-%if "%{toolchain}" == "clang"
-	-DCMAKE_C_COMPILER=clang \
-	-DCMAKE_CXX_COMPILER=clang++ \
 %endif
 	-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF # could be on?
 
@@ -112,21 +107,6 @@ cd _build
 %endif
 
 %changelog
-* Fri Dec 6 2024 liyunfei <liyunfei33@huawei.com> - 18.1.8-1
-- init for Multi-Version LLVM-18.1.8
-
-* Thu Nov 14 2024 Funda Wang <fundawang@yeah.net> - 17.0.6-6
-- adopt to new cmake macro
-
-* Tue Aug 20 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-5
-- Add BiSheng Autotuner support.
-
-* Fri Jul 5 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-4
-- Add toolchain_clang build support
-
-* Wed Apr 03 2024 zhanglimin <zhanglimin@loongson.cn> - 17.0.6-3
-- Improve the support for compiler-rt on LoongArch
-
 * Fri Feb 23 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 17.0.6-2
 - Fix an unpackaged file issue on riscv64