From d0c38922bba81fa178b2714d2c0e010f6a1ccb59 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 27 Sep 2022 05:02:57 -0400
Subject: [PATCH] import lld-14.0.6-1.module+el8.7.0+15816+ec020e8f

---
 .gitignore                        |   2 +-
 .lld.metadata                     |   2 +-
 SOURCES/lld-13.0.1.src.tar.xz.sig | Bin 566 -> 0 bytes
 SOURCES/lld-14.0.6.src.tar.xz.sig | Bin 0 -> 566 bytes
 SPECS/lld.spec                    | 105 ++++++++++++++++++++++++++----
 5 files changed, 93 insertions(+), 16 deletions(-)
 delete mode 100644 SOURCES/lld-13.0.1.src.tar.xz.sig
 create mode 100644 SOURCES/lld-14.0.6.src.tar.xz.sig

diff --git a/.gitignore b/.gitignore
index 69229d3..8a01b32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/lld-13.0.1.src.tar.xz
+SOURCES/lld-14.0.6.src.tar.xz
 SOURCES/tstellar-gpg-key.asc
diff --git a/.lld.metadata b/.lld.metadata
index 8eb0ab8..5171d3a 100644
--- a/.lld.metadata
+++ b/.lld.metadata
@@ -1,2 +1,2 @@
-78d69e9bd03422f12cf36cc720bf4ee7293e17c5 SOURCES/lld-13.0.1.src.tar.xz
+bba0ab108d525c911e80fed4b10435e459cdf7b6 SOURCES/lld-14.0.6.src.tar.xz
 b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc
diff --git a/SOURCES/lld-13.0.1.src.tar.xz.sig b/SOURCES/lld-13.0.1.src.tar.xz.sig
deleted file mode 100644
index b07cb7dad7c6c4625b38d4e00cea207b2d309228..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%7``3jhiU5TeJF
zsfIzFin;s`{TgHxy0vqYf*d#;5zk28rSpUNMLRvEiagz6%mm<ta+5W0fZL4Bn_(gd
zn^m8d+U4O{#>wAE9<Pmopw2<d-U|i&er9=}@>6ddS#-FpGXKrfMYKhOSm|4>QFDNs
zO#eYFY{K1dK*^69s`X<x*)dm+p9(eBI{xzHhDVEvAp81z_n?1mo>_`F1$B}zoQ<!T
zgeCd=^u^Mmu_1N5KAgl+(Evv%P_Vg^E^`YXHMmD`ry?IowLuO*GZ!<sS-%*UJ?`E(
z3oGU&-4+HvutlCECX2s)12igs^yCFMixr|8RDlCvV1$yb&vi!3gxvBynWc|08{Quf
zW7)7@_|>QtYUc-w;Uxim@x<u+WszL5pjuM}J?g)rE1T{{!y=(2ZVU1eZv9!Y5M`7F
zV{+Zj{Ab_WhW%i}-y>jlq4e4$O2Pev0v_H)cZ*P+Uu>YY+(~F8&fiQK;pfr`B!d9Y
zeMxNXMl)RdXr<3m!9tKs>omaq3wPMSqk}rL_30mRI=^WdRt3$J$|;ugpU*sRgOomL
z9Wk?-nlhu8b=JS0D#WO1D<>drT#p*mwNxYgv$Lp<BQI%f^#KgUr_;%pE=~LG?A)a%
zY*1qhqwRF5Yks&mv_ycn<+~RR7FCtp_(@uWu+%fXkPx!2os~4MjMzVl)A1N^yXz<%
EXY_&;;s5{u

diff --git a/SOURCES/lld-14.0.6.src.tar.xz.sig b/SOURCES/lld-14.0.6.src.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..afb22490d4c5f9fa332ae26a8d1c45751962e167
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0%Ep`W&jEa5TeJF
zsfIzFij4IS|8E_|dZ9EJg-tRc^#-$Bko7sHx;a+UP7YPGz9o!X5<~dLhda441L>H9
zw~b5P+WaTNKDw7|NmgB=9w0L(Ckos-eoo8RQL})||LtQ}Th{`6fxaEAQu11PvGL`8
zI7d;4OXyb@ux>2)Vm{hI0b%|DwcLz}wuCpYmfE#D{N@k*b||-3&ztLXH^A9#of(~>
z0ra4Dx@W5+o_8z=SVVIAYB!+SzZ(EYG3{iwe9347>anN|5Hf+=vB=G!)1V&u0Bt4Q
zlg|zmPQYma*dhRHW@9*VhJCK`6s=rNgiu-FZ>vSh8`G&MS#u>KsSBM8<Zl5pl<=Va
zl`?kafgKvNzRk#Re%b{eeQt~jc8Q&&RtEygh0DuzeihNj1rWkZjjKFVA@O$+)dahU
zO9X*OurGGWP48LmLIDJ!a&f%YVPN|eM>`wnT^TN^@GL4}r%$4<?C(TUZ|TfWe_)h(
zx#K4qp(tel-y_b#=^nfHahA4#5&HWIn#ETqtPexa<+y%oZ9GeJualIuRgcj51XRJ4
zPcvaz-XP&ogJ>D3q7#X?O6%j(5vB+=9tatg<v;JZU~Qd=3BijL6{mWY_}ok1B~w|`
zJ-+Q*jM{BlXTMc*sB8x?&nYER#793|I{f^iK8z*`YI9^cwA|0`%_TFu)<0%$mL17W
E8&OFLkN^Mx

literal 0
HcmV?d00001

diff --git a/SPECS/lld.spec b/SPECS/lld.spec
index 982bc09..e4a08b3 100644
--- a/SPECS/lld.spec
+++ b/SPECS/lld.spec
@@ -1,27 +1,27 @@
 %bcond_without check
 
-#global rc_ver 4
+#global rc_ver 1
 %global lld_srcdir lld-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
-%global baserelease 2
-%global maj_ver 13
+%global maj_ver 14
 %global min_ver 0
-%global patch_ver 1
+%global patch_ver 6
 
 # Don't include unittests in automatic generation of provides or requires.
 %global __provides_exclude_from ^%{_libdir}/lld/.*$
 %global __requires_exclude ^libgtest.*$
 
 %bcond_with ld_alternative
+%bcond_with testpkg
 
 Name:		lld
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	%{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
+Release:	1%{?rc_ver:.rc%{rc_ver}}%{?dist}
 Summary:	The LLVM Linker
 
 License:	NCSA
 URL:		http://llvm.org
-Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{lld_srcdir}.tar.xz
-Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{lld_srcdir}.tar.xz.sig
+Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{lld_srcdir}.tar.xz
+Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{lld_srcdir}.tar.xz.sig
 Source2:	tstellar-gpg-key.asc
 Source3:	run-lit-tests
 Source4:	lit.lld-test.cfg.py
@@ -33,7 +33,6 @@ Patch0:		0001-PATCH-lld-CMake-Check-for-gtest-headers-even-if-lit..patch
 # Bundle libunwind header need during build for MachO support
 Patch1:		0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch
 
-
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
@@ -49,6 +48,9 @@ BuildRequires:	python3-rpm-macros
 BuildRequires:	python3-lit
 BuildRequires:	llvm-googletest = %{version}
 
+# For gpg source verification
+BuildRequires:	gnupg2
+
 %if %{with ld_alternative}
 Requires(post): %{_sbindir}/alternatives
 Requires(preun): %{_sbindir}/alternatives
@@ -76,7 +78,20 @@ Summary:	LLD shared libraries
 %description libs
 Shared libraries for LLD.
 
+%if %{with testpkg}
+%package test
+Summary: LLD regression tests
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	python3-lit
+Requires:	llvm-test(major) = %{maj_ver}
+Requires:	lld-libs = %{version}-%{release}
+
+%description test
+LLVM regression tests.
+%endif
+
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -n %{lld_srcdir} -p2
 
 
@@ -107,11 +122,55 @@ cd %{_vpath_builddir}
 
 %cmake_build
 
-%install
-# Install libraries and binaries
-cd %{_target_platform}
+%if %{with testpkg}
+# Build the unittests so we can install them.
+%cmake_build --target lld-test-depends
+%endif
 
+%install
+%if %{with testpkg}
+%global lit_cfg test/%{_arch}.site.cfg.py
+%global lit_unit_cfg test/Unit/%{_arch}.site.cfg.py
+%global lit_lld_test_cfg_install_path %{_datadir}/lld/lit.lld-test.cfg.py
+
+# Generate lit config files.  Strip off the last line that initiates the
+# test run, so we can customize the configuration.
+head -n -1 %{__cmake_builddir}/test/lit.site.cfg.py >> %{lit_cfg}
+head -n -1 %{__cmake_builddir}/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg}
+
+# Patch lit config files to load custom config:
+for f in %{lit_cfg} %{lit_unit_cfg}; do
+  echo "lit_config.load_config(config, '%{lit_lld_test_cfg_install_path}')" >> $f
+done
+
+# Install test files
+install -d %{buildroot}%{_datadir}/lld/src
+cp %{SOURCE4} %{buildroot}%{_datadir}/lld/
+
+# The various tar options are there to make sur the archive is the same on 32 and 64 bit arch, i.e.
+# the archive creation is reproducible. Move arch-specific content out of the tarball
+mv %{lit_cfg} %{buildroot}%{_datadir}/lld/src/%{_arch}.site.cfg.py
+mv %{lit_unit_cfg} %{buildroot}%{_datadir}/lld/src/%{_arch}.Unit.site.cfg.py
+tar --sort=name --mtime='UTC 2020-01-01' -c test/ | gzip -n > %{buildroot}%{_datadir}/lld/src/test.tar.gz
+
+install -d %{buildroot}%{_libexecdir}/tests/lld
+install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/lld
+
+# Install unit test binaries
+install -d %{buildroot}%{_libdir}/lld/
+
+rm -rf `find %{buildroot}%{_libdir}/lld/ -iname '*make*'`
+
+# Install gtest libraries
+cp %{__cmake_builddir}/%{_lib}/libgtest*so* %{buildroot}%{_libdir}/lld/
+%endif
+
+# Install libraries and binaries
+pushd %{_vpath_builddir}
 %cmake_install
+popd
+
+
 # This is generated by Patch1 during build and (probably) must be removed afterward
 rm %{buildroot}%{_includedir}/mach-o/compact_unwind_encoding.h
 
@@ -130,13 +189,14 @@ fi
 %endif
 
 %check
-
 cd %{_vpath_builddir}
 
 # armv7lhl tests disabled because of arm issue, see https://koji.fedoraproject.org/koji/taskinfo?taskID=33660162
 %ifnarch %{arm}
+%if %{with check}
 %cmake_build --target check-lld
 %endif
+%endif
 
 %ldconfig_scriptlets libs
 
@@ -148,8 +208,6 @@ cd %{_vpath_builddir}
 %{_bindir}/lld*
 %{_bindir}/ld.lld
 %{_bindir}/ld64.lld
-%{_bindir}/ld64.lld.darwinnew
-%{_bindir}/ld64.lld.darwinold
 %{_bindir}/wasm-ld
 
 %files devel
@@ -160,7 +218,26 @@ cd %{_vpath_builddir}
 %files libs
 %{_libdir}/liblld*.so.*
 
+%if %{with testpkg}
+%files test
+%{_libexecdir}/tests/lld/
+%{_libdir}/lld/
+%{_datadir}/lld/src/test.tar.gz
+%{_datadir}/lld/src/%{_arch}.site.cfg.py
+%{_datadir}/lld/src/%{_arch}.Unit.site.cfg.py
+%{_datadir}/lld/lit.lld-test.cfg.py
+%endif
+
 %changelog
+* Tue Jun 28 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-1
+- 14.0.6 Release
+
+* Fri May 06 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-2
+- Backport ignoring --no-add-needed
+
+* Thu Apr 07 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
+- Update to 14.0.0
+
 * Thu Feb 03 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-1
 - 13.0.1 Release