Skip to content

Commit b493565

Browse files
committed
Sync from rust 3048886e59c94470e726ecaaf2add7242510ac11
2 parents 54db8a5 + b56c50f commit b493565

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

patches/0027-sysroot_tests-128bit-atomic-operations.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ index 1e336bf..35e6f54 100644
1919
-#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
2020
#![cfg_attr(test, feature(cfg_select))]
2121
#![feature(alloc_layout_extra)]
22-
#![feature(array_chunks)]
22+
#![feature(array_ptr_get)]
2323
diff --git a/coretests/tests/atomic.rs b/coretests/tests/atomic.rs
2424
index b735957..ea728b6 100644
2525
--- a/coretests/tests/atomic.rs

scripts/setup_rust_fork.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ rustc = "$(pwd)/../dist/bin/rustc-clif"
3333
cargo = "$(rustup which cargo)"
3434
full-bootstrap = true
3535
local-rebuild = true
36+
compiletest-allow-stage0 = true
3637
3738
[rust]
3839
download-rustc = false

scripts/test_rustc_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,5 @@ index 073116933bd..c3e4578204d 100644
170170
EOF
171171

172172
echo "[TEST] rustc test suite"
173-
COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 --test-args=--no-capture tests/{codegen-units,run-make,ui,incremental}
173+
./x.py test --stage 0 --test-args=--no-capture tests/{codegen-units,run-make,ui,incremental}
174174
popd

0 commit comments

Comments
 (0)