Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 441e2e6

Browse files
committed
Rustup to rustc 1.60.0-nightly (88fb06a 2022-02-05)
1 parent bccf0a1 commit 441e2e6

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
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.66",
95+
"0.1.68",
9696
);
9797
apply_patches("compiler-builtins", Path::new("build_sysroot/compiler-builtins"));
9898
}

patches/0001-compiler-builtins-Disable-128bit-atomic-operations.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,33 @@ index 107762c..2d1ae10 100644
1313
--- a/src/mem/mod.rs
1414
+++ b/src/mem/mod.rs
1515
@@ -137,10 +137,6 @@ intrinsics! {
16-
pub extern "C" fn __llvm_memcpy_element_unordered_atomic_8(dest: *mut u64, src: *const u64, bytes: usize) -> () {
16+
pub unsafe extern "C" fn __llvm_memcpy_element_unordered_atomic_8(dest: *mut u64, src: *const u64, bytes: usize) -> () {
1717
memcpy_element_unordered_atomic(dest, src, bytes);
1818
}
1919
- #[cfg(target_has_atomic_load_store = "128")]
20-
- pub extern "C" fn __llvm_memcpy_element_unordered_atomic_16(dest: *mut u128, src: *const u128, bytes: usize) -> () {
20+
- pub unsafe extern "C" fn __llvm_memcpy_element_unordered_atomic_16(dest: *mut u128, src: *const u128, bytes: usize) -> () {
2121
- memcpy_element_unordered_atomic(dest, src, bytes);
2222
- }
2323

2424
#[cfg(target_has_atomic_load_store = "8")]
25-
pub extern "C" fn __llvm_memmove_element_unordered_atomic_1(dest: *mut u8, src: *const u8, bytes: usize) -> () {
25+
pub unsafe extern "C" fn __llvm_memmove_element_unordered_atomic_1(dest: *mut u8, src: *const u8, bytes: usize) -> () {
2626
@@ -158,10 +154,6 @@ intrinsics! {
27-
pub extern "C" fn __llvm_memmove_element_unordered_atomic_8(dest: *mut u64, src: *const u64, bytes: usize) -> () {
27+
pub unsafe extern "C" fn __llvm_memmove_element_unordered_atomic_8(dest: *mut u64, src: *const u64, bytes: usize) -> () {
2828
memmove_element_unordered_atomic(dest, src, bytes);
2929
}
3030
- #[cfg(target_has_atomic_load_store = "128")]
31-
- pub extern "C" fn __llvm_memmove_element_unordered_atomic_16(dest: *mut u128, src: *const u128, bytes: usize) -> () {
31+
- pub unsafe extern "C" fn __llvm_memmove_element_unordered_atomic_16(dest: *mut u128, src: *const u128, bytes: usize) -> () {
3232
- memmove_element_unordered_atomic(dest, src, bytes);
3333
- }
3434

3535
#[cfg(target_has_atomic_load_store = "8")]
36-
pub extern "C" fn __llvm_memset_element_unordered_atomic_1(s: *mut u8, c: u8, bytes: usize) -> () {
36+
pub unsafe extern "C" fn __llvm_memset_element_unordered_atomic_1(s: *mut u8, c: u8, bytes: usize) -> () {
3737
@@ -179,8 +171,4 @@ intrinsics! {
38-
pub extern "C" fn __llvm_memset_element_unordered_atomic_8(s: *mut u64, c: u8, bytes: usize) -> () {
38+
pub unsafe extern "C" fn __llvm_memset_element_unordered_atomic_8(s: *mut u64, c: u8, bytes: usize) -> () {
3939
memset_element_unordered_atomic(s, c, bytes);
4040
}
4141
- #[cfg(target_has_atomic_load_store = "128")]
42-
- pub extern "C" fn __llvm_memset_element_unordered_atomic_16(s: *mut u128, c: u8, bytes: usize) -> () {
42+
- pub unsafe extern "C" fn __llvm_memset_element_unordered_atomic_16(s: *mut u128, c: u8, bytes: usize) -> () {
4343
- memset_element_unordered_atomic(s, c, bytes);
4444
- }
4545
}

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-2022-01-30"
2+
channel = "nightly-2022-02-06"
33
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

0 commit comments

Comments
 (0)