PR#47: Update to 14.0.0 - rpms/compiler-rt

rpms / compiler-rt

#47 Update to 14.0.0

Merged 2 years ago by tstellar. Opened 2 years ago by tbaeder.

rpms/ tbaeder/compiler-rt rawhide into rawhide

Update to 14.0.0

Timm Bäder • 2 years ago

ddc83a7

0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch

file removed

-43

		`@@ -1,43 +0,0 @@`
		`- From 8247295860b69fd379e282c3e6315df9f700e4d8 Mon Sep 17 00:00:00 2001`
		`- From: serge-sans-paille <sguelton@redhat.com>`
		`- Date: Thu, 25 Feb 2021 14:12:57 +0100`
		`- Subject: [PATCH][compiler-rt] Workaround libstdc++ limitation wrt. thread copy`
		`-`
		`- ---`
		`- compiler-rt/lib/fuzzer/FuzzerDefs.h \| 6 ++++++`
		`- compiler-rt/lib/fuzzer/FuzzerDriver.cpp \| 2 +-`
		`- 2 files changed, 7 insertions(+), 1 deletion(-)`
		`-`
		`- diff --git a/compiler-rt/lib/fuzzer/FuzzerDefs.h b/compiler-rt/lib/fuzzer/FuzzerDefs.h`
		`- index 1a2752a..abfbb8d 100644`
		`- --- a/compiler-rt/lib/fuzzer/FuzzerDefs.h`
		`- +++ b/compiler-rt/lib/fuzzer/FuzzerDefs.h`
		`- @@ -50,6 +50,12 @@ template<typename T>`
		`-`
		`- template<class Other>`
		`- struct rebind { typedef fuzzer_allocator<Other> other; };`
		`- +`
		`- + template< class U, class... Args >`
		`- + void construct( U* p, Args&&... args ) {`
		`- + std::allocator<T>::construct(p, std::forward<Args>(args)...);`
		`- + }`
		`- +`
		`- };`
		`-`
		`- template<typename T>`
		`- diff --git a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp`
		`- index 447cafc..2fce139 100644`
		`- --- a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp`
		`- +++ b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp`
		`- @@ -294,7 +294,7 @@ static int RunInMultipleProcesses(const Vector<std::string> &Args,`
		`- std::thread Pulse(PulseThread);`
		`- Pulse.detach();`
		`- for (unsigned i = 0; i < NumWorkers; i++)`
		`- - V.push_back(std::thread(WorkerThread, std::ref(Cmd), &Counter, NumJobs, &HasErrors));`
		`- + V.emplace_back(WorkerThread, std::ref(Cmd), &Counter, NumJobs, &HasErrors);`
		`- for (auto &T : V)`
		`- T.join();`
		`- return HasErrors ? 1 : 0;`
		`- --`
		`- 1.8.3.1`
		`-`

add-llvm-cmake-package.patch

file added

+37

		`@@ -0,0 +1,37 @@`
		`+ commit b18bde7a9bd6ed80f5721c47c805f0158b4fe9f8`
		`+ Author: Timm Bäder <tbaeder@redhat.com>`
		`+ Date: Wed Mar 9 07:17:21 2022 +0100`
		`+`
		`+ [compiler-rt] Add LLVM cmake package in standalone builds`
		`+`
		`+ So the other files from the toplevel cmake/Modules directory have a`
		`+ chance of being found.`
		`+`
		`+ diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt`
		`+ index 3a41aa43e406..6516e10fa3c5 100644`
		`+ --- a/compiler-rt/CMakeLists.txt`
		`+ +++ b/compiler-rt/CMakeLists.txt`
		`+ @@ -28,6 +28,12 @@ else()`
		`+ set(CMAKE_CFG_RESOLVED_INTDIR "")`
		`+ endif()`
		`+`
		`+ +if(COMPILER_RT_STANDALONE_BUILD)`
		`+ + # Needed to find the other modules from the toplevel cmake/Modules dir`
		`+ + find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")`
		`+ + list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")`
		`+ +endif()`
		`+ +`
		`+ include(SetPlatformToolchainTools)`
		`+ include(base-config-ix)`
		`+ include(CompilerRTUtils)`
		`+ diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt`
		`+ index 5c2b634e1180..098fb0481517 100644`
		`+ --- a/compiler-rt/test/CMakeLists.txt`
		`+ +++ b/compiler-rt/test/CMakeLists.txt`
		`+ @@ -1,6 +1,3 @@`
		`+ -# Needed for lit support in standalone builds.`
		`+ -include(AddLLVM)`
		`+ -`
		`+ option(COMPILER_RT_TEST_STANDALONE_BUILD_LIBS`
		`+ "When set to ON and testing in a standalone build, test the runtime \`
		`+ libraries built by this standalone build rather than the runtime libraries \`

compiler-rt.spec

file modified

+6 -3

		`@@ -1,6 +1,5 @@`
		`+ %global compiler_rt_version 14.0.0`
		`#global rc_ver 2`
		`-`
		`- %global compiler_rt_version 13.0.1`
		`%global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src`

		`# see https://sourceware.org/bugzilla/show_bug.cgi?id=25271`
		`@@ -20,7 +19,7 @@`
		`Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig`
		`Source2: tstellar-gpg-key.asc`

		`- Patch0: 0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch`
		`+ Patch0: add-llvm-cmake-package.patch`

		`BuildRequires: gcc`
		`BuildRequires: gcc-c++`
		`@@ -30,6 +29,7 @@`
		`# We need python3-devel for %%py3_shebang_fix`
		`BuildRequires: python3-devel`
		`BuildRequires: llvm-devel = %{version}`
		`+ BuildRequires: llvm-cmake-devel = %{version}`

		`# For gpg source verification`
		`BuildRequires: gnupg2`
		`@@ -111,6 +111,9 @@`
		`%endif`

		`%changelog`
		`+ * Thu Mar 24 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1`
		`+ - Update to 14.0.0`
		`+`
		`* Thu Feb 03 2022 Nikita Popov <npopov@redhat.com> - 13.0.1-1`
		`- Update to LLVM 13.0.1 final`