From 379eb95ac2106298eaa546f7e18e6c7a6ae77f6d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 8 Nov 2022 01:31:45 -0500 Subject: [PATCH] import llvm-14.0.6-1.module+el8.7.0+15816+ec020e8f --- .gitignore | 3 +- .llvm.metadata | 3 +- ...abstract-variable.ll-test-on-ppc64le.patch | 4 +- SOURCES/llvm-13.0.1.src.tar.xz.sig | Bin 566 -> 0 bytes SOURCES/llvm-14.0.6.src.tar.xz.sig | Bin 0 -> 566 bytes SPECS/llvm.spec | 70 +++++++++++++----- 6 files changed, 57 insertions(+), 23 deletions(-) delete mode 100644 SOURCES/llvm-13.0.1.src.tar.xz.sig create mode 100644 SOURCES/llvm-14.0.6.src.tar.xz.sig diff --git a/.gitignore b/.gitignore index 2c77403..d368b74 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/llvm-13.0.1.src.tar.xz +SOURCES/llvm-14.0.6.src.tar.xz +SOURCES/tstellar-gpg-key.asc diff --git a/.llvm.metadata b/.llvm.metadata index 5eb43c3..0c6a26d 100644 --- a/.llvm.metadata +++ b/.llvm.metadata @@ -1 +1,2 @@ -8e50e3e47b6a14a0848862c574fb0007db212482 SOURCES/llvm-13.0.1.src.tar.xz +975020d4f7164d84a89f0f9b2153dd870d06e02d SOURCES/llvm-14.0.6.src.tar.xz +b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch b/SOURCES/0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch index 1866a66..4c4a9cf 100644 --- a/SOURCES/0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch +++ b/SOURCES/0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch @@ -23,8 +23,8 @@ index bd0de60268b6..cc5d56b0c512 100644 ; powerpc64 (and on x86_64 at at least -O2). Presumably this is a SelectionDAG ; issue. ; FIXME: arm64 is an alias for aarch64 on macs, apparently? --; XFAIL: powerpc64, aarch64, arm64, hexagon -+; XFAIL: powerpc64, aarch64, arm64, hexagon, ppc64le +-; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv ++; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv, ppc64le ; Build from the following source with clang -O2. diff --git a/SOURCES/llvm-13.0.1.src.tar.xz.sig b/SOURCES/llvm-13.0.1.src.tar.xz.sig deleted file mode 100644 index 2cba778ff42ab46660d656c721ca06a882b39c54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%7``3jhiU5TeJF zsfIzFinn(U{TzJz3wXeV+?g8#qr4lL)ny7;v|PZxHXX(Flr}@ZXCBQ-#u__v?OMD_ zqpe>&vRp;&JwWR1KY2ozY-^YRIySh}NyJdcoqArm3i52OKG_E1k2BzN=`gA~@aKQc zP(C|@sx}!hyoO*@b|_D#f(euH$@ryijN$)(aRf&)i?>WW<^_K3hRnNfbl69M0m@w= z&!r|iFO$~ie7oShv$*v@?aVy;0q6blL*B*Q&A)w)$X!on9djQg&W&INRw@|;{|&6APwiAn(~Xs{e3crp~U1s z15q|jLz402mDLIMkmkdz)HzRx>*|=rdSPhO^N_zT5qM{okvcY5J>`YJkJvSmqQ48? zh00{5TGGOBe4Hsd^k=aOJYIrxZ3z>isS9e`c&d|X9sVTJ7s?UBrVPJw_-)`Gg}Z0J ztk6d#Al$)WdFCf{r5&%VBW?hwIc^ Eu16mu(EtDd diff --git a/SOURCES/llvm-14.0.6.src.tar.xz.sig b/SOURCES/llvm-14.0.6.src.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..5629b21a9ab3f4b7df83cd2dd90869d285b0b21c GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%Ep`X8;Nb5TeJF zsfIzFiYY7)|4YsdgB=ROdj;B_5_4A_$te3Q+ywzbKI;d0y)}XBy$eiBlx1Ijm|UQ3 zaIpAQ8-xIeQ@?16(S#LohK_~(UMdyd3oEP^ub}!H(tgzrn zTGL_)FPIgN{Y1eoJ~WT|Hcp#(coE~32?d+nx(IIp4Vx+$I}qvNOE6R}@Kf~*)78bJ zZTw%d*&6+hA-68nlz$={c5Lx3^^~s-Z1`Bdo#mNoCZL|SG*MvY*|$PWfTV9R76uRqxnyDKhfxuuDaAm8E_QA z%NrWWB9P(o>_2z>??(^o*TbD#ltA!3nilh=5MbOfJOfSCoCOP6C8Q5-4#z{CQvtmF z6&JOO?A7^P+xgaCg8)o3p|qZyc=$;8RAzr|j4ykOb0NlSmjqDpV#jfL8Kh=UT;*X&5n9y`J)hUE1CXr}>QGrv zb+~i~yWED6)ef?6@(YnID-!kxFqT3v8*IIi^W}~+@>{lGM@oybH1~0RowCAmCh5%@ E7%kxg9{>OV literal 0 HcmV?d00001 diff --git a/SPECS/llvm.spec b/SPECS/llvm.spec index e5e2870..c7f55b4 100644 --- a/SPECS/llvm.spec +++ b/SPECS/llvm.spec @@ -1,10 +1,9 @@ -# Components enabled if supported by target architecture: -%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64} -%if 0%{?rhel} > 8 || 0%{?fedora} -# FIXME: Why is this disabled on RHEL <= 8 -%global gold_arches %{gold_arches} s390x -%endif +# We are building with clang for faster/lower memory LTO builds. +# See https://docs.fedoraproject.org/en-US/packaging-guidelines/#_compiler_macros +%global toolchain clang +# Components enabled if supported by target architecture: +%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x %ifarch %{gold_arches} %bcond_without gold %else @@ -17,9 +16,9 @@ %global llvm_libdir %{_libdir}/%{name} %global build_llvm_libdir %{buildroot}%{llvm_libdir} #global rc_ver 4 -%global maj_ver 13 +%global maj_ver 14 %global min_ver 0 -%global patch_ver 1 +%global patch_ver 6 %if !%{maj_ver} && 0%{?rc_ver} %global abi_revision 2 %endif @@ -83,6 +82,7 @@ License: NCSA URL: http://llvm.org Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz.sig +Source2: tstellar-gpg-key.asc %if %{without compat_build} Source3: run-lit-tests @@ -99,19 +99,15 @@ Patch101: 0001-Deactivate-markdown-doc.patch BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: clang BuildRequires: cmake BuildRequires: ninja-build BuildRequires: zlib-devel BuildRequires: libffi-devel BuildRequires: ncurses-devel +BuildRequires: python3-psutil BuildRequires: python3-sphinx - -%if !0%{?rhel} -BuildRequires: python3-recommonmark -%else -BuildRequires: pandoc -%endif - +BuildRequires: pandoc BuildRequires: multilib-rpm-config %if %{with gold} BuildRequires: binutils-devel @@ -128,6 +124,10 @@ BuildRequires: libedit-devel BuildRequires: python3-devel BuildRequires: python3-setuptools +# For origin certification +BuildRequires: gnupg2 + + Requires: %{name}-libs%{?_isa} = %{version}-%{release} Provides: llvm(major) = %{maj_ver} @@ -212,9 +212,10 @@ LLVM's modified googletest sources. %endif %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -n %{llvm_srcdir} -p2 -pathfix.py -i %{__python3} -pn \ +%py3_shebang_fix \ test/BugPoint/compile-custom.ll.py \ tools/opt-viewer/*.py \ utils/update_cc_test_checks.py @@ -228,7 +229,14 @@ find -name '*.md' | while read md; do sed -r -e 's/^( )*\* /\n\1\* /' ${md} | pa mkdir -p %{_vpath_builddir} cd %{_vpath_builddir} -%ifarch s390 %{arm} %ix86 +%ifarch s390 s390x +# Fails with "exceeded PCRE's backtracking limit" +%global _lto_cflags %nil +%else +%global _lto_cflags -flto=thin +%endif + +%ifarch s390 s390x %{arm} %ix86 # Decrease debuginfo verbosity to reduce memory consumption during final library linking %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif @@ -273,6 +281,7 @@ export LDFLAGS="${LDFLAGS} -Wl,--build-id=md5" \ -DLLVM_INCLUDE_TESTS:BOOL=ON \ -DLLVM_BUILD_TESTS:BOOL=ON \ + -DLLVM_LIT_ARGS=-v \ \ -DLLVM_INCLUDE_EXAMPLES:BOOL=ON \ -DLLVM_BUILD_EXAMPLES:BOOL=OFF \ @@ -295,15 +304,17 @@ export LDFLAGS="${LDFLAGS} -Wl,--build-id=md5" -DLLVM_VERSION_SUFFIX='' \ %endif -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \ - -DLLVM_DYLIB_EXPORT_ALL:BOOL=ON \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \ -DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=OFF \ + %{?abi_revision:-DLLVM_ABI_REVISION=%{abi_revision}} \ \ + -DLLVM_DEFAULT_TARGET_TRIPLE=%{llvm_triple} \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ -DCMAKE_INSTALL_PREFIX=%{install_prefix} \ -DLLVM_INSTALL_SPHINX_HTML_DIR=%{_pkgdocdir}/html \ - -DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3 + -DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3 \ + -DLLVM_INCLUDE_BENCHMARKS=OFF # Build libLLVM.so first. This ensures that when libLLVM.so is linking, there # are no other compile jobs running. This will help reduce OOM errors on the @@ -423,9 +434,16 @@ rm %{buildroot}%{_bindir}/llvm-config%{exec_suffix} # ghost presence touch %{buildroot}%{_bindir}/llvm-config%{exec_suffix} +%if %{without compat_build} +cp -Rv ../cmake/Modules/* %{buildroot}%{_libdir}/cmake/llvm +%endif %check +# Disable check section on arm due to some kind of memory related failure. +# Possibly related to https://bugzilla.redhat.com/show_bug.cgi?id=1920183 +%ifnarch %{arm} + # TODO: Fix the failures below %ifarch %{arm} rm test/tools/llvm-readobj/ELF/dependent-libraries.test @@ -439,6 +457,8 @@ rm test/tools/dsymutil/X86/swift-interface.test LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir} %{__ninja} check-all -C %{_vpath_builddir} %endif +%endif + %ldconfig_scriptlets libs %post devel @@ -556,6 +576,18 @@ fi %endif %changelog +* Mon Jun 27 2022 Tom Stellard - 14.0.6-1 +- 14.0.6 Release + +* Mon May 23 2022 Timm Bäder - 14.0.0-3 +- Build gold plugin on s390x as well + +* Fri Apr 29 2022 Timm Bäder - 14.0.0-2 +- Remove llvm-cmake-devel package again + +* Thu Apr 07 2022 Timm Bäder - 14.0.0-1 +- Update to 14.0.0 + * Wed Feb 02 2022 Tom Stellard - 13.0.1-1 - 13.0.1 Release