packages/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.75.0

Browse Source
This commit is contained in:
wk333 2024-01-10 16:24:23 +08:00
parent 4f88407bc7
commit dfa3ca685f
6 changed files with 96 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-Use-lld-provided-by-system.patch
View File

@ -1,19 +1,19 @@
From b6ca6a363a7c91136c723a21fda4816d3009e479 Mon Sep 17 00:00:00 2001 From 61b5cc96337da2121221dd1bcdb63fd36551d065 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com> From: Josh Stone <jistone@redhat.com>
Date: Wed, 1 Nov 2023 15:21:15 -0700 Date: Wed, 1 Nov 2023 15:21:15 -0700
Subject: [PATCH] Use lld provided by system Subject: [PATCH] Use lld provided by system
--- ---
compiler/rustc_target/src/spec/wasm_base.rs | 3 +-- compiler/rustc_target/src/spec/base/wasm.rs | 3 +--
compiler/rustc_target/src/spec/x86_64_unknown_none.rs | 2 +- compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +-
compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs | 1 + compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 +
3 files changed, 3 insertions(+), 3 deletions(-) 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
index 341763aadbaf..ee6358e72955 100644 index 87ade9e58cf4..2ddff95febab 100644
--- a/compiler/rustc_target/src/spec/wasm_base.rs --- a/compiler/rustc_target/src/spec/base/wasm.rs
+++ b/compiler/rustc_target/src/spec/wasm_base.rs +++ b/compiler/rustc_target/src/spec/base/wasm.rs
@@ -89,8 +89,7 @@ macro_rules! args { @@ -91,8 +91,7 @@ macro_rules! args {
// arguments just yet // arguments just yet
limit_rdylib_exports: false, limit_rdylib_exports: false,
@ -23,10 +23,10 @@ index 341763aadbaf..ee6358e72955 100644
linker_flavor: LinkerFlavor::WasmLld(Cc::No), linker_flavor: LinkerFlavor::WasmLld(Cc::No),
pre_link_args, pre_link_args,
diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/x86_64_unknown_none.rs diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
index fe3b24f2d4af..1f1731d202ca 100644 index 9aa95a35f8e5..a9172f9441b7 100644
--- a/compiler/rustc_target/src/spec/x86_64_unknown_none.rs --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_none.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
@@ -17,7 +17,7 @@ pub fn target() -> Target { @@ -17,7 +17,7 @@ pub fn target() -> Target {
static_position_independent_executables: true, static_position_independent_executables: true,
relro_level: RelroLevel::Full, relro_level: RelroLevel::Full,
@ -36,11 +36,11 @@ index fe3b24f2d4af..1f1731d202ca 100644
features: features:
"-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float" "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float"
.into(), .into(),
diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
index 41ba768068a3..2eea4c76f1ca 100644 index 5abfb8162f70..13cb43bda1a4 100644
--- a/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
@@ -13,6 +13,7 @@ pub fn target() -> Target { @@ -16,6 +16,7 @@ pub fn target() -> Target {
base.plt_by_default = false; base.plt_by_default = false;
base.max_atomic_width = Some(64); base.max_atomic_width = Some(64);
base.entry_abi = Conv::X86_64Win64; base.entry_abi = Conv::X86_64Win64;

33
0001-bootstrap-only-show-PGO-warnings-when-verbose.patch Normal file
View File

@ -0,0 +1,33 @@
From 776146e9ebb6bbe17a37bfad955f3dac95317275 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 16 Nov 2023 10:42:23 -0800
Subject: [PATCH] bootstrap: only show PGO warnings when verbose
Building rustc with `--rust-profile-use` is currently dumping a lot of
warnings of "no profile data available for function" from `rustc_smir`
and `stable_mir`. These simply aren't exercised by the current profile-
gathering steps, but that's to be expected for new or experimental
functionality. I think for most people, these warnings will be just
noise, so it makes sense to only have them in verbose builds.
---
src/bootstrap/src/core/build_steps/compile.rs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index af69860df1c5..51e4195827fc 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -887,7 +887,9 @@ fn run(self, builder: &Builder<'_>) {
} else if let Some(path) = &builder.config.rust_profile_use {
if compiler.stage == 1 {
cargo.rustflag(&format!("-Cprofile-use={path}"));
- cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
+ if builder.is_verbose() {
+ cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
+ }
true
} else {
false
--
2.43.0

31
rust.spec
View File

@ -1,7 +1,7 @@
%global bootstrap_rust 1.73.0 %global bootstrap_rust 1.74.0
%global bootstrap_cargo 1.73.0 %global bootstrap_cargo 1.74.0
%global bootstrap_channel 1.73.0 %global bootstrap_channel 1.74.0
%global bootstrap_date 2023-10-05 %global bootstrap_date 2023-11-16
%bcond_with llvm_static %bcond_with llvm_static
%bcond_with bundled_llvm %bcond_with bundled_llvm
%bcond_without bundled_libgit2 %bcond_without bundled_libgit2
@ -10,7 +10,7 @@
%bcond_without analyzer %bcond_without analyzer
Name: rust Name: rust
Version: 1.74.0 Version: 1.75.0
Release: 1 Release: 1
Summary: The Rust Programming Language Summary: The Rust Programming Language
License: Apache-2.0 OR MIT License: Apache-2.0 OR MIT
@ -23,14 +23,15 @@ Source3: cargo-config
Source4: cargo-config.sh Source4: cargo-config.sh
Source5: cargo-config.csh Source5: cargo-config.csh
Patch0000: rustc-1.74.0-disable-libssh2.patch Patch0000: rustc-1.75.0-disable-libssh2.patch
Patch0001: clippy-driver-usage-should-user-friendly.patch Patch0001: cargo-help-clippy-should-have-description-to-user.patch
Patch0002: cargo-help-clippy-should-have-description-to-user.patch Patch0002: fix-a-println-wrong-format.patch
Patch0003: fix-a-println-wrong-format.patch
# By default, rust tries to use "rust-lld" as a linker for some targets. # By default, rust tries to use "rust-lld" as a linker for some targets.
Patch0004: 0001-Use-lld-provided-by-system.patch Patch0003: 0001-Use-lld-provided-by-system.patch
# Set a substitute-path in rust-gdb for standard library sources. # Set a substitute-path in rust-gdb for standard library sources.
Patch0005: rustc-1.70.0-rust-gdb-substitute-path.patch Patch0004: rustc-1.70.0-rust-gdb-substitute-path.patch
# https://github.com/rust-lang/rust/pull/117982
Patch0005: 0001-bootstrap-only-show-PGO-warnings-when-verbose.patch
%{lua: function rust_triple(arch) %{lua: function rust_triple(arch)
local abi = "gnu" local abi = "gnu"
@ -270,7 +271,10 @@ rm -rf vendor/libgit2-sys*/libgit2/
%if %with disabled_libssh2 %if %with disabled_libssh2
rm -rf vendor/libssh2-sys*/ rm -rf vendor/libssh2-sys*/
%endif %endif
sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs
# 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/src/core/build_steps/tool.rs
%if %{without bundled_llvm} && %{with llvm_static} %if %{without bundled_llvm} && %{with llvm_static}
sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \ sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
src/librustc_llvm/lib.rs src/librustc_llvm/lib.rs
@ -484,6 +488,9 @@ export %{rust_env}
%{_mandir}/man1/cargo*.1* %{_mandir}/man1/cargo*.1*
%changelog %changelog
* Wed Jan 10 2024 wangkai <13474090681@163.com> - 1.75.0-1
- Update to 1.75.0
* Fri Nov 24 2023 wangkai <13474090681@163.com> - 1.74.0-1 * Fri Nov 24 2023 wangkai <13474090681@163.com> - 1.74.0-1
- Update to 1.74.0 - Update to 1.74.0

16
rustc-1.74.0-src.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
wsFcBAABCgAQBQJlVhZpCRCFq5bm+hvl/gAAoEcP/RnTbzU3dwTRRm/KD403G2CV
4O67vVPlv+ofLzVJvLqiiHuX9nZvYdZ7bbS6AYYj+Sr4bek/L61/Op3tJL+Qmam+
f5s10qluNR4wmzQw/sx/m80YqspvluKJPkzPgYvU2fN/nrvJpvYCd+aMz3HRmePL
y/bIw7I7Foqzn6FJ4DeNLQddw0BTGyAVsEQnCYUUnpvCXKMzQkjPQTesSKYmQ++H
C1TdNVkg1+x/iS5rOi/nquX0vIhDV0BhVAi5V0CNcons6OmVs+l/frJyqwVaMHHu
0e2X3lWojWzaWcWC/OyTmLTMUHgUh0boRDL28ZiZTmnsSjPaZh9q8yirPSyUzYEL
gmui4g1ID3M3lNjKyCJJhI8Mn+WlJp6mnnF8QA9D/h9zhfPpP7Ie9JLdJM8T1kxs
2MOS/DPxm8oUOXvNC2kgZKeU2iGmN91MwMQ1oF7wOANJsXXZ1ujPA5GAKBH3aIKg
bht3AOPfu1iBsrj+iidhaVQ9Y+zlg9dvUX+9evc8AUhr4sHHNc3FwMeq0SncnZyG
bzPAoeXVkSAokOlOK4XBdPkHN+9QfGl3b8n6WfORcHhmbWwU+Cx9bMkD6EbaUsKu
fUY1jSmvMaBHKpj1Aq9olgvslQYnEeqkdvx8LwR3ZKO3CSt8I/DmW607ATFroU6O
gEGIny1kghs+mCvPFimL
=7+Ln
-----END PGP SIGNATURE-----

20
rustc-1.74.0-disable-libssh2.patch → rustc-1.75.0-disable-libssh2.patch
View File

@ -1,6 +1,6 @@
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2023-10-20 22:31:52.000000000 -0700 --- ./rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2023-11-12 12:24:35.000000000 -0800
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2023-11-01 15:33:13.224745542 -0700 +++ rustc-beta-src/src/tools/cargo/Cargo.lock 2023-11-14 17:01:32.010125953 -0800
@@ -2009,7 +2009,6 @@ @@ -2027,7 +2027,6 @@
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@ -8,7 +8,7 @@
"libz-sys", "libz-sys",
"openssl-sys", "openssl-sys",
"pkg-config", "pkg-config",
@@ -2042,20 +2041,6 @@ @@ -2060,20 +2059,6 @@
] ]
[[package]] [[package]]
@ -29,14 +29,14 @@
name = "libz-sys" name = "libz-sys"
version = "1.1.9" version = "1.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-11-01 15:33:13.225745528 -0700 --- ./rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2023-11-14 17:01:32.010125953 -0800
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-11-01 15:34:51.883397544 -0700 +++ rustc-beta-src/src/tools/cargo/Cargo.toml 2023-11-14 17:02:44.645097701 -0800
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
curl-sys = "0.4.68" curl-sys = "0.4.68"
filetime = "0.2.22" filetime = "0.2.22"
flate2 = { version = "1.0.27", default-features = false, features = ["zlib"] } flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
-git2 = "0.18.0" -git2 = "0.18.1"
+git2 = { version = "0.18.0", default-features = false, features = ["https"] } +git2 = { version = "0.18.1", default-features = false, features = ["https"] }
git2-curl = "0.19.0" git2-curl = "0.19.0"
gix = { version = "0.54.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] } gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }

16
rustc-1.75.0-src.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
wsFcBAABCgAQBQJljZswCRCFq5bm+hvl/gAACK4QAMMLm93fJY4slss9sTfzMhT/
hFGI+ro1I+N9RxRaNm/DOFl6rYU01NRXAuitJE9j1zJRPhbaTZUGJibMOHC1/+oz
18CMxYG/vhF7I2AqXtcfFMtivjzX0W32hjTX9oeocDYQ/NtmnVbUFF9DCpw2utWk
AF3HEwFcBD/8CGe7wcaiq4GdbbdxYshaquuhDnC1q8+uaIHtIvEgxBv7HA0Rybko
o+VeKsl1a3rIq+Ngh7Vef8E19CckSqvE0a0pfSMzVZLrcUbaTlUhUWKobtKIjg2x
9q4gHUz5CD6YdYahz/XB//rkPChyrW1es9RvUN4xXUPPR1bznxLMrk4qYTTHu6cO
39lF6QmJd/Ix9gH8Nb3G98DDf48fiIPe8bsX2dLuWGJrXJ0tkpzwO/QoCTpmVv2D
9VeDUlgLoqXpI9BwTJHAJ5l5pY4DS1jydLmhNZnY7tLlbwKCGUM8lcqTRgJCUrU7
dmGrytBPaJP1yh1SSnvEplhvtbFbINurhuE8/Ld3Zi8rUM4ZOgNEPO6MD5xKoqNN
D54hi1ch+NVdDj9cyr94F9BQqs6d7jC9ytg8+ZfwmYudKnld8/eKWb04NRfB7bdQ
JJK0IqK5JFrjA5pH0Wj6HrEfkcVcxxetP5//vNk8u3dXTpCUEXOEk1gA8IYm54fO
1SYzuW+5joGowKKPFa6g
=cucm
-----END PGP SIGNATURE-----