From fb6f764dbf5ca5a939837fd5ccf4fe54f8a6901a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 10 May 2022 04:23:58 +0000 Subject: [PATCH] import compiler-rt-14.0.0-2.module+el8.7.0+15055+6f24677b --- .compiler-rt.metadata | 2 +- .gitignore | 2 +- ...t-Workaround-libstdc-limitation-wrt..patch | 43 ------------------ SOURCES/add-llvm-cmake-package.patch | 37 +++++++++++++++ SOURCES/compiler-rt-13.0.1.src.tar.xz.sig | Bin 566 -> 0 bytes SOURCES/compiler-rt-14.0.0.src.tar.xz.sig | Bin 0 -> 566 bytes SPECS/compiler-rt.spec | 22 ++++++--- 7 files changed, 54 insertions(+), 52 deletions(-) delete mode 100644 SOURCES/0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch create mode 100644 SOURCES/add-llvm-cmake-package.patch delete mode 100644 SOURCES/compiler-rt-13.0.1.src.tar.xz.sig create mode 100644 SOURCES/compiler-rt-14.0.0.src.tar.xz.sig diff --git a/.compiler-rt.metadata b/.compiler-rt.metadata index 181a005..6ebfd6b 100644 --- a/.compiler-rt.metadata +++ b/.compiler-rt.metadata @@ -1,2 +1,2 @@ -68e9e2f569ccfe0af9f5df61ec74808688198946 SOURCES/compiler-rt-13.0.1.src.tar.xz +6e285bfcbd93160355011a276efec3112d3179f2 SOURCES/compiler-rt-14.0.0.src.tar.xz b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/.gitignore b/.gitignore index 941953c..cbe244c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/compiler-rt-13.0.1.src.tar.xz +SOURCES/compiler-rt-14.0.0.src.tar.xz SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch b/SOURCES/0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch deleted file mode 100644 index f734b5f..0000000 --- a/SOURCES/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/SOURCES/add-llvm-cmake-package.patch b/SOURCES/add-llvm-cmake-package.patch new file mode 100644 index 0000000..b7b63b6 --- /dev/null +++ b/SOURCES/add-llvm-cmake-package.patch @@ -0,0 +1,37 @@ +commit b18bde7a9bd6ed80f5721c47c805f0158b4fe9f8 +Author: Timm Bäder +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 \ diff --git a/SOURCES/compiler-rt-13.0.1.src.tar.xz.sig b/SOURCES/compiler-rt-13.0.1.src.tar.xz.sig deleted file mode 100644 index 92caabc6c4960dcf0c45dc05da78723ff397d7f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%7``3IGZT5TeJF zsfIzFimt^F0HCLb%n1+eu6}U8dz!jzaacy7X${c7PzInA1Jlv^DJ^lz5G{>bYEvg1 zTQc$>q;Iy+sOBpb@~_&LuLGmS8cZ54aK4ij;;G%ZzUtN75EYN6oJ*=QARZG(3t%$=sTbzxtHrSPC&wFhEz>Jv}o1bO2+6CD2~MXh*w_VD~$B!Q!~AKCkS)JnJ)^ z!W^xA8oOl2DQ^_fP6%4Ty~m4lk;0zhF6pnMNSh^Jume-VSN|TOJJ#vuBpS~|m5;2F z7Sub{Y|BiWM};#8fzghjY}*}(FI@wu0ujZyzkG(upRJy>0TxLiS9UP0%AJ2Q~(MI5TeJF zsfIzFiasw7{xv`Ni=j2g2kLvm>@1q18|w`C+axXXFu+O(rTolb&7*9W*0zok2Ek|2 z4D|HUtabUip{+|GbI3@lP2qAXUk#5NmCB?4W$7@Gt2L>d$`bsU@>Aw82)2k)2GHkb zxqvh>Cycs@9X!`RFp=yFudQ)PG?62JqAAdR9)h=ky0j~d1sUUMMZrT}b{st@6?D+f zd49*uK+&+pf1v2L{Ov(IL0yvCg5Ld9MU*H?JUM7>N;eW0wp}SWO8x;5K@SS5umQez zzrlD#zyZUF>BSij$Ty@di(nz7$+5T}RvOuPI`Q_3X)Cpp_%!{ez5n&4+rpJi1yTnZ z7h9M|gYN1kU!NLM28HL%YxZIE;0pDs-sBlqsg!%8;)++?}js1>6 z$VvamIL@z<=QHSmDK;TM+kT_QI3yu_8HVl{yAq8Af^qe9>S`1xY7-vE0TwEGW0*>w zNz3_;_Am#b^@iQ1cS~=^d^Fad_#@|}4#o@&l)ylzVVMRr_EA{A6aOg=*sy)e+MljL zrfgX6VqJZ?AktG*;%*!Ug^^K - 14.0.0-2 +- Remove llvm-cmake-devel BR + +* Thu Apr 07 2022 Timm Bäder - 14.0.0-1 +- Update to 14.0.0 + * Thu Feb 03 2022 Tom Stellard - 13.0.1-1 - 13.0.1 Release