diff --git a/.gitignore b/.gitignore
index 06bdd82..ba7f42e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/lld-9.0.1.src.tar.xz
+SOURCES/lld-10.0.1.src.tar.xz
diff --git a/.lld.metadata b/.lld.metadata
index bd049c0..fdc9eb2 100644
--- a/.lld.metadata
+++ b/.lld.metadata
@@ -1 +1 @@
-ef5f529adfb9b57b33c394641d7d5e2d1f1b5ff6 SOURCES/lld-9.0.1.src.tar.xz
+8581337dba00041c2633f61bfb5be778df83cff7 SOURCES/lld-10.0.1.src.tar.xz
diff --git a/SOURCES/hans-gpg-key.asc b/SOURCES/hans-gpg-key.asc
new file mode 100644
index 0000000..2cf5255
--- /dev/null
+++ b/SOURCES/hans-gpg-key.asc
@@ -0,0 +1,7 @@
+
+404 Not Found
+
+404 Not Found
+
nginx/1.4.6 (Ubuntu)
+
+
diff --git a/SOURCES/lld-10.0.1.src.tar.xz.sig b/SOURCES/lld-10.0.1.src.tar.xz.sig
new file mode 100644
index 0000000..8686839
Binary files /dev/null and b/SOURCES/lld-10.0.1.src.tar.xz.sig differ
diff --git a/SOURCES/run-lit-tests b/SOURCES/run-lit-tests
index 7b92d2e..b02c0b3 100755
--- a/SOURCES/run-lit-tests
+++ b/SOURCES/run-lit-tests
@@ -56,8 +56,9 @@ esac
cd $(mktemp -d)
ln -s /usr/include include
tar -xzf /usr/share/lld/src/test.tar.gz
-ln -s $ARCH.site.cfg.py test/lit.site.cfg.py
-ln -s $ARCH.site.cfg.py test/Unit/lit.site.cfg.py
+ln -s /usr/share/lld/src/$ARCH.site.cfg.py test/lit.site.cfg.py
+ln -s /usr/share/lld/src/$ARCH.Unit.site.cfg.py test/Unit/lit.site.cfg.py
+
LD_LIBRARY_PATH=$LIB_DIR/lld:$LD_LIBRARY_PATH \
lit -v -s $threads_arg test \
diff --git a/SPECS/lld.spec b/SPECS/lld.spec
index 94b1dee..11b3bcc 100644
--- a/SPECS/lld.spec
+++ b/SPECS/lld.spec
@@ -1,7 +1,9 @@
-#%%global rc_ver 3
+#%%global rc_ver 6
%global baserelease 1
%global lld_srcdir lld-%{version}%{?rc_ver:rc%{rc_ver}}.src
-%global maj_ver 9
+%global maj_ver 10
+%global min_ver 0
+%global patch_ver 1
# Don't include unittests in automatic generation of provides or requires.
%global __provides_exclude_from ^%{_libdir}/lld/.*$
@@ -10,15 +12,22 @@
%bcond_with ld_alternative
Name: lld
-Version: %{maj_ver}.0.1
+Version: %{maj_ver}.%{min_ver}.%{patch_ver}
Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist}
Summary: The LLVM Linker
License: NCSA
URL: http://llvm.org
-Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{lld_srcdir}.tar.xz
+%if 0%{?rc_ver:1}
+Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lld_srcdir}.tar.xz
+Source3: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lld_srcdir}.tar.xz.sig
+%else
+Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lld_srcdir}.tar.xz
+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
@@ -71,7 +80,7 @@ Requires: lld-libs = %{version}-%{release}
LLVM regression tests.
%prep
-%autosetup -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1
+%autosetup -n %{lld_srcdir} -p1
%build
@@ -118,7 +127,13 @@ done
install -d %{buildroot}%{_datadir}/lld/src
cp %{SOURCE2} %{buildroot}%{_datadir}/lld/
-tar -czf %{buildroot}%{_datadir}/lld/src/test.tar.gz test/
+# 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
cp %{SOURCE1} %{buildroot}%{_libexecdir}/tests/lld
@@ -182,9 +197,20 @@ make -C %{_target_platform} %{?_smp_mflags} check-lld
%{_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
%changelog
+* Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1
+- 10.0.1 release
+
+* Mon Jul 20 2020 sguelton@redhat.com - 10.0.0-2
+- Fix arch-dependent tarball
+
+* Thu Apr 9 2020 sguelton@redhat.com - 10.0.0-1
+- 10.0.0 final
+
* Thu Dec 19 2019 Tom Stellard -9.0.1-1
- 9.0.1 Release