diff --git a/0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch b/0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch deleted file mode 100644 index f734b5f950d8a064deaf80dff7c33ce7fcd3cced..0000000000000000000000000000000000000000 --- a/0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8247295860b69fd379e282c3e6315df9f700e4d8 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -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 - - template - struct rebind { typedef fuzzer_allocator other; }; -+ -+ template< class U, class... Args > -+ void construct( U* p, Args&&... args ) { -+ std::allocator::construct(p, std::forward(args)...); -+ } -+ - }; - - template -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 &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 - diff --git a/compiler-rt-13.0.1.src.tar.xz b/compiler-rt-13.0.1.src.tar.xz deleted file mode 100644 index 0e9a69e3575f88fc8bf379e3074e04b94f44b060..0000000000000000000000000000000000000000 Binary files a/compiler-rt-13.0.1.src.tar.xz and /dev/null differ diff --git a/compiler-rt-13.0.1.src.tar.xz.sig b/compiler-rt-13.0.1.src.tar.xz.sig deleted file mode 100644 index 92caabc6c4960dcf0c45dc05da78723ff397d7f5..0000000000000000000000000000000000000000 Binary files a/compiler-rt-13.0.1.src.tar.xz.sig and /dev/null differ diff --git a/compiler-rt-15.0.7.src.tar.xz b/compiler-rt-15.0.7.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..c5659383f7d8e95fc178d06ddc1d6988d85d8d3e Binary files /dev/null and b/compiler-rt-15.0.7.src.tar.xz differ diff --git a/compiler-rt.spec b/compiler-rt.spec index 0a0641b31d3ff04a7e8ee8d8f85747a68beb4714..a404f62ffdf9e46b4f5677b31bd784bff0b65937 100644 --- a/compiler-rt.spec +++ b/compiler-rt.spec @@ -1,6 +1,7 @@ %define anolis_release 1 -%global compiler_rt_version 13.0.1 -%global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src +%global toolchain clang +%global compiler_rt_version 15.0.7 +%global crt_srcdir compiler-rt-%{compiler_rt_version}.src # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271 %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE) @@ -9,20 +10,15 @@ %global optflags %(echo %{optflags} -Dasm=__asm__) Name: compiler-rt -Version: %{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}} +Version: %{compiler_rt_version} Release: %{anolis_release}%{?dist} Summary: LLVM "compiler-rt" runtime libraries -License: NCSA or MIT +License: Apache-2.0 WITH LLVM-exception OR NCSA OR MIT URL: http://llvm.org -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz -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 +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{compiler_rt_version}/%{crt_srcdir}.tar.xz -Patch0001: 0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch - -BuildRequires: gcc -BuildRequires: gcc-c++ +BuildRequires: clang BuildRequires: cmake BuildRequires: ninja-build BuildRequires: python3 @@ -30,9 +26,6 @@ BuildRequires: python3 BuildRequires: python3-devel BuildRequires: llvm-devel = %{version} -# For gpg source verification -BuildRequires: gnupg2 - Requires: clang-resource-filesystem = %{version} %description @@ -50,16 +43,19 @@ BuildArch: noarch The %{name}-doc package contains documentations for %{name} %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -n %{crt_srcdir} -p2 %py3_shebang_fix lib/hwasan/scripts/hwasan_symbolize %build +# Copy CFLAGS into ASMFLAGS, so -fcf-protection is used when compiling assembly files. +export ASMFLAGS=$CFLAGS + %cmake -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \ + -DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \ -DCMAKE_SKIP_RPATH:BOOL=ON \ + \ -DLLVM_LIBDIR_SUFFIX=64 \ -DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF @@ -83,13 +79,8 @@ for i in *.a *.so do ln -s ../$i linux/$i done - popd -%check -#%%cmake_build --target check-compiler-rt - - %files %license LICENSE.TXT %{_includedir}/* @@ -98,9 +89,11 @@ popd %{_bindir}/hwasan_symbolize %files doc -%doc README.txt CODE_OWNERS.TXT docs/TestingGuide.rst docs/TestingGuide.rst - +%doc README.txt CODE_OWNERS.TXT docs/TestingGuide.rst %changelog -* Sun Jul 31 happy_orange - 13.0.1-1 +* Wed Feb 1 2023 Funda Wang - 15.0.7-1 +- New version 15.0.7 + +* Sun Jul 31 2022 happy_orange - 13.0.1-1 - Init pcakage from upstream diff --git a/tstellar-gpg-key.asc b/tstellar-gpg-key.asc deleted file mode 100644 index eba625c41a5fb1646d8b087acb97a6f079901712..0000000000000000000000000000000000000000 Binary files a/tstellar-gpg-key.asc and /dev/null differ