Skip to content

Commit c0aefeb

Browse files
committed
Rustup to rustc 1.51.0-nightly (a4cbb44 2021-01-20)
1 parent cfedad1 commit c0aefeb

File tree

5 files changed

+51
-10
lines changed

5 files changed

+51
-10
lines changed

build_sysroot/Cargo.lock

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

build_sysroot/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ test = { path = "./sysroot_src/library/test" }
1111

1212
alloc_system = { path = "./alloc_system" }
1313

14-
compiler_builtins = { version = "=0.1.36", default-features = false }
14+
compiler_builtins = { version = "0.1.39", default-features = false, features = ["no-asm"] }
1515

1616
[patch.crates-io]
1717
rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" }
1818
rustc-std-workspace-alloc = { path = "./sysroot_src/library/rustc-std-workspace-alloc" }
1919
rustc-std-workspace-std = { path = "./sysroot_src/library/rustc-std-workspace-std" }
20+
compiler_builtins = { path = "./compiler-builtins" }
2021

2122
[profile.dev]
2223
lto = "off"

build_sysroot/prepare_sysroot_src.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,11 @@ git commit --no-gpg-sign -m "Patch $file"
2929
done
3030
popd
3131

32-
echo "Successfully prepared libcore for building"
32+
git clone https://github.com/rust-lang/compiler-builtins.git || echo "rust-lang/compiler-builtins has already been cloned"
33+
pushd compiler-builtins
34+
git checkout -- .
35+
git checkout 0.1.39
36+
git apply ../../crate_patches/0001-compiler-builtins-Remove-rotate_left-from-Int.patch
37+
popd
38+
39+
echo "Successfully prepared sysroot source for building"
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 7078cca3cb614e1e82da428380b4e16fc3afef46 Mon Sep 17 00:00:00 2001
2+
From: bjorn3 <bjorn3@users.noreply.github.com>
3+
Date: Thu, 21 Jan 2021 14:46:36 +0100
4+
Subject: [PATCH] Remove rotate_left from Int
5+
6+
---
7+
src/int/mod.rs | 5 -----
8+
1 file changed, 5 deletions(-)
9+
10+
diff --git a/src/int/mod.rs b/src/int/mod.rs
11+
index 06054c8..3bea17b 100644
12+
--- a/src/int/mod.rs
13+
+++ b/src/int/mod.rs
14+
@@ -85,7 +85,6 @@ pub trait Int:
15+
fn wrapping_sub(self, other: Self) -> Self;
16+
fn wrapping_shl(self, other: u32) -> Self;
17+
fn wrapping_shr(self, other: u32) -> Self;
18+
- fn rotate_left(self, other: u32) -> Self;
19+
fn overflowing_add(self, other: Self) -> (Self, bool);
20+
fn aborting_div(self, other: Self) -> Self;
21+
fn aborting_rem(self, other: Self) -> Self;
22+
@@ -209,10 +208,6 @@ macro_rules! int_impl_common {
23+
<Self>::wrapping_shr(self, other)
24+
}
25+
26+
- fn rotate_left(self, other: u32) -> Self {
27+
- <Self>::rotate_left(self, other)
28+
- }
29+
-
30+
fn overflowing_add(self, other: Self) -> (Self, bool) {
31+
<Self>::overflowing_add(self, other)
32+
}
33+
--
34+
2.26.2.7.g19db9cfb68
35+

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2021-01-01
1+
nightly-2021-01-21

0 commit comments

Comments
 (0)