diff --git a/fedora-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch b/0001-fedora-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch similarity index 99% rename from fedora-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch rename to 0001-fedora-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch index a37f8c3a03da37688d009ea9c6ff3d1ece9de6e5..7d8bedac75e63f57a11dff5cd95d9daeb52dd0c0 100644 --- a/fedora-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch +++ b/0001-fedora-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch @@ -5,8 +5,6 @@ Subject: [PATCH 2/2] [PATCH][lld] Import compact_unwind_encoding.h from libunwind This avoids an implicit cross package dependency - -Signed-off-by: Chenxi Mao --- lld/include/mach-o/compact_unwind_encoding.h | 477 +++++++++++++++++++++++++++ 1 file changed, 477 insertions(+) diff --git a/README.en.md b/README.en.md index 29b56e95b8bfd2d4e639df01e5d0901324a33568..67a193ac7f4f51ecfa9962ba2a090d84886dcc19 100644 --- a/README.en.md +++ b/README.en.md @@ -1,4 +1,4 @@ -# lld-15 +# lld #### Description LLVM Linker diff --git a/README.md b/README.md index 54f637186b1adcb389bc5cc86566b767816bc08f..0c91377848f2002468b578b6fd4bb1590749f964 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# lld-15 +# lld #### 介绍 LLVM Linker diff --git a/lld-12.0.1.src.tar.xz b/lld-12.0.1.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..37a92f985cc7ef0702c1eb21196112a97896fe5d Binary files /dev/null and b/lld-12.0.1.src.tar.xz differ diff --git a/lld-15.0.7.src.tar.xz b/lld-15.0.7.src.tar.xz deleted file mode 100644 index 2ef69eee9206f87446435a8de82ad9820cceeb5f..0000000000000000000000000000000000000000 Binary files a/lld-15.0.7.src.tar.xz and /dev/null differ diff --git a/lld.spec b/lld.spec index 9e311779a4f160e8b2d5866616bf1a5af8377b90..bbc08f5e7325ba7fd21f6bb06cfe9ce03ed97ade 100644 --- a/lld.spec +++ b/lld.spec @@ -1,22 +1,12 @@ -%bcond_without check - -%global maj_ver 15 +%global maj_ver 12 %global min_ver 0 -%global patch_ver 7 - -%global pkg_name lld%{maj_ver} -%global bin_suffix -%{maj_ver} -%global install_prefix %{_libdir}/llvm%{maj_ver} -%global install_includedir %{install_prefix}/include -%global install_libdir %{install_prefix}/lib -%global install_bindir %{install_prefix}/bin -%global pkg_bindir %{install_bindir} +%global patch_ver 1 # Don't include unittests in automatic generation of provides or requires. %global __provides_exclude_from ^%{_libdir}/lld/.*$ %global __requires_exclude ^libgtest.*$ -Name: %{pkg_name} +Name: lld Version: %{maj_ver}.%{min_ver}.%{patch_ver} Release: 1 Summary: The LLVM Linker @@ -25,18 +15,19 @@ License: NCSA URL: http://llvm.org Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/lld-%{version}.src.tar.xz -Patch1: fedora-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch +Patch1: 0001-fedora-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch BuildRequires: clang BuildRequires: cmake -BuildRequires: llvm%{maj_ver}-devel = %{version} -BuildRequires: llvm%{maj_ver}-googletest = %{version} -BuildRequires: llvm%{maj_ver}-test = %{version} -BuildRequires: ncurses-devel BuildRequires: ninja-build -BuildRequires: python3-rpm-macros -BuildRequires: python3-lit >= %{version} +BuildRequires: llvm-devel = %{version} +BuildRequires: ncurses-devel BuildRequires: zlib-devel +BuildRequires: python3-devel + +# For make check: +BuildRequires: python3-rpm-macros +BuildRequires: python3-lit Requires(post): %{_sbindir}/update-alternatives Requires(preun): %{_sbindir}/update-alternatives @@ -67,61 +58,40 @@ Shared libraries for LLD. mkdir -p _build cd _build %cmake .. -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=%{install_prefix} \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DLLVM_DYLIB_COMPONENTS="all" \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DPYTHON_EXECUTABLE=%{__python3} \ - -DLLVM_INCLUDE_TESTS=ON \ - -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ - -DLLVM_LIT_ARGS="-sv \ - --path %{_libdir}/llvm%{maj_ver}" \ - -DLLVM_MAIN_SRC_DIR=%{_libdir}/llvm%{maj_ver}/src + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src %ninja_build %install %ninja_install -C _build -rm %{buildroot}%{install_includedir}/mach-o/compact_unwind_encoding.h - -# Add version suffix to binaries -mkdir -p %{buildroot}/%{_bindir} -for f in %{buildroot}/%{install_bindir}/*; do - filename=`basename $f` - ln -s ../../%{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename%{bin_suffix} -done +rm %{buildroot}%{_includedir}/mach-o/compact_unwind_encoding.h %check -%if %{with check} -cd _build -%ninja_build check-lld -%endif %files %license LICENSE.TXT -%{_bindir}/lld%{bin_suffix} -%{_bindir}/lld-link%{bin_suffix} -%{_bindir}/ld.lld%{bin_suffix} -%{_bindir}/ld64.lld%{bin_suffix} -%{_bindir}/wasm-ld%{bin_suffix} -%{pkg_bindir} +%{_bindir}/lld* +%{_bindir}/ld.lld +%{_bindir}/ld64.lld +%{_bindir}/ld64.lld.darwinnew +%{_bindir}/wasm-ld %files devel -%{install_includedir}/lld -%{install_libdir}/liblld*.so -%{install_libdir}/cmake/lld/ +%{_includedir}/lld +%{_libdir}/liblld*.so +%{_libdir}/cmake/lld/ %files libs -%{install_libdir}/liblld*.so.* +%{_libdir}/liblld*.so.* %changelog -* Mon Feb 20 2023 Chenxi Mao - 15.0.7-1 -- Upgrade to 15.0.7. - -* Thu Feb 9 2023 Chenxi Mao - 15.0.6-2 -- Enable lld unit test. - -* Mon Jan 2 2023 Chenxi Mao - 15.0.6-1 +* Mon Feb 18 2023 cf-zhao - 12.0.1-1 - Package init +