import lld-11.0.0-0.1.rc2.module+el8.4.0+8195+484edabc

.gitignore

@@ -1 +1 @@
-SOURCES/lld-10.0.1.src.tar.xz
+SOURCES/lld-11.0.0rc2.src.tar.xz

.lld.metadata

@@ -1 +1 @@
-8581337dba00041c2633f61bfb5be778df83cff7 SOURCES/lld-10.0.1.src.tar.xz
+d7fe5e7b0b50f9ae96cb65efdcfdd47be1b0ae05 SOURCES/lld-11.0.0rc2.src.tar.xz

SPECS/lld.spec

@@ -1,9 +1,9 @@
-#%%global rc_ver 6
+%global rc_ver 2
-%global baserelease 1
+%global baserelease 0.1
 %global lld_srcdir lld-%{version}%{?rc_ver:rc%{rc_ver}}.src
-%global maj_ver 10
+%global maj_ver 11
 %global min_ver 0
-%global patch_ver 1
+%global patch_ver 0
 
 # Don't include unittests in automatic generation of provides or requires.
 %global __provides_exclude_from ^%{_libdir}/lld/.*$
@@ -18,27 +18,25 @@ Summary:	The LLVM Linker
 
 License:	NCSA
 URL:		http://llvm.org
-%if 0%{?rc_ver:1}
+Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{lld_srcdir}.tar.xz
-Source0:	https://prereleases.llvm.org/%{version}/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
-Source3:	https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lld_srcdir}.tar.xz.sig
+Source2:	https://prereleases.llvm.org/%{version}/hans-gpg-key.asc
-%else
+Source3:	run-lit-tests
-Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lld_srcdir}.tar.xz
+Source4:	lit.lld-test.cfg.py
-Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lld_srcdir}.tar.xz.sig
-%endif
-Source1:	run-lit-tests
-Source2:	lit.lld-test.cfg.py
-Source4:	https://prereleases.llvm.org/%{version}/hans-gpg-key.asc
 
 Patch0:		0001-CMake-Check-for-gtest-headers-even-if-lit.py-is-not-.patch
+Patch1:		0001-Revert-lld-Initial-commit-for-new-Mach-O-backend.patch
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
+BuildRequires:	ninja-build
 BuildRequires:	llvm-devel = %{version}
 BuildRequires:	llvm-test = %{version}
 BuildRequires:	ncurses-devel
 BuildRequires:	zlib-devel
 BuildRequires:	chrpath
+BuildRequires:	python3-devel
 
 # For make check:
 BuildRequires:	python3-rpm-macros
@@ -57,7 +55,10 @@ The LLVM project linker.
 
 %package devel
 Summary:	Libraries and header files for LLD
-Requires: lld-libs = %{version}-%{release}
+Requires: lld-libs%{?_isa} = %{version}-%{release}
+# lld tools are referenced in the cmake files, so we need to add lld as a
+# dependency.
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains library and header files needed to develop new native
@@ -80,7 +81,15 @@ Requires:	lld-libs = %{version}-%{release}
 LLVM regression tests.
 
 %prep
-%autosetup -n %{lld_srcdir} -p1
+
+%setup -q -n %{lld_srcdir}
+
+%patch0 -p1 -b .gtest-fix
+# Remove the MachO backend since it doesn't seem to work on big-endian hosts.
+%ifarch s390x
+%patch1 -p2 -b .remove-MachO
+%endif
+
 
 %build
 
@@ -88,8 +97,10 @@ mkdir %{_target_platform}
 cd %{_target_platform}
 
 %cmake .. \
+	-GNinja \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DLLVM_DYLIB_COMPONENTS="all" \
+	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DPYTHON_EXECUTABLE=%{__python3} \
 	-DLLVM_INCLUDE_TESTS=ON \
 	-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
@@ -102,10 +113,10 @@ cd %{_target_platform}
 	-DLLVM_LIBDIR_SUFFIX=
 %endif
 
-%make_build
+%ninja_build
 
 # Build the unittests so we can install them.
-%make_build lld-test-depends
+%ninja_build lld-test-depends
 
 %install
 
@@ -125,7 +136,7 @@ done
 
 # Install test files
 install -d %{buildroot}%{_datadir}/lld/src
-cp %{SOURCE2} %{buildroot}%{_datadir}/lld/
+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
@@ -133,9 +144,8 @@ 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
-cp %{SOURCE1} %{buildroot}%{_libexecdir}/tests/lld
+cp %{SOURCE3} %{buildroot}%{_libexecdir}/tests/lld
 
 # Install unit test binaries
 install -d %{buildroot}%{_libdir}/lld/
@@ -147,12 +157,7 @@ cp %{_target_platform}/%{_lib}/libgtest*so* %{buildroot}%{_libdir}/lld/
 
 # Install libraries and binaries
 cd %{_target_platform}
-%make_install
+%ninja_install
-
-# Remove rpath
-chrpath --delete %{buildroot}%{_bindir}/*
-chrpath --delete %{buildroot}%{_libdir}/*.so*
-chrpath --delete `find %{buildroot}%{_libdir}/lld/ -type f`
 
 %if %{with ld_alternative}
 # Required when using update-alternatives:
@@ -172,12 +177,13 @@ fi
 
 # armv7lhl tests disabled because of arm issue, see https://koji.fedoraproject.org/koji/taskinfo?taskID=33660162
 %ifnarch %{arm}
-make -C %{_target_platform} %{?_smp_mflags} check-lld
+%ninja_build -C %{_target_platform} %{?_smp_mflags} check-lld
 %endif
 
 %ldconfig_scriptlets libs
 
 %files
+%license LICENSE.TXT
 %if %{with ld_alternative}
 %ghost %{_bindir}/ld
 %endif
@@ -189,6 +195,7 @@ make -C %{_target_platform} %{?_smp_mflags} check-lld
 %files devel
 %{_includedir}/lld
 %{_libdir}/liblld*.so
+%{_libdir}/cmake/lld/
 
 %files libs
 %{_libdir}/liblld*.so.*
@@ -202,6 +209,9 @@ make -C %{_target_platform} %{?_smp_mflags} check-lld
 %{_datadir}/lld/lit.lld-test.cfg.py
 
 %changelog
+* Fri Sep 18 2020 sguelton@redhat.com - 11.0.0-0.1.rc2
+- 11.0.0-rc2 Release
+
 * Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1
 - 10.0.1 release