diff --git a/_constraints b/_constraints index 5d373c6..1e2f2c8 100644 --- a/_constraints +++ b/_constraints @@ -34,11 +34,8 @@ riscv64 - - 52 - - 10000 + 14000 diff --git a/clang-13.0.0.src.tar.xz b/clang-13.0.0.src.tar.xz deleted file mode 100644 index 5f7b2ed..0000000 --- a/clang-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d611cbb06cfb6626be46eb2f23d003b2b80f40182898daa54b1c4e8b5b9e17e -size 17846828 diff --git a/clang-13.0.1.src.tar.xz b/clang-13.0.1.src.tar.xz new file mode 100644 index 0000000..8568eb8 --- /dev/null +++ b/clang-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:787a9e2d99f5c8720aa1773e4be009461cd30d3bd40fdd24591e473467c917c9 +size 17847584 diff --git a/clang-docs-13.0.0.src.tar.xz b/clang-docs-13.0.0.src.tar.xz deleted file mode 100644 index 3a2855a..0000000 --- a/clang-docs-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53ce5672cfa261948815112bfd515a564246dcbc725a030ce0dca2e2cc4ab583 -size 1327856 diff --git a/clang-docs-13.0.1.src.tar.xz b/clang-docs-13.0.1.src.tar.xz new file mode 100644 index 0000000..8903c2b --- /dev/null +++ b/clang-docs-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ea0c464d9fedf843a5066e13f32a0167334b89c92546bba81f9b953ef29b95e +size 1326592 diff --git a/clang-tools-extra-13.0.0.src.tar.xz b/clang-tools-extra-13.0.0.src.tar.xz deleted file mode 100644 index 51dbb96..0000000 --- a/clang-tools-extra-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:428b6060a28b22adf0cdf5d827abbc2ba81809f4661ede3d02b1d3fedaa3ead5 -size 2739604 diff --git a/clang-tools-extra-13.0.1.src.tar.xz b/clang-tools-extra-13.0.1.src.tar.xz new file mode 100644 index 0000000..2c24acb --- /dev/null +++ b/clang-tools-extra-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc2bc8598848513fa2257a270083e986fd61048347eccf1d801926ea709392d0 +size 2740348 diff --git a/compiler-rt-13.0.0.src.tar.xz b/compiler-rt-13.0.0.src.tar.xz deleted file mode 100644 index e3a9a8f..0000000 --- a/compiler-rt-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c3602d76c7868a96b30c36165c4b7643e2a20173fced7e071b4baeb2d74db3f -size 2287616 diff --git a/compiler-rt-13.0.1.src.tar.xz b/compiler-rt-13.0.1.src.tar.xz new file mode 100644 index 0000000..0ba6ad9 --- /dev/null +++ b/compiler-rt-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b33955031f9a9c5d63077dedb0f99d77e4e7c996266952c1cec55626dca5dfc +size 2290068 diff --git a/libcxx-13.0.0.src.tar.xz b/libcxx-13.0.0.src.tar.xz deleted file mode 100644 index 518e608..0000000 --- a/libcxx-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3682f16ce33bb0a8951fc2c730af2f9b01a13b71b2b0dc1ae1e7034c7d86ca1a -size 2086032 diff --git a/libcxx-13.0.1.src.tar.xz b/libcxx-13.0.1.src.tar.xz new file mode 100644 index 0000000..6f3f755 --- /dev/null +++ b/libcxx-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f446acc00bb7cfb4e866c2fa46d1b6dbf4e7d2ab62e3c3d84e56f7b9e28110f +size 2085992 diff --git a/libcxxabi-13.0.0.src.tar.xz b/libcxxabi-13.0.0.src.tar.xz deleted file mode 100644 index 2f3100b..0000000 --- a/libcxxabi-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:becd5f1cd2c03cd6187558e9b4dc8a80b6d774ff2829fede88aa1576c5234ce3 -size 554780 diff --git a/libcxxabi-13.0.1.src.tar.xz b/libcxxabi-13.0.1.src.tar.xz new file mode 100644 index 0000000..91f13a8 --- /dev/null +++ b/libcxxabi-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db5fa6093c786051e8b1c85527240924eceb6c95eeff0a2bbc57be8422b3cef1 +size 554912 diff --git a/lld-13.0.0.src.tar.xz b/lld-13.0.0.src.tar.xz deleted file mode 100644 index 2462338..0000000 --- a/lld-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20d1900bcd64ff62047291f6edb6ba2fed34d782675ff68713bf0c2fc9e69386 -size 1472476 diff --git a/lld-13.0.1.src.tar.xz b/lld-13.0.1.src.tar.xz new file mode 100644 index 0000000..f2fbd68 --- /dev/null +++ b/lld-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:666af745e8bf7b680533b4d18b7a31dc7cab575b1e6e4d261922bbafd9644cfb +size 1473868 diff --git a/lldb-13.0.0.src.tar.xz b/lldb-13.0.0.src.tar.xz deleted file mode 100644 index 921a485..0000000 --- a/lldb-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24c65bd5ec0d7cbc37bafdd7533b1783352708bf6338c403a72f47884e406dbd -size 9905788 diff --git a/lldb-13.0.1.src.tar.xz b/lldb-13.0.1.src.tar.xz new file mode 100644 index 0000000..54572e0 --- /dev/null +++ b/lldb-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a0c590bccbb3ce8fcbc1997aaed89a0ddbfd8be4b7f393230a867b2de62db16 +size 9904936 diff --git a/llvm-13.0.0.src.tar.xz b/llvm-13.0.0.src.tar.xz deleted file mode 100644 index da68c59..0000000 --- a/llvm-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:408d11708643ea826f519ff79761fcdfc12d641a2510229eec459e72f8163020 -size 45471992 diff --git a/llvm-13.0.1.src.tar.xz b/llvm-13.0.1.src.tar.xz new file mode 100644 index 0000000..2643805 --- /dev/null +++ b/llvm-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec6b80d82c384acad2dc192903a6cf2cdbaffb889b84bfb98da9d71e630fc834 +size 45479112 diff --git a/llvm-do-not-install-static-libraries.patch b/llvm-do-not-install-static-libraries.patch index 2413e49..67e4232 100644 --- a/llvm-do-not-install-static-libraries.patch +++ b/llvm-do-not-install-static-libraries.patch @@ -2,10 +2,10 @@ This has similar effect as simply deleting the static libraries which we don't want after installation. By not copying them in the first place we reduce the disk usage during installation. -Index: clang-13.0.0.src/cmake/modules/AddClang.cmake +Index: clang-13.0.1.src/cmake/modules/AddClang.cmake =================================================================== ---- a/clang-13.0.0.src/cmake/modules/AddClang.cmake -+++ b/clang-13.0.0.src/cmake/modules/AddClang.cmake +--- a/clang-13.0.1.src/cmake/modules/AddClang.cmake ++++ b/clang-13.0.1.src/cmake/modules/AddClang.cmake @@ -106,12 +106,15 @@ macro(add_clang_library name) if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN) @@ -68,10 +68,10 @@ Index: cmake/modules/AddLLVM.cmake endif() if (ARG_MODULE) set_target_properties(${name} PROPERTIES FOLDER "Loadable modules") -Index: lld-13.0.0.src/cmake/modules/AddLLD.cmake +Index: lld-13.0.1.src/cmake/modules/AddLLD.cmake =================================================================== ---- a/lld-13.0.0.src/cmake/modules/AddLLD.cmake -+++ b/lld-13.0.0.src/cmake/modules/AddLLD.cmake +--- a/lld-13.0.1.src/cmake/modules/AddLLD.cmake ++++ b/lld-13.0.1.src/cmake/modules/AddLLD.cmake @@ -17,13 +17,6 @@ macro(add_lld_library name) if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) @@ -86,10 +86,10 @@ Index: lld-13.0.0.src/cmake/modules/AddLLD.cmake if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-${name} DEPENDS ${name} -Index: polly-13.0.0.src/cmake/polly_macros.cmake +Index: polly-13.0.1.src/cmake/polly_macros.cmake =================================================================== ---- a/polly-13.0.0.src/cmake/polly_macros.cmake -+++ b/polly-13.0.0.src/cmake/polly_macros.cmake +--- a/polly-13.0.1.src/cmake/polly_macros.cmake ++++ b/polly-13.0.1.src/cmake/polly_macros.cmake @@ -42,12 +42,14 @@ macro(add_polly_library name) llvm_config(${name} ${LLVM_LINK_COMPONENTS}) endif( LLVM_LINK_COMPONENTS ) @@ -110,10 +110,10 @@ Index: polly-13.0.0.src/cmake/polly_macros.cmake endmacro(add_polly_library) macro(add_polly_loadable_module name) -Index: polly-13.0.0.src/lib/CMakeLists.txt +Index: polly-13.0.1.src/lib/CMakeLists.txt =================================================================== ---- a/polly-13.0.0.src/lib/CMakeLists.txt -+++ b/polly-13.0.0.src/lib/CMakeLists.txt +--- a/polly-13.0.1.src/lib/CMakeLists.txt ++++ b/polly-13.0.1.src/lib/CMakeLists.txt @@ -74,7 +74,7 @@ set_target_properties(PollyCore PROPERTI # It depends on all library it needs, such that with # LLVM_POLLY_LINK_INTO_TOOLS=ON, its dependencies like PollyISL are linked as diff --git a/llvm-docs-13.0.0.src.tar.xz b/llvm-docs-13.0.0.src.tar.xz deleted file mode 100644 index c7227c1..0000000 --- a/llvm-docs-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7bc1e1fc6eb794b1d3003fd64bdf9d96c754a903b7b7cc4d9de8be9155e278e -size 4595600 diff --git a/llvm-docs-13.0.1.src.tar.xz b/llvm-docs-13.0.1.src.tar.xz new file mode 100644 index 0000000..e86a39a --- /dev/null +++ b/llvm-docs-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d1af6b4e2a7a0f32ffa2c5f889604b746ba3fbb1e691fccdf39978d7e193b21 +size 4593796 diff --git a/llvm-fix-building-with-GCC-12.patch b/llvm-fix-building-with-GCC-12.patch deleted file mode 100644 index 38f734b..0000000 --- a/llvm-fix-building-with-GCC-12.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c5029023fb076f72a3e5bf26085642bcd1fa22fb Mon Sep 17 00:00:00 2001 -From: Martin Liska -Date: Tue, 2 Nov 2021 09:34:09 +0100 -Subject: [PATCH] Fix building with GCC 12: - -Fixes: https://bugs.llvm.org/show_bug.cgi?id=52380 - -Differential Revision: https://reviews.llvm.org/D112990 ---- - llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp b/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp -index 58415ecc9432..1f5312e5cb14 100644 ---- a/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp -+++ b/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp -@@ -2065,7 +2065,7 @@ SILoadStoreOptimizer::collectMergeableInsts( - // adjacent to each other in the list, which will make it easier to find - // matches. - MergeList.sort( -- [] (const CombineInfo &A, CombineInfo &B) { -+ [] (const CombineInfo &A, const CombineInfo &B) { - return A.Offset < B.Offset; - }); - ++I; --- -2.33.1 - diff --git a/llvm13.changes b/llvm13.changes index 1ec97c8..befa421 100644 --- a/llvm13.changes +++ b/llvm13.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Feb 3 21:56:28 UTC 2022 - Aaron Puchert + +- Update to version 13.0.1. + * This release contains bug-fixes for the LLVM 13.0.0 release. + This release is API and ABI compatible with 13.0.0. +- Rebase llvm-do-not-install-static-libraries.patch. +- Drop obsolete patches: + * llvm-fix-building-with-GCC-12.patch +- Drop RUNPATH from packaged binaries, instead set LD_LIBRARY_PATH + for building and testing to simulate behavior of actual package. + +------------------------------------------------------------------- +Mon Jan 31 21:16:52 UTC 2022 - Andreas Schwab + +- Update constraints for riscv64 + ------------------------------------------------------------------- Thu Jan 20 00:11:33 UTC 2022 - John Paul Adrian Glaubitz diff --git a/llvm13.spec b/llvm13.spec index 7ed94f6..7369fc3 100644 --- a/llvm13.spec +++ b/llvm13.spec @@ -16,13 +16,13 @@ # -%define _relver 13.0.0 +%define _relver 13.0.1 %define _version %_relver%{?_rc:rc%_rc} %define _tagver %_relver%{?_rc:-rc%_rc} %define _minor 13.0 %define _sonum 13 # Integer version used by update-alternatives -%define _uaver 1300 +%define _uaver 1301 %define _socxx 1 %ifarch x86_64 aarch64 %arm @@ -137,7 +137,6 @@ Patch26: lld-default-sha1.patch Patch27: llvm-exegesis-link-dylib.patch # Fix lookup of targets in installed CMake files. (boo#1180748, https://reviews.llvm.org/D96670) Patch33: CMake-Look-up-target-subcomponents-in-LLVM_AVAILABLE_LIBS.patch -Patch34: llvm-fix-building-with-GCC-12.patch Patch35: llvm-update-extract-section-script.patch BuildRequires: binutils-devel >= 2.21.90 BuildRequires: cmake >= 3.13.4 @@ -566,7 +565,6 @@ This package contains the development files for Polly. %patch24 -p1 %patch27 -p2 %patch33 -p2 -%patch34 -p2 %patch35 -p2 pushd clang-%{_version}.src @@ -725,7 +723,6 @@ avail_mem=$(awk '/MemAvailable/ { print $2 }' /proc/meminfo) -DCOMPILER_RT_BUILD_SANITIZERS:BOOL=OFF \ -DCOMPILER_RT_BUILD_XRAY:BOOL=OFF \ -DLLDB_DISABLE_PYTHON=ON \ - -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-keep-memory" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-keep-memory" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-keep-memory" @@ -781,6 +778,9 @@ export LLVM_TABLEGEN=${PWD}/stage1/bin/llvm-tblgen export CLANG_TABLEGEN=${PWD}/stage1/bin/clang-tblgen # Build is using absolute paths assuming the monorepo layout, so we need this. export CLANG_TOOLS_EXTRA_DIR=${PWD}/tools/clang/tools/extra +# The build occasionally uses tools linking against previously built +# libraries (mostly libLLVM.so), but we don't want to set RUNPATHs. +export LD_LIBRARY_PATH=${PWD}/build/%{_lib} # -z,now is breaking now, it needs to be fixed %cmake \ -DBUILD_SHARED_LIBS:BOOL=OFF \ @@ -835,7 +835,7 @@ export CLANG_TOOLS_EXTRA_DIR=${PWD}/tools/clang/tools/extra %if %{without lldb_python} -DLLDB_DISABLE_PYTHON=ON \ %endif - -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--build-id=sha1" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--build-id=sha1" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--build-id=sha1" \ @@ -860,6 +860,8 @@ MALLOC_CHECK_=$MALLOC_CHECK_BACK cd .. %install +# Installation seems to build some files not contained in "all". +export LD_LIBRARY_PATH=${PWD}/build/%{_lib} %cmake_install # Install FileCheck needed for testing Rust boo#1192629 @@ -1107,6 +1109,9 @@ rm %{buildroot}%{_mandir}/man1/scan-build.1 %fdupes %{_includedir}/%{name}/Host/ %check +# We don't want to set RUNPATHs, and running tests against installed libraries +# should be more representative of the actual behavior of the installed packages. +export LD_LIBRARY_PATH=%{buildroot}%{_libdir} # LLVM test suite is written in python and has troubles with encoding if # python 3 is used because it is written with assumption that python will # default to UTF-8 encoding. However, it only does if the current locale is diff --git a/openmp-13.0.0.src.tar.xz b/openmp-13.0.0.src.tar.xz deleted file mode 100644 index e10402d..0000000 --- a/openmp-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4930ae7a1829a53b698255c2c6b6ee977cc364b37450c14ee458793c0d5e493c -size 1139488 diff --git a/openmp-13.0.1.src.tar.xz b/openmp-13.0.1.src.tar.xz new file mode 100644 index 0000000..d0a891a --- /dev/null +++ b/openmp-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b79261371616c31fea18cd3ee1797c79ee38bcaf8417676d4fa366a24c96b4f +size 1139440 diff --git a/polly-13.0.0.src.tar.xz b/polly-13.0.0.src.tar.xz deleted file mode 100644 index 86feb84..0000000 --- a/polly-13.0.0.src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd93672c3be35146e199b1e221fb81a39403a0cdeabcad4a47ae878655eea872 -size 9186852 diff --git a/polly-13.0.1.src.tar.xz b/polly-13.0.1.src.tar.xz new file mode 100644 index 0000000..2c4c8c6 --- /dev/null +++ b/polly-13.0.1.src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4003e03da57b53bf206faadd0cf53f7b198c38498c605dec45743db23c10ad0 +size 9186828