bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rustup to rustc 1.59.0-nightly (c5ecc1570 2021-12-15)

Browse source
This commit is contained in:
bjorn3 2021-12-16 14:10:51 +01:00
parent d084fca557
commit d0f97fc039
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build_sysroot/Cargo.lock generated
View file

@ -56,7 +56,7 @@ dependencies = [
[[package]] [[package]]
name = "compiler_builtins" name = "compiler_builtins"
version = "0.1.55" version = "0.1.66"
dependencies = [ dependencies = [
"rustc-std-workspace-core", "rustc-std-workspace-core",
] ]
@ -132,9 +132,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.109" version = "0.2.112"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01" checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
dependencies = [ dependencies = [
"rustc-std-workspace-core", "rustc-std-workspace-core",
] ]

2
build_system/prepare.rs
View file

@ -92,7 +92,7 @@ fn prepare_sysroot() {
clone_repo( clone_repo(
"build_sysroot/compiler-builtins", "build_sysroot/compiler-builtins",
"https://github.com/rust-lang/compiler-builtins.git", "https://github.com/rust-lang/compiler-builtins.git",
"0.1.55", "0.1.66",
); );
apply_patches("compiler-builtins", Path::new("build_sysroot/compiler-builtins")); apply_patches("compiler-builtins", Path::new("build_sysroot/compiler-builtins"));
} }

2
rust-toolchain
View file

@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "nightly-2021-12-09" channel = "nightly-2021-12-16"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

2
scripts/setup_rust_fork.sh
View file

@ -33,7 +33,7 @@ index d95b5b7f17f..00b6f0e3635 100644
[dependencies] [dependencies]
core = { path = "../core" } core = { path = "../core" }
-compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std'] } -compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std'] }
+compiler_builtins = { version = "0.1.53", features = ['rustc-dep-of-std', 'no-asm'] } +compiler_builtins = { version = "0.1.66", features = ['rustc-dep-of-std', 'no-asm'] }
[dev-dependencies] [dev-dependencies]
rand = "0.7" rand = "0.7"

12
src/inline_asm.rs
View file

@ -317,10 +317,14 @@ impl<'tcx> InlineAssemblyGenerator<'_, 'tcx> {
let mut new_slot = |x| new_slot_fn(&mut slot_size, x); let mut new_slot = |x| new_slot_fn(&mut slot_size, x);
// Allocate stack slots for saving clobbered registers // Allocate stack slots for saving clobbered registers
let abi_clobber = let abi_clobber = InlineAsmClobberAbi::parse(
InlineAsmClobberAbi::parse(self.arch, &self.tcx.sess.target, Symbol::intern("C")) self.arch,
.unwrap() |feature| self.tcx.sess.target_features.contains(&Symbol::intern(feature)),
.clobbered_regs(); &self.tcx.sess.target,
Symbol::intern("C"),
)
.unwrap()
.clobbered_regs();
for (i, reg) in self.registers.iter().enumerate().filter_map(|(i, r)| r.map(|r| (i, r))) { for (i, reg) in self.registers.iter().enumerate().filter_map(|(i, r)| r.map(|r| (i, r))) {
let mut need_save = true; let mut need_save = true;
// If the register overlaps with a register clobbered by function call, then // If the register overlaps with a register clobbered by function call, then