Merge branch 'rawhide' into beta

2021-03-09 10:18:22 -08:00 · 2021-03-09 10:18:22 -08:00 · 86f616623c
parent 44fe1090f9 8148cbf678
commit 86f616623c
8 changed files with 456 additions and 107 deletions
--- a/.gitignore
+++ b/.gitignore
@ -279,3 +279,52 @@
 /rust-1.43.1-s390x-unknown-linux-gnu.tar.xz
 /rust-1.43.1-x86_64-unknown-linux-gnu.tar.xz
 /rustc-1.44.1-src.tar.xz
+/rustc-1.45.0-src.tar.xz
+/rust-1.44.0-x86_64-unknown-linux-gnu.tar.xz
+/rust-1.44.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.44.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.44.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.44.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.44.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.44.0-s390x-unknown-linux-gnu.tar.xz
+/rustc-1.45.1-src.tar.xz
+/rustc-1.45.2-src.tar.xz
+/rustc-1.46.0-src.tar.xz
+/rust-1.45.2-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.45.2-i686-unknown-linux-gnu.tar.xz
+/rust-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.45.2-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.45.2-s390x-unknown-linux-gnu.tar.xz
+/rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.47.0-src.tar.xz
+/rust-1.46.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.46.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.46.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.46.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.46.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.46.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.48.0-src.tar.xz
+/rust-1.47.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.47.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.47.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.47.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.47.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.47.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.47.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.49.0-src.tar.xz
+/rust-1.48.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.48.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.48.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.48.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.48.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.50.0-src.tar.xz
+/rust-1.49.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.49.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.49.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.49.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.49.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.49.0-x86_64-unknown-linux-gnu.tar.xz
--- a/0001-Revert-Auto-merge-of-79547.patch
+++ b/0001-Revert-Auto-merge-of-79547.patch
@ -0,0 +1,102 @@
+From eaf7ea1fc339e1ff348ed941ed2e8c4d66f3e458 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Thu, 18 Feb 2021 19:14:58 -0800
+Subject: [PATCH] Revert "Auto merge of #79547 - erikdesjardins:byval,
+ r=nagisa"
+
+This reverts commit a094ff9590b83c8f94d898f92c2964a5803ded06, reversing
+changes made to d37afad0cc87bf709ad10c85319296ac53030f03.
+---
+ compiler/rustc_middle/src/ty/layout.rs               | 12 ++++++------
+ ...return-value-in-reg.rs => return-value-in-reg.rs} |  4 ++--
+ src/test/codegen/union-abi.rs                        | 11 +++--------
+ 3 files changed, 11 insertions(+), 16 deletions(-)
+ rename src/test/codegen/{arg-return-value-in-reg.rs => return-value-in-reg.rs} (74%)
+
+diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs
+index b545b92c9252..545f6aee1a21 100644
+--- a/compiler/rustc_middle/src/ty/layout.rs
+++ b/compiler/rustc_middle/src/ty/layout.rs
+@@ -2849,7 +2849,7 @@ fn adjust_for_abi(&mut self, cx: &C, abi: SpecAbi) {
+             || abi == SpecAbi::RustIntrinsic
+             || abi == SpecAbi::PlatformIntrinsic
+         {
+-            let fixup = |arg: &mut ArgAbi<'tcx, Ty<'tcx>>| {
+            let fixup = |arg: &mut ArgAbi<'tcx, Ty<'tcx>>, is_ret: bool| {
+                 if arg.is_ignore() {
+                     return;
+                 }
+@@ -2887,9 +2887,9 @@ fn adjust_for_abi(&mut self, cx: &C, abi: SpecAbi) {
+                     _ => return,
+                 }
+ 
+-                // Pass and return structures up to 2 pointers in size by value, matching `ScalarPair`.
+-                // LLVM will usually pass these in 2 registers, which is more efficient than by-ref.
+-                let max_by_val_size = Pointer.size(cx) * 2;
+                // Return structures up to 2 pointers in size by value, matching `ScalarPair`. LLVM
+                // will usually return these in 2 registers, which is more efficient than by-ref.
+                let max_by_val_size = if is_ret { Pointer.size(cx) * 2 } else { Pointer.size(cx) };
+                 let size = arg.layout.size;
+ 
+                 if arg.layout.is_unsized() || size > max_by_val_size {
+@@ -2901,9 +2901,9 @@ fn adjust_for_abi(&mut self, cx: &C, abi: SpecAbi) {
+                     arg.cast_to(Reg { kind: RegKind::Integer, size });
+                 }
+             };
+-            fixup(&mut self.ret);
+            fixup(&mut self.ret, true);
+             for arg in &mut self.args {
+-                fixup(arg);
+                fixup(arg, false);
+             }
+             return;
+         }
+diff --git a/src/test/codegen/arg-return-value-in-reg.rs b/src/test/codegen/return-value-in-reg.rs
+similarity index 74%
+rename from src/test/codegen/arg-return-value-in-reg.rs
+rename to src/test/codegen/return-value-in-reg.rs
+index a69291d47821..4bc0136c5e32 100644
+--- a/src/test/codegen/arg-return-value-in-reg.rs
+++ b/src/test/codegen/return-value-in-reg.rs
+@@ -1,4 +1,4 @@
+-//! Check that types of up to 128 bits are passed and returned by-value instead of via pointer.
+//! This test checks that types of up to 128 bits are returned by-value instead of via out-pointer.
+ 
+ // compile-flags: -C no-prepopulate-passes -O
+ // only-x86_64
+@@ -11,7 +11,7 @@ pub struct S {
+     c: u32,
+ }
+ 
+-// CHECK: define i128 @modify(i128{{( %0)?}})
+// CHECK: define i128 @modify(%S* noalias nocapture dereferenceable(16) %s)
+ #[no_mangle]
+ pub fn modify(s: S) -> S {
+     S { a: s.a + s.a, b: s.b + s.b, c: s.c + s.c }
+diff --git a/src/test/codegen/union-abi.rs b/src/test/codegen/union-abi.rs
+index f282fd237054..afea01e9a2d0 100644
+--- a/src/test/codegen/union-abi.rs
+++ b/src/test/codegen/union-abi.rs
+@@ -63,16 +63,11 @@ pub union UnionU128{a:u128}
+ #[no_mangle]
+ pub fn test_UnionU128(_: UnionU128) -> UnionU128 { loop {} }
+ 
+-pub union UnionU128x2{a:(u128, u128)}
+-// CHECK: define void @test_UnionU128x2(i128 %_1.0, i128 %_1.1)
+-#[no_mangle]
+-pub fn test_UnionU128x2(_: UnionU128x2) { loop {} }
+-
+ #[repr(C)]
+-pub union CUnionU128x2{a:(u128, u128)}
+-// CHECK: define void @test_CUnionU128x2(%CUnionU128x2* {{.*}} %_1)
+pub union CUnionU128{a:u128}
+// CHECK: define void @test_CUnionU128(%CUnionU128* {{.*}} %_1)
+ #[no_mangle]
+-pub fn test_CUnionU128x2(_: CUnionU128x2) { loop {} }
+pub fn test_CUnionU128(_: CUnionU128) { loop {} }
+ 
+ pub union UnionBool { b:bool }
+ // CHECK: define zeroext i1 @test_UnionBool(i8 %b)
+-- 
+2.29.2
+
--- a/rust.spec
+++ b/rust.spec
@ -1,5 +1,5 @@
 # Only x86_64 and i686 are Tier 1 platforms at this time.
-# https://forge.rust-lang.org/platform-support.html
+# https://doc.rust-lang.org/nightly/rustc/platform-support.html
 %global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x

 # The channel can be stable, beta, or nightly
@ -9,10 +9,10 @@
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
 # Note that cargo matches the program version here, not its crate version.
-%global bootstrap_rust 1.44.0
-%global bootstrap_cargo 1.44.0
-%global bootstrap_channel 1.44.0
-%global bootstrap_date 2020-06-04
+%global bootstrap_rust 1.49.0
+%global bootstrap_cargo 1.49.0
+%global bootstrap_channel 1.49.0
+%global bootstrap_date 2020-12-31

 # Only the specified arches will use bootstrap binaries.
 #global bootstrap_arches %%{rust_arches}
@ -21,35 +21,39 @@
 %bcond_with llvm_static

 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
-# is insufficient.  Rust currently requires LLVM 8.0+.
-%if 0%{?rhel} && !0%{?epel}
-%bcond_without bundled_llvm
-%else
+# is insufficient.  Rust currently requires LLVM 9.0+.
 %bcond_with bundled_llvm
+
+# Requires stable libgit2 1.1
+%if 0%{?fedora} >= 34
+%bcond_with bundled_libgit2
+%else
+%bcond_without bundled_libgit2
 %endif

-# libgit2-sys expects to use its bundled library, which is sometimes just a
-# snapshot of libgit2's master branch.  This can mean the FFI declarations
-# won't match our released libgit2.so, e.g. having changed struct fields.
-# So, tread carefully if you toggle this...
-%bcond_without bundled_libgit2
-
 %if 0%{?rhel}
-%bcond_without bundled_libssh2
+# Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
+%bcond_without disabled_libssh2
 %else
-%bcond_with bundled_libssh2
+%bcond_with disabled_libssh2
+%endif
+
+%if 0%{?rhel} && 0%{?rhel} < 8
+%bcond_with curl_http2
+%else
+%bcond_without curl_http2
 %endif

 # LLDB isn't available everywhere...
-%if !0%{?rhel}
-%bcond_without lldb
-%else
+%if 0%{?rhel} && 0%{?rhel} < 8
 %bcond_with lldb
+%else
+%bcond_without lldb
 %endif

 Name:           rust
-Version:        1.45.0
-Release:        0.1.beta.4%{?dist}
+Version:        1.50.0
+Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@ -63,6 +67,24 @@ ExclusiveArch:  %{rust_arches}
 %endif
 Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz

+# This internal rust-abi change broke s390x -- revert for now.
+# https://github.com/rust-lang/rust/issues/80810#issuecomment-781784032
+Patch1:         0001-Revert-Auto-merge-of-79547.patch
+
+### RHEL-specific patches below ###
+
+# Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
+Patch100:       rustc-1.48.0-disable-libssh2.patch
+
+# libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
+# will try to build it statically -- instead we turn off the feature.
+Patch101:       rustc-1.49.0-disable-http2.patch
+
+# kernel rh1410097 causes too-small stacks for PIE.
+# (affects RHEL6 kernels when building for RHEL7)
+Patch102:       rustc-1.48.0-no-default-pie.patch
+
+
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
  local abi = "gnu"
@ -73,6 +95,8 @@ Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
    arch = "powerpc64"
  elseif arch == "ppc64le" then
    arch = "powerpc64le"
+  elseif arch == "riscv64" then
+    arch = "riscv64gc"
  end
  return arch.."-unknown-linux-"..abi
 end}
@ -106,11 +130,11 @@ end}
 Provides:       bundled(%{name}-bootstrap) = %{bootstrap_rust}
 %else
 BuildRequires:  cargo >= %{bootstrap_cargo}
-%if 0%{?fedora} >= 27
-BuildRequires:  (%{name} >= %{bootstrap_rust} with %{name} <= %{version})
-%else
+%if 0%{?rhel} && 0%{?rhel} < 8
 BuildRequires:  %{name} >= %{bootstrap_rust}
 BuildConflicts: %{name} > %{version}
+%else
+BuildRequires:  (%{name} >= %{bootstrap_rust} with %{name} <= %{version})
 %endif
 %global local_rust_root %{_prefix}
 %endif
@ -120,33 +144,31 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  ncurses-devel
 BuildRequires:  curl
+# explicit curl-devel to avoid httpd24-curl (rhbz1540167)
+BuildRequires:  curl-devel
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)

 %if %without bundled_libgit2
-BuildRequires:  pkgconfig(libgit2) >= 1.0.0
+BuildRequires:  pkgconfig(libgit2) >= 1.1.0
 %endif

-%if %without bundled_libssh2
+%if %{without disabled_libssh2}
 # needs libssh2_userauth_publickey_frommemory
 BuildRequires:  pkgconfig(libssh2) >= 1.6.0
 %endif

-%if 0%{?rhel} && 0%{?rhel} <= 7
-%global python python2
-%else
 %global python python3
-%endif
 BuildRequires:  %{python}

 %if %with bundled_llvm
 BuildRequires:  cmake3 >= 3.4.3
-Provides:       bundled(llvm) = 10.0.1
+Provides:       bundled(llvm) = 11.0.0
 %else
 BuildRequires:  cmake >= 2.8.11
-%if 0%{?epel}
+%if 0%{?epel} == 7
 %global llvm llvm9.0
 %endif
 %if %defined llvm
@ -155,7 +177,7 @@ BuildRequires:  cmake >= 2.8.11
 %global llvm llvm
 %global llvm_root %{_prefix}
 %endif
-BuildRequires:  %{llvm}-devel >= 8.0
+BuildRequires:  %{llvm}-devel >= 9.0
 %if %with llvm_static
 BuildRequires:  %{llvm}-static
 BuildRequires:  libffi-devel
@ -168,9 +190,6 @@ BuildRequires:  procps-ng
 # debuginfo-gdb tests need gdb
 BuildRequires:  gdb

-# TODO: work on unbundling these!
-Provides:       bundled(libbacktrace) = 1.0.20200219
-
 # Virtual provides for folks who attempt "dnf install rustc"
 Provides:       rustc = %{version}-%{release}
 Provides:       rustc%{?_isa} = %{version}-%{release}
@ -192,14 +211,14 @@ Requires:       /usr/bin/cc

 # While we don't want to encourage dynamic linking to Rust shared libraries, as
 # there's no stable ABI, we still need the unallocated metadata (.rustc) to
-# support custom-derive plugins like #[proc_macro_derive(Foo)].  But eu-strip is
-# very eager by default, so we have to limit it to -g, only debugging symbols.
-%if 0%{?fedora} >= 27
-# Newer find-debuginfo.sh supports --keep-section, which is preferable. rhbz1465997
-%global _find_debuginfo_opts --keep-section .rustc
-%else
+# support custom-derive plugins like #[proc_macro_derive(Foo)].
+%if 0%{?rhel} && 0%{?rhel} < 8
+# eu-strip is very eager by default, so we have to limit it to -g, only debugging symbols.
 %global _find_debuginfo_opts -g
 %undefine _include_minidebuginfo
+%else
+# Newer find-debuginfo.sh supports --keep-section, which is preferable. rhbz1465997
+%global _find_debuginfo_opts --keep-section .rustc
 %endif

 # Use hardening ldflags.
@ -251,11 +270,7 @@ programs.
 Summary:        LLDB pretty printers for Rust
 BuildArch:      noarch
 Requires:       lldb
-%if 0%{?fedora} >= 31
-Requires:       python3-lldb
-%else
-Requires:       python2-lldb
-%endif
+Requires:       %{python}-lldb
 Requires:       %{name}-debugger-common = %{version}-%{release}

 %description lldb
@ -280,10 +295,7 @@ its standard library.
 %package -n cargo
 Summary:        Rust's package manager and build tool
 %if %with bundled_libgit2
-Provides:       bundled(libgit2) = 1.0.0
-%endif
-%if %with bundled_libssh2
-Provides:       bundled(libssh2) = 1.9.0~dev
+Provides:       bundled(libgit2) = 1.1.0
 %endif
 # For tests:
 BuildRequires:  git
@ -326,10 +338,7 @@ A tool for formatting Rust code according to style guidelines.
 %package -n rls
 Summary:        Rust Language Server for IDE integration
 %if %with bundled_libgit2
-Provides:       bundled(libgit2) = 1.0.0
-%endif
-%if %with bundled_libssh2
-Provides:       bundled(libssh2) = 1.9.0~dev
+Provides:       bundled(libgit2) = 1.1.0
 %endif
 Requires:       rust-analysis
 # /usr/bin/rls is dynamically linked against internal rustc libs
@ -391,18 +400,37 @@ test -f '%{local_rust_root}/bin/rustc'

 %setup -q -n %{rustc_package}

-%if "%{python}" == "python3"
-sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
+%patch1 -p1
+
+%if %with disabled_libssh2
+%patch100 -p1
+%endif
+
+%if %without curl_http2
+%patch101 -p1
+rm -rf vendor/libnghttp2-sys/
+%endif
+
+%if 0%{?rhel} && 0%{?rhel} < 8
+%patch102 -p1
+%endif
+
+%if "%{python}" != "python3"
+# Use our preferred python first
+sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure
 %endif

 %if %without bundled_llvm
 rm -rf src/llvm-project/
+mkdir -p src/llvm-project/libunwind/
 %endif

 # Remove other unused vendored libraries
 rm -rf vendor/curl-sys/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
+rm -rf vendor/libssh2-sys/libssh2/
 rm -rf vendor/libz-sys/src/zlib/
+rm -rf vendor/libz-sys/src/zlib-ng/
 rm -rf vendor/lzma-sys/xz-*/
 rm -rf vendor/openssl-src/openssl/

@ -410,17 +438,14 @@ rm -rf vendor/openssl-src/openssl/
 rm -rf vendor/libgit2-sys/libgit2/
 %endif

-%if %without bundled_libssh2
-rm -rf vendor/libssh2-sys/libssh2/
+%if %with disabled_libssh2
+rm -rf vendor/libssh2-sys/
 %endif

 # This only affects the transient rust-installer, but let it use our dynamic xz-libs
 sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs

-# rename bundled license for packaging
-cp -a vendor/backtrace-sys/src/libbacktrace/LICENSE{,-libbacktrace}
-
-%if %{with bundled_llvm} && 0%{?epel}
+%if %{with bundled_llvm} && 0%{?epel} == 7
 mkdir -p cmake-bin
 ln -s /usr/bin/cmake3 cmake-bin/cmake
 %global cmake_path $PWD/cmake-bin
@ -443,26 +468,23 @@ find vendor -name .cargo-checksum.json \
 # it's a shebang and make them executable. Then brp-mangle-shebangs gets upset...
 find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'

-
-%build
-# This package fails to build with LTO due to undefined symbols.  LTO
-# was disabled in OpenSuSE as well, but with no real explanation why
-# beyond the undefined symbols.  It really should be investigated further.
-# Disable LTO
-%define _lto_cflags %{nil}
-
+# Set up shared environment variables for build/install/check
+%global rust_env RUSTFLAGS="%{rustflags}"
+%if 0%{?cmake_path:1}
+%global rust_env %{rust_env} PATH="%{cmake_path}:$PATH"
+%endif
 %if %without bundled_libgit2
 # convince libgit2-sys to use the distro libgit2
-export LIBGIT2_SYS_USE_PKG_CONFIG=1
+%global rust_env %{rust_env} LIBGIT2_SYS_USE_PKG_CONFIG=1
 %endif
-
-%if %without bundled_libssh2
+%if %without disabled_libssh2
 # convince libssh2-sys to use the distro libssh2
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
+%global rust_env %{rust_env} LIBSSH2_SYS_USE_PKG_CONFIG=1
 %endif

-%{?cmake_path:export PATH=%{cmake_path}:$PATH}
-%{?rustflags:export RUSTFLAGS="%{rustflags}"}
+
+%build
+export %{rust_env}

 # We're going to override --libdir when configuring to get rustlib into a
 # common path, but we'll fix the shared libraries during install.
@ -472,7 +494,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
 %ifarch %{arm} %{ix86} s390x
 # full debuginfo is exhausting memory; just do libstd for now
 # https://github.com/rust-lang/rust/issues/45854
-%if (0%{?fedora} && 0%{?fedora} < 27) || (0%{?rhel} && 0%{?rhel} <= 7)
+%if 0%{?rhel} && 0%{?rhel} < 8
 # Older rpmbuild didn't work with partial debuginfo coverage.
 %global debug_package %{nil}
 %define enable_debuginfo --debuginfo-level=0
@ -490,6 +512,14 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
 %define codegen_units_std --set rust.codegen-units-std=1
 %endif

+# Some builders have relatively little memory for their CPU count.
+# At least 2GB per CPU is a good rule of thumb for building rustc.
+ncpus=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+max_cpus=$(( ($(free -g | awk '/^Mem:/{print $2}') + 1) / 2 ))
+if [ "$max_cpus" -ge 1 -a "$max_cpus" -lt "$ncpus" ]; then
+  ncpus="$max_cpus"
+fi
+
 %configure --disable-option-checking \
  --libdir=%{common_libdir} \
  --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
@ -505,15 +535,15 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
  --enable-vendor \
  --enable-verbose-tests \
  %{?codegen_units_std} \
-  --release-channel=%{channel}
+  --release-channel=%{channel} \
+  --release-description="%{?fedora:Fedora }%{?rhel:Red Hat }%{version}-%{release}"

-%{python} ./x.py build
-%{python} ./x.py doc
+%{python} ./x.py build -j "$ncpus" --stage 2
+%{python} ./x.py doc --stage 2


 %install
-%{?cmake_path:export PATH=%{cmake_path}:$PATH}
-%{?rustflags:export RUSTFLAGS="%{rustflags}"}
+export %{rust_env}

 DESTDIR=%{buildroot} %{python} ./x.py install

@ -577,20 +607,22 @@ ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html

 %if %without lldb
 rm -f %{buildroot}%{_bindir}/rust-lldb
-rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
+rm -f %{buildroot}%{rustlibdir}/etc/lldb_*
 %endif

+# We don't want Rust copies of LLVM tools (rust-lld, rust-llvm-dwp)
+rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*
+

 %check
-%{?cmake_path:export PATH=%{cmake_path}:$PATH}
-%{?rustflags:export RUSTFLAGS="%{rustflags}"}
+export %{rust_env}

 # The results are not stable on koji, so mask errors and just log it.
-%{python} ./x.py test --no-fail-fast || :
-%{python} ./x.py test --no-fail-fast cargo || :
-%{python} ./x.py test --no-fail-fast clippy || :
-%{python} ./x.py test --no-fail-fast rls || :
-%{python} ./x.py test --no-fail-fast rustfmt || :
+%{python} ./x.py test --no-fail-fast --stage 2 || :
+%{python} ./x.py test --no-fail-fast --stage 2 cargo || :
+%{python} ./x.py test --no-fail-fast --stage 2 clippy || :
+%{python} ./x.py test --no-fail-fast --stage 2 rls || :
+%{python} ./x.py test --no-fail-fast --stage 2 rustfmt || :


 %ldconfig_scriptlets
@ -598,7 +630,6 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*

 %files
 %license COPYRIGHT LICENSE-APACHE LICENSE-MIT
-%license vendor/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
 %doc README.md
 %{_bindir}/rustc
 %{_bindir}/rustdoc
@ -621,19 +652,19 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %files debugger-common
 %dir %{rustlibdir}
 %dir %{rustlibdir}/etc
-%{rustlibdir}/etc/debugger_*.py*
+%{rustlibdir}/etc/rust_*.py*


 %files gdb
 %{_bindir}/rust-gdb
-%{rustlibdir}/etc/gdb_*.py*
+%{rustlibdir}/etc/gdb_*
 %exclude %{_bindir}/rust-gdbgui


 %if %with lldb
 %files lldb
 %{_bindir}/rust-lldb
-%{rustlibdir}/etc/lldb_*.py*
+%{rustlibdir}/etc/lldb_*
 %endif


@ -644,7 +675,6 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %{_docdir}/%{name}/html/*/
 %{_docdir}/%{name}/html/*.html
 %{_docdir}/%{name}/html/*.css
-%{_docdir}/%{name}/html/*.ico
 %{_docdir}/%{name}/html/*.js
 %{_docdir}/%{name}/html/*.png
 %{_docdir}/%{name}/html/*.svg
@ -657,6 +687,7 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %license src/tools/cargo/LICENSE-APACHE src/tools/cargo/LICENSE-MIT src/tools/cargo/LICENSE-THIRD-PARTY
 %doc src/tools/cargo/README.md
 %{_bindir}/cargo
+%{_libexecdir}/cargo*
 %{_mandir}/man1/cargo*.1*
 %{_sysconfdir}/bash_completion.d/cargo
 %{_datadir}/zsh/site-functions/_cargo
@ -700,7 +731,49 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*


 %changelog
-* Wed Jul 01 2020 Josh Stone <jistone@redhat.com> - 1.44.1-2
+* Thu Feb 11 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
+- Update to 1.50.0.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.49.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 05 2021 Josh Stone <jistone@redhat.com> - 1.49.0-1
+- Update to 1.49.0.
+
+* Tue Dec 29 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-3
+- De-bootstrap
+
+* Mon Dec 28 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-2
+- Rebuild for libgit2 1.1.x
+
+* Thu Nov 19 2020 Josh Stone <jistone@redhat.com> - 1.48.0-1
+- Update to 1.48.0.
+
+* Sat Oct 10 2020 Jeff Law <law@redhat.com> - 1.47.0-2
+- Re-enable LTO
+
+* Thu Oct 08 2020 Josh Stone <jistone@redhat.com> - 1.47.0-1
+- Update to 1.47.0.
+
+* Fri Aug 28 2020 Fabio Valentini <decathorpe@gmail.com> - 1.46.0-2
+- Fix LTO with doctests (backported cargo PR#8657).
+
+* Thu Aug 27 2020 Josh Stone <jistone@redhat.com> - 1.46.0-1
+- Update to 1.46.0.
+
+* Mon Aug 03 2020 Josh Stone <jistone@redhat.com> - 1.45.2-1
+- Update to 1.45.2.
+
+* Thu Jul 30 2020 Josh Stone <jistone@redhat.com> - 1.45.1-1
+- Update to 1.45.1.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.45.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 16 2020 Josh Stone <jistone@redhat.com> - 1.45.0-1
+- Update to 1.45.0.
+
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 1.44.1-2
 - Disable LTO

 * Thu Jun 18 2020 Josh Stone <jistone@redhat.com> - 1.44.1-1
--- a/rustc-1.48.0-disable-libssh2.patch
+++ b/rustc-1.48.0-disable-libssh2.patch
@ -0,0 +1,42 @@
+--- rustc-1.48.0-src/Cargo.lock.orig	2020-11-16 06:01:53.000000000 -0800
+++ rustc-1.48.0-src/Cargo.lock	2020-11-16 09:27:44.425104404 -0800
+@@ -1676,7 +1676,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -1693,20 +1692,6 @@
+ ]
+ 
+ [[package]]
+-name = "libssh2-sys"
+-version = "0.2.19"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+-
+-[[package]]
+ name = "libz-sys"
+ version = "1.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- rustc-1.48.0-src/vendor/git2/Cargo.toml.orig	2020-11-16 06:27:49.000000000 -0800
+++ rustc-1.48.0-src/vendor/git2/Cargo.toml	2020-11-16 09:27:44.425104404 -0800
+@@ -49,7 +49,7 @@
+ version = "0.1.39"
+ 
+ [features]
+-default = ["ssh", "https", "ssh_key_from_memory"]
+default = ["https"]
+ https = ["libgit2-sys/https", "openssl-sys", "openssl-probe"]
+ ssh = ["libgit2-sys/ssh"]
+ ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
--- a/rustc-1.48.0-no-default-pie.patch
+++ b/rustc-1.48.0-no-default-pie.patch
@ -0,0 +1,18 @@
+--- rustc-1.48.0-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig	2020-11-16 06:01:53.000000000 -0800
+++ rustc-1.48.0-src/compiler/rustc_codegen_ssa/src/back/link.rs	2020-11-16 09:37:15.779516797 -0800
+@@ -1185,10 +1185,12 @@
+ }
+ 
+ fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
+-    let kind = match (crate_type, sess.crt_static(Some(crate_type)), sess.relocation_model()) {
+-        (CrateType::Executable, false, RelocModel::Pic) => LinkOutputKind::DynamicPicExe,
+    // Only use PIE if explicity specified.
+    let explicit_pic = matches!(sess.opts.cg.relocation_model, Some(RelocModel::Pic));
+    let kind = match (crate_type, sess.crt_static(Some(crate_type)), explicit_pic) {
+        (CrateType::Executable, false, true) => LinkOutputKind::DynamicPicExe,
+         (CrateType::Executable, false, _) => LinkOutputKind::DynamicNoPicExe,
+-        (CrateType::Executable, true, RelocModel::Pic) => LinkOutputKind::StaticPicExe,
+        (CrateType::Executable, true, true) => LinkOutputKind::StaticPicExe,
+         (CrateType::Executable, true, _) => LinkOutputKind::StaticNoPicExe,
+         (_, true, _) => LinkOutputKind::StaticDylib,
+         (_, false, _) => LinkOutputKind::DynamicDylib,
--- a/rustc-1.49.0-disable-http2.patch
+++ b/rustc-1.49.0-disable-http2.patch
@ -0,0 +1,66 @@
+--- rustc-1.49.0-src/Cargo.lock.orig	2021-01-05 12:45:10.456414612 -0800
+++ rustc-1.49.0-src/Cargo.lock	2021-01-05 12:45:10.458414575 -0800
+@@ -882,7 +882,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libnghttp2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -1728,16 +1727,6 @@
+ ]
+ 
+ [[package]]
+-name = "libnghttp2-sys"
+-version = "0.1.4+1.41.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
+-dependencies = [
+- "cc",
+- "libc",
+-]
+-
+-[[package]]
+ name = "libz-sys"
+ version = "1.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- rustc-1.49.0-src/src/tools/cargo/Cargo.toml.orig	2021-01-05 12:45:10.458414575 -0800
+++ rustc-1.49.0-src/src/tools/cargo/Cargo.toml	2021-01-05 12:47:25.966928554 -0800
+@@ -25,7 +25,7 @@
+ crates-io = { path = "crates/crates-io", version = "0.31.1" }
+ crossbeam-utils = "0.8"
+ crypto-hash = "0.3.1"
+-curl = { version = "0.4.23", features = ["http2"] }
+curl = { version = "0.4.23", features = [] }
+ curl-sys = "0.4.22"
+ env_logger = "0.8.1"
+ pretty_env_logger = { version = "0.4", optional = true }
+--- rustc-1.49.0-src/src/tools/cargo/src/cargo/core/package.rs.orig	2020-12-28 19:03:25.000000000 -0800
+++ rustc-1.49.0-src/src/tools/cargo/src/cargo/core/package.rs	2021-01-05 12:45:10.458414575 -0800
+@@ -408,14 +408,8 @@
+         // Also note that pipelining is disabled as curl authors have indicated
+         // that it's buggy, and we've empirically seen that it's buggy with HTTP
+         // proxies.
+-        let mut multi = Multi::new();
+-        let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
+-        multi
+-            .pipelining(false, multiplexing)
+-            .chain_err(|| "failed to enable multiplexing/pipelining in curl")?;
+-
+-        // let's not flood crates.io with connections
+-        multi.set_max_host_connections(2)?;
+        let multi = Multi::new();
+        let multiplexing = false;
+ 
+         Ok(PackageSet {
+             packages: package_ids
+@@ -584,7 +578,7 @@
+ macro_rules! try_old_curl {
+     ($e:expr, $msg:expr) => {
+         let result = $e;
+-        if cfg!(target_os = "macos") {
+        if cfg!(any(target_os = "linux", target_os = "macos")) {
+             if let Err(e) = result {
+                 warn!("ignoring libcurl {} error: {}", $msg, e);
+             }
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (rustc-1.44.1-src.tar.xz) = 1c17002edae844a710db9b144c17171416330dc565343c65af8a6e112fb61555e2025bb4cf33cac1229d7df689e6ff8858b91ae00552400ccacafaf1de11849b
+SHA512 (rustc-1.50.0-src.tar.xz) = df3c83c0fdc9ebce6fdccddda781dea0cdbd88d2b2a8220cac40cc3a8fa957923ae834d1fa45283d4ad227b334bd9e220e37a4a1ad7a1c7aeb806ed9ed387245
--- a/15
+++ b/15
@ -1,8 +1,7 @@
-SHA512 (rustc-1.44.1-src.tar.xz) = 1c17002edae844a710db9b144c17171416330dc565343c65af8a6e112fb61555e2025bb4cf33cac1229d7df689e6ff8858b91ae00552400ccacafaf1de11849b
-SHA512 (rust-1.43.1-aarch64-unknown-linux-gnu.tar.xz) = b54fad5493344d2370bd77110f0ffb0231f41ab8aa9707e9303304957c5d9067dc83089432eb175605b78dc771dfcf7abfcce63d7fecdbb759dd224c17d12da0
-SHA512 (rust-1.43.1-armv7-unknown-linux-gnueabihf.tar.xz) = 0812b3229dd47f1b5cadb49020e68d28b4267ac0489d0c2e448f21e3b0b6519bbf216ac9b20b747e035033842a6eb3b13a98706f2eddca2c088d9396dcb2c21e
-SHA512 (rust-1.43.1-i686-unknown-linux-gnu.tar.xz) = c7423bccfb15f3df6043ec1d81203c9db9b3229dedd347cab09d3cc3b183f53aa0707f59964efccd63418e1c6ad21e7ee7dcc1495eda8c4ecb55ee8e6b3ac034
-SHA512 (rust-1.43.1-powerpc64le-unknown-linux-gnu.tar.xz) = da447ec44ebf998290a73420437c8d434a6c196cfe1c3331a9adf40abf7acd97a231e352a8626bbfa961da8e0c4f450aa59d573254257f72cce4068eeb8112a1
-SHA512 (rust-1.43.1-powerpc64-unknown-linux-gnu.tar.xz) = 695591807892c8f08801cd145ebc6a91ee4222000210baaaa0d6c8acf1ac6a96f4bf2566871def04d15a9965b7e3ea4287e37d7851fb14010518694d8ede75e6
-SHA512 (rust-1.43.1-s390x-unknown-linux-gnu.tar.xz) = f087e50a91b1cc4a12bf15aea1cefbda9b89518febcecc0d56ea7d0a6a682be06cff7777d0a0b4812e96f3fb3295e7799bf200c1599c88cb7083a78d5002f14a
-SHA512 (rust-1.43.1-x86_64-unknown-linux-gnu.tar.xz) = 2fc573ca2826d9f03044f746ae4d7715b4e31b9ac933289607aa3449a538bb4dfd519540576a1d0d286c0d754a7ba6ce38beef6aded1090d3af3091b6ba2a9ee
+SHA512 (rustc-1.50.0-src.tar.xz) = df3c83c0fdc9ebce6fdccddda781dea0cdbd88d2b2a8220cac40cc3a8fa957923ae834d1fa45283d4ad227b334bd9e220e37a4a1ad7a1c7aeb806ed9ed387245
+SHA512 (rust-1.49.0-aarch64-unknown-linux-gnu.tar.xz) = fa81b618359c2952de941e094eabfe2966e3c1a39a1b20452a77f1a68a54dde9cc5cade18db911cf448ffe947d934461ce752112bd9b5b5430e1fcdabbd8b56a
+SHA512 (rust-1.49.0-armv7-unknown-linux-gnueabihf.tar.xz) = 1cba85fc958371aeb1d521e8842ad576e65d244147e2c75c34eaa776552ed025434d10284fa976d901d6cede69f6db3e5fdd770005ca0b93bb5e3202b9f9392a
+SHA512 (rust-1.49.0-i686-unknown-linux-gnu.tar.xz) = b4d39cb234314f013969b5db3d365d21719d7a01f2dc0816e4f221c5e6d4abecd7f9e83f54b8640173d00d3e701cb3cbb61cef32f00db9356139005a1ce3bd19
+SHA512 (rust-1.49.0-powerpc64le-unknown-linux-gnu.tar.xz) = c17eb27ec4dbcc56da3edffbc57e0edda99744d6a0d38369fa08af066894aeb13dd78c7b8055f2246fc3bf13c654842675ea4df44b7bc8852e0f9952acdf7e7c
+SHA512 (rust-1.49.0-s390x-unknown-linux-gnu.tar.xz) = 25259ea2e499c89459b14571e2c54f230d642af9cfe539dc2b8be15eff0e23b8c6e60af4c567bcbb6c6c185b4537eaab19c3395fce48b1f6e5ef1234efc31e3a
+SHA512 (rust-1.49.0-x86_64-unknown-linux-gnu.tar.xz) = c008aa50e17db6a0134fb85235a958258d345410f5063bc77175f7c28b2e35895427b9e68cd1ac9acb769769c83313cd59fe6465b453e891cf415a2514b7722d