Skip to content

Commit d0f97fc

Browse files
committed
Rustup to rustc 1.59.0-nightly (c5ecc15 2021-12-15)
1 parent d084fca commit d0f97fc

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

build_sysroot/Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build_system/prepare.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fn prepare_sysroot() {
9292
clone_repo(
9393
"build_sysroot/compiler-builtins",
9494
"https://github.com/rust-lang/compiler-builtins.git",
95-
"0.1.55",
95+
"0.1.66",
9696
);
9797
apply_patches("compiler-builtins", Path::new("build_sysroot/compiler-builtins"));
9898
}

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2021-12-09"
2+
channel = "nightly-2021-12-16"
33
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

scripts/setup_rust_fork.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ index d95b5b7f17f..00b6f0e3635 100644
3333
[dependencies]
3434
core = { path = "../core" }
3535
-compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std'] }
36-
+compiler_builtins = { version = "0.1.53", features = ['rustc-dep-of-std', 'no-asm'] }
36+
+compiler_builtins = { version = "0.1.66", features = ['rustc-dep-of-std', 'no-asm'] }
3737
3838
[dev-dependencies]
3939
rand = "0.7"

src/inline_asm.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,14 @@ impl<'tcx> InlineAssemblyGenerator<'_, 'tcx> {
317317
let mut new_slot = |x| new_slot_fn(&mut slot_size, x);
318318

319319
// Allocate stack slots for saving clobbered registers
320-
let abi_clobber =
321-
InlineAsmClobberAbi::parse(self.arch, &self.tcx.sess.target, Symbol::intern("C"))
322-
.unwrap()
323-
.clobbered_regs();
320+
let abi_clobber = InlineAsmClobberAbi::parse(
321+
self.arch,
322+
|feature| self.tcx.sess.target_features.contains(&Symbol::intern(feature)),
323+
&self.tcx.sess.target,
324+
Symbol::intern("C"),
325+
)
326+
.unwrap()
327+
.clobbered_regs();
324328
for (i, reg) in self.registers.iter().enumerate().filter_map(|(i, r)| r.map(|r| (i, r))) {
325329
let mut need_save = true;
326330
// If the register overlaps with a register clobbered by function call, then

0 commit comments

Comments
 (0)