mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #125702 - workingjubilee:tell-tidy-about-csky, r=nikic

Browse Source 
Give tidy the good news about C-SKY

It seems this was overlooked in https://github.com/rust-lang/rust/pull/125472 because we don't test C-SKY much yet.

Fixes #125697

r? `@erikdesjardins`
This commit is contained in:
bors 2024-05-29 22:34:14 +00:00
commit 23ea77b8ed
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ci/docker/host-x86_64/x86_64-gnu-llvm-17/Dockerfile
View File

@ -45,10 +45,6 @@ RUN sh /scripts/sccache.sh
ENV NO_DOWNLOAD_CI_LLVM 1 ENV NO_DOWNLOAD_CI_LLVM 1
ENV EXTERNAL_LLVM 1 ENV EXTERNAL_LLVM 1
# This is not the latest LLVM version, so some components required by tests may
# be missing.
ENV IS_NOT_LATEST_LLVM 1
# Using llvm-link-shared due to libffi issues -- see #34486 # Using llvm-link-shared due to libffi issues -- see #34486
ENV RUST_CONFIGURE_ARGS \ ENV RUST_CONFIGURE_ARGS \
--build=x86_64-unknown-linux-gnu \ --build=x86_64-unknown-linux-gnu \

8
src/ci/run.sh
View File

@ -89,6 +89,8 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --dist-compression-formats=xz"
# (to avoid spending a lot of time cloning llvm) # (to avoid spending a lot of time cloning llvm)
if [ "$EXTERNAL_LLVM" = "" ]; then if [ "$EXTERNAL_LLVM" = "" ]; then
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.optimized-compiler-builtins" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.optimized-compiler-builtins"
# Likewise, only demand we test all LLVM components if we know we built LLVM with them
export COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS=1
elif [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then elif [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
echo "error: dist builds should always use optimized compiler-rt!" >&2 echo "error: dist builds should always use optimized compiler-rt!" >&2
exit 1 exit 1
@ -169,12 +171,6 @@ else
fi fi
fi fi
# Unless we're using an older version of LLVM, check that all LLVM components
# used by tests are available.
if [ "$IS_NOT_LATEST_LLVM" = "" ]; then
export COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS=1
fi
if [ "$ENABLE_GCC_CODEGEN" = "1" ]; then if [ "$ENABLE_GCC_CODEGEN" = "1" ]; then
# If `ENABLE_GCC_CODEGEN` is set and not empty, we add the `--enable-new-symbol-mangling` # If `ENABLE_GCC_CODEGEN` is set and not empty, we add the `--enable-new-symbol-mangling`
# argument to `RUST_CONFIGURE_ARGS` and set the `GCC_EXEC_PREFIX` environment variable. # argument to `RUST_CONFIGURE_ARGS` and set the `GCC_EXEC_PREFIX` environment variable.

1
src/tools/tidy/src/target_specific_tests.rs
View File

@ -15,6 +15,7 @@
"arm", "arm",
"avr", "avr",
"bpf", "bpf",
"csky",
"hexagon", "hexagon",
"loongarch", "loongarch",
"m68k", "m68k",

13
tests/ui/abi/compatibility.rs
View File

@ -52,18 +52,16 @@
//@ revisions: m68k //@ revisions: m68k
//@[m68k] compile-flags: --target m68k-unknown-linux-gnu //@[m68k] compile-flags: --target m68k-unknown-linux-gnu
//@[m68k] needs-llvm-components: m68k //@[m68k] needs-llvm-components: m68k
//@ revisions: csky
//@[csky] compile-flags: --target csky-unknown-linux-gnuabiv2
//@[csky] needs-llvm-components: csky
// FIXME: disabled on nvptx64 since the target ABI fails the sanity check // FIXME: disabled on nvptx64 since the target ABI fails the sanity check
// see https://github.com/rust-lang/rust/issues/117480 // see https://github.com/rust-lang/rust/issues/117480
/* revisions: nvptx64 /* revisions: nvptx64
[nvptx64] compile-flags: --target nvptx64-nvidia-cuda [nvptx64] compile-flags: --target nvptx64-nvidia-cuda
[nvptx64] needs-llvm-components: nvptx [nvptx64] needs-llvm-components: nvptx
*/ */
// FIXME: disabled since it fails on CI saying the csky component is missing
// see https://github.com/rust-lang/rust/issues/125697
/* revisions: csky
[csky] compile-flags: --target csky-unknown-linux-gnuabiv2
[csky] needs-llvm-components: csky
*/
#![feature(rustc_attrs, unsized_fn_params, transparent_unions)] #![feature(rustc_attrs, unsized_fn_params, transparent_unions)]
#![cfg_attr(not(host), feature(no_core, lang_items), no_std, no_core)] #![cfg_attr(not(host), feature(no_core, lang_items), no_std, no_core)]
#![allow(unused, improper_ctypes_definitions, internal_features)] #![allow(unused, improper_ctypes_definitions, internal_features)]
@ -75,8 +73,7 @@
#[cfg(host)] #[cfg(host)]
use std::{ use std::{
any::Any, marker::PhantomData, mem::ManuallyDrop, num::NonZero, ptr::NonNull, rc::Rc, any::Any, marker::PhantomData, mem::ManuallyDrop, num::NonZero, ptr::NonNull, rc::Rc, sync::Arc,
sync::Arc,
}; };
/// To work cross-target this test must be no_core. /// To work cross-target this test must be no_core.