From c49b0307ad0d235d013c69794d606003385620cd Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 14 Apr 2023 13:58:04 +0200 Subject: [PATCH] Update to LLVM 16.0.1 Resolves: #2178739 --- .gitignore | 139 +----------------- 0001-Install-clang-tblgen.patch | 28 ---- 0001-llvm-Add-install-targets-for-gtest.patch | 32 ++++ ...abstract-variable.ll-test-on-ppc64le.patch | 33 ----- ...-party-Add-install-targets-for-gtest.patch | 47 ++++++ D145763.diff | 21 +++ llvm-Config-config.h | 9 -- llvm-Config-llvm-config.h | 9 -- llvm.spec | 85 ++++++----- sources | 8 +- tstellar-gpg-key.asc | Bin 2222 -> 0 bytes 11 files changed, 164 insertions(+), 247 deletions(-) delete mode 100644 0001-Install-clang-tblgen.patch create mode 100644 0001-llvm-Add-install-targets-for-gtest.patch delete mode 100644 0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch create mode 100644 0201-third-party-Add-install-targets-for-gtest.patch create mode 100644 D145763.diff delete mode 100644 llvm-Config-config.h delete mode 100644 llvm-Config-llvm-config.h delete mode 100644 tstellar-gpg-key.asc diff --git a/.gitignore b/.gitignore index b599ae1..d4e7b84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,132 +1,7 @@ -/cfe-*.src.tar.gz -/compiler-rt-*.src.tar.gz -/lldb-*.src.tar.gz -/llvm-*.src.tar.gz -/clang-3.4.src.tar.gz -/cfe-3.5.0.src.tar.xz -/compiler-rt-3.5.0.src.tar.xz -/lldb-3.5.0.src.tar.xz -/llvm-3.5.0.src.tar.xz -/cfe-3.6.0.src.tar.xz -/compiler-rt-3.6.0.src.tar.xz -/lldb-3.6.0.src.tar.xz -/llvm-3.6.0.src.tar.xz -/llvm-3.6.1.src.tar.xz -/compiler-rt-3.6.1.src.tar.xz -/cfe-3.6.1.src.tar.xz -/lldb-3.6.1.src.tar.xz -/cfe-3.6.2.src.tar.xz -/compiler-rt-3.6.2.src.tar.xz -/lldb-3.6.2.src.tar.xz -/llvm-3.6.2.src.tar.xz -/llvm-3.7.0.src.tar.xz -/cfe-3.7.0.src.tar.xz -/compiler-rt-3.7.0.src.tar.xz -/lldb-3.7.0.src.tar.xz -/llvm-3.7.1.src.tar.xz -/llvm-3.8.0rc2.src.tar.xz -/llvm-3.8.0rc3.src.tar.xz -/llvm-3.8.0.src.tar.xz -/llvm-3.8.1.src.tar.xz -/llvm-3.9.0.src.tar.xz -/llvm-3.9.1.src.tar.xz -/llvm-4.0.0.src.tar.xz -/llvm-4.0.1.src.tar.xz -/llvm-5.0.0.src.tar.xz -/llvm-5.0.1.src.tar.xz -/llvm-6.0.0rc1.src.tar.xz -/llvm-6.0.0rc2.src.tar.xz -/llvm-6.0.0.src.tar.xz -/llvm-6.0.1rc1.src.tar.xz -/llvm-6.0.1rc2.src.tar.xz -/llvm-6.0.1.src.tar.xz -/llvm-7.0.0rc1.src.tar.xz -/llvm-7.0.0rc2.src.tar.xz -/llvm-7.0.0rc3.src.tar.xz -/llvm-7.0.0.src.tar.xz -/llvm-7.0.1.src.tar.xz -/llvm-8.0.0rc1.src.tar.xz -/llvm-8.0.0rc2.src.tar.xz -/llvm-8.0.0rc3.src.tar.xz -/llvm-8.0.0rc4.src.tar.xz -/llvm-8.0.0.src.tar.xz -/llvm-9.0.0rc2.src.tar.xz -/llvm-9.0.0rc3.src.tar.xz -/llvm-9.0.0.src.tar.xz -/llvm-9.0.1.src.tar.xz -/llvm-10.0.0rc1.src.tar.xz -/llvm-10.0.0rc1.src.tar.xz.sig -/llvm-10.0.0rc2.src.tar.xz -/llvm-10.0.0rc2.src.tar.xz.sig -/llvm-10.0.0rc3.src.tar.xz -/llvm-10.0.0rc3.src.tar.xz.sig -/llvm-10.0.0rc4.src.tar.xz -/llvm-10.0.0rc4.src.tar.xz.sig -/llvm-10.0.0rc5.src.tar.xz -/llvm-10.0.0rc5.src.tar.xz.sig -/llvm-10.0.0rc6.src.tar.xz -/llvm-10.0.0rc6.src.tar.xz.sig -/llvm-10.0.0.src.tar.xz -/llvm-10.0.0.src.tar.xz.sig -/llvm-11.0.0rc1.src.tar.xz -/llvm-11.0.0rc1.src.tar.xz.sig -/llvm-11.0.0rc2.src.tar.xz -/llvm-11.0.0rc2.src.tar.xz.sig -/llvm-11.0.0rc3.src.tar.xz -/llvm-11.0.0rc3.src.tar.xz.sig -/llvm-11.0.0rc5.src.tar.xz -/llvm-11.0.0rc5.src.tar.xz.sig -/llvm-11.0.0rc6.src.tar.xz -/llvm-11.0.0rc6.src.tar.xz.sig -/llvm-11.0.0.src.tar.xz -/llvm-11.0.0.src.tar.xz.sig -/llvm-11.0.1rc1.src.tar.xz -/llvm-11.0.1rc1.src.tar.xz.sig -/llvm-11.0.1rc2.src.tar.xz.sig -/llvm-11.0.1rc2.src.tar.xz -/llvm-11.0.1.src.tar.xz -/llvm-11.0.1.src.tar.xz.sig -/llvm-11.1.0rc1.src.tar.xz.sig -/llvm-11.1.0rc1.src.tar.xz -/llvm-11.1.0rc2.src.tar.xz -/llvm-11.1.0rc2.src.tar.xz.sig -/llvm-12.0.0rc1.src.tar.xz -/llvm-12.0.0rc1.src.tar.xz.sig -/llvm-12.0.0rc2.src.tar.xz -/llvm-12.0.0rc2.src.tar.xz.sig -/llvm-12.0.0rc3.src.tar.xz -/llvm-12.0.0rc3.src.tar.xz.sig -/llvm-12.0.0rc4.src.tar.xz -/llvm-12.0.0rc4.src.tar.xz.sig -/llvm-12.0.0rc5.src.tar.xz -/llvm-12.0.0rc5.src.tar.xz.sig -/llvm-12.0.0.src.tar.xz -/llvm-12.0.0.src.tar.xz.sig -/llvm-12.0.1.src.tar.xz -/llvm-12.0.1.src.tar.xz.sig -/llvm-13.0.0.src.tar.xz -/llvm-13.0.0.src.tar.xz.sig -/llvm-13.0.1.src.tar.xz -/llvm-13.0.1.src.tar.xz.sig -/llvm-14.0.0.src.tar.xz -/llvm-14.0.0.src.tar.xz.sig -/llvm-14.0.5.src.tar.xz -/llvm-14.0.5.src.tar.xz.sig -/llvm-14.0.6.src.tar.xz -/llvm-14.0.6.src.tar.xz.sig -/llvm-15.0.0.src.tar.xz -/llvm-15.0.0.src.tar.xz.sig -/cmake-15.0.0.src.tar.xz -/cmake-15.0.0.src.tar.xz.sig -/cmake-15.0.1.src.tar.xz -/llvm-15.0.1.src.tar.xz -/llvm-15.0.1.src.tar.xz.sig -/cmake-15.0.1.src.tar.xz.sig -/llvm-15.0.6.src.tar.xz -/llvm-15.0.6.src.tar.xz.sig -/cmake-15.0.6.src.tar.xz -/cmake-15.0.6.src.tar.xz.sig -/llvm-15.0.7.src.tar.xz -/llvm-15.0.7.src.tar.xz.sig -/cmake-15.0.7.src.tar.xz -/cmake-15.0.7.src.tar.xz.sig +/*.src.rpm +/*.src.tar.xz +/*.src.tar.xz.sig +/cmake/ +/llvm-*.src/ +/results_llvm/ +/third-party/ diff --git a/0001-Install-clang-tblgen.patch b/0001-Install-clang-tblgen.patch deleted file mode 100644 index 6bfc2e2..0000000 --- a/0001-Install-clang-tblgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2e106d4cfc909e23e16104725706e4f9dda15974 Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Fri, 5 Aug 2022 08:57:18 +0200 -Subject: [PATCH] Install clang-tblgen - ---- - llvm/cmake/modules/TableGen.cmake | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake -index 4711456776c8..edcc9d0b607d 100644 ---- a/llvm/cmake/modules/TableGen.cmake -+++ b/llvm/cmake/modules/TableGen.cmake -@@ -186,7 +186,10 @@ macro(add_tablegen target project) - endif() - endif() - -- if ((${project} STREQUAL LLVM OR ${project} STREQUAL MLIR) AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND LLVM_BUILD_UTILS) -+ # (llvm|mlir|clang)-tblgen may also be used outside the respective projects. -+ if ((${project} STREQUAL LLVM OR ${project} STREQUAL MLIR OR -+ ${project} STREQUAL CLANG) AND -+ NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND LLVM_BUILD_UTILS) - set(export_to_llvmexports) - if(${target} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR - NOT LLVM_DISTRIBUTION_COMPONENTS) --- -2.37.1 - diff --git a/0001-llvm-Add-install-targets-for-gtest.patch b/0001-llvm-Add-install-targets-for-gtest.patch new file mode 100644 index 0000000..e84c444 --- /dev/null +++ b/0001-llvm-Add-install-targets-for-gtest.patch @@ -0,0 +1,32 @@ +From 8cc3870f09d728d9017c72eba9520117a4283fee Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Thu, 17 Nov 2022 09:01:10 +0000 +Subject: Add install targets for gtest + +Stand-alone builds need an installed version of gtest in order to run +the unittests. + +Differential Revision: https://reviews.llvm.org/D137890 +--- + llvm/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt +index 60e1f29620af..d91338532815 100644 +--- a/llvm/CMakeLists.txt ++++ b/llvm/CMakeLists.txt +@@ -693,6 +693,11 @@ option(LLVM_BUILD_TESTS + "Build LLVM unit tests. If OFF, just generate build targets." OFF) + option(LLVM_INCLUDE_TESTS "Generate build targets for the LLVM unit tests." ON) + ++option(LLVM_INSTALL_GTEST ++ "Install the llvm gtest library. This should be on if you want to do ++ stand-alone builds of the other projects and run their unit tests." OFF) ++ ++ + option(LLVM_BUILD_BENCHMARKS "Add LLVM benchmark targets to the list of default + targets. If OFF, benchmarks still could be built using Benchmarks target." OFF) + option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." ON) +-- +2.34.3 + diff --git a/0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch b/0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch deleted file mode 100644 index 0f4acd3..0000000 --- a/0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 01529ba2c76be37e41713cf7f3eca8b61833e320 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Tue, 9 Nov 2021 15:05:07 +0100 -Subject: [PATCH] XFAIL missing-abstract-variable.ll test on ppc64le - -It's seems the strategy with this test is to XFAIL it on all -architectures that it fails on. I wonder if we should be passing -it a specific triple? Also, from what I can tell, this tests only -runs when llvm is configured with LLVM_DEFAULT_TARGET_TRIPLE set -to a non-empty value, which is why it may not fail in every build -configuration. - -Differential Revision: https://reviews.llvm.org/D109806 ---- - llvm/test/DebugInfo/Generic/missing-abstract-variable.ll | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll b/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll -index 8f8d404..07a8778 100644 ---- a/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll -+++ b/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll -@@ -4,7 +4,7 @@ - ; powerpc64 (and on x86_64 at at least -O2). Presumably this is a SelectionDAG - ; issue. - ; FIXME: arm64 is an alias for aarch64 on macs, apparently? --; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv, sparc -+; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv, sparc, ppc64le - - ; Build from the following source with clang -O2. - --- -1.8.3.1 - diff --git a/0201-third-party-Add-install-targets-for-gtest.patch b/0201-third-party-Add-install-targets-for-gtest.patch new file mode 100644 index 0000000..5c86130 --- /dev/null +++ b/0201-third-party-Add-install-targets-for-gtest.patch @@ -0,0 +1,47 @@ +From 8cc3870f09d728d9017c72eba9520117a4283fee Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Thu, 17 Nov 2022 09:01:10 +0000 +Subject: Add install targets for gtest + +Stand-alone builds need an installed version of gtest in order to run +the unittests. + +Differential Revision: https://reviews.llvm.org/D137890 +--- + third-party/unittest/CMakeLists.txt | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/third-party/unittest/CMakeLists.txt b/third-party/unittest/CMakeLists.txt +index 0e54e0e57c35..1d2a52730d7d 100644 +--- a/third-party/unittest/CMakeLists.txt ++++ b/third-party/unittest/CMakeLists.txt +@@ -65,12 +65,25 @@ if (NOT LLVM_ENABLE_THREADS) + endif () + + target_include_directories(llvm_gtest +- PUBLIC googletest/include googlemock/include ++ PUBLIC $ ++ $ ++ $ ++ $ + PRIVATE googletest googlemock + ) + + add_subdirectory(UnitTestMain) + ++if (LLVM_INSTALL_GTEST) ++export(TARGETS llvm_gtest llvm_gtest_main LLVMTestingSupport FILE LLVMGTestConfig.cmake) ++install(TARGETS llvm_gtest llvm_gtest_main LLVMTestingSupport EXPORT LLVMGTestConfig ++ ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT llvm_gtest) ++ install(EXPORT LLVMGTestConfig DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} COMPONENT llvm_gtest) ++ add_llvm_install_targets(install-llvm_gtest COMPONENT llvm_gtest DEPENDS llvm_gtest LLVMGTestConfig.cmake) ++ install(DIRECTORY googletest/include/gtest/ DESTINATION include/llvm-gtest/gtest/ COMPONENT llvm_gtest) ++ install(DIRECTORY googlemock/include/gmock/ DESTINATION include/llvm-gmock/gmock/ COMPONENT llvm_gtest) ++endif() ++ + # When LLVM_LINK_LLVM_DYLIB is enabled, libLLVM.so is added to the interface + # link libraries for gtest and gtest_main. This means that any target, like + # unittests for example, that links against gtest will be forced to link +-- +2.34.3 + diff --git a/D145763.diff b/D145763.diff new file mode 100644 index 0000000..79de2d7 --- /dev/null +++ b/D145763.diff @@ -0,0 +1,21 @@ +diff --git a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg +--- a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg ++++ b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg +@@ -1,3 +1,6 @@ + if not ('PowerPC' in config.root.targets): + # We need support for PowerPC. + config.unsupported = True ++elif not ('powerpc' in config.root.host_triple): ++ # We need to be running on an PPC host. ++ config.unsupported = True +diff --git a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg +--- a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg ++++ b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg +@@ -1,3 +1,6 @@ + if not ('X86' in config.root.targets): + # We need support for X86. + config.unsupported = True ++elif not ('x86_64' in config.root.host_triple): ++ # We need to be running on an X86 host. ++ config.unsupported = True + diff --git a/llvm-Config-config.h b/llvm-Config-config.h deleted file mode 100644 index c369b45..0000000 --- a/llvm-Config-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "config-32.h" -#elif __WORDSIZE == 64 -#include "config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/llvm-Config-llvm-config.h b/llvm-Config-llvm-config.h deleted file mode 100644 index 2fa08c9..0000000 --- a/llvm-Config-llvm-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "llvm-config-32.h" -#elif __WORDSIZE == 64 -#include "llvm-config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/llvm.spec b/llvm.spec index 4108907..d4cb067 100644 --- a/llvm.spec +++ b/llvm.spec @@ -11,22 +11,24 @@ %endif %bcond_with compat_build -%bcond_with bundle_compat_lib +%bcond_without bundle_compat_lib %bcond_without check %if %{with bundle_compat_lib} -%global compat_maj_ver 14 -%global compat_ver %{compat_maj_ver}.0.6 +%global compat_maj_ver 15 +%global compat_ver %{compat_maj_ver}.0.7 %endif %global llvm_libdir %{_libdir}/%{name} %global build_llvm_libdir %{buildroot}%{llvm_libdir} #global rc_ver 3 -%global maj_ver 15 +%global maj_ver 16 %global min_ver 0 -%global patch_ver 7 +%global patch_ver 1 %global llvm_srcdir llvm-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src %global cmake_srcdir cmake-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src +%global third_party_srcdir third-party-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ +ver:rc%{rc_ver}}.src %if %{with compat_build} %global pkg_name llvm%{maj_ver} @@ -67,7 +69,7 @@ # we need to hard-code the correct triple here. %global llvm_triple armv7l-redhat-linux-gnueabihf %else -%global llvm_triple %{_host} +%global llvm_triple %{_target_platform} %endif # https://fedoraproject.org/wiki/Changes/PythonSafePath#Opting_out @@ -80,29 +82,32 @@ Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} Release: 1%{?dist} Summary: The Low Level Virtual Machine -License: NCSA +License: Apache-2.0 WITH LLVM-exception OR NCSA URL: http://llvm.org Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz.sig Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig -Source4: release-keys.asc +Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{third_party_srcdir}.tar.xz +Source5: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{third_party_srcdir}.tar.xz.sig +Source6: release-keys.asc %if %{without compat_build} -Source5: run-lit-tests -Source6: lit.fedora.cfg.py +Source7: run-lit-tests +Source8: lit.fedora.cfg.py %endif %if %{with bundle_compat_lib} -Source7: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/llvm-%{compat_ver}.src.tar.xz -Source8: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/llvm-%{compat_ver}.src.tar.xz.sig -Source9: tstellar-gpg-key.asc +Source9: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/llvm-%{compat_ver}.src.tar.xz +Source10: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compat_ver}/llvm-%{compat_ver}.src.tar.xz.sig %endif -Patch2: 0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch +# Backport from LLVM 17. +Patch0: D145763.diff -# Needed to export clang-tblgen during the clang build, needed by the flang docs build. -# TODO: Can be dropped for LLVM 16, see https://reviews.llvm.org/D131282. -Patch3: 0001-Install-clang-tblgen.patch +# See https://reviews.llvm.org/D137890 for the next two patches +Patch2: 0001-llvm-Add-install-targets-for-gtest.patch +# Patching third-party dir with a 200 offset in patch number +Patch201: 0201-third-party-Add-install-targets-for-gtest.patch # RHEL-specific patches Patch101: 0001-Deactivate-markdown-doc.patch @@ -233,10 +238,11 @@ This is the main package for llvm-toolset. %endif %prep -%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE2}' +%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE3}' --data='%{SOURCE2}' +%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE5}' --data='%{SOURCE4}' %if %{with bundle_compat_lib} -%{gpgverify} --keyring='%{SOURCE9}' --signature='%{SOURCE8}' --data='%{SOURCE7}' +%{gpgverify} --keyring='%{SOURCE6}' --signature='%{SOURCE10}' --data='%{SOURCE9}' %endif %setup -T -q -b 2 -n %{cmake_srcdir} @@ -245,11 +251,17 @@ This is the main package for llvm-toolset. cd .. mv %{cmake_srcdir} cmake +%setup -T -q -b 4 -n %{third_party_srcdir} +%autopatch -m200 -p2 +cd .. +mv %{third_party_srcdir} third-party + %if %{with bundle_compat_lib} -%setup -T -q -b 7 -n llvm-%{compat_ver}.src +%setup -T -q -b 9 -n llvm-%{compat_ver}.src %endif -%autosetup -n %{llvm_srcdir} -p2 +%setup -T -q -b 0 -n %{llvm_srcdir} +%autopatch -M200 -p2 %py3_shebang_fix \ test/BugPoint/compile-custom.ll.py \ @@ -309,6 +321,11 @@ export ASMFLAGS=$CFLAGS \ -DLLVM_INCLUDE_TESTS:BOOL=ON \ -DLLVM_BUILD_TESTS:BOOL=ON \ +%if %{with compat_build} + -DLLVM_INSTALL_GTEST:BOOL=OFF \ +%else + -DLLVM_INSTALL_GTEST:BOOL=ON \ +%endif -DLLVM_LIT_ARGS=-v \ \ -DLLVM_INCLUDE_EXAMPLES:BOOL=ON \ @@ -403,17 +420,7 @@ rm -rf test/tools/UpdateTestChecks %endif install %{build_libdir}/libLLVMTestingSupport.a %{buildroot}%{_libdir} - -%global install_srcdir %{buildroot}%{_datadir}/llvm/src - -# Install gtest sources so clang can use them for gtest -install -d %{install_srcdir} -install -d %{install_srcdir}/utils/ -cp -R utils/unittest %{install_srcdir}/utils/ - -# Clang needs these for running lit tests. -cp utils/update_cc_test_checks.py %{install_srcdir}/utils/ -cp -R utils/UpdateTestChecks %{install_srcdir}/utils/ +install %{build_libdir}/libLLVMTestingAnnotations.a %{buildroot}%{_libdir} %if %{with gold} # Add symlink to lto plugin in the binutils plugin directory. @@ -605,6 +612,9 @@ fi %if %{without compat_build} %{_libdir}/*.a %exclude %{_libdir}/libLLVMTestingSupport.a +%exclude %{_libdir}/libLLVMTestingAnnotations.a +%exclude %{_libdir}/libllvm_gtest.a +%exclude %{_libdir}/libllvm_gtest_main.a %else %{_libdir}/%{name}/lib/*.a %endif @@ -622,8 +632,12 @@ fi %files googletest %license LICENSE.TXT -%{_datadir}/llvm/src/utils %{_libdir}/libLLVMTestingSupport.a +%{_libdir}/libLLVMTestingAnnotations.a +%{_libdir}/libllvm_gtest.a +%{_libdir}/libllvm_gtest_main.a +%{_includedir}/llvm-gtest +%{_includedir}/llvm-gmock %files toolset %license LICENSE.TXT @@ -631,6 +645,9 @@ fi %endif %changelog +* Fri Apr 14 2023 Nikita Popov - 16.0.1-1 +- Update to LLVM 16.0.1 + * Fri Jan 13 2023 Konrad Kleine - 15.0.7-1 - Update to LLVM 15.0.7 - Remove workaround for rbhz#2048440 diff --git a/sources b/sources index 489bedb..091cd92 100644 --- a/sources +++ b/sources @@ -1,4 +1,8 @@ SHA512 (llvm-15.0.7.src.tar.xz) = ed8d565515b1bc6164e4ff06d3388ba92e332850305496fd65db9adf1ec87bd9dd1bfde49dd41be5d5216289efc72bfd287cd7392f2bba80b740d4c314c749e5 SHA512 (llvm-15.0.7.src.tar.xz.sig) = 79fc82dfabe397f7df4c139f75fa9a0a34c92b77d603543a4eb3e579e253a9d84d0e8314f7356ed77326977d6190997b42f074a6c910d0f932e6b21d09374bde -SHA512 (cmake-15.0.7.src.tar.xz) = 85097a6eaee0df004567905f7e5ce8ca02e3b46c6fc66fa552fe99734642e6ee61685de4e5e6e8b505963334d7b91d98ecd9c5870e6bdd3f0018ee5b963ffa96 -SHA512 (cmake-15.0.7.src.tar.xz.sig) = 61d53c602bcb099426b8828a239628ba2fca9616afcdf67ce3c8c887146dce99a649ddb625df096e3d8aa9ede1ea9bb6933f88f3adec0192fd68faeca2488a1a +SHA512 (cmake-16.0.1.src.tar.xz) = 7a0f01a82660a953e06b1df267918542205ac46f151d284dca74255c36fe5ccd995266638a85ce502a81cdd5e76ff3311e5f8488e09d0abbf22ee07cec186f5f +SHA512 (cmake-16.0.1.src.tar.xz.sig) = 8d49050e9b04df253a5bb2fa3b27796f204d085610432826bef6bb6cab876990d67e7fd5267fc89fadf21d88da73c535c82ae6ea0e1c867f7cd5efac244b0fa2 +SHA512 (llvm-16.0.1.src.tar.xz) = f0ad41adc6075c20f8f4434b5a5704a17a1ca3308c67eabb1e132330c32d637faab86516c822db9661f6163af5ad1e7af6cd4a2ff030d6e148c3f6fd40925b7d +SHA512 (llvm-16.0.1.src.tar.xz.sig) = 2774c96158b34f789bae54d01905910f396179220317da5ea8e7085c9f19068bbd4406f8a66b5a1cea672be2b761a0ea949ab29ccdaeee8c57f690d2480dd5e5 +SHA512 (third-party-16.0.1.src.tar.xz) = 3293aacac5b636d15b9ae2e28b1db9395ad6f56d558c42eebf2a491622d9290e8b1be2dfabcd27ea1b0a6301746ddf01031f69230ffc8fe737c127f6b396245b +SHA512 (third-party-16.0.1.src.tar.xz.sig) = d2ee851b35e3c60b4d2c8881c7ee3c49f078f25837c7bb77a4d7c34ca9e5b4ba9ae7502b41f7050f21474f177115fb3a31c2373b01f176676e490da0ba400967 diff --git a/tstellar-gpg-key.asc b/tstellar-gpg-key.asc deleted file mode 100644 index eba625c41a5fb1646d8b087acb97a6f079901712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2222 zcmV;f2vPT$0u2OO>VZ805CFTzjTRs0jjXv;pGugCr`4v#a%GKo$r!Jd->PCt z$y%rpj==vUV}Ir+*R8b>IVmXk+p1pb?8#X&nu=A^mMLf^hWzyKgNi2>hyWLVh=fxY z2uQphyka|M&B_iX7`4E;@VIVye4j+?(eh_~`%yu#&d z*V9fM6W6bny8d9hd1I{mwtG%>CC@J*juZpAErTo`!5xcYL1Aj+mdQryB5UR$E%yF6 z*!s!u));Q?P+9N#0Q6S0jli^^Y40t$(uybAR^$1y6%VyNeBeQ!@oTFdcu?K8u$-I` zKDUMj7UGg4A}({Q;YHV$l=+&0cGG3Hh4_R+d%{rZxYsm$HE!9TA$H#_hM3|NNT^K> zZQU8HH=}vu#c;-9-Jyy=nkH&Ih5=&vyyTF3Oa0+QyQp|o8>g~GALwBu0JFctO)F4By^oR|Q&^+ok_ahpz* zx2{4_^~smFohQB{Cn}OKl!M)6h-Sp7pTRPF)8{xDQnsT*2KBVqzLp^_b}_%Gi3#{7 zPmKinsRK(isAm8X0RRECB2;f}AX9W@Y;0k2WFS0rb97~FY+-Uha%E&_VRSBIZ*4w_ z0zU*30RjLi1p->?fjt5n0|f~I;WK~-3ke7Z0|EgC6$kC|{ ztfg+f-L$-*LG&Y8rEs>Pk0kY2M!#d(HZRxiE0ipTCeAm7F|v6IH9B7Vlm=s3u!P6x zukC3z;PJmJ)xh$MIj*i=cG31 zsr(;uWSlOsz%_4Yz*UkKLqI0&M?pa@7vLxT7E~NOMQpRmC;};m26SlTQ+yR!^FSkd z5X@jE=BH4}c|41ZEr0imr|M~OJc6e@^UU(IF|W<>p1aTajeew-gHXQNys755V(S?e zy&C%siGryJ(2hm;uw^%r#}(W7xEi6^+X#Ec26;Q4R?Bq8H1hLh#VmX*+=kLh#l)OH zuC2P$?)S;hs*FQk8?PUuG{npPBS~7t;@#%(02I5L`it-=nvT%hwBu9Vylt?Rx_WO8 zn;xz3>aTq41Kx`}**s6A$49Kf_AikxBYjpmen!2RxlOtbF<6izL<4CJepUil@?zwT z9--9FX0i_jVtyY+6GeUXY{C6s&jp=gZVLvg0K<2!X;=PL%?gW_4bZMVYaV0@NJs-G zR53P~&$$8(1X}8WJpm8^!P@Z0GUu_8r6%69;^`~$FlQ_sXC1gfPE!ZD7nWV}F8ra9JxN4Hc;rg@5`G`UmNK zQK2H?OT@C(8zIO}kZRe0_IN@oCg4<+qQMIIQ9BTzli>7{__%>7EJKyOXMQt~d~dO#*vR-UpkDf2!SqwMz3;vEnk@ z?=o=Jt#mt#&qQ5T^Djs9 z^4k@B1GCy801*KI0f_=71Q-DV01pKMTIzv40vikk2?60VfB*^!5TeJFsfIzFiUFe# z0I}kKVKh7v)wfS?mcAnLFf2mw>&+IUnN!`^A5o?AROoVE|1Wn*mv*_@{l7RSech<$ z?RLGlpeWdkMhbOTAw|NxrZVM!5o8(5NV^UY>QiIQrC87nWDTTnJfN`ajL|@# zl)Qnlzy(_cGgW866I0m2oMj27)0bsK>19i)o*dAxPI!tSpuQR`^kJnT+%gR}_vkiWGx zBRSn>o||dsUIz{u>`KQ`n~m24dqQqPaip8qJ@%<^y5X6+qY7;4MB$!YUu}^Vz&|fAyIM wpX0lD!)BYGzJZL|-kImy^XM9ph5)K0`p3zNu2XNcRC)Y~P3B_BHh)~2!0gUKHvj+t