From a3d196ceea53871736a9b09213ec5b3560e6c2bc Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 19 Nov 2021 04:56:21 +0000 Subject: [PATCH] import compiler-rt-13.0.0-1.module+el8.6.0+13042+9f423c45 --- .compiler-rt.metadata | 2 +- .gitignore | 2 +- ...mpiler-rt-arch-detection-for-ppc64le.patch | 25 +++++++++++++ SOURCES/compiler-rt-12.0.1.src.tar.xz.sig | Bin 566 -> 0 bytes SOURCES/compiler-rt-13.0.0.src.tar.xz.sig | Bin 0 -> 566 bytes SPECS/compiler-rt.spec | 35 ++++++++++-------- 6 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 SOURCES/0001-Fix-compiler-rt-arch-detection-for-ppc64le.patch delete mode 100644 SOURCES/compiler-rt-12.0.1.src.tar.xz.sig create mode 100644 SOURCES/compiler-rt-13.0.0.src.tar.xz.sig diff --git a/.compiler-rt.metadata b/.compiler-rt.metadata index d2a6fc5..6ae9c8d 100644 --- a/.compiler-rt.metadata +++ b/.compiler-rt.metadata @@ -1,2 +1,2 @@ -d33af648dc9b901c6c9f6c5872af2f59203f1a25 SOURCES/compiler-rt-12.0.1.src.tar.xz +f3241c200e739abbfa846c707175fd711d3cf4fe SOURCES/compiler-rt-13.0.0.src.tar.xz b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/.gitignore b/.gitignore index b91f9de..8805ec4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/compiler-rt-12.0.1.src.tar.xz +SOURCES/compiler-rt-13.0.0.src.tar.xz SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/0001-Fix-compiler-rt-arch-detection-for-ppc64le.patch b/SOURCES/0001-Fix-compiler-rt-arch-detection-for-ppc64le.patch new file mode 100644 index 0000000..7ad9295 --- /dev/null +++ b/SOURCES/0001-Fix-compiler-rt-arch-detection-for-ppc64le.patch @@ -0,0 +1,25 @@ +From 72191190adea8e861e9a383b83799e7472b80e30 Mon Sep 17 00:00:00 2001 +From: Tom Stellard +Date: Thu, 23 Sep 2021 18:06:41 -0700 +Subject: [PATCH] Fix compiler-rt arch detection for ppc64le + +--- + compiler-rt/cmake/base-config-ix.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake +index c11342e68813..3ca9dc0f5515 100644 +--- a/compiler-rt/cmake/base-config-ix.cmake ++++ b/compiler-rt/cmake/base-config-ix.cmake +@@ -204,7 +204,7 @@ macro(test_targets) + test_target_arch(x86_64 "" "") + endif() + endif() +- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc64le") ++ elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc64le|ppc64le") + test_target_arch(powerpc64le "" "-m64") + elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "powerpc") + if(CMAKE_SYSTEM_NAME MATCHES "AIX") +-- +2.27.0 + diff --git a/SOURCES/compiler-rt-12.0.1.src.tar.xz.sig b/SOURCES/compiler-rt-12.0.1.src.tar.xz.sig deleted file mode 100644 index c41c6248cbd653ec1aece40b6e3a8af33cb246bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0$}Ie&HxGt5TeJF zsfIzFiZ6%{{0|tQ&^w*tC6~gi=s;7aOrA%xIqo;`S! zt9^ugIwOCQ>Ivy_Q%1WEa~7GOz|f5=%bu)((RuVBnUikSf}6QOxZ;OrUOvRb+ z@&5dg*tVs8InFkP)6LDyT>n?zP+J|)2ThghR1Ftg`p+w9RC?nN0}x(>{CGYAS(1kO zdtx}8tD%7&=v{hCRsG;0tWV*<^`p=v#mc zu8^g|d$H6PAZ!@ogcFc88v&?9NXyRjIJN1-(3ipTDiEHN$bARzYH z9i785EzL4VA~>?T+)UMYBq`|v)1rU0mM<})N?#uGqh+v}VDB$oh}nG97gq09Jg2UC^g3zRj;aRd zVwbo2qnCh}Hr?#k>-nC+5rd}Uju&p3KyAI-MGQP0l7om{f~dz;EJNBt!N?GLAL;el EzFs#Qb^rhX diff --git a/SOURCES/compiler-rt-13.0.0.src.tar.xz.sig b/SOURCES/compiler-rt-13.0.0.src.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..09d9dfd20375085560edd81ce9febf53d375bb80 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%2BrZvYAj5TeJF zsfIzFik3tV|4?!m#z=p_rw|N-85u^xSep}CIUe%4K%K#w;)1v`og#B) zO$N4}8Q}l;ZRyQj$y$`*W)EO+PAdHf*Omm9{zH(pq&1bDXWqZTtJAipFB=oN5G$Gm z5mQM$8;+pNIUOUT_>9K&$nosVq_~?ByA26W^*YuuqI+(={y<`>2UY($2npPbBwdP8sr{Ci(8$f6Ir`2+bv6hONb$@{Nyuhl02P7 zp-XzLES&o5E_~rqD_OQ~&PQ;H<%B-RKV-H5U&xh-D0`Q1&ON-HVxNG=WY28QOW-1( zP>FuYCFrYsUL%6}$rA*Bw39)~sFaIwzSUP|aVIOc$(iS-1P~5z?KbPY4v;J0{b6O} zvs3W52+?1kZ(gfojp%$u_V8{z4AyWX*sYfuYl1T@W2P%UqUd#(Vn}|0rZBT3s5?}6 zCRry$eF0D;{bHGm!$M#&{=@eL#?mePfQ%Ys6WTk!_h0-iqCX904Z(Oqz>r0k2W~1) zqm}@Vnx!+vm}Z2<7e7SaqUi}!yt=D-5PQt=&*`Z?jaR?+)7;@BX)dfWAXQD^wf(}W E&`Hb<^8f$< literal 0 HcmV?d00001 diff --git a/SPECS/compiler-rt.spec b/SPECS/compiler-rt.spec index cdd58b7..7ea6325 100644 --- a/SPECS/compiler-rt.spec +++ b/SPECS/compiler-rt.spec @@ -1,6 +1,7 @@ -#%%global rc_ver 5 +#global rc_ver 3 -%global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src +%global compiler_rt_version 13.0.0 +%global crt_srcdir compiler-rt-%{compiler_rt_version}%{?rc_ver:rc%{rc_ver}}.src # see https://sourceware.org/bugzilla/show_bug.cgi?id=25271 %global optflags %(echo %{optflags} -D_DEFAULT_SOURCE) @@ -9,17 +10,18 @@ %global optflags %(echo %{optflags} -Dasm=__asm__) Name: compiler-rt -Version: 12.0.1%{?rc_ver:~rc%{rc_ver}} +Version: %{compiler_rt_version}%{?rc_ver:~rc%{rc_ver}} Release: 1%{?dist} Summary: LLVM "compiler-rt" runtime libraries License: NCSA or MIT URL: http://llvm.org -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz -Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{crt_srcdir}.tar.xz.sig +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 Patch0: 0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch +Patch1: 0001-Fix-compiler-rt-arch-detection-for-ppc64le.patch # RHEL-specific patches Patch100: 0001-Drop-fno-stack-protector-from-the-compiler-flags.patch @@ -70,15 +72,15 @@ cd %{_vpath_builddir} %cmake_install # move blacklist/abilist files to where clang expect them -mkdir -p %{buildroot}%{_libdir}/clang/%{version}/share -mv -v %{buildroot}%{_datadir}/*list.txt %{buildroot}%{_libdir}/clang/%{version}/share/ +mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share +mv -v %{buildroot}%{_datadir}/*list.txt %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/share/ # move sanitizer libs to better place %global libclang_rt_installdir lib/linux -mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib -mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib -mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/ -pushd %{buildroot}%{_libdir}/clang/%{version}/lib +mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib +mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib +mkdir -p %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib/linux/ +pushd %{buildroot}%{_libdir}/clang/%{compiler_rt_version}/lib for i in *.a *.so do ln -s ../$i linux/$i @@ -88,11 +90,11 @@ done # the symlinks will be dangling if the 32 bits version is not installed, but that should be fine %ifarch x86_64 -mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{version}/lib/linux +mkdir -p %{buildroot}/%{_exec_prefix}/lib/clang/%{compiler_rt_version}/lib/linux for i in *.a *.so do target=`echo "$i" | sed -e 's/x86_64/i386/'` - ln -s ../../../../../lib/clang/%{version}/lib/$target ../../../../%{_lib}/clang/%{version}/lib/linux/ + ln -s ../../../../../lib/clang/%{compiler_rt_version}/lib/$target ../../../../%{_lib}/clang/%{compiler_rt_version}/lib/linux/ done %endif @@ -106,13 +108,16 @@ popd %files %license LICENSE.TXT %{_includedir}/* -%{_libdir}/clang/%{version}/lib/* -%{_libdir}/clang/%{version}/share/* +%{_libdir}/clang/%{compiler_rt_version}/lib/* +%{_libdir}/clang/%{compiler_rt_version}/share/* %ifarch x86_64 aarch64 %{_bindir}/hwasan_symbolize %endif %changelog +* Fri Oct 15 2021 Tom Stellard - 13.0.0-1 +- 13.0.0 Release + * Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1 - 12.0.1 release