Merge commit '35d9c6bf25' into sync_cg_clif-2022-02-23

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

@@ -13,33 +13,33 @@ index 107762c..2d1ae10 100644
 --- a/src/mem/mod.rs
 +++ b/src/mem/mod.rs
 @@ -137,10 +137,6 @@ intrinsics! {
-     pub extern "C" fn __llvm_memcpy_element_unordered_atomic_8(dest: *mut u64, src: *const u64, bytes: usize) -> () {
+     pub unsafe extern "C" fn __llvm_memcpy_element_unordered_atomic_8(dest: *mut u64, src: *const u64, bytes: usize) -> () {
          memcpy_element_unordered_atomic(dest, src, bytes);
      }
 -    #[cfg(target_has_atomic_load_store = "128")]
--    pub extern "C" fn __llvm_memcpy_element_unordered_atomic_16(dest: *mut u128, src: *const u128, bytes: usize) -> () {
+-    pub unsafe extern "C" fn __llvm_memcpy_element_unordered_atomic_16(dest: *mut u128, src: *const u128, bytes: usize) -> () {
 -        memcpy_element_unordered_atomic(dest, src, bytes);
 -    }
  
      #[cfg(target_has_atomic_load_store = "8")]
-     pub extern "C" fn __llvm_memmove_element_unordered_atomic_1(dest: *mut u8, src: *const u8, bytes: usize) -> () {
+     pub unsafe extern "C" fn __llvm_memmove_element_unordered_atomic_1(dest: *mut u8, src: *const u8, bytes: usize) -> () {
 @@ -158,10 +154,6 @@ intrinsics! {
-     pub extern "C" fn __llvm_memmove_element_unordered_atomic_8(dest: *mut u64, src: *const u64, bytes: usize) -> () {
+     pub unsafe extern "C" fn __llvm_memmove_element_unordered_atomic_8(dest: *mut u64, src: *const u64, bytes: usize) -> () {
          memmove_element_unordered_atomic(dest, src, bytes);
      }
 -    #[cfg(target_has_atomic_load_store = "128")]
--    pub extern "C" fn __llvm_memmove_element_unordered_atomic_16(dest: *mut u128, src: *const u128, bytes: usize) -> () {
+-    pub unsafe extern "C" fn __llvm_memmove_element_unordered_atomic_16(dest: *mut u128, src: *const u128, bytes: usize) -> () {
 -        memmove_element_unordered_atomic(dest, src, bytes);
 -    }
  
      #[cfg(target_has_atomic_load_store = "8")]
-     pub extern "C" fn __llvm_memset_element_unordered_atomic_1(s: *mut u8, c: u8, bytes: usize) -> () {
+     pub unsafe extern "C" fn __llvm_memset_element_unordered_atomic_1(s: *mut u8, c: u8, bytes: usize) -> () {
 @@ -179,8 +171,4 @@ intrinsics! {
-     pub extern "C" fn __llvm_memset_element_unordered_atomic_8(s: *mut u64, c: u8, bytes: usize) -> () {
+     pub unsafe extern "C" fn __llvm_memset_element_unordered_atomic_8(s: *mut u64, c: u8, bytes: usize) -> () {
          memset_element_unordered_atomic(s, c, bytes);
      }
 -    #[cfg(target_has_atomic_load_store = "128")]
--    pub extern "C" fn __llvm_memset_element_unordered_atomic_16(s: *mut u128, c: u8, bytes: usize) -> () {
+-    pub unsafe extern "C" fn __llvm_memset_element_unordered_atomic_16(s: *mut u128, c: u8, bytes: usize) -> () {
 -        memset_element_unordered_atomic(s, c, bytes);
 -    }
  }

compiler/rustc_codegen_cranelift/patches/0022-sysroot-Disable-not-compiling-tests.patch

@@ -22,7 +22,7 @@ index 0000000..46fd999
 +[package]
 +name = "core"
 +version = "0.0.0"
-+edition = "2018"
++edition = "2021"
 +
 +[lib]
 +name = "coretests"
@@ -44,7 +44,7 @@ index 1a6be3a..42dbd59 100644
 --- a/library/core/tests/ptr.rs
 +++ b/library/core/tests/ptr.rs
 @@ -250,6 +250,7 @@ fn test_unsized_nonnull() {
-     assert!(ys == zs);
+     };
  }
  
 +/*

compiler/rustc_codegen_cranelift/patches/0027-sysroot-128bit-atomic-operations.patch

@@ -8,7 +8,6 @@ Cranelift doesn't support them yet
  library/core/src/panic/unwind_safe.rs |  6 -----
  library/core/src/sync/atomic.rs       | 38 ---------------------------
  library/core/tests/atomic.rs          |  4 ---
- library/std/src/time/monotonic.rs     |  6 +++--
  4 files changed, 4 insertions(+), 50 deletions(-)
 
 diff --git a/library/core/src/panic/unwind_safe.rs b/library/core/src/panic/unwind_safe.rs
@@ -99,38 +98,6 @@ index b735957..ea728b6 100644
      #[cfg(target_has_atomic = "ptr")]
      assert_eq!(align_of::<AtomicUsize>(), size_of::<AtomicUsize>());
      #[cfg(target_has_atomic = "ptr")]
-diff --git a/library/std/src/time/monotonic.rs b/library/std/src/time/monotonic.rs
-index fa96b7a..2854f9c 100644
---- a/library/std/src/time/monotonic.rs
-+++ b/library/std/src/time/monotonic.rs
-@@ -5,7 +5,7 @@ pub(super) fn monotonize(raw: time::Instant) -> time::Instant {
-     inner::monotonize(raw)
- }
- 
--#[cfg(any(all(target_has_atomic = "64", not(target_has_atomic = "128")), target_arch = "aarch64"))]
-+#[cfg(target_has_atomic = "64")]
- pub mod inner {
-     use crate::sync::atomic::AtomicU64;
-     use crate::sync::atomic::Ordering::*;
-@@ -70,6 +70,7 @@ pub mod inner {
-     }
- }
- 
-+/*
- #[cfg(all(target_has_atomic = "128", not(target_arch = "aarch64")))]
- pub mod inner {
-     use crate::sync::atomic::AtomicU128;
-@@ -94,8 +95,9 @@ pub mod inner {
-         ZERO.checked_add_duration(&Duration::new(secs, nanos)).unwrap()
-     }
- }
-+*/
- 
--#[cfg(not(any(target_has_atomic = "64", target_has_atomic = "128")))]
-+#[cfg(not(target_has_atomic = "64"))]
- pub mod inner {
-     use crate::cmp;
-     use crate::sys::time;
 -- 
 2.26.2.7.g19db9cfb68