Skip to content

Commit 23ea77b

Browse files
committed
Auto merge of rust-lang#125702 - workingjubilee:tell-tidy-about-csky, r=nikic
Give tidy the good news about C-SKY It seems this was overlooked in rust-lang#125472 because we don't test C-SKY much yet. Fixes rust-lang#125697 r? `@erikdesjardins`
2 parents debd22d + 60c30f5 commit 23ea77b

File tree

4 files changed

+8
-18
lines changed

4 files changed

+8
-18
lines changed

Diff for: src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile

-4
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ RUN sh /scripts/sccache.sh
4545
ENV NO_DOWNLOAD_CI_LLVM 1
4646
ENV EXTERNAL_LLVM 1
4747

48-
# This is not the latest LLVM version, so some components required by tests may
49-
# be missing.
50-
ENV IS_NOT_LATEST_LLVM 1
51-
5248
# Using llvm-link-shared due to libffi issues -- see #34486
5349
ENV RUST_CONFIGURE_ARGS \
5450
--build=x86_64-unknown-linux-gnu \

Diff for: src/ci/run.sh

+2-6
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --dist-compression-formats=xz"
8989
# (to avoid spending a lot of time cloning llvm)
9090
if [ "$EXTERNAL_LLVM" = "" ]; then
9191
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.optimized-compiler-builtins"
92+
# Likewise, only demand we test all LLVM components if we know we built LLVM with them
93+
export COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS=1
9294
elif [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
9395
echo "error: dist builds should always use optimized compiler-rt!" >&2
9496
exit 1
@@ -169,12 +171,6 @@ else
169171
fi
170172
fi
171173

172-
# Unless we're using an older version of LLVM, check that all LLVM components
173-
# used by tests are available.
174-
if [ "$IS_NOT_LATEST_LLVM" = "" ]; then
175-
export COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS=1
176-
fi
177-
178174
if [ "$ENABLE_GCC_CODEGEN" = "1" ]; then
179175
# If `ENABLE_GCC_CODEGEN` is set and not empty, we add the `--enable-new-symbol-mangling`
180176
# argument to `RUST_CONFIGURE_ARGS` and set the `GCC_EXEC_PREFIX` environment variable.

Diff for: src/tools/tidy/src/target_specific_tests.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const KNOWN_LLVM_COMPONENTS: &[&str] = &[
1515
"arm",
1616
"avr",
1717
"bpf",
18+
"csky",
1819
"hexagon",
1920
"loongarch",
2021
"m68k",

Diff for: tests/ui/abi/compatibility.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,16 @@
5252
//@ revisions: m68k
5353
//@[m68k] compile-flags: --target m68k-unknown-linux-gnu
5454
//@[m68k] needs-llvm-components: m68k
55+
//@ revisions: csky
56+
//@[csky] compile-flags: --target csky-unknown-linux-gnuabiv2
57+
//@[csky] needs-llvm-components: csky
58+
5559
// FIXME: disabled on nvptx64 since the target ABI fails the sanity check
5660
// see https://github.com/rust-lang/rust/issues/117480
5761
/* revisions: nvptx64
5862
[nvptx64] compile-flags: --target nvptx64-nvidia-cuda
5963
[nvptx64] needs-llvm-components: nvptx
6064
*/
61-
// FIXME: disabled since it fails on CI saying the csky component is missing
62-
// see https://github.com/rust-lang/rust/issues/125697
63-
/* revisions: csky
64-
[csky] compile-flags: --target csky-unknown-linux-gnuabiv2
65-
[csky] needs-llvm-components: csky
66-
*/
6765
#![feature(rustc_attrs, unsized_fn_params, transparent_unions)]
6866
#![cfg_attr(not(host), feature(no_core, lang_items), no_std, no_core)]
6967
#![allow(unused, improper_ctypes_definitions, internal_features)]
@@ -75,8 +73,7 @@
7573

7674
#[cfg(host)]
7775
use std::{
78-
any::Any, marker::PhantomData, mem::ManuallyDrop, num::NonZero, ptr::NonNull, rc::Rc,
79-
sync::Arc,
76+
any::Any, marker::PhantomData, mem::ManuallyDrop, num::NonZero, ptr::NonNull, rc::Rc, sync::Arc,
8077
};
8178

8279
/// To work cross-target this test must be no_core.

0 commit comments

Comments
 (0)