From 11e4e4ecf9fc7e4cceb46c94ecb6be6a34665bcb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 8 Nov 2022 01:31:15 -0500 Subject: [PATCH] import compiler-rt-14.0.6-1.module+el8.7.0+15816+ec020e8f --- .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.6.src.tar.xz.sig | Bin 0 -> 566 bytes SOURCES/fix-page-size-constant.patch | 15 ++++++ SPECS/compiler-rt.spec | 27 ++++++++--- 8 files changed, 75 insertions(+), 51 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.6.src.tar.xz.sig create mode 100644 SOURCES/fix-page-size-constant.patch diff --git a/.compiler-rt.metadata b/.compiler-rt.metadata index 181a005..f138bf8 100644 --- a/.compiler-rt.metadata +++ b/.compiler-rt.metadata @@ -1,2 +1,2 @@ -68e9e2f569ccfe0af9f5df61ec74808688198946 SOURCES/compiler-rt-13.0.1.src.tar.xz +91f03b578aff0fda6b9d3e2185e6ea5e588c6d47 SOURCES/compiler-rt-14.0.6.src.tar.xz b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/.gitignore b/.gitignore index 941953c..671a08d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/compiler-rt-13.0.1.src.tar.xz +SOURCES/compiler-rt-14.0.6.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%Ep`WdI5Z5TeJF zsfIzFih(5%0IY*OnT+441P#T*D|eRnXKM@84FpASV3P`u5M^4qu%aLaN#w#V&*2>| zcg;byh=tVngkv)%%YW0C?7=JPh|S#JtxM~ngZy3YM>ieZq^a!1J>6@leBI9{lmL7y z;ETldpAjL)SkK{NCn}*U>G-?Eqy~h{9%;m>Q|MnY|C1Q+5zPK*45`o`s*dH#47RmH zhcAAz*;83KcNUv;Ph2#NmbCv+Ax26bp&40HMa&-g-8$L^pYJE4ZK4-YE264zhAkW~ zpeKa&5f&-ujy44hvrF}8pKyDGI!~!Z-lE}&6=F=HmNynseAT!EqT&yb1+h?{KI88V z$$_9Q_W;o+hS)I8yU`ilLt5^AZhcy`Wj_i;9ifpplX+*sR=5SS!x`AB;WAEBD&l%s z{I6C-arD~)^Wx1JU-eMFxY`l}e4sYddEK*7Gg3B&Oq=-XhnEUrah6TYWcqWXfaWW; zy$bJyny(GyZ+*ZcTQPB`+VKBeFbfLJH76Qzhtvg_kpgixLgMkRSICu1ihxnJOYUn! zT3Lgl8I~H$-Et4G`eO$KrcI-}_s%*l6gVdMFd;$@6Xp2t8q-+^=F%mxpS!)z==4n! z1y0alWw7r`Nih-@FF7POO@m>=3I5d - 14.0.6-1 +- 14.0.6 Release + +* Wed May 25 2022 Timm Bäder - 14.0.0-3 +- Fix page size constant size on aarch64 and ppc64le + +* Fri Apr 29 2022 Timm Bäder - 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