about summary refs log tree commit diff
path: root/scripts
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2022-03-19 10:44:56 +0100
committerbjorn3 <bjorn3@users.noreply.github.com>2022-03-19 12:56:03 +0100
commitef4512b7dcaf2ae10e80e3aeb9b014c4128364b2 (patch)
tree28411dd3309f2037376c9886978fcee78f588689 /scripts
parent31329f98412b70f034e41420dba28cb8d14ec4a9 (diff)
downloadrust-ef4512b7dcaf2ae10e80e3aeb9b014c4128364b2.tar.gz
rust-ef4512b7dcaf2ae10e80e3aeb9b014c4128364b2.zip
Codegen 128bit atomic loads and stores for compiler builtins as trap
128bit atomics are unstable and only enabled on AArch64 and x86_64 macOS.
Cranelift doesn't support 128bit atomics yet.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/setup_rust_fork.sh12
1 files changed, 0 insertions, 12 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh
index ddcf05ec252..85c0109c6f6 100644
--- a/scripts/setup_rust_fork.sh
+++ b/scripts/setup_rust_fork.sh
@@ -12,18 +12,6 @@ git checkout -- .
 git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')"
 
 git apply - <<EOF
-diff --git a/Cargo.toml b/Cargo.toml
-index 5bd1147cad5..10d68a2ff14 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -111,5 +111,7 @@ rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
- rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
- rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
-
-+compiler_builtins = { path = "../build_sysroot/compiler-builtins" }
-+
- [patch."https://github.com/rust-lang/rust-clippy"]
- clippy_lints = { path = "src/tools/clippy/clippy_lints" }
 diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml
 index d95b5b7f17f..00b6f0e3635 100644
 --- a/library/alloc/Cargo.toml