From 3796f7de57f5d4cf4325d1f13aeb07fdaa57983b Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 30 Oct 2025 17:24:55 +0100 Subject: [PATCH] compiletest: rename add-core-stubs to add-minicore --- src/doc/rustc-dev-guide/src/tests/minicore.md | 14 ++++++------- src/tools/compiletest/src/directives.rs | 20 +++++++++---------- .../src/directives/directive_names.rs | 2 +- src/tools/compiletest/src/runtest.rs | 6 +++--- tests/assembly-llvm/aarch64-pointer-auth.rs | 2 +- tests/assembly-llvm/asm/aarch64-el2vmsa.rs | 2 +- tests/assembly-llvm/asm/aarch64-modifiers.rs | 2 +- tests/assembly-llvm/asm/aarch64-types.rs | 2 +- tests/assembly-llvm/asm/arm-modifiers.rs | 2 +- tests/assembly-llvm/asm/arm-types.rs | 2 +- tests/assembly-llvm/asm/avr-modifiers.rs | 2 +- tests/assembly-llvm/asm/avr-types.rs | 2 +- tests/assembly-llvm/asm/bpf-types.rs | 2 +- tests/assembly-llvm/asm/hexagon-types.rs | 2 +- tests/assembly-llvm/asm/loongarch-type.rs | 2 +- tests/assembly-llvm/asm/m68k-types.rs | 2 +- tests/assembly-llvm/asm/mips-types.rs | 2 +- tests/assembly-llvm/asm/msp430-types.rs | 2 +- tests/assembly-llvm/asm/nvptx-types.rs | 2 +- tests/assembly-llvm/asm/powerpc-types.rs | 2 +- tests/assembly-llvm/asm/riscv-types.rs | 2 +- tests/assembly-llvm/asm/s390x-types.rs | 2 +- tests/assembly-llvm/asm/sparc-types.rs | 2 +- tests/assembly-llvm/asm/wasm-types.rs | 2 +- tests/assembly-llvm/asm/x86-modifiers.rs | 2 +- tests/assembly-llvm/asm/x86-types.rs | 2 +- tests/assembly-llvm/cmse.rs | 2 +- .../use-minicore-no-run.rs | 4 ++-- tests/assembly-llvm/dwarf4.rs | 2 +- tests/assembly-llvm/dwarf5.rs | 2 +- .../loongarch-float-struct-abi.rs | 2 +- tests/assembly-llvm/naked-functions/aix.rs | 2 +- tests/assembly-llvm/naked-functions/wasm32.rs | 2 +- tests/assembly-llvm/pic-relocation-model.rs | 2 +- tests/assembly-llvm/pie-relocation-model.rs | 2 +- tests/assembly-llvm/powerpc64-struct-abi.rs | 2 +- tests/assembly-llvm/reg-struct-return.rs | 2 +- tests/assembly-llvm/regparm-module-flag.rs | 2 +- tests/assembly-llvm/riscv-float-struct-abi.rs | 2 +- .../riscv-soft-abi-with-float-features.rs | 2 +- tests/assembly-llvm/s390x-backchain-toggle.rs | 2 +- tests/assembly-llvm/s390x-vector-abi.rs | 2 +- .../sanitizer/kcfi/emit-arity-indicator.rs | 2 +- tests/assembly-llvm/simd-bitmask.rs | 2 +- tests/assembly-llvm/simd-intrinsic-gather.rs | 2 +- .../assembly-llvm/simd-intrinsic-mask-load.rs | 2 +- .../simd-intrinsic-mask-reduce.rs | 2 +- .../simd-intrinsic-mask-store.rs | 2 +- tests/assembly-llvm/simd-intrinsic-scatter.rs | 2 +- tests/assembly-llvm/simd-intrinsic-select.rs | 2 +- tests/assembly-llvm/sparc-struct-abi.rs | 2 +- tests/assembly-llvm/stack-probes.rs | 2 +- .../stack-protector-target-support.rs | 2 +- .../assembly-llvm/static-relocation-model.rs | 2 +- .../assembly-llvm/target-feature-multiple.rs | 2 +- tests/assembly-llvm/targets/targets-amdgpu.rs | 2 +- tests/assembly-llvm/targets/targets-elf.rs | 2 +- tests/assembly-llvm/targets/targets-macho.rs | 2 +- tests/assembly-llvm/targets/targets-nvptx.rs | 2 +- tests/assembly-llvm/targets/targets-pe.rs | 2 +- tests/assembly-llvm/x86-return-float.rs | 2 +- ...4-fortanix-unknown-sgx-lvi-generic-load.rs | 2 +- ...64-fortanix-unknown-sgx-lvi-generic-ret.rs | 2 +- ...ortanix-unknown-sgx-lvi-inline-assembly.rs | 2 +- .../assembly-llvm/x86_64-windows-float-abi.rs | 2 +- .../assembly-llvm/x86_64-windows-i128-abi.rs | 2 +- tests/codegen-llvm/aarch64-softfloat.rs | 2 +- .../codegen-llvm/aarch64-struct-align-128.rs | 2 +- tests/codegen-llvm/abi-efiapi.rs | 2 +- tests/codegen-llvm/abi-repr-ext.rs | 2 +- tests/codegen-llvm/abi-sysv64.rs | 2 +- tests/codegen-llvm/abi-win64-zst.rs | 3 +-- tests/codegen-llvm/abi-x86-interrupt.rs | 2 +- .../align-byval-alignment-mismatch.rs | 2 +- tests/codegen-llvm/align-byval-vector.rs | 2 +- tests/codegen-llvm/align-byval.rs | 2 +- tests/codegen-llvm/amdgpu-addrspacecast.rs | 2 +- tests/codegen-llvm/asm/aarch64-clobbers.rs | 2 +- tests/codegen-llvm/asm/avr-clobbers.rs | 2 +- tests/codegen-llvm/asm/bpf-clobbers.rs | 2 +- tests/codegen-llvm/asm/csky-clobbers.rs | 2 +- tests/codegen-llvm/asm/hexagon-clobbers.rs | 2 +- tests/codegen-llvm/asm/msp430-clobbers.rs | 2 +- tests/codegen-llvm/asm/powerpc-clobbers.rs | 2 +- tests/codegen-llvm/asm/readonly-not-pure.rs | 2 +- tests/codegen-llvm/asm/riscv-clobbers.rs | 2 +- tests/codegen-llvm/asm/s390x-clobbers.rs | 2 +- tests/codegen-llvm/asm/sanitize-llvm.rs | 2 +- tests/codegen-llvm/asm/sparc-clobbers.rs | 2 +- tests/codegen-llvm/avr/avr-func-addrspace.rs | 2 +- tests/codegen-llvm/branch-protection.rs | 2 +- tests/codegen-llvm/c-variadic-lifetime.rs | 2 +- tests/codegen-llvm/call-tmps-lifetime.rs | 2 +- tests/codegen-llvm/cast-target-abi.rs | 2 +- tests/codegen-llvm/cf-protection.rs | 2 +- tests/codegen-llvm/cffi/c-variadic-ffi.rs | 2 +- .../cffi/ffi-out-of-bounds-loads.rs | 2 +- .../minicore-smoke-test.rs | 2 +- tests/codegen-llvm/darwin-no-objc.rs | 2 +- tests/codegen-llvm/darwin-objc-abi-v1.rs | 2 +- tests/codegen-llvm/darwin-objc-abi-v2.rs | 2 +- .../codegen-llvm/default-requires-uwtable.rs | 2 +- tests/codegen-llvm/f128-wasm32-callconv.rs | 2 +- tests/codegen-llvm/fastcall-inreg.rs | 2 +- tests/codegen-llvm/fixed-x18.rs | 2 +- .../codegen-llvm/frame-pointer-cli-control.rs | 2 +- tests/codegen-llvm/frame-pointer.rs | 2 +- tests/codegen-llvm/function-return.rs | 2 +- tests/codegen-llvm/gpu-kernel-abi.rs | 2 +- tests/codegen-llvm/i128-wasm32-callconv.rs | 2 +- tests/codegen-llvm/i128-x86-callconv.rs | 2 +- .../codegen-llvm/indirect-branch-cs-prefix.rs | 2 +- tests/codegen-llvm/intrinsics/nontemporal.rs | 2 +- .../loongarch-abi/cast-local-large-enough.rs | 2 +- .../loongarch-abi/loongarch64-lp64d-abi.rs | 2 +- .../macos/i686-macosx-deployment-target.rs | 2 +- .../macos/i686-no-macosx-deployment-target.rs | 2 +- .../macos/x86_64-macosx-deployment-target.rs | 2 +- .../x86_64-no-macosx-deployment-target.rs | 2 +- tests/codegen-llvm/naked-asan.rs | 2 +- .../codegen-llvm/naked-fn/instruction-set.rs | 2 +- .../codegen-llvm/naked-fn/naked-functions.rs | 2 +- tests/codegen-llvm/no-jump-tables.rs | 2 +- .../powerpc64le-struct-align-128.rs | 2 +- tests/codegen-llvm/reg-struct-return.rs | 2 +- tests/codegen-llvm/regparm-inreg.rs | 2 +- .../repr/transparent-byval-struct-ptr.rs | 2 +- .../repr/transparent-imm-array.rs | 2 +- tests/codegen-llvm/repr/transparent-mips64.rs | 2 +- .../repr/transparent-opaque-ptr.rs | 2 +- .../codegen-llvm/repr/transparent-sparc64.rs | 2 +- tests/codegen-llvm/repr/transparent-sysv64.rs | 2 +- tests/codegen-llvm/retpoline.rs | 2 +- .../riscv-abi/cast-local-large-enough.rs | 2 +- .../riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs | 2 +- .../riscv-abi/riscv64-lp64d-abi.rs | 2 +- .../riscv-abi/riscv64-lp64f-lp64d-abi.rs | 2 +- tests/codegen-llvm/riscv-target-abi.rs | 2 +- .../rust-abi-arch-specific-adjustment.rs | 2 +- tests/codegen-llvm/s390x-simd.rs | 2 +- ...arch64-shadow-call-stack-with-fixed-x18.rs | 2 +- .../sanitizer/kasan-emits-instrumentation.rs | 2 +- .../kcfi/add-cfi-normalize-integers-flag.rs | 2 +- .../sanitizer/kcfi/add-kcfi-arity-flag.rs | 2 +- .../sanitizer/kcfi/add-kcfi-flag.rs | 2 +- .../sanitizer/kcfi/add-kcfi-offset-flag.rs | 2 +- ...t-kcfi-operand-bundle-attr-sanitize-off.rs | 2 +- ...rand-bundle-itanium-cxx-abi-generalized.rs | 2 +- ...-itanium-cxx-abi-normalized-generalized.rs | 2 +- ...erand-bundle-itanium-cxx-abi-normalized.rs | 2 +- ...mit-kcfi-operand-bundle-itanium-cxx-abi.rs | 2 +- .../kcfi/emit-kcfi-operand-bundle.rs | 2 +- .../kcfi/emit-type-metadata-trait-objects.rs | 2 +- .../sanitizer/kcfi/fn-ptr-reify-shim.rs | 2 +- .../sanitizer/kcfi/naked-function.rs | 2 +- .../sanitizer/riscv64-shadow-call-stack.rs | 2 +- .../sanitizer/sanitize-off-asan-kasan.rs | 2 +- .../some-abis-do-extend-params-to-32-bits.rs | 2 +- tests/codegen-llvm/sparc-struct-abi.rs | 2 +- tests/codegen-llvm/stack-probes-inline.rs | 2 +- .../target-feature-negative-implication.rs | 2 +- .../codegen-llvm/target-feature-overrides.rs | 2 +- tests/codegen-llvm/tied-features-strength.rs | 2 +- tests/codegen-llvm/transmute-scalar.rs | 2 +- tests/ui/abi/arm-unadjusted-intrinsic.rs | 2 +- tests/ui/abi/c-zst.rs | 2 +- tests/ui/abi/cannot-be-called.rs | 2 +- tests/ui/abi/cannot-be-coroutine.rs | 2 +- tests/ui/abi/compatibility.rs | 2 +- tests/ui/abi/debug.rs | 2 +- tests/ui/abi/interrupt-invalid-signature.rs | 2 +- .../ui/abi/interrupt-returns-never-or-unit.rs | 2 +- .../ui/abi/riscv-discoverability-guidance.rs | 2 +- .../abi/rust-cold-works-with-rustic-args.rs | 2 +- tests/ui/abi/simd-abi-checks-empty-list.rs | 2 +- tests/ui/abi/simd-abi-checks-s390x.rs | 2 +- tests/ui/abi/simd-abi-checks-sse.rs | 2 +- tests/ui/abi/sparcv8plus.rs | 2 +- tests/ui/abi/unsupported.rs | 2 +- tests/ui/abi/vectorcall-abi-checks.rs | 2 +- tests/ui/asm/aarch64/arm64ec-sve.rs | 2 +- tests/ui/asm/arm-low-dreg.rs | 2 +- tests/ui/asm/bad-template.rs | 2 +- tests/ui/asm/inline-syntax.rs | 2 +- tests/ui/asm/issue-85247.rs | 2 +- tests/ui/asm/issue-92378.rs | 2 +- tests/ui/asm/issue-99071.rs | 2 +- tests/ui/asm/loongarch/bad-reg.rs | 2 +- tests/ui/asm/naked-function-shim.rs | 2 +- .../ui/asm/naked-functions-instruction-set.rs | 2 +- tests/ui/asm/powerpc/bad-reg.rs | 2 +- tests/ui/asm/reg-conflict.rs | 2 +- tests/ui/asm/riscv/bad-reg.rs | 2 +- tests/ui/asm/riscv/riscv32e-registers.rs | 2 +- tests/ui/asm/s390x/bad-reg.rs | 2 +- tests/ui/asm/sparc/bad-reg.rs | 2 +- ...ed-types-ICE-when-projecting-out-of-err.rs | 2 +- tests/ui/borrowck/issue-92157.rs | 2 +- tests/ui/c-variadic/unsupported-abi.rs | 2 +- tests/ui/c-variadic/variadic-ffi-1.rs | 2 +- .../crt-static-with-target-features-works.rs | 2 +- tests/ui/check-cfg/values-target-json.rs | 2 +- .../callback-as-argument.rs | 2 +- .../cmse-nonsecure-call/generics.rs | 2 +- .../cmse-nonsecure-call/params-via-stack.rs | 2 +- .../cmse-nonsecure-call/return-via-stack.rs | 4 ++-- .../undeclared-lifetime.rs | 2 +- .../cmse-nonsecure-call/via-registers.rs | 2 +- .../wrong-abi-location-1.rs | 2 +- .../wrong-abi-location-2.rs | 2 +- .../cmse-nonsecure-entry/c-variadic.rs | 2 +- .../cmse-nonsecure-entry/generics.rs | 2 +- .../cmse-nonsecure-entry/params-via-stack.rs | 2 +- .../cmse-nonsecure-entry/return-via-stack.rs | 3 +-- .../return-via-stack.stderr | 18 ++++++++--------- .../cmse-nonsecure-entry/trustzone-only.rs | 2 +- .../cmse-nonsecure-entry/via-registers.rs | 2 +- .../minicore-smoke-test.rs | 2 +- tests/ui/deriving/deriving-with-helper.rs | 2 +- .../feature-gate-abi-avr-interrupt.rs | 2 +- .../feature-gates/feature-gate-abi-custom.rs | 2 +- .../feature-gate-abi-msp430-interrupt.rs | 2 +- .../feature-gate-abi-riscv-interrupt.rs | 2 +- .../feature-gate-abi-x86-interrupt.rs | 2 +- tests/ui/feature-gates/feature-gate-abi.rs | 2 +- .../feature-gate-abi_gpu_kernel.rs | 2 +- .../ui/feature-gates/feature-gate-abi_ptx.rs | 2 +- .../feature-gate-asm_experimental_arch.rs | 2 +- .../feature-gate-asm_experimental_reg.rs | 2 +- .../feature-gates/feature-gate-vectorcall.rs | 2 +- tests/ui/force-inlining/asm.rs | 2 +- tests/ui/layout/hexagon-enum.rs | 2 +- tests/ui/layout/reprc-power-alignment.rs | 2 +- tests/ui/layout/thumb-enum.rs | 2 +- tests/ui/layout/too-big-with-padding.rs | 2 +- .../import-name-type-invalid-format.rs | 2 +- .../windows/import-name-type-multiple.rs | 2 +- .../windows/import-name-type-unknown-value.rs | 2 +- .../import-name-type-unsupported-link-kind.rs | 2 +- .../windows/import-name-type-x86-only.rs | 2 +- .../raw-dylib/windows/unsupported-abi.rs | 2 +- tests/ui/mir/checks_without_panic_impl.rs | 2 +- .../auxiliary/needs-unwind-immediate-abort.rs | 2 +- .../need-abort-got-immediate-abort.rs | 2 +- .../need-immediate-abort-got-abort.rs | 2 +- .../need-immediate-abort-got-unwind.rs | 2 +- .../need-unwind-got-immediate-abort.rs | 2 +- tests/ui/repr/16-bit-repr-c-enum.rs | 2 +- tests/ui/repr/repr-c-dead-variants.rs | 2 +- tests/ui/repr/repr_align_greater_usize.rs | 2 +- tests/ui/sanitizer/cfg-kasan.rs | 2 +- tests/ui/sanitizer/cfg.rs | 2 +- tests/ui/static/static_sized_requirement.rs | 2 +- ...compatible-target-feature-attribute-fcw.rs | 2 +- ...i-incompatible-target-feature-attribute.rs | 2 +- ...incompatible-target-feature-flag-enable.rs | 2 +- ...-irrelevant-target-feature-flag-disable.rs | 2 +- .../abi-required-target-feature-attribute.rs | 2 +- ...bi-required-target-feature-flag-disable.rs | 2 +- tests/ui/target-feature/feature-hierarchy.rs | 2 +- ...-hardfloat-target-feature-attribute-e-d.rs | 2 +- ...dfloat-target-feature-attribute-f-zfinx.rs | 2 +- .../forbidden-hardfloat-target-feature-cfg.rs | 2 +- .../forbidden-target-feature-attribute.rs | 2 +- .../forbidden-target-feature-cfg.rs | 2 +- .../forbidden-target-feature-flag-disable.rs | 2 +- .../forbidden-target-feature-flag.rs | 2 +- tests/ui/target-feature/inline-always.rs | 2 +- tests/ui/target-feature/no-llvm-leaks.rs | 2 +- .../retpoline-target-feature-flag.rs | 2 +- ...arget-cpu-lacks-required-target-feature.rs | 2 +- tests/ui/target-feature/tied-features-cli.rs | 2 +- .../tied-features-no-implication-1.rs | 2 +- .../tied-features-no-implication.rs | 2 +- tests/ui/target-feature/tied-features.rs | 3 +-- tests/ui/target-feature/tied-features.stderr | 6 +++--- 276 files changed, 305 insertions(+), 308 deletions(-) diff --git a/src/doc/rustc-dev-guide/src/tests/minicore.md b/src/doc/rustc-dev-guide/src/tests/minicore.md index 23b772790114..7d71efdd1193 100644 --- a/src/doc/rustc-dev-guide/src/tests/minicore.md +++ b/src/doc/rustc-dev-guide/src/tests/minicore.md @@ -14,21 +14,21 @@ range of tests. -A test can use [`minicore`] by specifying the `//@ add-core-stubs` directive. -Then, mark the test with `#![feature(no_core)]` + `#![no_std]` + `#![no_core]`. -Due to Edition 2015 extern prelude rules, you will probably need to declare -`minicore` as an extern crate. +A test can use [`minicore`] by specifying the `//@ add-minicore` directive. +Then, mark the test with `#![feature(no_core)]` + `#![no_std]` + `#![no_core]`, +and import the crate into the test with `extern crate minicore` (edition 2015) +or `use minicore` (edition 2018+). ## Implied compiler flags -Due to the `no_std` + `no_core` nature of these tests, `//@ add-core-stubs` +Due to the `no_std` + `no_core` nature of these tests, `//@ add-minicore` implies and requires that the test will be built with `-C panic=abort`. **Unwinding panics are not supported.** Tests will also be built with `-C force-unwind-tables=yes` to preserve CFI directives in assembly tests. -TL;DR: `//@ add-core-stubs` implies two compiler flags: +TL;DR: `//@ add-minicore` implies two compiler flags: 1. `-C panic=abort` 2. `-C force-unwind-tables=yes` @@ -48,7 +48,7 @@ attributes (e.g. `on_unimplemented`) should be replicated exactly in `minicore`. ## Example codegen test that uses `minicore` ```rust,no_run -//@ add-core-stubs +//@ add-minicore //@ revisions: meow bark //@[meow] compile-flags: --target=x86_64-unknown-linux-gnu //@[meow] needs-llvm-components: x86 diff --git a/src/tools/compiletest/src/directives.rs b/src/tools/compiletest/src/directives.rs index 5988f59fd92f..6e4ba2b9f32e 100644 --- a/src/tools/compiletest/src/directives.rs +++ b/src/tools/compiletest/src/directives.rs @@ -200,7 +200,7 @@ pub(crate) struct TestProps { pub no_auto_check_cfg: bool, /// Build and use `minicore` as `core` stub for `no_core` tests in cross-compilation scenarios /// that don't otherwise want/need `-Z build-std`. - pub add_core_stubs: bool, + pub add_minicore: bool, /// Add these flags to the build of `minicore`. pub core_stubs_compile_flags: Vec, /// Whether line annotatins are required for the given error kind. @@ -254,7 +254,7 @@ mod directives { pub const LLVM_COV_FLAGS: &'static str = "llvm-cov-flags"; pub const FILECHECK_FLAGS: &'static str = "filecheck-flags"; pub const NO_AUTO_CHECK_CFG: &'static str = "no-auto-check-cfg"; - pub const ADD_CORE_STUBS: &'static str = "add-core-stubs"; + pub const ADD_MINICORE: &'static str = "add-minicore"; pub const CORE_STUBS_COMPILE_FLAGS: &'static str = "core-stubs-compile-flags"; pub const DISABLE_GDB_PRETTY_PRINTERS: &'static str = "disable-gdb-pretty-printers"; pub const COMPARE_OUTPUT_BY_LINES: &'static str = "compare-output-by-lines"; @@ -311,7 +311,7 @@ impl TestProps { llvm_cov_flags: vec![], filecheck_flags: vec![], no_auto_check_cfg: false, - add_core_stubs: false, + add_minicore: false, core_stubs_compile_flags: vec![], dont_require_annotations: Default::default(), disable_gdb_pretty_printers: false, @@ -601,7 +601,7 @@ impl TestProps { config.set_name_directive(ln, NO_AUTO_CHECK_CFG, &mut self.no_auto_check_cfg); - self.update_add_core_stubs(ln, config); + self.update_add_minicore(ln, config); if let Some(flags) = config.parse_name_value_directive(ln, CORE_STUBS_COMPILE_FLAGS) @@ -753,12 +753,12 @@ impl TestProps { self.pass_mode } - fn update_add_core_stubs(&mut self, ln: &DirectiveLine<'_>, config: &Config) { - let add_core_stubs = config.parse_name_directive(ln, directives::ADD_CORE_STUBS); - if add_core_stubs { + fn update_add_minicore(&mut self, ln: &DirectiveLine<'_>, config: &Config) { + let add_minicore = config.parse_name_directive(ln, directives::ADD_MINICORE); + if add_minicore { if !matches!(config.mode, TestMode::Ui | TestMode::Codegen | TestMode::Assembly) { panic!( - "`add-core-stubs` is currently only supported for ui, codegen and assembly test modes" + "`add-minicore` is currently only supported for ui, codegen and assembly test modes" ); } @@ -767,10 +767,10 @@ impl TestProps { if self.local_pass_mode().is_some_and(|pm| pm == PassMode::Run) { // `minicore` can only be used with non-run modes, because it's `core` prelude stubs // and can't run. - panic!("`add-core-stubs` cannot be used to run the test binary"); + panic!("`add-minicore` cannot be used to run the test binary"); } - self.add_core_stubs = add_core_stubs; + self.add_minicore = add_minicore; } } } diff --git a/src/tools/compiletest/src/directives/directive_names.rs b/src/tools/compiletest/src/directives/directive_names.rs index 3a46dbc704e8..ad8eb41ef2a7 100644 --- a/src/tools/compiletest/src/directives/directive_names.rs +++ b/src/tools/compiletest/src/directives/directive_names.rs @@ -3,7 +3,7 @@ /// a best-effort approximation for diagnostics. Add new directives to this list when needed. pub(crate) const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ // tidy-alphabetical-start - "add-core-stubs", + "add-minicore", "assembly-output", "aux-bin", "aux-build", diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 611380a35ae7..8b8031d58574 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1307,7 +1307,7 @@ impl<'test> TestCx<'test> { /// `root_testpaths` refers to the path of the original test. the auxiliary and the test with an /// aux-build have the same `root_testpaths`. fn compose_and_run_compiler(&self, mut rustc: Command, input: Option) -> ProcRes { - if self.props.add_core_stubs { + if self.props.add_minicore { let minicore_path = self.build_minicore(); rustc.arg("--extern"); rustc.arg(&format!("minicore={}", minicore_path)); @@ -1449,7 +1449,7 @@ impl<'test> TestCx<'test> { aux_rustc.arg("-L").arg(&aux_dir); - if aux_props.add_core_stubs { + if aux_props.add_minicore { let minicore_path = self.build_minicore(); aux_rustc.arg("--extern"); aux_rustc.arg(&format!("minicore={}", minicore_path)); @@ -1891,7 +1891,7 @@ impl<'test> TestCx<'test> { // change the default. // // `minicore` requires `#![no_std]` and `#![no_core]`, which means no unwinding panics. - if self.props.add_core_stubs { + if self.props.add_minicore { rustc.arg("-Cpanic=abort"); rustc.arg("-Cforce-unwind-tables=yes"); } diff --git a/tests/assembly-llvm/aarch64-pointer-auth.rs b/tests/assembly-llvm/aarch64-pointer-auth.rs index e1ca6d775813..cf255d6aa639 100644 --- a/tests/assembly-llvm/aarch64-pointer-auth.rs +++ b/tests/assembly-llvm/aarch64-pointer-auth.rs @@ -1,6 +1,6 @@ // Test that PAC instructions are emitted when branch-protection is specified. -//@ add-core-stubs +//@ add-minicore //@ revisions: GCS PACRET PAUTHLR_NOP PAUTHLR //@ assembly-output: emit-asm //@ needs-llvm-components: aarch64 diff --git a/tests/assembly-llvm/asm/aarch64-el2vmsa.rs b/tests/assembly-llvm/asm/aarch64-el2vmsa.rs index 3652d58d85a0..0954f9255ae3 100644 --- a/tests/assembly-llvm/asm/aarch64-el2vmsa.rs +++ b/tests/assembly-llvm/asm/aarch64-el2vmsa.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target aarch64-unknown-linux-gnu //@ needs-llvm-components: aarch64 diff --git a/tests/assembly-llvm/asm/aarch64-modifiers.rs b/tests/assembly-llvm/asm/aarch64-modifiers.rs index 58f7c114d3a6..6cb028461ddd 100644 --- a/tests/assembly-llvm/asm/aarch64-modifiers.rs +++ b/tests/assembly-llvm/asm/aarch64-modifiers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: -Copt-level=3 -C panic=abort //@ compile-flags: --target aarch64-unknown-linux-gnu diff --git a/tests/assembly-llvm/asm/aarch64-types.rs b/tests/assembly-llvm/asm/aarch64-types.rs index b7abeb022986..a304bf8688da 100644 --- a/tests/assembly-llvm/asm/aarch64-types.rs +++ b/tests/assembly-llvm/asm/aarch64-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 arm64ec //@ assembly-output: emit-asm //@ [aarch64] compile-flags: --target aarch64-unknown-linux-gnu diff --git a/tests/assembly-llvm/asm/arm-modifiers.rs b/tests/assembly-llvm/asm/arm-modifiers.rs index 32a368404924..2f090b706ccd 100644 --- a/tests/assembly-llvm/asm/arm-modifiers.rs +++ b/tests/assembly-llvm/asm/arm-modifiers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: -Copt-level=3 -C panic=abort //@ compile-flags: --target armv7-unknown-linux-gnueabihf diff --git a/tests/assembly-llvm/asm/arm-types.rs b/tests/assembly-llvm/asm/arm-types.rs index fb93f474c20e..2022c86ef2e0 100644 --- a/tests/assembly-llvm/asm/arm-types.rs +++ b/tests/assembly-llvm/asm/arm-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: base d32 neon //@ assembly-output: emit-asm //@ compile-flags: --target armv7-unknown-linux-gnueabihf diff --git a/tests/assembly-llvm/asm/avr-modifiers.rs b/tests/assembly-llvm/asm/avr-modifiers.rs index 124cad9bef6a..a65eeeced707 100644 --- a/tests/assembly-llvm/asm/avr-modifiers.rs +++ b/tests/assembly-llvm/asm/avr-modifiers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target avr-none -C target-cpu=atmega328p //@ needs-llvm-components: avr diff --git a/tests/assembly-llvm/asm/avr-types.rs b/tests/assembly-llvm/asm/avr-types.rs index 309405f4d51e..29a937b58e9e 100644 --- a/tests/assembly-llvm/asm/avr-types.rs +++ b/tests/assembly-llvm/asm/avr-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target avr-none -C target-cpu=atmega328p //@ needs-llvm-components: avr diff --git a/tests/assembly-llvm/asm/bpf-types.rs b/tests/assembly-llvm/asm/bpf-types.rs index 07ea7bd5ce05..4b1e6de0e08b 100644 --- a/tests/assembly-llvm/asm/bpf-types.rs +++ b/tests/assembly-llvm/asm/bpf-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target bpfel-unknown-none -C target_feature=+alu32 //@ needs-llvm-components: bpf diff --git a/tests/assembly-llvm/asm/hexagon-types.rs b/tests/assembly-llvm/asm/hexagon-types.rs index ce80fa75b359..fb66d777b677 100644 --- a/tests/assembly-llvm/asm/hexagon-types.rs +++ b/tests/assembly-llvm/asm/hexagon-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target hexagon-unknown-linux-musl //@ compile-flags: -Zmerge-functions=disabled diff --git a/tests/assembly-llvm/asm/loongarch-type.rs b/tests/assembly-llvm/asm/loongarch-type.rs index 95d811a6bd0a..e0a7940f89a3 100644 --- a/tests/assembly-llvm/asm/loongarch-type.rs +++ b/tests/assembly-llvm/asm/loongarch-type.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: loongarch32 loongarch64 //@ assembly-output: emit-asm diff --git a/tests/assembly-llvm/asm/m68k-types.rs b/tests/assembly-llvm/asm/m68k-types.rs index 9e4f6d9a1a9d..c9b269f544d6 100644 --- a/tests/assembly-llvm/asm/m68k-types.rs +++ b/tests/assembly-llvm/asm/m68k-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target m68k-unknown-linux-gnu //@ needs-llvm-components: m68k diff --git a/tests/assembly-llvm/asm/mips-types.rs b/tests/assembly-llvm/asm/mips-types.rs index 1dd345ff8fe0..51fe8124dc2a 100644 --- a/tests/assembly-llvm/asm/mips-types.rs +++ b/tests/assembly-llvm/asm/mips-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: mips32 mips64 //@ assembly-output: emit-asm //@[mips32] compile-flags: --target mips-unknown-linux-gnu diff --git a/tests/assembly-llvm/asm/msp430-types.rs b/tests/assembly-llvm/asm/msp430-types.rs index 442dc77999f5..c5a41f4cf3c3 100644 --- a/tests/assembly-llvm/asm/msp430-types.rs +++ b/tests/assembly-llvm/asm/msp430-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target msp430-none-elf //@ needs-llvm-components: msp430 diff --git a/tests/assembly-llvm/asm/nvptx-types.rs b/tests/assembly-llvm/asm/nvptx-types.rs index 7e8ebd03024e..1cb176cf5148 100644 --- a/tests/assembly-llvm/asm/nvptx-types.rs +++ b/tests/assembly-llvm/asm/nvptx-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target nvptx64-nvidia-cuda //@ needs-llvm-components: nvptx diff --git a/tests/assembly-llvm/asm/powerpc-types.rs b/tests/assembly-llvm/asm/powerpc-types.rs index c3a0fc4cfa97..076b216d019e 100644 --- a/tests/assembly-llvm/asm/powerpc-types.rs +++ b/tests/assembly-llvm/asm/powerpc-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: powerpc powerpc_altivec powerpc_vsx powerpc64 powerpc64_vsx //@ assembly-output: emit-asm //@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu diff --git a/tests/assembly-llvm/asm/riscv-types.rs b/tests/assembly-llvm/asm/riscv-types.rs index 724aa154da8c..3ebfbaee4319 100644 --- a/tests/assembly-llvm/asm/riscv-types.rs +++ b/tests/assembly-llvm/asm/riscv-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: riscv64 riscv32 riscv64-zfhmin riscv32-zfhmin riscv64-zfh riscv32-zfh //@ assembly-output: emit-asm diff --git a/tests/assembly-llvm/asm/s390x-types.rs b/tests/assembly-llvm/asm/s390x-types.rs index e6fe38ecb0df..24db91bf7772 100644 --- a/tests/assembly-llvm/asm/s390x-types.rs +++ b/tests/assembly-llvm/asm/s390x-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: s390x s390x_vector //@ assembly-output: emit-asm //@[s390x] compile-flags: --target s390x-unknown-linux-gnu diff --git a/tests/assembly-llvm/asm/sparc-types.rs b/tests/assembly-llvm/asm/sparc-types.rs index 49cc377cd952..3eb3528991ef 100644 --- a/tests/assembly-llvm/asm/sparc-types.rs +++ b/tests/assembly-llvm/asm/sparc-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: sparc sparcv8plus sparc64 //@ assembly-output: emit-asm //@[sparc] compile-flags: --target sparc-unknown-none-elf diff --git a/tests/assembly-llvm/asm/wasm-types.rs b/tests/assembly-llvm/asm/wasm-types.rs index 78e555c53173..b00a84acf50c 100644 --- a/tests/assembly-llvm/asm/wasm-types.rs +++ b/tests/assembly-llvm/asm/wasm-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target wasm32-unknown-unknown //@ needs-llvm-components: webassembly diff --git a/tests/assembly-llvm/asm/x86-modifiers.rs b/tests/assembly-llvm/asm/x86-modifiers.rs index 5f68e5c7317f..3d939a61a2a5 100644 --- a/tests/assembly-llvm/asm/x86-modifiers.rs +++ b/tests/assembly-llvm/asm/x86-modifiers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86_64 i686 //@ assembly-output: emit-asm //@ compile-flags: -Copt-level=3 -C panic=abort diff --git a/tests/assembly-llvm/asm/x86-types.rs b/tests/assembly-llvm/asm/x86-types.rs index 6120ed0d5327..9fe7ea00bd93 100644 --- a/tests/assembly-llvm/asm/x86-types.rs +++ b/tests/assembly-llvm/asm/x86-types.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86_64 i686 //@ assembly-output: emit-asm //@[x86_64] compile-flags: --target x86_64-unknown-linux-gnu diff --git a/tests/assembly-llvm/cmse.rs b/tests/assembly-llvm/cmse.rs index a68ee99eac67..e66e6e7c69e9 100644 --- a/tests/assembly-llvm/cmse.rs +++ b/tests/assembly-llvm/cmse.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: hard soft //@ assembly-output: emit-asm //@ [hard] compile-flags: --target thumbv8m.main-none-eabihf --crate-type lib -Copt-level=1 diff --git a/tests/assembly-llvm/compiletest-self-test/use-minicore-no-run.rs b/tests/assembly-llvm/compiletest-self-test/use-minicore-no-run.rs index 0e4f05c4b374..8c59457754cd 100644 --- a/tests/assembly-llvm/compiletest-self-test/use-minicore-no-run.rs +++ b/tests/assembly-llvm/compiletest-self-test/use-minicore-no-run.rs @@ -1,5 +1,5 @@ -//! `compiletest` self-test to check that `add-core-stubs` is incompatible with run pass modes. +//! `compiletest` self-test to check that `add-minicore` is incompatible with run pass modes. -//@ add-core-stubs +//@ add-minicore //@ run-pass //@ should-fail diff --git a/tests/assembly-llvm/dwarf4.rs b/tests/assembly-llvm/dwarf4.rs index 03a388603b44..5ec56c056500 100644 --- a/tests/assembly-llvm/dwarf4.rs +++ b/tests/assembly-llvm/dwarf4.rs @@ -1,6 +1,6 @@ // Makes sure that `-C dwarf-version=4` causes `rustc` to emit DWARF version 4. //@ assembly-output: emit-asm -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -g --target x86_64-unknown-linux-gnu -C dwarf-version=4 -Copt-level=0 //@ needs-llvm-components: x86 diff --git a/tests/assembly-llvm/dwarf5.rs b/tests/assembly-llvm/dwarf5.rs index 9bd92cc0d097..240ea4cb6c56 100644 --- a/tests/assembly-llvm/dwarf5.rs +++ b/tests/assembly-llvm/dwarf5.rs @@ -1,5 +1,5 @@ // Makes sure that `-C dwarf-version=5` causes `rustc` to emit DWARF version 5. -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: -g --target x86_64-unknown-linux-gnu -C dwarf-version=5 -Copt-level=0 //@ needs-llvm-components: x86 diff --git a/tests/assembly-llvm/loongarch-float-struct-abi.rs b/tests/assembly-llvm/loongarch-float-struct-abi.rs index 4991004fc05a..605c3724a1e6 100644 --- a/tests/assembly-llvm/loongarch-float-struct-abi.rs +++ b/tests/assembly-llvm/loongarch-float-struct-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: -Copt-level=3 --target loongarch64-unknown-linux-gnu //@ needs-llvm-components: loongarch diff --git a/tests/assembly-llvm/naked-functions/aix.rs b/tests/assembly-llvm/naked-functions/aix.rs index 57ff0e183bed..3cc84fa0c9c6 100644 --- a/tests/assembly-llvm/naked-functions/aix.rs +++ b/tests/assembly-llvm/naked-functions/aix.rs @@ -1,5 +1,5 @@ //@ revisions: elfv1-be aix -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm // //@[elfv1-be] compile-flags: --target powerpc64-unknown-linux-gnu diff --git a/tests/assembly-llvm/naked-functions/wasm32.rs b/tests/assembly-llvm/naked-functions/wasm32.rs index 4bf04dd39234..e2a2ab94c8a3 100644 --- a/tests/assembly-llvm/naked-functions/wasm32.rs +++ b/tests/assembly-llvm/naked-functions/wasm32.rs @@ -1,5 +1,5 @@ //@ revisions: wasm32-unknown wasm64-unknown wasm32-wasip1 -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ [wasm32-unknown] compile-flags: --target wasm32-unknown-unknown //@ [wasm64-unknown] compile-flags: --target wasm64-unknown-unknown diff --git a/tests/assembly-llvm/pic-relocation-model.rs b/tests/assembly-llvm/pic-relocation-model.rs index 15a8723f756e..e2406478b7c9 100644 --- a/tests/assembly-llvm/pic-relocation-model.rs +++ b/tests/assembly-llvm/pic-relocation-model.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x64 //@ assembly-output: emit-asm //@ [x64] compile-flags: --target x86_64-unknown-linux-gnu -Crelocation-model=pic diff --git a/tests/assembly-llvm/pie-relocation-model.rs b/tests/assembly-llvm/pie-relocation-model.rs index cbe0001041ef..eba6cb0e611c 100644 --- a/tests/assembly-llvm/pie-relocation-model.rs +++ b/tests/assembly-llvm/pie-relocation-model.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x64 //@ assembly-output: emit-asm //@ [x64] compile-flags: --target x86_64-unknown-linux-gnu -Crelocation-model=pie diff --git a/tests/assembly-llvm/powerpc64-struct-abi.rs b/tests/assembly-llvm/powerpc64-struct-abi.rs index ee4965deb4fd..aeec46c7c513 100644 --- a/tests/assembly-llvm/powerpc64-struct-abi.rs +++ b/tests/assembly-llvm/powerpc64-struct-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: elfv1-be elfv2-be elfv2-le aix //@ assembly-output: emit-asm //@ compile-flags: -Copt-level=3 diff --git a/tests/assembly-llvm/reg-struct-return.rs b/tests/assembly-llvm/reg-struct-return.rs index b251d791d513..d364954abe30 100644 --- a/tests/assembly-llvm/reg-struct-return.rs +++ b/tests/assembly-llvm/reg-struct-return.rs @@ -5,7 +5,7 @@ //! `-Zreg-struct-return` is activated //! * Caller side, verifying callers do receive returned structs in registers when //! `-Zreg-struct-return` is activated -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: -O --target=i686-unknown-linux-gnu -Crelocation-model=static //@ revisions: WITH WITHOUT diff --git a/tests/assembly-llvm/regparm-module-flag.rs b/tests/assembly-llvm/regparm-module-flag.rs index 67ef44285eac..4a08bfdf85e5 100644 --- a/tests/assembly-llvm/regparm-module-flag.rs +++ b/tests/assembly-llvm/regparm-module-flag.rs @@ -1,6 +1,6 @@ // Test the regparm ABI with builtin and non-builtin calls // Issue: https://github.com/rust-lang/rust/issues/145271 -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: -O --target=i686-unknown-linux-gnu -Crelocation-model=static //@ revisions: REGPARM1 REGPARM2 REGPARM3 diff --git a/tests/assembly-llvm/riscv-float-struct-abi.rs b/tests/assembly-llvm/riscv-float-struct-abi.rs index 5d9ac9d70b83..9a2a2fe24315 100644 --- a/tests/assembly-llvm/riscv-float-struct-abi.rs +++ b/tests/assembly-llvm/riscv-float-struct-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: -Copt-level=3 --target riscv64gc-unknown-linux-gnu //@ needs-llvm-components: riscv diff --git a/tests/assembly-llvm/riscv-soft-abi-with-float-features.rs b/tests/assembly-llvm/riscv-soft-abi-with-float-features.rs index 085ea9facd06..4ee68f241eeb 100644 --- a/tests/assembly-llvm/riscv-soft-abi-with-float-features.rs +++ b/tests/assembly-llvm/riscv-soft-abi-with-float-features.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target riscv64imac-unknown-none-elf -Ctarget-feature=+f,+d //@ needs-llvm-components: riscv diff --git a/tests/assembly-llvm/s390x-backchain-toggle.rs b/tests/assembly-llvm/s390x-backchain-toggle.rs index 9bae15b7d11b..baf710472783 100644 --- a/tests/assembly-llvm/s390x-backchain-toggle.rs +++ b/tests/assembly-llvm/s390x-backchain-toggle.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: enable-backchain disable-backchain default-backchain //@ assembly-output: emit-asm //@ compile-flags: -Copt-level=3 --crate-type=lib --target=s390x-unknown-linux-gnu diff --git a/tests/assembly-llvm/s390x-vector-abi.rs b/tests/assembly-llvm/s390x-vector-abi.rs index c9c3266a18fa..9635bb6cb440 100644 --- a/tests/assembly-llvm/s390x-vector-abi.rs +++ b/tests/assembly-llvm/s390x-vector-abi.rs @@ -1,5 +1,5 @@ //@ revisions: z10 z10_vector z13 z13_no_vector -//@ add-core-stubs +//@ add-minicore // ignore-tidy-linelength //@ assembly-output: emit-asm //@ compile-flags: -Copt-level=3 -Z merge-functions=disabled diff --git a/tests/assembly-llvm/sanitizer/kcfi/emit-arity-indicator.rs b/tests/assembly-llvm/sanitizer/kcfi/emit-arity-indicator.rs index f9966a234469..63fe7e2bd536 100644 --- a/tests/assembly-llvm/sanitizer/kcfi/emit-arity-indicator.rs +++ b/tests/assembly-llvm/sanitizer/kcfi/emit-arity-indicator.rs @@ -1,6 +1,6 @@ // Verifies that KCFI arity indicator is emitted. // -//@ add-core-stubs +//@ add-minicore //@ revisions: x86_64 //@ assembly-output: emit-asm //@[x86_64] compile-flags: --target x86_64-unknown-linux-gnu -Cllvm-args=-x86-asm-syntax=intel -Ctarget-feature=-crt-static -Cpanic=abort -Zsanitizer=kcfi -Zsanitizer-kcfi-arity -Copt-level=0 diff --git a/tests/assembly-llvm/simd-bitmask.rs b/tests/assembly-llvm/simd-bitmask.rs index d3e20f6ae1a8..115d76e8ba92 100644 --- a/tests/assembly-llvm/simd-bitmask.rs +++ b/tests/assembly-llvm/simd-bitmask.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86 x86-avx2 x86-avx512 aarch64 //@ [x86] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel //@ [x86] needs-llvm-components: x86 diff --git a/tests/assembly-llvm/simd-intrinsic-gather.rs b/tests/assembly-llvm/simd-intrinsic-gather.rs index bcab0ba1cc09..788b8af52f62 100644 --- a/tests/assembly-llvm/simd-intrinsic-gather.rs +++ b/tests/assembly-llvm/simd-intrinsic-gather.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86-avx512 //@ [x86-avx512] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel //@ [x86-avx512] compile-flags: -C target-feature=+avx512f,+avx512vl,+avx512bw,+avx512dq diff --git a/tests/assembly-llvm/simd-intrinsic-mask-load.rs b/tests/assembly-llvm/simd-intrinsic-mask-load.rs index d3f3453a780a..e9ad554ae987 100644 --- a/tests/assembly-llvm/simd-intrinsic-mask-load.rs +++ b/tests/assembly-llvm/simd-intrinsic-mask-load.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86-avx2 x86-avx512 //@ [x86-avx2] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel //@ [x86-avx2] compile-flags: -C target-feature=+avx2 diff --git a/tests/assembly-llvm/simd-intrinsic-mask-reduce.rs b/tests/assembly-llvm/simd-intrinsic-mask-reduce.rs index 8b15ed0a254c..40d16886c6d7 100644 --- a/tests/assembly-llvm/simd-intrinsic-mask-reduce.rs +++ b/tests/assembly-llvm/simd-intrinsic-mask-reduce.rs @@ -1,5 +1,5 @@ // verify that simd mask reductions do not introduce additional bit shift operations -//@ add-core-stubs +//@ add-minicore //@ revisions: x86 aarch64 //@ [x86] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel // Set the base cpu explicitly, in case the default has been changed. diff --git a/tests/assembly-llvm/simd-intrinsic-mask-store.rs b/tests/assembly-llvm/simd-intrinsic-mask-store.rs index 001762e5060d..b8b76b618231 100644 --- a/tests/assembly-llvm/simd-intrinsic-mask-store.rs +++ b/tests/assembly-llvm/simd-intrinsic-mask-store.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86-avx2 x86-avx512 //@ [x86-avx2] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel //@ [x86-avx2] compile-flags: -C target-feature=+avx2 diff --git a/tests/assembly-llvm/simd-intrinsic-scatter.rs b/tests/assembly-llvm/simd-intrinsic-scatter.rs index d77dfad3546d..48fabba1ec38 100644 --- a/tests/assembly-llvm/simd-intrinsic-scatter.rs +++ b/tests/assembly-llvm/simd-intrinsic-scatter.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86-avx512 //@ [x86-avx512] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel //@ [x86-avx512] compile-flags: -C target-feature=+avx512f,+avx512vl,+avx512bw,+avx512dq diff --git a/tests/assembly-llvm/simd-intrinsic-select.rs b/tests/assembly-llvm/simd-intrinsic-select.rs index e7c7b0db0d5e..84ae6568b742 100644 --- a/tests/assembly-llvm/simd-intrinsic-select.rs +++ b/tests/assembly-llvm/simd-intrinsic-select.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86-avx2 x86-avx512 aarch64 //@ [x86-avx2] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel //@ [x86-avx2] compile-flags: -C target-feature=+avx2 diff --git a/tests/assembly-llvm/sparc-struct-abi.rs b/tests/assembly-llvm/sparc-struct-abi.rs index b1594428811f..c6e83b6f8dab 100644 --- a/tests/assembly-llvm/sparc-struct-abi.rs +++ b/tests/assembly-llvm/sparc-struct-abi.rs @@ -2,7 +2,7 @@ // - float structure members are passes in floating point registers // (#86163) -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ needs-llvm-components: sparc //@ compile-flags: --target=sparcv9-sun-solaris -Copt-level=3 diff --git a/tests/assembly-llvm/stack-probes.rs b/tests/assembly-llvm/stack-probes.rs index de245431f470..f2d43d0eea67 100644 --- a/tests/assembly-llvm/stack-probes.rs +++ b/tests/assembly-llvm/stack-probes.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86_64 i686 aarch64 //@ assembly-output: emit-asm //@[x86_64] compile-flags: --target x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel diff --git a/tests/assembly-llvm/stack-protector/stack-protector-target-support.rs b/tests/assembly-llvm/stack-protector/stack-protector-target-support.rs index a937256a60f8..0218fe0a52f8 100644 --- a/tests/assembly-llvm/stack-protector/stack-protector-target-support.rs +++ b/tests/assembly-llvm/stack-protector/stack-protector-target-support.rs @@ -1,7 +1,7 @@ // Test that stack smash protection code is emitted for all tier1 and tier2 // targets, with the exception of nvptx64-nvidia-cuda // -//@ add-core-stubs +//@ add-minicore //@ revisions: r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18 r19 r20 r21 r22 r23 //@ revisions: r24 r25 r26 r27 r28 r29 r30 r31 r32 r33 r36 r37 r38 r39 r40 r41 r42 r43 r44 //@ revisions: r45 r46 r47 r48 r49 r50 r51 r52 r53 r54 r55 r56 r57 r58 r59 r60 r61 r62 r63 r64 r65 diff --git a/tests/assembly-llvm/static-relocation-model.rs b/tests/assembly-llvm/static-relocation-model.rs index 35ad94133b2c..a47681f4532a 100644 --- a/tests/assembly-llvm/static-relocation-model.rs +++ b/tests/assembly-llvm/static-relocation-model.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x64 A64 ppc64le //@ assembly-output: emit-asm //@ [x64] compile-flags: --target x86_64-unknown-linux-gnu -Crelocation-model=static diff --git a/tests/assembly-llvm/target-feature-multiple.rs b/tests/assembly-llvm/target-feature-multiple.rs index 9a941c52bdac..f136a39900e3 100644 --- a/tests/assembly-llvm/target-feature-multiple.rs +++ b/tests/assembly-llvm/target-feature-multiple.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ needs-llvm-components: x86 //@ revisions: TWOFLAGS SINGLEFLAG diff --git a/tests/assembly-llvm/targets/targets-amdgpu.rs b/tests/assembly-llvm/targets/targets-amdgpu.rs index 1d10b8fc315c..69a90ff70bee 100644 --- a/tests/assembly-llvm/targets/targets-amdgpu.rs +++ b/tests/assembly-llvm/targets/targets-amdgpu.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm // ignore-tidy-linelength //@ revisions: amdgcn_amd_amdhsa diff --git a/tests/assembly-llvm/targets/targets-elf.rs b/tests/assembly-llvm/targets/targets-elf.rs index d2f22fd8d1a5..4ca46013b574 100644 --- a/tests/assembly-llvm/targets/targets-elf.rs +++ b/tests/assembly-llvm/targets/targets-elf.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm // ignore-tidy-linelength //@ revisions: aarch64_be_unknown_hermit diff --git a/tests/assembly-llvm/targets/targets-macho.rs b/tests/assembly-llvm/targets/targets-macho.rs index 92bde1c6971b..037f3c009361 100644 --- a/tests/assembly-llvm/targets/targets-macho.rs +++ b/tests/assembly-llvm/targets/targets-macho.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm // ignore-tidy-linelength //@ revisions: aarch64_apple_darwin diff --git a/tests/assembly-llvm/targets/targets-nvptx.rs b/tests/assembly-llvm/targets/targets-nvptx.rs index 49c12aebaaaf..69d576de696c 100644 --- a/tests/assembly-llvm/targets/targets-nvptx.rs +++ b/tests/assembly-llvm/targets/targets-nvptx.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm // ignore-tidy-linelength //@ revisions: nvptx64_nvidia_cuda diff --git a/tests/assembly-llvm/targets/targets-pe.rs b/tests/assembly-llvm/targets/targets-pe.rs index de29b9af5020..2f4472ac74d9 100644 --- a/tests/assembly-llvm/targets/targets-pe.rs +++ b/tests/assembly-llvm/targets/targets-pe.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm // ignore-tidy-linelength //@ revisions: aarch64_pc_windows_msvc diff --git a/tests/assembly-llvm/x86-return-float.rs b/tests/assembly-llvm/x86-return-float.rs index 1b283c2759b3..6fe5898f2b65 100644 --- a/tests/assembly-llvm/x86-return-float.rs +++ b/tests/assembly-llvm/x86-return-float.rs @@ -7,7 +7,7 @@ //@ compile-flags: -Copt-level=2 //@ filecheck-flags: --implicit-check-not fld --implicit-check-not fst //@ revisions: linux win -//@ add-core-stubs +//@ add-minicore //@[linux] needs-llvm-components: x86 //@[win] needs-llvm-components: x86 //@[linux] compile-flags: --target i686-unknown-linux-gnu diff --git a/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs b/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs index 2892ff2882a7..b418c7adb2da 100644 --- a/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs +++ b/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-generic-load.rs @@ -1,6 +1,6 @@ // Test LVI load hardening on SGX enclave code, specifically that `ret` is rewritten. -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target x86_64-fortanix-unknown-sgx -Copt-level=0 //@ needs-llvm-components: x86 diff --git a/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs b/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs index a0cedc3bc2da..2749bd5b2a82 100644 --- a/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs +++ b/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-generic-ret.rs @@ -1,6 +1,6 @@ // Test LVI ret hardening on generic rust code -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target x86_64-fortanix-unknown-sgx //@ needs-llvm-components: x86 diff --git a/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs b/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs index 215fb4b804ac..9521cf898c9c 100644 --- a/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs +++ b/tests/assembly-llvm/x86_64-fortanix-unknown-sgx-lvi-inline-assembly.rs @@ -1,6 +1,6 @@ // Test LVI load hardening on SGX inline assembly code -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target x86_64-fortanix-unknown-sgx //@ needs-llvm-components: x86 diff --git a/tests/assembly-llvm/x86_64-windows-float-abi.rs b/tests/assembly-llvm/x86_64-windows-float-abi.rs index cbc809108511..8f5cc1e94486 100644 --- a/tests/assembly-llvm/x86_64-windows-float-abi.rs +++ b/tests/assembly-llvm/x86_64-windows-float-abi.rs @@ -2,7 +2,7 @@ //@ compile-flags: -Copt-level=3 //@ compile-flags: --target x86_64-pc-windows-msvc //@ needs-llvm-components: x86 -//@ add-core-stubs +//@ add-minicore #![feature(f16, f128)] #![feature(no_core)] diff --git a/tests/assembly-llvm/x86_64-windows-i128-abi.rs b/tests/assembly-llvm/x86_64-windows-i128-abi.rs index d2aefb7daa64..d24496dd5ab4 100644 --- a/tests/assembly-llvm/x86_64-windows-i128-abi.rs +++ b/tests/assembly-llvm/x86_64-windows-i128-abi.rs @@ -1,5 +1,5 @@ //@ assembly-output: emit-asm -//@ add-core-stubs +//@ add-minicore //@ revisions: msvc softfloat //@ compile-flags: -Copt-level=3 //@[msvc] compile-flags: --target x86_64-pc-windows-msvc diff --git a/tests/codegen-llvm/aarch64-softfloat.rs b/tests/codegen-llvm/aarch64-softfloat.rs index 4f5366e047fb..aba8b1de91ca 100644 --- a/tests/codegen-llvm/aarch64-softfloat.rs +++ b/tests/codegen-llvm/aarch64-softfloat.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target aarch64-unknown-none-softfloat -Zmerge-functions=disabled //@ needs-llvm-components: aarch64 #![crate_type = "lib"] diff --git a/tests/codegen-llvm/aarch64-struct-align-128.rs b/tests/codegen-llvm/aarch64-struct-align-128.rs index ba1d19680f4e..7e2941217e9f 100644 --- a/tests/codegen-llvm/aarch64-struct-align-128.rs +++ b/tests/codegen-llvm/aarch64-struct-align-128.rs @@ -1,6 +1,6 @@ // Test that structs aligned to 128 bits are passed with the correct ABI on aarch64. -//@ add-core-stubs +//@ add-minicore //@ revisions: linux darwin win //@[linux] compile-flags: --target aarch64-unknown-linux-gnu //@[darwin] compile-flags: --target aarch64-apple-darwin diff --git a/tests/codegen-llvm/abi-efiapi.rs b/tests/codegen-llvm/abi-efiapi.rs index 4cd645101a8b..8dec8089096a 100644 --- a/tests/codegen-llvm/abi-efiapi.rs +++ b/tests/codegen-llvm/abi-efiapi.rs @@ -1,6 +1,6 @@ // Checks if the correct annotation for the efiapi ABI is passed to llvm. -//@ add-core-stubs +//@ add-minicore //@ revisions:x86_64 i686 aarch64 arm riscv //@[x86_64] compile-flags: --target x86_64-unknown-uefi //@[x86_64] needs-llvm-components: x86 diff --git a/tests/codegen-llvm/abi-repr-ext.rs b/tests/codegen-llvm/abi-repr-ext.rs index 1da28a94d9dd..05ba4284b7a6 100644 --- a/tests/codegen-llvm/abi-repr-ext.rs +++ b/tests/codegen-llvm/abi-repr-ext.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 //@ revisions:x86_64 i686 aarch64-apple aarch64-windows aarch64-linux arm riscv diff --git a/tests/codegen-llvm/abi-sysv64.rs b/tests/codegen-llvm/abi-sysv64.rs index 7ade17f2baec..dff743905050 100644 --- a/tests/codegen-llvm/abi-sysv64.rs +++ b/tests/codegen-llvm/abi-sysv64.rs @@ -2,7 +2,7 @@ // llvm. Also checks that the abi-sysv64 feature gate allows usage // of the sysv64 abi. // -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: x86 //@ compile-flags: -C no-prepopulate-passes --target=x86_64-unknown-linux-gnu -Copt-level=0 diff --git a/tests/codegen-llvm/abi-win64-zst.rs b/tests/codegen-llvm/abi-win64-zst.rs index e46f9666d42e..e855b60ca4d2 100644 --- a/tests/codegen-llvm/abi-win64-zst.rs +++ b/tests/codegen-llvm/abi-win64-zst.rs @@ -1,6 +1,5 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Z merge-functions=disabled -//@ add-core-stubs //@ revisions: windows-gnu //@[windows-gnu] compile-flags: --target x86_64-pc-windows-gnu diff --git a/tests/codegen-llvm/abi-x86-interrupt.rs b/tests/codegen-llvm/abi-x86-interrupt.rs index b5c495803d89..14dfc1b2a6b9 100644 --- a/tests/codegen-llvm/abi-x86-interrupt.rs +++ b/tests/codegen-llvm/abi-x86-interrupt.rs @@ -2,7 +2,7 @@ // llvm. Also checks that the abi_x86_interrupt feature gate allows usage // of the x86-interrupt abi. -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: x86 //@ compile-flags: -C no-prepopulate-passes --target=x86_64-unknown-linux-gnu -Copt-level=0 diff --git a/tests/codegen-llvm/align-byval-alignment-mismatch.rs b/tests/codegen-llvm/align-byval-alignment-mismatch.rs index 8eaf2751ed78..ad181a422907 100644 --- a/tests/codegen-llvm/align-byval-alignment-mismatch.rs +++ b/tests/codegen-llvm/align-byval-alignment-mismatch.rs @@ -1,5 +1,5 @@ // ignore-tidy-linelength -//@ add-core-stubs +//@ add-minicore //@ revisions:i686-linux x86_64-linux //@ compile-flags: -Cno-prepopulate-passes -Copt-level=1 -Cpanic=abort diff --git a/tests/codegen-llvm/align-byval-vector.rs b/tests/codegen-llvm/align-byval-vector.rs index c33b41a7bbee..6c478c58da0a 100644 --- a/tests/codegen-llvm/align-byval-vector.rs +++ b/tests/codegen-llvm/align-byval-vector.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions:x86-linux x86-darwin //@[x86-linux] compile-flags: --target i686-unknown-linux-gnu diff --git a/tests/codegen-llvm/align-byval.rs b/tests/codegen-llvm/align-byval.rs index 75dabd74a79c..2d6fc0d1e78d 100644 --- a/tests/codegen-llvm/align-byval.rs +++ b/tests/codegen-llvm/align-byval.rs @@ -1,5 +1,5 @@ // ignore-tidy-linelength -//@ add-core-stubs +//@ add-minicore //@ revisions:m68k x86_64-linux x86_64-windows i686-linux i686-windows //@[m68k] compile-flags: --target m68k-unknown-linux-gnu diff --git a/tests/codegen-llvm/amdgpu-addrspacecast.rs b/tests/codegen-llvm/amdgpu-addrspacecast.rs index 829133de00d8..16a0c276ac0e 100644 --- a/tests/codegen-llvm/amdgpu-addrspacecast.rs +++ b/tests/codegen-llvm/amdgpu-addrspacecast.rs @@ -2,7 +2,7 @@ //@ compile-flags: --crate-type=rlib --target=amdgcn-amd-amdhsa -Ctarget-cpu=gfx900 //@ needs-llvm-components: amdgpu -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] diff --git a/tests/codegen-llvm/asm/aarch64-clobbers.rs b/tests/codegen-llvm/asm/aarch64-clobbers.rs index dd3ba1510b5b..e86956cb4797 100644 --- a/tests/codegen-llvm/asm/aarch64-clobbers.rs +++ b/tests/codegen-llvm/asm/aarch64-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 aarch64_fixed_x18 aarch64_no_x18 aarch64_reserve_x18 arm64ec //@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu //@[aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/asm/avr-clobbers.rs b/tests/codegen-llvm/asm/avr-clobbers.rs index 9451127bf04a..472ee328465b 100644 --- a/tests/codegen-llvm/asm/avr-clobbers.rs +++ b/tests/codegen-llvm/asm/avr-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target avr-none -C target-cpu=atmega328p //@ needs-llvm-components: avr diff --git a/tests/codegen-llvm/asm/bpf-clobbers.rs b/tests/codegen-llvm/asm/bpf-clobbers.rs index 1117549b1ec3..dd4ad04e778d 100644 --- a/tests/codegen-llvm/asm/bpf-clobbers.rs +++ b/tests/codegen-llvm/asm/bpf-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target bpfel-unknown-none //@ needs-llvm-components: bpf diff --git a/tests/codegen-llvm/asm/csky-clobbers.rs b/tests/codegen-llvm/asm/csky-clobbers.rs index 4986d0fe56df..12c171a5de09 100644 --- a/tests/codegen-llvm/asm/csky-clobbers.rs +++ b/tests/codegen-llvm/asm/csky-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target csky-unknown-linux-gnuabiv2 //@ needs-llvm-components: csky diff --git a/tests/codegen-llvm/asm/hexagon-clobbers.rs b/tests/codegen-llvm/asm/hexagon-clobbers.rs index 800b8964669c..ddc3b1e7fbb1 100644 --- a/tests/codegen-llvm/asm/hexagon-clobbers.rs +++ b/tests/codegen-llvm/asm/hexagon-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: hexagon //@[hexagon] compile-flags: --target hexagon-unknown-linux-musl //@[hexagon] needs-llvm-components: hexagon diff --git a/tests/codegen-llvm/asm/msp430-clobbers.rs b/tests/codegen-llvm/asm/msp430-clobbers.rs index 2c8d29cffc4b..52808821dcea 100644 --- a/tests/codegen-llvm/asm/msp430-clobbers.rs +++ b/tests/codegen-llvm/asm/msp430-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ compile-flags: --target msp430-none-elf //@ needs-llvm-components: msp430 diff --git a/tests/codegen-llvm/asm/powerpc-clobbers.rs b/tests/codegen-llvm/asm/powerpc-clobbers.rs index 9d8204fa3be9..ee52727e3c03 100644 --- a/tests/codegen-llvm/asm/powerpc-clobbers.rs +++ b/tests/codegen-llvm/asm/powerpc-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: powerpc powerpc64 powerpc64le aix64 //@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu //@[powerpc] needs-llvm-components: powerpc diff --git a/tests/codegen-llvm/asm/readonly-not-pure.rs b/tests/codegen-llvm/asm/readonly-not-pure.rs index a3c0e276c7f5..e50d312f6451 100644 --- a/tests/codegen-llvm/asm/readonly-not-pure.rs +++ b/tests/codegen-llvm/asm/readonly-not-pure.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 --target x86_64-unknown-linux-gnu //@ needs-llvm-components: x86 diff --git a/tests/codegen-llvm/asm/riscv-clobbers.rs b/tests/codegen-llvm/asm/riscv-clobbers.rs index 0f235ddcdcc8..51b9b25aec48 100644 --- a/tests/codegen-llvm/asm/riscv-clobbers.rs +++ b/tests/codegen-llvm/asm/riscv-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ assembly-output: emit-asm //@ revisions: rv32i rv64i rv32e //@[rv32i] compile-flags: --target riscv32i-unknown-none-elf diff --git a/tests/codegen-llvm/asm/s390x-clobbers.rs b/tests/codegen-llvm/asm/s390x-clobbers.rs index 0ba22a32abf3..f9e54da74f42 100644 --- a/tests/codegen-llvm/asm/s390x-clobbers.rs +++ b/tests/codegen-llvm/asm/s390x-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: s390x //@[s390x] compile-flags: --target s390x-unknown-linux-gnu -C target-cpu=z10 //@[s390x] needs-llvm-components: systemz diff --git a/tests/codegen-llvm/asm/sanitize-llvm.rs b/tests/codegen-llvm/asm/sanitize-llvm.rs index 97a770332842..17f412264346 100644 --- a/tests/codegen-llvm/asm/sanitize-llvm.rs +++ b/tests/codegen-llvm/asm/sanitize-llvm.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore // FIXME(nagisa): remove the flags below once all targets support `asm!`. //@ compile-flags: --target x86_64-unknown-linux-gnu -Copt-level=0 //@ needs-llvm-components: x86 diff --git a/tests/codegen-llvm/asm/sparc-clobbers.rs b/tests/codegen-llvm/asm/sparc-clobbers.rs index a71715ed94d5..5da8a0b88093 100644 --- a/tests/codegen-llvm/asm/sparc-clobbers.rs +++ b/tests/codegen-llvm/asm/sparc-clobbers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: sparc sparcv8plus sparc64 //@[sparc] compile-flags: --target sparc-unknown-none-elf //@[sparc] needs-llvm-components: sparc diff --git a/tests/codegen-llvm/avr/avr-func-addrspace.rs b/tests/codegen-llvm/avr/avr-func-addrspace.rs index e0192f8b45ab..2a40f0f24754 100644 --- a/tests/codegen-llvm/avr/avr-func-addrspace.rs +++ b/tests/codegen-llvm/avr/avr-func-addrspace.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 --target=avr-none -C target-cpu=atmega328p --crate-type=rlib -C panic=abort //@ needs-llvm-components: avr diff --git a/tests/codegen-llvm/branch-protection.rs b/tests/codegen-llvm/branch-protection.rs index f92259c941ce..ed1cb2cd137e 100644 --- a/tests/codegen-llvm/branch-protection.rs +++ b/tests/codegen-llvm/branch-protection.rs @@ -1,6 +1,6 @@ // Test that the correct module flags are emitted with different branch protection flags. -//@ add-core-stubs +//@ add-minicore //@ revisions: BTI GCS PACRET LEAF BKEY PAUTHLR PAUTHLR_BKEY PAUTHLR_LEAF PAUTHLR_BTI NONE //@ needs-llvm-components: aarch64 //@ [BTI] compile-flags: -Z branch-protection=bti diff --git a/tests/codegen-llvm/c-variadic-lifetime.rs b/tests/codegen-llvm/c-variadic-lifetime.rs index c6d3602ef51a..fa38fbbc5381 100644 --- a/tests/codegen-llvm/c-variadic-lifetime.rs +++ b/tests/codegen-llvm/c-variadic-lifetime.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 #![feature(c_variadic)] #![crate_type = "lib"] diff --git a/tests/codegen-llvm/call-tmps-lifetime.rs b/tests/codegen-llvm/call-tmps-lifetime.rs index 0d7657ed758b..14c3f0c1e131 100644 --- a/tests/codegen-llvm/call-tmps-lifetime.rs +++ b/tests/codegen-llvm/call-tmps-lifetime.rs @@ -1,7 +1,7 @@ // Test that temporary allocas used for call arguments have their lifetimes described by // intrinsics. // -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=1 -Cno-prepopulate-passes --crate-type=lib --target i686-unknown-linux-gnu //@ needs-llvm-components: x86 #![feature(no_core)] diff --git a/tests/codegen-llvm/cast-target-abi.rs b/tests/codegen-llvm/cast-target-abi.rs index 090de00df936..101e73e33c91 100644 --- a/tests/codegen-llvm/cast-target-abi.rs +++ b/tests/codegen-llvm/cast-target-abi.rs @@ -1,5 +1,5 @@ // ignore-tidy-linelength -//@ add-core-stubs +//@ add-minicore //@ revisions:aarch64 loongarch64 powerpc64 sparc64 x86_64 //@ compile-flags: -Copt-level=3 -Cno-prepopulate-passes -Zlint-llvm-ir diff --git a/tests/codegen-llvm/cf-protection.rs b/tests/codegen-llvm/cf-protection.rs index 9efadb599322..c9e9d3433f1f 100644 --- a/tests/codegen-llvm/cf-protection.rs +++ b/tests/codegen-llvm/cf-protection.rs @@ -1,6 +1,6 @@ // Test that the correct module flags are emitted with different control-flow protection flags. -//@ add-core-stubs +//@ add-minicore //@ revisions: undefined none branch return full //@ needs-llvm-components: x86 // [undefined] no extra compile-flags diff --git a/tests/codegen-llvm/cffi/c-variadic-ffi.rs b/tests/codegen-llvm/cffi/c-variadic-ffi.rs index 1dee477e9ed7..314dfcd2cdbb 100644 --- a/tests/codegen-llvm/cffi/c-variadic-ffi.rs +++ b/tests/codegen-llvm/cffi/c-variadic-ffi.rs @@ -1,5 +1,5 @@ //! Test calling variadic functions with various ABIs. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Z merge-functions=disabled //@ revisions: x86_32 x86_32_win x86_64 aarch64 arm32 //@[x86_64] compile-flags: --target x86_64-unknown-linux-gnu diff --git a/tests/codegen-llvm/cffi/ffi-out-of-bounds-loads.rs b/tests/codegen-llvm/cffi/ffi-out-of-bounds-loads.rs index 859386d2df87..9a1fbd8b328b 100644 --- a/tests/codegen-llvm/cffi/ffi-out-of-bounds-loads.rs +++ b/tests/codegen-llvm/cffi/ffi-out-of-bounds-loads.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: linux apple //@ compile-flags: -Copt-level=0 -Cno-prepopulate-passes -Zlint-llvm-ir diff --git a/tests/codegen-llvm/compiletest-self-test/minicore-smoke-test.rs b/tests/codegen-llvm/compiletest-self-test/minicore-smoke-test.rs index 9dd1bf29c6cf..beab07bd6c6a 100644 --- a/tests/codegen-llvm/compiletest-self-test/minicore-smoke-test.rs +++ b/tests/codegen-llvm/compiletest-self-test/minicore-smoke-test.rs @@ -1,6 +1,6 @@ //! Basic smoke test for `minicore` test auxiliary. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target=x86_64-unknown-linux-gnu //@ needs-llvm-components: x86 diff --git a/tests/codegen-llvm/darwin-no-objc.rs b/tests/codegen-llvm/darwin-no-objc.rs index fda3671fb6d8..3b76ee79fc77 100644 --- a/tests/codegen-llvm/darwin-no-objc.rs +++ b/tests/codegen-llvm/darwin-no-objc.rs @@ -1,6 +1,6 @@ // Test that we don't generate Objective-C definitions or image info unnecessarily. -//@ add-core-stubs +//@ add-minicore //@ revisions: i686_apple_darwin //@ [i686_apple_darwin] compile-flags: --target i686-apple-darwin //@ [i686_apple_darwin] needs-llvm-components: x86 diff --git a/tests/codegen-llvm/darwin-objc-abi-v1.rs b/tests/codegen-llvm/darwin-objc-abi-v1.rs index 0fc1de9332ac..060d90743bdc 100644 --- a/tests/codegen-llvm/darwin-objc-abi-v1.rs +++ b/tests/codegen-llvm/darwin-objc-abi-v1.rs @@ -1,5 +1,5 @@ // ignore-tidy-linelength -//@ add-core-stubs +//@ add-minicore //@ revisions: i686_apple_darwin //@ [i686_apple_darwin] compile-flags: --target i686-apple-darwin //@ [i686_apple_darwin] needs-llvm-components: x86 diff --git a/tests/codegen-llvm/darwin-objc-abi-v2.rs b/tests/codegen-llvm/darwin-objc-abi-v2.rs index f142371d5825..dab89038429c 100644 --- a/tests/codegen-llvm/darwin-objc-abi-v2.rs +++ b/tests/codegen-llvm/darwin-objc-abi-v2.rs @@ -1,5 +1,5 @@ // ignore-tidy-linelength -//@ add-core-stubs +//@ add-minicore //@ revisions: x86_64_macos //@ [x86_64_macos] compile-flags: --target x86_64-apple-darwin //@ [x86_64_macos] needs-llvm-components: x86 diff --git a/tests/codegen-llvm/default-requires-uwtable.rs b/tests/codegen-llvm/default-requires-uwtable.rs index 54a6e171db66..ac6474f98115 100644 --- a/tests/codegen-llvm/default-requires-uwtable.rs +++ b/tests/codegen-llvm/default-requires-uwtable.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: WINDOWS_ ANDROID_ //@ compile-flags: -C panic=abort -Copt-level=0 //@ [WINDOWS_] compile-flags: --target=x86_64-pc-windows-msvc diff --git a/tests/codegen-llvm/f128-wasm32-callconv.rs b/tests/codegen-llvm/f128-wasm32-callconv.rs index 7dccbda18f1a..19e3f0ddeca3 100644 --- a/tests/codegen-llvm/f128-wasm32-callconv.rs +++ b/tests/codegen-llvm/f128-wasm32-callconv.rs @@ -1,6 +1,6 @@ //! Verify that Rust implements the expected calling convention for `f128` -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 --target wasm32-wasip1 //@ needs-llvm-components: webassembly diff --git a/tests/codegen-llvm/fastcall-inreg.rs b/tests/codegen-llvm/fastcall-inreg.rs index 066943d6e7eb..dddb27c7d28d 100644 --- a/tests/codegen-llvm/fastcall-inreg.rs +++ b/tests/codegen-llvm/fastcall-inreg.rs @@ -2,7 +2,7 @@ // as "inreg" like the C/C++ compilers for the platforms. // x86 only. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target i686-unknown-linux-gnu -Cno-prepopulate-passes -Copt-level=3 //@ needs-llvm-components: x86 diff --git a/tests/codegen-llvm/fixed-x18.rs b/tests/codegen-llvm/fixed-x18.rs index a5767cfa456b..2020c2ea1830 100644 --- a/tests/codegen-llvm/fixed-x18.rs +++ b/tests/codegen-llvm/fixed-x18.rs @@ -1,7 +1,7 @@ // Test that the `reserve-x18` target feature is (not) emitted when // the `-Zfixed-x18` flag is (not) set. -//@ add-core-stubs +//@ add-minicore //@ revisions: unset set //@ needs-llvm-components: aarch64 //@ compile-flags: --target aarch64-unknown-none diff --git a/tests/codegen-llvm/frame-pointer-cli-control.rs b/tests/codegen-llvm/frame-pointer-cli-control.rs index a65dd132763d..911a5f03cbcd 100644 --- a/tests/codegen-llvm/frame-pointer-cli-control.rs +++ b/tests/codegen-llvm/frame-pointer-cli-control.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --crate-type=rlib -Copt-level=0 //@ revisions: force-on aarch64-apple aarch64-apple-on aarch64-apple-off //@ [force-on] compile-flags: -Cforce-frame-pointers=on diff --git a/tests/codegen-llvm/frame-pointer.rs b/tests/codegen-llvm/frame-pointer.rs index 23989653fa8e..1d0dd762826b 100644 --- a/tests/codegen-llvm/frame-pointer.rs +++ b/tests/codegen-llvm/frame-pointer.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --crate-type=rlib -Copt-level=0 //@ revisions: aarch64-apple aarch64-linux force x64-apple x64-linux //@ [aarch64-apple] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/function-return.rs b/tests/codegen-llvm/function-return.rs index 4127f5160385..23547febf7a5 100644 --- a/tests/codegen-llvm/function-return.rs +++ b/tests/codegen-llvm/function-return.rs @@ -1,7 +1,7 @@ // Test that the `fn_ret_thunk_extern` function attribute is (not) emitted when // the `-Zfunction-return={keep,thunk-extern}` flag is (not) set. -//@ add-core-stubs +//@ add-minicore //@ revisions: unset keep thunk-extern keep-thunk-extern thunk-extern-keep //@ needs-llvm-components: x86 //@ compile-flags: --target x86_64-unknown-linux-gnu diff --git a/tests/codegen-llvm/gpu-kernel-abi.rs b/tests/codegen-llvm/gpu-kernel-abi.rs index d5a357ef6552..828b10c37880 100644 --- a/tests/codegen-llvm/gpu-kernel-abi.rs +++ b/tests/codegen-llvm/gpu-kernel-abi.rs @@ -1,6 +1,6 @@ // Checks that the gpu-kernel calling convention correctly translates to LLVM calling conventions. -//@ add-core-stubs +//@ add-minicore //@ revisions: amdgpu nvptx //@ [amdgpu] compile-flags: --crate-type=rlib --target=amdgcn-amd-amdhsa -Ctarget-cpu=gfx900 //@ [amdgpu] needs-llvm-components: amdgpu diff --git a/tests/codegen-llvm/i128-wasm32-callconv.rs b/tests/codegen-llvm/i128-wasm32-callconv.rs index 9d73d270ef3d..7918f60bcec1 100644 --- a/tests/codegen-llvm/i128-wasm32-callconv.rs +++ b/tests/codegen-llvm/i128-wasm32-callconv.rs @@ -1,6 +1,6 @@ //! Verify that Rust implements the expected calling convention for `i128`/`u128`. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 --target wasm32-wasip1 //@ needs-llvm-components: webassembly diff --git a/tests/codegen-llvm/i128-x86-callconv.rs b/tests/codegen-llvm/i128-x86-callconv.rs index 41c30c09c1ac..948e37ec97b2 100644 --- a/tests/codegen-llvm/i128-x86-callconv.rs +++ b/tests/codegen-llvm/i128-x86-callconv.rs @@ -3,7 +3,7 @@ // Eliminate intermediate instructions during `nop` tests //@ compile-flags: -Copt-level=1 -//@ add-core-stubs +//@ add-minicore //@ revisions: MSVC MINGW softfloat //@ [MSVC] needs-llvm-components: x86 //@ [MSVC] compile-flags: --target x86_64-pc-windows-msvc diff --git a/tests/codegen-llvm/indirect-branch-cs-prefix.rs b/tests/codegen-llvm/indirect-branch-cs-prefix.rs index df25008d5f09..9ad7f9d9afa6 100644 --- a/tests/codegen-llvm/indirect-branch-cs-prefix.rs +++ b/tests/codegen-llvm/indirect-branch-cs-prefix.rs @@ -1,7 +1,7 @@ // Test that the `indirect_branch_cs_prefix` module attribute is (not) // emitted when the `-Zindirect-branch-cs-prefix` flag is (not) set. -//@ add-core-stubs +//@ add-minicore //@ revisions: unset set //@ needs-llvm-components: x86 //@ compile-flags: --target x86_64-unknown-linux-gnu diff --git a/tests/codegen-llvm/intrinsics/nontemporal.rs b/tests/codegen-llvm/intrinsics/nontemporal.rs index a151d4bd2974..4367211a2ec8 100644 --- a/tests/codegen-llvm/intrinsics/nontemporal.rs +++ b/tests/codegen-llvm/intrinsics/nontemporal.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 //@revisions: with_nontemporal without_nontemporal //@[with_nontemporal] compile-flags: --target aarch64-unknown-linux-gnu diff --git a/tests/codegen-llvm/loongarch-abi/cast-local-large-enough.rs b/tests/codegen-llvm/loongarch-abi/cast-local-large-enough.rs index e5a0e4cd3a2c..f693f0cbfb06 100644 --- a/tests/codegen-llvm/loongarch-abi/cast-local-large-enough.rs +++ b/tests/codegen-llvm/loongarch-abi/cast-local-large-enough.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=0 -Cdebuginfo=0 --target loongarch64-unknown-linux-gnu //@ needs-llvm-components: loongarch diff --git a/tests/codegen-llvm/loongarch-abi/loongarch64-lp64d-abi.rs b/tests/codegen-llvm/loongarch-abi/loongarch64-lp64d-abi.rs index 7ea08a1a8f72..546007ab0f2c 100644 --- a/tests/codegen-llvm/loongarch-abi/loongarch64-lp64d-abi.rs +++ b/tests/codegen-llvm/loongarch-abi/loongarch64-lp64d-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes --target loongarch64-unknown-linux-gnu //@ needs-llvm-components: loongarch diff --git a/tests/codegen-llvm/macos/i686-macosx-deployment-target.rs b/tests/codegen-llvm/macos/i686-macosx-deployment-target.rs index cfa91e61cb00..c8051c457930 100644 --- a/tests/codegen-llvm/macos/i686-macosx-deployment-target.rs +++ b/tests/codegen-llvm/macos/i686-macosx-deployment-target.rs @@ -1,7 +1,7 @@ // Checks that we correctly modify the target when MACOSX_DEPLOYMENT_TARGET is set. // See issue #60235. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 --target=i686-apple-darwin --crate-type=rlib //@ needs-llvm-components: x86 //@ rustc-env:MACOSX_DEPLOYMENT_TARGET=10.14 diff --git a/tests/codegen-llvm/macos/i686-no-macosx-deployment-target.rs b/tests/codegen-llvm/macos/i686-no-macosx-deployment-target.rs index 25ec5f6acbb7..258cf1aa726f 100644 --- a/tests/codegen-llvm/macos/i686-no-macosx-deployment-target.rs +++ b/tests/codegen-llvm/macos/i686-no-macosx-deployment-target.rs @@ -1,7 +1,7 @@ // Checks that we leave the target alone MACOSX_DEPLOYMENT_TARGET is unset. // See issue #60235. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 --target=i686-apple-darwin --crate-type=rlib //@ needs-llvm-components: x86 //@ unset-rustc-env:MACOSX_DEPLOYMENT_TARGET diff --git a/tests/codegen-llvm/macos/x86_64-macosx-deployment-target.rs b/tests/codegen-llvm/macos/x86_64-macosx-deployment-target.rs index 8ea95ba0575e..e40571d73b2d 100644 --- a/tests/codegen-llvm/macos/x86_64-macosx-deployment-target.rs +++ b/tests/codegen-llvm/macos/x86_64-macosx-deployment-target.rs @@ -1,7 +1,7 @@ // Checks that we correctly modify the target when MACOSX_DEPLOYMENT_TARGET is set. // See issue #60235. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 --target=x86_64-apple-darwin --crate-type=rlib //@ needs-llvm-components: x86 //@ rustc-env:MACOSX_DEPLOYMENT_TARGET=10.14 diff --git a/tests/codegen-llvm/macos/x86_64-no-macosx-deployment-target.rs b/tests/codegen-llvm/macos/x86_64-no-macosx-deployment-target.rs index 474094957aeb..328b539029e4 100644 --- a/tests/codegen-llvm/macos/x86_64-no-macosx-deployment-target.rs +++ b/tests/codegen-llvm/macos/x86_64-no-macosx-deployment-target.rs @@ -1,7 +1,7 @@ // Checks that we leave the target alone when MACOSX_DEPLOYMENT_TARGET is unset. // See issue #60235. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 --target=x86_64-apple-darwin --crate-type=rlib //@ needs-llvm-components: x86 //@ unset-rustc-env:MACOSX_DEPLOYMENT_TARGET diff --git a/tests/codegen-llvm/naked-asan.rs b/tests/codegen-llvm/naked-asan.rs index a57e55d1366c..9dbbee47f75d 100644 --- a/tests/codegen-llvm/naked-asan.rs +++ b/tests/codegen-llvm/naked-asan.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: x86 //@ compile-flags: --target x86_64-unknown-linux-gnu -Zsanitizer=address -Ctarget-feature=-crt-static diff --git a/tests/codegen-llvm/naked-fn/instruction-set.rs b/tests/codegen-llvm/naked-fn/instruction-set.rs index 67560c5aba75..367498961746 100644 --- a/tests/codegen-llvm/naked-fn/instruction-set.rs +++ b/tests/codegen-llvm/naked-fn/instruction-set.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: arm-mode thumb-mode //@ [arm-mode] compile-flags: --target armv5te-none-eabi //@ [thumb-mode] compile-flags: --target thumbv5te-none-eabi diff --git a/tests/codegen-llvm/naked-fn/naked-functions.rs b/tests/codegen-llvm/naked-fn/naked-functions.rs index 8a7ee4b4de56..76c9b90e92ef 100644 --- a/tests/codegen-llvm/naked-fn/naked-functions.rs +++ b/tests/codegen-llvm/naked-fn/naked-functions.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: linux win_x86 win_i686 macos thumb // //@[linux] compile-flags: --target x86_64-unknown-linux-gnu diff --git a/tests/codegen-llvm/no-jump-tables.rs b/tests/codegen-llvm/no-jump-tables.rs index e49de7e9dc1e..8f607e38350d 100644 --- a/tests/codegen-llvm/no-jump-tables.rs +++ b/tests/codegen-llvm/no-jump-tables.rs @@ -1,7 +1,7 @@ // Test that the `no-jump-tables` function attribute are (not) emitted when // the `-Zno-jump-tables` flag is (not) set. -//@ add-core-stubs +//@ add-minicore //@ revisions: unset set //@ needs-llvm-components: x86 //@ compile-flags: --target x86_64-unknown-linux-gnu diff --git a/tests/codegen-llvm/powerpc64le-struct-align-128.rs b/tests/codegen-llvm/powerpc64le-struct-align-128.rs index c1c1ac264854..715d92f6923e 100644 --- a/tests/codegen-llvm/powerpc64le-struct-align-128.rs +++ b/tests/codegen-llvm/powerpc64le-struct-align-128.rs @@ -1,7 +1,7 @@ // Test that structs aligned to 128 bits are passed with the correct ABI on powerpc64le. // This is similar to aarch64-struct-align-128.rs, but for ppc. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target powerpc64le-unknown-linux-gnu //@ needs-llvm-components: powerpc diff --git a/tests/codegen-llvm/reg-struct-return.rs b/tests/codegen-llvm/reg-struct-return.rs index dfc9f8c519c2..6ffc4503c4f2 100644 --- a/tests/codegen-llvm/reg-struct-return.rs +++ b/tests/codegen-llvm/reg-struct-return.rs @@ -4,7 +4,7 @@ // x86 only. //@ revisions: ENABLED DISABLED -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target i686-unknown-linux-gnu -Cno-prepopulate-passes -Copt-level=3 //@ [ENABLED] compile-flags: -Zreg-struct-return //@ needs-llvm-components: x86 diff --git a/tests/codegen-llvm/regparm-inreg.rs b/tests/codegen-llvm/regparm-inreg.rs index 15702804dfd0..ef70f7f8be0b 100644 --- a/tests/codegen-llvm/regparm-inreg.rs +++ b/tests/codegen-llvm/regparm-inreg.rs @@ -2,7 +2,7 @@ // marks function arguments as "inreg" like the C/C++ compilers for the platforms. // x86 only. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target i686-unknown-linux-gnu -Cno-prepopulate-passes -Copt-level=3 -Ctarget-feature=+avx //@ needs-llvm-components: x86 diff --git a/tests/codegen-llvm/repr/transparent-byval-struct-ptr.rs b/tests/codegen-llvm/repr/transparent-byval-struct-ptr.rs index 0918884144fc..6ecad80b008f 100644 --- a/tests/codegen-llvm/repr/transparent-byval-struct-ptr.rs +++ b/tests/codegen-llvm/repr/transparent-byval-struct-ptr.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: i686-linux i686-freebsd x64-linux x64-apple //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes diff --git a/tests/codegen-llvm/repr/transparent-imm-array.rs b/tests/codegen-llvm/repr/transparent-imm-array.rs index 6dad04477845..c72151741400 100644 --- a/tests/codegen-llvm/repr/transparent-imm-array.rs +++ b/tests/codegen-llvm/repr/transparent-imm-array.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: arm-linux arm-android armv7-linux armv7-android mips thumb sparc //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes diff --git a/tests/codegen-llvm/repr/transparent-mips64.rs b/tests/codegen-llvm/repr/transparent-mips64.rs index 98901350154e..fac1bdcb3a2b 100644 --- a/tests/codegen-llvm/repr/transparent-mips64.rs +++ b/tests/codegen-llvm/repr/transparent-mips64.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: mips64 mips64el //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes diff --git a/tests/codegen-llvm/repr/transparent-opaque-ptr.rs b/tests/codegen-llvm/repr/transparent-opaque-ptr.rs index 7911370c478c..466711d90dbe 100644 --- a/tests/codegen-llvm/repr/transparent-opaque-ptr.rs +++ b/tests/codegen-llvm/repr/transparent-opaque-ptr.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64-linux aarch64-darwin wasm32-wasip1 //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes diff --git a/tests/codegen-llvm/repr/transparent-sparc64.rs b/tests/codegen-llvm/repr/transparent-sparc64.rs index 62bfc8a5fce2..960a9c434081 100644 --- a/tests/codegen-llvm/repr/transparent-sparc64.rs +++ b/tests/codegen-llvm/repr/transparent-sparc64.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes --target sparc64-unknown-linux-gnu //@ needs-llvm-components: sparc diff --git a/tests/codegen-llvm/repr/transparent-sysv64.rs b/tests/codegen-llvm/repr/transparent-sysv64.rs index 3efc3f7c3911..fc32cb685237 100644 --- a/tests/codegen-llvm/repr/transparent-sysv64.rs +++ b/tests/codegen-llvm/repr/transparent-sysv64.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: linux apple win //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes diff --git a/tests/codegen-llvm/retpoline.rs b/tests/codegen-llvm/retpoline.rs index 915c2c3d7978..1d063773ef1d 100644 --- a/tests/codegen-llvm/retpoline.rs +++ b/tests/codegen-llvm/retpoline.rs @@ -3,7 +3,7 @@ // `retpoline-external-thunk`, `retpoline-indirect-branches`, `retpoline-indirect-calls` // target features are (not) emitted when the `retpoline/retpoline-external-thunk` flag is (not) set. -//@ add-core-stubs +//@ add-minicore //@ revisions: disabled enabled_retpoline enabled_retpoline_external_thunk //@ needs-llvm-components: x86 //@ compile-flags: --target x86_64-unknown-linux-gnu diff --git a/tests/codegen-llvm/riscv-abi/cast-local-large-enough.rs b/tests/codegen-llvm/riscv-abi/cast-local-large-enough.rs index 9d21d73b4597..67588300c9ed 100644 --- a/tests/codegen-llvm/riscv-abi/cast-local-large-enough.rs +++ b/tests/codegen-llvm/riscv-abi/cast-local-large-enough.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=0 -Cdebuginfo=0 --target riscv64gc-unknown-linux-gnu //@ needs-llvm-components: riscv diff --git a/tests/codegen-llvm/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs b/tests/codegen-llvm/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs index df99f6969fc1..0f5a449ead13 100644 --- a/tests/codegen-llvm/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs +++ b/tests/codegen-llvm/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target riscv64gc-unknown-linux-gnu -Copt-level=3 -C no-prepopulate-passes -C panic=abort //@ needs-llvm-components: riscv diff --git a/tests/codegen-llvm/riscv-abi/riscv64-lp64d-abi.rs b/tests/codegen-llvm/riscv-abi/riscv64-lp64d-abi.rs index d768ab9381aa..337d812b1881 100644 --- a/tests/codegen-llvm/riscv-abi/riscv64-lp64d-abi.rs +++ b/tests/codegen-llvm/riscv-abi/riscv64-lp64d-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes --target riscv64gc-unknown-linux-gnu //@ needs-llvm-components: riscv diff --git a/tests/codegen-llvm/riscv-abi/riscv64-lp64f-lp64d-abi.rs b/tests/codegen-llvm/riscv-abi/riscv64-lp64f-lp64d-abi.rs index 361f03226904..c52d0cf4fe8a 100644 --- a/tests/codegen-llvm/riscv-abi/riscv64-lp64f-lp64d-abi.rs +++ b/tests/codegen-llvm/riscv-abi/riscv64-lp64f-lp64d-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes --target riscv64gc-unknown-linux-gnu //@ needs-llvm-components: riscv diff --git a/tests/codegen-llvm/riscv-target-abi.rs b/tests/codegen-llvm/riscv-target-abi.rs index d41fcb4dd845..53b2f51f36d5 100644 --- a/tests/codegen-llvm/riscv-target-abi.rs +++ b/tests/codegen-llvm/riscv-target-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions:riscv64gc riscv32gc riscv32imac //@[riscv64gc] compile-flags: --target=riscv64gc-unknown-linux-gnu diff --git a/tests/codegen-llvm/rust-abi-arch-specific-adjustment.rs b/tests/codegen-llvm/rust-abi-arch-specific-adjustment.rs index ffff4b359947..119722c4ef34 100644 --- a/tests/codegen-llvm/rust-abi-arch-specific-adjustment.rs +++ b/tests/codegen-llvm/rust-abi-arch-specific-adjustment.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 -C no-prepopulate-passes //@ revisions: riscv64 loongarch64 diff --git a/tests/codegen-llvm/s390x-simd.rs b/tests/codegen-llvm/s390x-simd.rs index 464c1be11f1a..50df08524f52 100644 --- a/tests/codegen-llvm/s390x-simd.rs +++ b/tests/codegen-llvm/s390x-simd.rs @@ -1,6 +1,6 @@ //! test that s390x vector types are passed using `PassMode::Direct` //! see also https://github.com/rust-lang/rust/issues/135744 -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target s390x-unknown-linux-gnu -Copt-level=3 //@ needs-llvm-components: systemz diff --git a/tests/codegen-llvm/sanitizer/aarch64-shadow-call-stack-with-fixed-x18.rs b/tests/codegen-llvm/sanitizer/aarch64-shadow-call-stack-with-fixed-x18.rs index e1d7dc2d631f..bde2bd095b77 100644 --- a/tests/codegen-llvm/sanitizer/aarch64-shadow-call-stack-with-fixed-x18.rs +++ b/tests/codegen-llvm/sanitizer/aarch64-shadow-call-stack-with-fixed-x18.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 android //@[aarch64] compile-flags: --target aarch64-unknown-none -Zfixed-x18 -Zsanitizer=shadow-call-stack //@[aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kasan-emits-instrumentation.rs b/tests/codegen-llvm/sanitizer/kasan-emits-instrumentation.rs index c70aae1703ef..da0c976d8a53 100644 --- a/tests/codegen-llvm/sanitizer/kasan-emits-instrumentation.rs +++ b/tests/codegen-llvm/sanitizer/kasan-emits-instrumentation.rs @@ -1,6 +1,6 @@ // Verifies that `-Zsanitizer=kernel-address` emits sanitizer instrumentation. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Zsanitizer=kernel-address -Copt-level=0 //@ revisions: aarch64 riscv64imac riscv64gc x86_64 //@[aarch64] compile-flags: --target aarch64-unknown-none diff --git a/tests/codegen-llvm/sanitizer/kcfi/add-cfi-normalize-integers-flag.rs b/tests/codegen-llvm/sanitizer/kcfi/add-cfi-normalize-integers-flag.rs index 0be1ff197749..24c5d1be1d60 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/add-cfi-normalize-integers-flag.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/add-cfi-normalize-integers-flag.rs @@ -1,6 +1,6 @@ // Verifies that "cfi-normalize-integers" module flag is added. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-arity-flag.rs b/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-arity-flag.rs index 9a2290901d64..a8e3b034eae7 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-arity-flag.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-arity-flag.rs @@ -1,6 +1,6 @@ // Verifies that "kcfi-arity" module flag is added. // -//@ add-core-stubs +//@ add-minicore //@ revisions: x86_64 //@ [x86_64] compile-flags: --target x86_64-unknown-none //@ [x86_64] needs-llvm-components: x86 diff --git a/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-flag.rs b/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-flag.rs index eabe0409c9a3..53b1a3f2d74a 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-flag.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-flag.rs @@ -1,6 +1,6 @@ // Verifies that "kcfi" module flag is added. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-offset-flag.rs b/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-offset-flag.rs index 2f18c9d84b90..82747351e028 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-offset-flag.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/add-kcfi-offset-flag.rs @@ -1,6 +1,6 @@ // Verifies that "kcfi-offset" module flag is added. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-attr-sanitize-off.rs b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-attr-sanitize-off.rs index 2581784ce3ee..ee4928053cf9 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-attr-sanitize-off.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-attr-sanitize-off.rs @@ -1,6 +1,6 @@ // Verifies that KCFI operand bundles are omitted. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-generalized.rs b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-generalized.rs index 9a60d51713f5..9b861c08ac95 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-generalized.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-generalized.rs @@ -1,6 +1,6 @@ // Verifies that generalized KCFI type metadata for functions are emitted. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-normalized-generalized.rs b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-normalized-generalized.rs index 134f4ff4bfd9..c2410aa9f4d8 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-normalized-generalized.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-normalized-generalized.rs @@ -1,6 +1,6 @@ // Verifies that normalized and generalized KCFI type metadata for functions are emitted. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-normalized.rs b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-normalized.rs index 4328b7fa07df..fbad335286cb 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-normalized.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi-normalized.rs @@ -1,6 +1,6 @@ // Verifies that normalized KCFI type metadata for functions are emitted. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi.rs b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi.rs index 81a9db1b97a5..6c7a8194ec4e 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle-itanium-cxx-abi.rs @@ -1,6 +1,6 @@ // Verifies that KCFI type metadata for functions are emitted. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle.rs b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle.rs index 61056c2a54e7..e22a210f3dfb 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/emit-kcfi-operand-bundle.rs @@ -1,6 +1,6 @@ // Verifies that KCFI operand bundles are emitted. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/emit-type-metadata-trait-objects.rs b/tests/codegen-llvm/sanitizer/kcfi/emit-type-metadata-trait-objects.rs index 182af162d782..3312f12f6885 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/emit-type-metadata-trait-objects.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/emit-type-metadata-trait-objects.rs @@ -1,6 +1,6 @@ // Verifies that type metadata identifiers for trait objects are emitted correctly. // -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/fn-ptr-reify-shim.rs b/tests/codegen-llvm/sanitizer/kcfi/fn-ptr-reify-shim.rs index 604b4c8c2f8a..b5900852711d 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/fn-ptr-reify-shim.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/fn-ptr-reify-shim.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/kcfi/naked-function.rs b/tests/codegen-llvm/sanitizer/kcfi/naked-function.rs index 31f59ee01dec..77684fea7022 100644 --- a/tests/codegen-llvm/sanitizer/kcfi/naked-function.rs +++ b/tests/codegen-llvm/sanitizer/kcfi/naked-function.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/sanitizer/riscv64-shadow-call-stack.rs b/tests/codegen-llvm/sanitizer/riscv64-shadow-call-stack.rs index 945e46218d04..72f9c12fae0e 100644 --- a/tests/codegen-llvm/sanitizer/riscv64-shadow-call-stack.rs +++ b/tests/codegen-llvm/sanitizer/riscv64-shadow-call-stack.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target riscv64imac-unknown-none-elf -Zsanitizer=shadow-call-stack //@ needs-llvm-components: riscv diff --git a/tests/codegen-llvm/sanitizer/sanitize-off-asan-kasan.rs b/tests/codegen-llvm/sanitizer/sanitize-off-asan-kasan.rs index 37549aba4477..c5df311efae0 100644 --- a/tests/codegen-llvm/sanitizer/sanitize-off-asan-kasan.rs +++ b/tests/codegen-llvm/sanitizer/sanitize-off-asan-kasan.rs @@ -1,7 +1,7 @@ // Verifies that the `#[sanitize(address = "off")]` attribute also turns off // the kernel address sanitizer. // -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Zsanitizer=kernel-address -Ctarget-feature=-crt-static -Copt-level=0 //@ revisions: aarch64 riscv64imac riscv64gc x86_64 //@[aarch64] compile-flags: --target aarch64-unknown-none diff --git a/tests/codegen-llvm/some-abis-do-extend-params-to-32-bits.rs b/tests/codegen-llvm/some-abis-do-extend-params-to-32-bits.rs index 6ca6697588fd..8032ff445ae8 100644 --- a/tests/codegen-llvm/some-abis-do-extend-params-to-32-bits.rs +++ b/tests/codegen-llvm/some-abis-do-extend-params-to-32-bits.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Cno-prepopulate-passes -Copt-level=0 //@ revisions:x86_64 i686 aarch64-apple aarch64-windows aarch64-linux arm riscv diff --git a/tests/codegen-llvm/sparc-struct-abi.rs b/tests/codegen-llvm/sparc-struct-abi.rs index 32d2c5bb0ef8..85725803e1b5 100644 --- a/tests/codegen-llvm/sparc-struct-abi.rs +++ b/tests/codegen-llvm/sparc-struct-abi.rs @@ -1,7 +1,7 @@ // Checks that we correctly codegen extern "C" functions returning structs. // See issues #52638 and #86163. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -Copt-level=3 --target=sparc64-unknown-linux-gnu --crate-type=rlib //@ needs-llvm-components: sparc #![feature(no_core, lang_items)] diff --git a/tests/codegen-llvm/stack-probes-inline.rs b/tests/codegen-llvm/stack-probes-inline.rs index 746272b09941..465e35090ae1 100644 --- a/tests/codegen-llvm/stack-probes-inline.rs +++ b/tests/codegen-llvm/stack-probes-inline.rs @@ -1,7 +1,7 @@ // Check the "probe-stack" attribute for targets with `StackProbeType::Inline`, // or `StackProbeType::InlineOrCall` when running on newer LLVM. -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -C no-prepopulate-passes //@ revisions: aarch64 powerpc powerpc64 powerpc64le s390x i686 x86_64 //@[aarch64] compile-flags: --target aarch64-unknown-linux-gnu diff --git a/tests/codegen-llvm/target-feature-negative-implication.rs b/tests/codegen-llvm/target-feature-negative-implication.rs index 36cd82dd8cf5..a9cdca428399 100644 --- a/tests/codegen-llvm/target-feature-negative-implication.rs +++ b/tests/codegen-llvm/target-feature-negative-implication.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: x86 //@ compile-flags: --target=x86_64-unknown-linux-gnu //@ compile-flags: -Ctarget-feature=-avx2 diff --git a/tests/codegen-llvm/target-feature-overrides.rs b/tests/codegen-llvm/target-feature-overrides.rs index 63a586d388b6..2adc8ee6f53b 100644 --- a/tests/codegen-llvm/target-feature-overrides.rs +++ b/tests/codegen-llvm/target-feature-overrides.rs @@ -1,5 +1,5 @@ // ignore-tidy-linelength -//@ add-core-stubs +//@ add-minicore //@ revisions: COMPAT INCOMPAT //@ needs-llvm-components: x86 //@ compile-flags: --target=x86_64-unknown-linux-gnu -Copt-level=3 diff --git a/tests/codegen-llvm/tied-features-strength.rs b/tests/codegen-llvm/tied-features-strength.rs index 81499c070d19..e01ff5b0165b 100644 --- a/tests/codegen-llvm/tied-features-strength.rs +++ b/tests/codegen-llvm/tied-features-strength.rs @@ -1,5 +1,5 @@ // ignore-tidy-linelength -//@ add-core-stubs +//@ add-minicore //@ revisions: ENABLE_SVE DISABLE_SVE DISABLE_NEON ENABLE_NEON //@ compile-flags: --crate-type=rlib --target=aarch64-unknown-linux-gnu //@ needs-llvm-components: aarch64 diff --git a/tests/codegen-llvm/transmute-scalar.rs b/tests/codegen-llvm/transmute-scalar.rs index e1ce8e506066..16adfb663fdb 100644 --- a/tests/codegen-llvm/transmute-scalar.rs +++ b/tests/codegen-llvm/transmute-scalar.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: -C opt-level=0 -C no-prepopulate-passes --target=x86_64-unknown-linux-gnu //@ needs-llvm-components: x86 diff --git a/tests/ui/abi/arm-unadjusted-intrinsic.rs b/tests/ui/abi/arm-unadjusted-intrinsic.rs index 6421f9a00847..1f386308c878 100644 --- a/tests/ui/abi/arm-unadjusted-intrinsic.rs +++ b/tests/ui/abi/arm-unadjusted-intrinsic.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-pass //@ revisions: arm //@[arm] compile-flags: --target arm-unknown-linux-gnueabi diff --git a/tests/ui/abi/c-zst.rs b/tests/ui/abi/c-zst.rs index 2d55b61f57a1..22cb3f98f28d 100644 --- a/tests/ui/abi/c-zst.rs +++ b/tests/ui/abi/c-zst.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ normalize-stderr: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN" /*! C doesn't have zero-sized types... except it does. diff --git a/tests/ui/abi/cannot-be-called.rs b/tests/ui/abi/cannot-be-called.rs index e5385ed6d69d..315ea1601633 100644 --- a/tests/ui/abi/cannot-be-called.rs +++ b/tests/ui/abi/cannot-be-called.rs @@ -3,7 +3,7 @@ Interrupt ABIs share similar semantics, in that they are special entry-points unusable by Rust. So we test that they error in essentially all of the same places. */ -//@ add-core-stubs +//@ add-minicore //@ revisions: x64 x64_win i686 riscv32 riscv64 avr msp430 // //@ [x64] needs-llvm-components: x86 diff --git a/tests/ui/abi/cannot-be-coroutine.rs b/tests/ui/abi/cannot-be-coroutine.rs index 5548b8cb8d60..c070e8032e1a 100644 --- a/tests/ui/abi/cannot-be-coroutine.rs +++ b/tests/ui/abi/cannot-be-coroutine.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ edition: 2021 //@ revisions: x64 x64_win i686 riscv32 riscv64 avr msp430 // diff --git a/tests/ui/abi/compatibility.rs b/tests/ui/abi/compatibility.rs index 4ffc81eb5f6f..906f372dd441 100644 --- a/tests/ui/abi/compatibility.rs +++ b/tests/ui/abi/compatibility.rs @@ -1,5 +1,5 @@ //@ check-pass -//@ add-core-stubs +//@ add-minicore //@ revisions: host //@ revisions: i686 //@[i686] compile-flags: --target i686-unknown-linux-gnu diff --git a/tests/ui/abi/debug.rs b/tests/ui/abi/debug.rs index 7cd275376faf..2e34fa5d7df4 100644 --- a/tests/ui/abi/debug.rs +++ b/tests/ui/abi/debug.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ normalize-stderr: "(abi|pref|unadjusted_abi_align): Align\([1-8] bytes\)" -> "$1: $$SOME_ALIGN" //@ normalize-stderr: "randomization_seed: \d+" -> "randomization_seed: $$SEED" //@ normalize-stderr: "(size): Size\([48] bytes\)" -> "$1: $$SOME_SIZE" diff --git a/tests/ui/abi/interrupt-invalid-signature.rs b/tests/ui/abi/interrupt-invalid-signature.rs index e81a52e98678..76302f6a4fad 100644 --- a/tests/ui/abi/interrupt-invalid-signature.rs +++ b/tests/ui/abi/interrupt-invalid-signature.rs @@ -7,7 +7,7 @@ A notable and interesting exception is x86. This test uses `cfg` because it is not testing whether these ABIs work on the platform. */ -//@ add-core-stubs +//@ add-minicore //@ revisions: x64 i686 riscv32 riscv64 avr msp430 // //@ [x64] needs-llvm-components: x86 diff --git a/tests/ui/abi/interrupt-returns-never-or-unit.rs b/tests/ui/abi/interrupt-returns-never-or-unit.rs index bf7036f00b6d..29713f2828ba 100644 --- a/tests/ui/abi/interrupt-returns-never-or-unit.rs +++ b/tests/ui/abi/interrupt-returns-never-or-unit.rs @@ -5,7 +5,7 @@ but it makes sense to allow them to return ! because they could indeed be diverg This test uses `cfg` because it is not testing whether these ABIs work on the platform. */ -//@ add-core-stubs +//@ add-minicore //@ revisions: x64 i686 riscv32 riscv64 avr msp430 //@ build-pass // diff --git a/tests/ui/abi/riscv-discoverability-guidance.rs b/tests/ui/abi/riscv-discoverability-guidance.rs index 28309e7c62db..7f43f9fcfc79 100644 --- a/tests/ui/abi/riscv-discoverability-guidance.rs +++ b/tests/ui/abi/riscv-discoverability-guidance.rs @@ -1,5 +1,5 @@ // ignore-tidy-linelength -//@ add-core-stubs +//@ add-minicore //@ revisions: riscv32 riscv64 // //@ [riscv32] needs-llvm-components: riscv diff --git a/tests/ui/abi/rust-cold-works-with-rustic-args.rs b/tests/ui/abi/rust-cold-works-with-rustic-args.rs index 551485469d3a..94227f71a3ee 100644 --- a/tests/ui/abi/rust-cold-works-with-rustic-args.rs +++ b/tests/ui/abi/rust-cold-works-with-rustic-args.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-pass //@ compile-flags: -Clink-dead-code=true // We used to not handle all "rustic" ABIs in a (relatively) uniform way, diff --git a/tests/ui/abi/simd-abi-checks-empty-list.rs b/tests/ui/abi/simd-abi-checks-empty-list.rs index f4b5ca7be7d9..8907a2c391db 100644 --- a/tests/ui/abi/simd-abi-checks-empty-list.rs +++ b/tests/ui/abi/simd-abi-checks-empty-list.rs @@ -1,6 +1,6 @@ //! At the time of writing, the list of "which target feature enables which vector size" is empty //! for SPARC. Ensure that this leads to all vector sizes causing an error. -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: sparc //@ compile-flags: --target=sparc-unknown-none-elf --crate-type=rlib //@ build-fail diff --git a/tests/ui/abi/simd-abi-checks-s390x.rs b/tests/ui/abi/simd-abi-checks-s390x.rs index b2d64cecd523..6caddc0e0af5 100644 --- a/tests/ui/abi/simd-abi-checks-s390x.rs +++ b/tests/ui/abi/simd-abi-checks-s390x.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: z10 z13_no_vector z13_soft_float //@ build-fail //@[z10] compile-flags: --target s390x-unknown-linux-gnu -C target-cpu=z10 diff --git a/tests/ui/abi/simd-abi-checks-sse.rs b/tests/ui/abi/simd-abi-checks-sse.rs index 8e8379c23fc4..b9c1c10757d1 100644 --- a/tests/ui/abi/simd-abi-checks-sse.rs +++ b/tests/ui/abi/simd-abi-checks-sse.rs @@ -2,7 +2,7 @@ //! on a target via the base CPU, but disabled in this file via a `-C` flag. //@ compile-flags: --crate-type=rlib --target=i586-unknown-linux-gnu //@ compile-flags: -Ctarget-cpu=pentium4 -C target-feature=-sse,-sse2 -//@ add-core-stubs +//@ add-minicore //@ build-fail //@ needs-llvm-components: x86 //@ ignore-backends: gcc diff --git a/tests/ui/abi/sparcv8plus.rs b/tests/ui/abi/sparcv8plus.rs index c03853b6a387..00daeaa7f156 100644 --- a/tests/ui/abi/sparcv8plus.rs +++ b/tests/ui/abi/sparcv8plus.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: sparc sparcv8plus sparc_cpu_v9 sparc_feature_v8plus sparc_cpu_v9_feature_v8plus //@[sparc] compile-flags: --target sparc-unknown-none-elf //@[sparc] needs-llvm-components: sparc diff --git a/tests/ui/abi/unsupported.rs b/tests/ui/abi/unsupported.rs index a217b8eb87cf..7f7963ea51e1 100644 --- a/tests/ui/abi/unsupported.rs +++ b/tests/ui/abi/unsupported.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x64 x64_win i686 aarch64 arm riscv32 riscv64 // //@ [x64] needs-llvm-components: x86 diff --git a/tests/ui/abi/vectorcall-abi-checks.rs b/tests/ui/abi/vectorcall-abi-checks.rs index 14ad1ef32b62..1925508f2e8a 100644 --- a/tests/ui/abi/vectorcall-abi-checks.rs +++ b/tests/ui/abi/vectorcall-abi-checks.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --crate-type=rlib --target=i586-unknown-linux-gnu -C target-feature=-sse,-sse2 //@ build-fail //@ ignore-pass (test emits codegen-time errors) diff --git a/tests/ui/asm/aarch64/arm64ec-sve.rs b/tests/ui/asm/aarch64/arm64ec-sve.rs index 651bb5c088c7..05830aee8a97 100644 --- a/tests/ui/asm/aarch64/arm64ec-sve.rs +++ b/tests/ui/asm/aarch64/arm64ec-sve.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target arm64ec-pc-windows-msvc //@ needs-llvm-components: aarch64 //@ ignore-backends: gcc diff --git a/tests/ui/asm/arm-low-dreg.rs b/tests/ui/asm/arm-low-dreg.rs index 8190076477de..6c1491ff0664 100644 --- a/tests/ui/asm/arm-low-dreg.rs +++ b/tests/ui/asm/arm-low-dreg.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-pass //@ compile-flags: --target=armv7-unknown-linux-gnueabihf //@ needs-llvm-components: arm diff --git a/tests/ui/asm/bad-template.rs b/tests/ui/asm/bad-template.rs index 0bed9fc480be..966611949926 100644 --- a/tests/ui/asm/bad-template.rs +++ b/tests/ui/asm/bad-template.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86_64 aarch64 //@ [x86_64] compile-flags: --target x86_64-unknown-linux-gnu diff --git a/tests/ui/asm/inline-syntax.rs b/tests/ui/asm/inline-syntax.rs index 4ac0087d5b78..b48841aabfe7 100644 --- a/tests/ui/asm/inline-syntax.rs +++ b/tests/ui/asm/inline-syntax.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86_64 arm //@[x86_64] compile-flags: --target x86_64-unknown-linux-gnu //@[x86_64] check-pass diff --git a/tests/ui/asm/issue-85247.rs b/tests/ui/asm/issue-85247.rs index f81c08fd5bd0..ff44f8763f74 100644 --- a/tests/ui/asm/issue-85247.rs +++ b/tests/ui/asm/issue-85247.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: ropi rwpi //@ [ropi] compile-flags: --target armv7-unknown-linux-gnueabihf -C relocation-model=ropi diff --git a/tests/ui/asm/issue-92378.rs b/tests/ui/asm/issue-92378.rs index 1bdaef5a1af7..89ef2247d84b 100644 --- a/tests/ui/asm/issue-92378.rs +++ b/tests/ui/asm/issue-92378.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target armv5te-unknown-linux-gnueabi //@ needs-llvm-components: arm //@ build-pass diff --git a/tests/ui/asm/issue-99071.rs b/tests/ui/asm/issue-99071.rs index fc7baa677240..1404b3730708 100644 --- a/tests/ui/asm/issue-99071.rs +++ b/tests/ui/asm/issue-99071.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv6m-none-eabi //@ needs-llvm-components: arm //@ ignore-backends: gcc diff --git a/tests/ui/asm/loongarch/bad-reg.rs b/tests/ui/asm/loongarch/bad-reg.rs index c39756d7cb1a..7d28884966d4 100644 --- a/tests/ui/asm/loongarch/bad-reg.rs +++ b/tests/ui/asm/loongarch/bad-reg.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: loongarch32_ilp32d loongarch32_ilp32s loongarch64_lp64d loongarch64_lp64s //@[loongarch32_ilp32d] compile-flags: --target loongarch32-unknown-none //@[loongarch32_ilp32d] needs-llvm-components: loongarch diff --git a/tests/ui/asm/naked-function-shim.rs b/tests/ui/asm/naked-function-shim.rs index 55fe9291ba5d..8d5b87f0bedd 100644 --- a/tests/ui/asm/naked-function-shim.rs +++ b/tests/ui/asm/naked-function-shim.rs @@ -2,7 +2,7 @@ // this is handled correctly. See also https://github.com/rust-lang/rust/issues/143266. //@ build-pass -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86_64 //@ [aarch64] compile-flags: --target aarch64-unknown-none //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/ui/asm/naked-functions-instruction-set.rs b/tests/ui/asm/naked-functions-instruction-set.rs index 4ee82cfcbb3d..8c796ff8b262 100644 --- a/tests/ui/asm/naked-functions-instruction-set.rs +++ b/tests/ui/asm/naked-functions-instruction-set.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target armv5te-unknown-linux-gnueabi //@ needs-llvm-components: arm //@ build-pass diff --git a/tests/ui/asm/powerpc/bad-reg.rs b/tests/ui/asm/powerpc/bad-reg.rs index c09001f27ffe..6ded9b97eb88 100644 --- a/tests/ui/asm/powerpc/bad-reg.rs +++ b/tests/ui/asm/powerpc/bad-reg.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: powerpc powerpc64 powerpc64le aix64 //@[powerpc] compile-flags: --target powerpc-unknown-linux-gnu //@[powerpc] needs-llvm-components: powerpc diff --git a/tests/ui/asm/reg-conflict.rs b/tests/ui/asm/reg-conflict.rs index bcb3ceb23c04..606735051f7a 100644 --- a/tests/ui/asm/reg-conflict.rs +++ b/tests/ui/asm/reg-conflict.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target armv7-unknown-linux-gnueabihf //@ needs-llvm-components: arm //@ ignore-backends: gcc diff --git a/tests/ui/asm/riscv/bad-reg.rs b/tests/ui/asm/riscv/bad-reg.rs index 0acf94c71994..9332df0cc583 100644 --- a/tests/ui/asm/riscv/bad-reg.rs +++ b/tests/ui/asm/riscv/bad-reg.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: riscv32i riscv32imafc riscv32gc riscv32e riscv64imac riscv64gc //@[riscv32i] compile-flags: --target riscv32i-unknown-none-elf //@[riscv32i] needs-llvm-components: riscv diff --git a/tests/ui/asm/riscv/riscv32e-registers.rs b/tests/ui/asm/riscv/riscv32e-registers.rs index c07cd3c596a7..70231edddbc6 100644 --- a/tests/ui/asm/riscv/riscv32e-registers.rs +++ b/tests/ui/asm/riscv/riscv32e-registers.rs @@ -1,6 +1,6 @@ // Test that loads into registers x16..=x31 are never generated for riscv32{e,em,emc} targets // -//@ add-core-stubs +//@ add-minicore //@ build-fail //@ revisions: riscv32e riscv32em riscv32emc // diff --git a/tests/ui/asm/s390x/bad-reg.rs b/tests/ui/asm/s390x/bad-reg.rs index 274f4cd887c1..97b2b3d50b34 100644 --- a/tests/ui/asm/s390x/bad-reg.rs +++ b/tests/ui/asm/s390x/bad-reg.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: s390x s390x_vector s390x_vector_stable //@[s390x] compile-flags: --target s390x-unknown-linux-gnu -C target-feature=-vector //@[s390x] needs-llvm-components: systemz diff --git a/tests/ui/asm/sparc/bad-reg.rs b/tests/ui/asm/sparc/bad-reg.rs index 82ac1ebb7afa..c44f6c5790bf 100644 --- a/tests/ui/asm/sparc/bad-reg.rs +++ b/tests/ui/asm/sparc/bad-reg.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: sparc sparcv8plus sparc64 //@[sparc] compile-flags: --target sparc-unknown-none-elf //@[sparc] needs-llvm-components: sparc diff --git a/tests/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs b/tests/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs index 227860436931..ceee5728b414 100644 --- a/tests/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs +++ b/tests/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore // Test that we do not ICE when the self type is `ty::err`, but rather // just propagate the error. diff --git a/tests/ui/borrowck/issue-92157.rs b/tests/ui/borrowck/issue-92157.rs index 72f216e301df..3dbcb4ad8b7f 100644 --- a/tests/ui/borrowck/issue-92157.rs +++ b/tests/ui/borrowck/issue-92157.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![feature(lang_items)] diff --git a/tests/ui/c-variadic/unsupported-abi.rs b/tests/ui/c-variadic/unsupported-abi.rs index bed6b41d669a..f055ea481914 100644 --- a/tests/ui/c-variadic/unsupported-abi.rs +++ b/tests/ui/c-variadic/unsupported-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: x86 //@ compile-flags: --target=i686-pc-windows-gnu --crate-type=rlib //@ ignore-backends: gcc diff --git a/tests/ui/c-variadic/variadic-ffi-1.rs b/tests/ui/c-variadic/variadic-ffi-1.rs index 95cd34419676..2b3c1056253a 100644 --- a/tests/ui/c-variadic/variadic-ffi-1.rs +++ b/tests/ui/c-variadic/variadic-ffi-1.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: x86 //@ compile-flags: --target=i686-pc-windows-msvc --crate-type=rlib //@ ignore-backends: gcc diff --git a/tests/ui/cfg/crt-static-with-target-features-works.rs b/tests/ui/cfg/crt-static-with-target-features-works.rs index bce022296245..53165969c4da 100644 --- a/tests/ui/cfg/crt-static-with-target-features-works.rs +++ b/tests/ui/cfg/crt-static-with-target-features-works.rs @@ -2,7 +2,7 @@ // does not result in skipping the features following it. // This is a regression test for #144143 -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: x86 //@ compile-flags: --target=x86_64-unknown-linux-gnu //@ compile-flags: -Ctarget-feature=+crt-static,+avx2 diff --git a/tests/ui/check-cfg/values-target-json.rs b/tests/ui/check-cfg/values-target-json.rs index d473f39c3d6a..ddfcb24c640c 100644 --- a/tests/ui/check-cfg/values-target-json.rs +++ b/tests/ui/check-cfg/values-target-json.rs @@ -1,6 +1,6 @@ // This test checks that we don't lint values defined by a custom target (target json) // -//@ add-core-stubs +//@ add-minicore //@ check-pass //@ no-auto-check-cfg //@ needs-llvm-components: x86 diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/callback-as-argument.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/callback-as-argument.rs index 2d937b69908e..0546b26820bc 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/callback-as-argument.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/callback-as-argument.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-pass //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/generics.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/generics.rs index 72efd0581432..fc5db3cd7543 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/generics.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/generics.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm #![feature(abi_cmse_nonsecure_call, no_core, lang_items)] diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.rs index 7036cd367e40..e35138bf7cb8 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm #![feature(abi_cmse_nonsecure_call, no_core, lang_items)] diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/return-via-stack.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/return-via-stack.rs index 77347b04ede8..b9d9fc92c8e2 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/return-via-stack.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/return-via-stack.rs @@ -1,7 +1,7 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm -//@ add-core-stubs +//@ add-minicore #![feature(abi_cmse_nonsecure_call, no_core, lang_items)] #![no_core] diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs index 0a0dca804ef3..1ed5df459c7b 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ incremental (required to trigger the bug) //@ needs-llvm-components: arm diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/via-registers.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/via-registers.rs index 419d26875bcd..db9a51969a9f 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/via-registers.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/via-registers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-pass //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs index 44a1e7d69a8c..290688f8ed95 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm #![feature(abi_cmse_nonsecure_call, lang_items, no_core)] diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs index f23f45f786fb..f23677e1ed71 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm #![feature(abi_cmse_nonsecure_call, lang_items, no_core)] diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs index 9317ab5cd275..b3da4ff0120c 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/c-variadic.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ edition: 2018 //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/generics.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/generics.rs index d01934929d97..4b320ded7943 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/generics.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/generics.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm #![feature(cmse_nonsecure_entry, no_core, lang_items)] diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-via-stack.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-via-stack.rs index d4f722fa1938..5326dd5765f1 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-via-stack.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-via-stack.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm #![feature(cmse_nonsecure_entry, no_core, lang_items)] diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/return-via-stack.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/return-via-stack.rs index 0052a0977ed7..19abd1740e65 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/return-via-stack.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/return-via-stack.rs @@ -1,7 +1,6 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm -//@ add-core-stubs #![feature(cmse_nonsecure_entry, no_core, lang_items)] #![no_core] diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/return-via-stack.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/return-via-stack.stderr index c5effed92ae9..07ee31bef23c 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/return-via-stack.stderr +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/return-via-stack.stderr @@ -1,5 +1,5 @@ error[E0798]: return value of `"cmse-nonsecure-entry"` function too large to pass via registers - --> $DIR/return-via-stack.rs:25:46 + --> $DIR/return-via-stack.rs:24:46 | LL | pub extern "cmse-nonsecure-entry" fn f1() -> ReprCU64 { | ^^^^^^^^ this type doesn't fit in the available registers @@ -8,7 +8,7 @@ LL | pub extern "cmse-nonsecure-entry" fn f1() -> ReprCU64 { = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size error[E0798]: return value of `"cmse-nonsecure-entry"` function too large to pass via registers - --> $DIR/return-via-stack.rs:30:46 + --> $DIR/return-via-stack.rs:29:46 | LL | pub extern "cmse-nonsecure-entry" fn f2() -> ReprCBytes { | ^^^^^^^^^^ this type doesn't fit in the available registers @@ -17,7 +17,7 @@ LL | pub extern "cmse-nonsecure-entry" fn f2() -> ReprCBytes { = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size error[E0798]: return value of `"cmse-nonsecure-entry"` function too large to pass via registers - --> $DIR/return-via-stack.rs:35:46 + --> $DIR/return-via-stack.rs:34:46 | LL | pub extern "cmse-nonsecure-entry" fn f3() -> U64Compound { | ^^^^^^^^^^^ this type doesn't fit in the available registers @@ -26,7 +26,7 @@ LL | pub extern "cmse-nonsecure-entry" fn f3() -> U64Compound { = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size error[E0798]: return value of `"cmse-nonsecure-entry"` function too large to pass via registers - --> $DIR/return-via-stack.rs:40:46 + --> $DIR/return-via-stack.rs:39:46 | LL | pub extern "cmse-nonsecure-entry" fn f4() -> ReprCAlign16 { | ^^^^^^^^^^^^ this type doesn't fit in the available registers @@ -35,7 +35,7 @@ LL | pub extern "cmse-nonsecure-entry" fn f4() -> ReprCAlign16 { = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size error[E0798]: return value of `"cmse-nonsecure-entry"` function too large to pass via registers - --> $DIR/return-via-stack.rs:47:46 + --> $DIR/return-via-stack.rs:46:46 | LL | pub extern "cmse-nonsecure-entry" fn f5() -> [u8; 5] { | ^^^^^^^ this type doesn't fit in the available registers @@ -44,7 +44,7 @@ LL | pub extern "cmse-nonsecure-entry" fn f5() -> [u8; 5] { = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size error[E0798]: return value of `"cmse-nonsecure-entry"` function too large to pass via registers - --> $DIR/return-via-stack.rs:53:48 + --> $DIR/return-via-stack.rs:52:48 | LL | pub extern "cmse-nonsecure-entry" fn u128() -> u128 { | ^^^^ this type doesn't fit in the available registers @@ -53,7 +53,7 @@ LL | pub extern "cmse-nonsecure-entry" fn u128() -> u128 { = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size error[E0798]: return value of `"cmse-nonsecure-entry"` function too large to pass via registers - --> $DIR/return-via-stack.rs:59:48 + --> $DIR/return-via-stack.rs:58:48 | LL | pub extern "cmse-nonsecure-entry" fn i128() -> i128 { | ^^^^ this type doesn't fit in the available registers @@ -62,7 +62,7 @@ LL | pub extern "cmse-nonsecure-entry" fn i128() -> i128 { = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size error[E0798]: return value of `"cmse-nonsecure-entry"` function too large to pass via registers - --> $DIR/return-via-stack.rs:76:54 + --> $DIR/return-via-stack.rs:75:54 | LL | pub extern "cmse-nonsecure-entry" fn union_rust() -> ReprRustUnionU64 { | ^^^^^^^^^^^^^^^^ this type doesn't fit in the available registers @@ -71,7 +71,7 @@ LL | pub extern "cmse-nonsecure-entry" fn union_rust() -> ReprRustUnionU64 { = note: the result must either be a (transparently wrapped) i64, u64 or f64, or be at most 4 bytes in size error[E0798]: return value of `"cmse-nonsecure-entry"` function too large to pass via registers - --> $DIR/return-via-stack.rs:81:51 + --> $DIR/return-via-stack.rs:80:51 | LL | pub extern "cmse-nonsecure-entry" fn union_c() -> ReprCUnionU64 { | ^^^^^^^^^^^^^ this type doesn't fit in the available registers diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.rs index aff632fa2879..32e6c92dc6cb 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/trustzone-only.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: x86 aarch64 thumb7 // //@[x86] compile-flags: --target x86_64-unknown-linux-gnu diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/via-registers.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/via-registers.rs index cc7e2199ca91..0a6565e37fc7 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/via-registers.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-entry/via-registers.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-pass //@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib //@ needs-llvm-components: arm diff --git a/tests/ui/compiletest-self-test/minicore-smoke-test.rs b/tests/ui/compiletest-self-test/minicore-smoke-test.rs index ec879f2852e1..0d43d45e2d65 100644 --- a/tests/ui/compiletest-self-test/minicore-smoke-test.rs +++ b/tests/ui/compiletest-self-test/minicore-smoke-test.rs @@ -3,7 +3,7 @@ //! This test is duplicated between ui/codegen/assembly because they have different runtest //! codepaths. -//@ add-core-stubs +//@ add-minicore //@ check-pass //@ compile-flags: --target=x86_64-unknown-linux-gnu //@ needs-llvm-components: x86 diff --git a/tests/ui/deriving/deriving-with-helper.rs b/tests/ui/deriving/deriving-with-helper.rs index df98bb6beb9f..8b468fade754 100644 --- a/tests/ui/deriving/deriving-with-helper.rs +++ b/tests/ui/deriving/deriving-with-helper.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ check-pass //@ compile-flags: --crate-type=lib diff --git a/tests/ui/feature-gates/feature-gate-abi-avr-interrupt.rs b/tests/ui/feature-gates/feature-gate-abi-avr-interrupt.rs index 4e9096f949ba..164bc1b5c29d 100644 --- a/tests/ui/feature-gates/feature-gate-abi-avr-interrupt.rs +++ b/tests/ui/feature-gates/feature-gate-abi-avr-interrupt.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: avr //@ compile-flags: --target=avr-none -C target-cpu=atmega328p --crate-type=rlib //@ ignore-backends: gcc diff --git a/tests/ui/feature-gates/feature-gate-abi-custom.rs b/tests/ui/feature-gates/feature-gate-abi-custom.rs index 312b6230b743..ca0b8337bbb7 100644 --- a/tests/ui/feature-gates/feature-gate-abi-custom.rs +++ b/tests/ui/feature-gates/feature-gate-abi-custom.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-asm-support #![no_core] #![feature(no_core, lang_items)] diff --git a/tests/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs b/tests/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs index 60bf69f597cc..4971fcb6cb5b 100644 --- a/tests/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs +++ b/tests/ui/feature-gates/feature-gate-abi-msp430-interrupt.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: msp430 //@ compile-flags: --target=msp430-none-elf --crate-type=rlib #![no_core] diff --git a/tests/ui/feature-gates/feature-gate-abi-riscv-interrupt.rs b/tests/ui/feature-gates/feature-gate-abi-riscv-interrupt.rs index 7953352329ea..2bb5f969cf98 100644 --- a/tests/ui/feature-gates/feature-gate-abi-riscv-interrupt.rs +++ b/tests/ui/feature-gates/feature-gate-abi-riscv-interrupt.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: riscv //@ compile-flags: --target=riscv32imc-unknown-none-elf --crate-type=rlib //@ ignore-backends: gcc diff --git a/tests/ui/feature-gates/feature-gate-abi-x86-interrupt.rs b/tests/ui/feature-gates/feature-gate-abi-x86-interrupt.rs index 0abdf0c5309b..2bfe03b89110 100644 --- a/tests/ui/feature-gates/feature-gate-abi-x86-interrupt.rs +++ b/tests/ui/feature-gates/feature-gate-abi-x86-interrupt.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: x86 //@ compile-flags: --target=x86_64-unknown-linux-gnu --crate-type=rlib #![no_core] diff --git a/tests/ui/feature-gates/feature-gate-abi.rs b/tests/ui/feature-gates/feature-gate-abi.rs index bafd3643788e..8e7f27e25cc5 100644 --- a/tests/ui/feature-gates/feature-gate-abi.rs +++ b/tests/ui/feature-gates/feature-gate-abi.rs @@ -1,5 +1,5 @@ // gate-test-intrinsics -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --crate-type=rlib #![feature(no_core, lang_items)] diff --git a/tests/ui/feature-gates/feature-gate-abi_gpu_kernel.rs b/tests/ui/feature-gates/feature-gate-abi_gpu_kernel.rs index 148efea208c7..d442c9317f64 100644 --- a/tests/ui/feature-gates/feature-gate-abi_gpu_kernel.rs +++ b/tests/ui/feature-gates/feature-gate-abi_gpu_kernel.rs @@ -1,5 +1,5 @@ //@ revisions: HOST AMDGPU NVPTX -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --crate-type=rlib //@[AMDGPU] compile-flags: --target amdgcn-amd-amdhsa -Ctarget-cpu=gfx1100 //@[AMDGPU] needs-llvm-components: amdgpu diff --git a/tests/ui/feature-gates/feature-gate-abi_ptx.rs b/tests/ui/feature-gates/feature-gate-abi_ptx.rs index 329e8e124494..7f5935a54683 100644 --- a/tests/ui/feature-gates/feature-gate-abi_ptx.rs +++ b/tests/ui/feature-gates/feature-gate-abi_ptx.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: nvptx //@ compile-flags: --target=nvptx64-nvidia-cuda --crate-type=rlib //@ ignore-backends: gcc diff --git a/tests/ui/feature-gates/feature-gate-asm_experimental_arch.rs b/tests/ui/feature-gates/feature-gate-asm_experimental_arch.rs index 3e8ebd4f9f0b..450a4f40beb0 100644 --- a/tests/ui/feature-gates/feature-gate-asm_experimental_arch.rs +++ b/tests/ui/feature-gates/feature-gate-asm_experimental_arch.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target mips-unknown-linux-gnu //@ needs-llvm-components: mips //@ ignore-backends: gcc diff --git a/tests/ui/feature-gates/feature-gate-asm_experimental_reg.rs b/tests/ui/feature-gates/feature-gate-asm_experimental_reg.rs index 15d6d4731c8f..7794bdc30b34 100644 --- a/tests/ui/feature-gates/feature-gate-asm_experimental_reg.rs +++ b/tests/ui/feature-gates/feature-gate-asm_experimental_reg.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target s390x-unknown-linux-gnu //@ needs-llvm-components: systemz //@ ignore-backends: gcc diff --git a/tests/ui/feature-gates/feature-gate-vectorcall.rs b/tests/ui/feature-gates/feature-gate-vectorcall.rs index 1811357d1bcb..8c397e9fc36f 100644 --- a/tests/ui/feature-gates/feature-gate-vectorcall.rs +++ b/tests/ui/feature-gates/feature-gate-vectorcall.rs @@ -1,5 +1,5 @@ // gate-test-abi_vectorcall -//@ add-core-stubs +//@ add-minicore //@ needs-llvm-components: x86 //@ compile-flags: --target=i686-pc-windows-msvc --crate-type=rlib //@ ignore-backends: gcc diff --git a/tests/ui/force-inlining/asm.rs b/tests/ui/force-inlining/asm.rs index 2b5f87c59d35..d48af8253d83 100644 --- a/tests/ui/force-inlining/asm.rs +++ b/tests/ui/force-inlining/asm.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-fail //@ compile-flags: --crate-type=lib --target thumbv4t-none-eabi //@ needs-llvm-components: arm diff --git a/tests/ui/layout/hexagon-enum.rs b/tests/ui/layout/hexagon-enum.rs index 22a1d5d10f30..517c1cb3d5cf 100644 --- a/tests/ui/layout/hexagon-enum.rs +++ b/tests/ui/layout/hexagon-enum.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target hexagon-unknown-linux-musl //@ normalize-stderr: "randomization_seed: \d+" -> "randomization_seed: $$SEED" //@ needs-llvm-components: hexagon diff --git a/tests/ui/layout/reprc-power-alignment.rs b/tests/ui/layout/reprc-power-alignment.rs index c8a6aa86a508..639e21782351 100644 --- a/tests/ui/layout/reprc-power-alignment.rs +++ b/tests/ui/layout/reprc-power-alignment.rs @@ -1,7 +1,7 @@ //@ check-pass //@ compile-flags: --target powerpc64-ibm-aix //@ needs-llvm-components: powerpc -//@ add-core-stubs +//@ add-minicore //@ ignore-backends: gcc #![feature(no_core)] #![no_core] diff --git a/tests/ui/layout/thumb-enum.rs b/tests/ui/layout/thumb-enum.rs index 1b516f05ec6f..d65822b4647a 100644 --- a/tests/ui/layout/thumb-enum.rs +++ b/tests/ui/layout/thumb-enum.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target thumbv8m.main-none-eabihf //@ normalize-stderr: "randomization_seed: \d+" -> "randomization_seed: $$SEED" //@ needs-llvm-components: arm diff --git a/tests/ui/layout/too-big-with-padding.rs b/tests/ui/layout/too-big-with-padding.rs index b8c75d24f492..cbbf772e7f59 100644 --- a/tests/ui/layout/too-big-with-padding.rs +++ b/tests/ui/layout/too-big-with-padding.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-fail //@ compile-flags: --target i686-unknown-linux-gnu --crate-type lib //@ needs-llvm-components: x86 diff --git a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-invalid-format.rs b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-invalid-format.rs index 4340703e106d..1eaa00f7397c 100644 --- a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-invalid-format.rs +++ b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-invalid-format.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target i686-pc-windows-msvc //@ needs-llvm-components: x86 //@ ignore-backends: gcc diff --git a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-multiple.rs b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-multiple.rs index a03fb53c687b..823748035a85 100644 --- a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-multiple.rs +++ b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-multiple.rs @@ -1,5 +1,5 @@ // ignore-tidy-linelength -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target i686-pc-windows-msvc //@ needs-llvm-components: x86 //@ ignore-backends: gcc diff --git a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unknown-value.rs b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unknown-value.rs index adcacc89e748..e1f7e03d0594 100644 --- a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unknown-value.rs +++ b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unknown-value.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target i686-pc-windows-msvc //@ needs-llvm-components: x86 //@ ignore-backends: gcc diff --git a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unsupported-link-kind.rs b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unsupported-link-kind.rs index 79aa16b98563..929e09a271ac 100644 --- a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unsupported-link-kind.rs +++ b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-unsupported-link-kind.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target i686-pc-windows-msvc //@ needs-llvm-components: x86 //@ ignore-backends: gcc diff --git a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-x86-only.rs b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-x86-only.rs index 0b82165f5752..82b6066edcdb 100644 --- a/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-x86-only.rs +++ b/tests/ui/linkage-attr/raw-dylib/windows/import-name-type-x86-only.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target aarch64-pc-windows-msvc //@ needs-llvm-components: aarch64 //@ ignore-backends: gcc diff --git a/tests/ui/linkage-attr/raw-dylib/windows/unsupported-abi.rs b/tests/ui/linkage-attr/raw-dylib/windows/unsupported-abi.rs index 9ccc9ce4fdb8..58f0a74e674d 100644 --- a/tests/ui/linkage-attr/raw-dylib/windows/unsupported-abi.rs +++ b/tests/ui/linkage-attr/raw-dylib/windows/unsupported-abi.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --target x86_64-pc-windows-msvc //@ compile-flags: --crate-type lib --emit link //@ needs-llvm-components: x86 diff --git a/tests/ui/mir/checks_without_panic_impl.rs b/tests/ui/mir/checks_without_panic_impl.rs index 11ab50a5f9af..f4624fedd0c8 100644 --- a/tests/ui/mir/checks_without_panic_impl.rs +++ b/tests/ui/mir/checks_without_panic_impl.rs @@ -2,7 +2,7 @@ // does not prevent crates without a panic_impl from compiling. // See rust-lang/rust#109996 -//@ add-core-stubs +//@ add-minicore //@ build-pass //@ compile-flags: -Cdebug-assertions=yes diff --git a/tests/ui/panic-runtime/auxiliary/needs-unwind-immediate-abort.rs b/tests/ui/panic-runtime/auxiliary/needs-unwind-immediate-abort.rs index 295876fec527..89f5b402ea44 100644 --- a/tests/ui/panic-runtime/auxiliary/needs-unwind-immediate-abort.rs +++ b/tests/ui/panic-runtime/auxiliary/needs-unwind-immediate-abort.rs @@ -1,6 +1,6 @@ //@ compile-flags:-C panic=unwind //@ no-prefer-dynamic -//@ add-core-stubs +//@ add-minicore #![crate_type = "rlib"] #![feature(no_core)] diff --git a/tests/ui/panic-runtime/need-abort-got-immediate-abort.rs b/tests/ui/panic-runtime/need-abort-got-immediate-abort.rs index 78977c60be98..918394b2d32d 100644 --- a/tests/ui/panic-runtime/need-abort-got-immediate-abort.rs +++ b/tests/ui/panic-runtime/need-abort-got-immediate-abort.rs @@ -2,7 +2,7 @@ //@ aux-build:needs-abort.rs //@ compile-flags:-Cpanic=immediate-abort -Zunstable-options //@ no-prefer-dynamic -//@ add-core-stubs +//@ add-minicore //@ core-stubs-compile-flags: -Cpanic=immediate-abort -Zunstable-options #![feature(no_core)] diff --git a/tests/ui/panic-runtime/need-immediate-abort-got-abort.rs b/tests/ui/panic-runtime/need-immediate-abort-got-abort.rs index 1c5f597a3f99..070262ca9ec1 100644 --- a/tests/ui/panic-runtime/need-immediate-abort-got-abort.rs +++ b/tests/ui/panic-runtime/need-immediate-abort-got-abort.rs @@ -2,7 +2,7 @@ //@ aux-build:needs-immediate-abort.rs //@ compile-flags:-C panic=abort //@ no-prefer-dynamic -//@ add-core-stubs +//@ add-minicore //@ core-stubs-compile-flags: -Zunstable-options -Cpanic=immediate-abort #![feature(no_core)] diff --git a/tests/ui/panic-runtime/need-immediate-abort-got-unwind.rs b/tests/ui/panic-runtime/need-immediate-abort-got-unwind.rs index 24d521230d49..9cdb7a0ed1dd 100644 --- a/tests/ui/panic-runtime/need-immediate-abort-got-unwind.rs +++ b/tests/ui/panic-runtime/need-immediate-abort-got-unwind.rs @@ -2,7 +2,7 @@ //@ needs-unwind //@ aux-build:needs-immediate-abort.rs //@ no-prefer-dynamic -//@ add-core-stubs +//@ add-minicore //@ core-stubs-compile-flags: -Zunstable-options -Cpanic=immediate-abort #![feature(no_core)] diff --git a/tests/ui/panic-runtime/need-unwind-got-immediate-abort.rs b/tests/ui/panic-runtime/need-unwind-got-immediate-abort.rs index 5aec028a46cf..6f3f7202016a 100644 --- a/tests/ui/panic-runtime/need-unwind-got-immediate-abort.rs +++ b/tests/ui/panic-runtime/need-unwind-got-immediate-abort.rs @@ -2,7 +2,7 @@ //@ aux-build:needs-unwind-immediate-abort.rs //@ compile-flags:-C panic=immediate-abort -Zunstable-options //@ no-prefer-dynamic -//@ add-core-stubs +//@ add-minicore //@ core-stubs-compile-flags: -Zunstable-options -Cpanic=immediate-abort #![feature(no_core)] diff --git a/tests/ui/repr/16-bit-repr-c-enum.rs b/tests/ui/repr/16-bit-repr-c-enum.rs index b0f402554b81..f981ea23ee24 100644 --- a/tests/ui/repr/16-bit-repr-c-enum.rs +++ b/tests/ui/repr/16-bit-repr-c-enum.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-pass //@ revisions: avr msp430 // diff --git a/tests/ui/repr/repr-c-dead-variants.rs b/tests/ui/repr/repr-c-dead-variants.rs index 048e74c177ca..81f313646c7c 100644 --- a/tests/ui/repr/repr-c-dead-variants.rs +++ b/tests/ui/repr/repr-c-dead-variants.rs @@ -9,7 +9,7 @@ use minicore::*; // See also: repr-c-int-dead-variants.rs -//@ add-core-stubs +//@ add-minicore //@ normalize-stderr: "pref: Align\([1-8] bytes\)" -> "pref: $$SOME_ALIGN" //@ normalize-stderr: "randomization_seed: \d+" -> "randomization_seed: $$SEED" diff --git a/tests/ui/repr/repr_align_greater_usize.rs b/tests/ui/repr/repr_align_greater_usize.rs index 7bbf0b29b2eb..d8eb03ef9525 100644 --- a/tests/ui/repr/repr_align_greater_usize.rs +++ b/tests/ui/repr/repr_align_greater_usize.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: msp430 aarch32 //@[msp430] needs-llvm-components: msp430 //@[msp430] compile-flags: --target=msp430-none-elf diff --git a/tests/ui/sanitizer/cfg-kasan.rs b/tests/ui/sanitizer/cfg-kasan.rs index 0f4560888935..2d934357adfe 100644 --- a/tests/ui/sanitizer/cfg-kasan.rs +++ b/tests/ui/sanitizer/cfg-kasan.rs @@ -1,7 +1,7 @@ // Verifies that when compiling with -Zsanitizer=kernel-address, // the `#[cfg(sanitize = "address")]` attribute is configured. -//@ add-core-stubs +//@ add-minicore //@ check-pass //@ compile-flags: -Zsanitizer=kernel-address //@ revisions: aarch64 riscv64imac riscv64gc x86_64 diff --git a/tests/ui/sanitizer/cfg.rs b/tests/ui/sanitizer/cfg.rs index 42b1d3c5e1f9..70914dcf9361 100644 --- a/tests/ui/sanitizer/cfg.rs +++ b/tests/ui/sanitizer/cfg.rs @@ -1,7 +1,7 @@ // Verifies that when compiling with -Zsanitizer=option, // the `#[cfg(sanitize = "option")]` attribute is configured. -//@ add-core-stubs +//@ add-minicore //@ check-pass //@ revisions: address cfi kcfi leak memory thread //@compile-flags: -Ctarget-feature=-crt-static diff --git a/tests/ui/static/static_sized_requirement.rs b/tests/ui/static/static_sized_requirement.rs index a0f4759112ca..644a6969fa56 100644 --- a/tests/ui/static/static_sized_requirement.rs +++ b/tests/ui/static/static_sized_requirement.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ check-pass #![feature(no_core)] diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-attribute-fcw.rs b/tests/ui/target-feature/abi-incompatible-target-feature-attribute-fcw.rs index a604a8588858..8449b8ce0928 100644 --- a/tests/ui/target-feature/abi-incompatible-target-feature-attribute-fcw.rs +++ b/tests/ui/target-feature/abi-incompatible-target-feature-attribute-fcw.rs @@ -1,7 +1,7 @@ //@ compile-flags: --crate-type=lib //@ compile-flags: --target=aarch64-unknown-none-softfloat //@ needs-llvm-components: aarch64 -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] #![deny(aarch64_softfloat_neon)] diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs index aab2be7a3669..20b82d2b1fb5 100644 --- a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs +++ b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs @@ -7,7 +7,7 @@ //@[riscv] compile-flags: --target=riscv32e-unknown-none-elf //@[riscv] needs-llvm-components: riscv //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core, riscv_target_feature, x87_target_feature)] #![no_core] diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs index ee932dac26a0..d3d2d6f62ec3 100644 --- a/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs +++ b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs @@ -10,7 +10,7 @@ //@[riscv] core-stubs-compile-flags: -Ctarget-feature=-d //@[riscv] needs-llvm-components: riscv //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core, riscv_target_feature)] #![no_core] diff --git a/tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.rs b/tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.rs index e5fe9d15c7b1..688f51dad58c 100644 --- a/tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.rs +++ b/tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.rs @@ -6,7 +6,7 @@ //@ compile-flags: -Ctarget-feature=-x87 //@ build-pass //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] diff --git a/tests/ui/target-feature/abi-required-target-feature-attribute.rs b/tests/ui/target-feature/abi-required-target-feature-attribute.rs index 747c00e48eac..b2d2c95313d2 100644 --- a/tests/ui/target-feature/abi-required-target-feature-attribute.rs +++ b/tests/ui/target-feature/abi-required-target-feature-attribute.rs @@ -4,7 +4,7 @@ //@ needs-llvm-components: x86 //@ build-pass //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core, x87_target_feature)] #![no_core] diff --git a/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs b/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs index 3b4bdb87a422..47b7abd50deb 100644 --- a/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs +++ b/tests/ui/target-feature/abi-required-target-feature-flag-disable.rs @@ -17,7 +17,7 @@ // Remove some LLVM warnings that only show up sometimes. //@ normalize-stderr: "\n[^\n]*(target-abi|lp64f)[^\n]*" -> "" //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] diff --git a/tests/ui/target-feature/feature-hierarchy.rs b/tests/ui/target-feature/feature-hierarchy.rs index 9ea24c19f085..2e10c0e6e690 100644 --- a/tests/ui/target-feature/feature-hierarchy.rs +++ b/tests/ui/target-feature/feature-hierarchy.rs @@ -4,7 +4,7 @@ //@ [aarch64-sve2] compile-flags: -Ctarget-feature=-neon,+sve2 --target=aarch64-unknown-linux-gnu //@ [aarch64-sve2] needs-llvm-components: aarch64 //@ build-pass -//@ add-core-stubs +//@ add-minicore #![no_core] #![crate_type = "rlib"] #![feature(intrinsics, rustc_attrs, no_core, staged_api)] diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute-e-d.rs b/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute-e-d.rs index 975cf3e56289..c787e747788d 100644 --- a/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute-e-d.rs +++ b/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute-e-d.rs @@ -2,7 +2,7 @@ //@ compile-flags: --target=riscv32e-unknown-none-elf --crate-type=lib //@ needs-llvm-components: riscv //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core, riscv_target_feature)] #![no_core] diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute-f-zfinx.rs b/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute-f-zfinx.rs index 1570c8e22251..ff9d38cc0a9d 100644 --- a/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute-f-zfinx.rs +++ b/tests/ui/target-feature/forbidden-hardfloat-target-feature-attribute-f-zfinx.rs @@ -2,7 +2,7 @@ //@ compile-flags: --target=riscv64gc-unknown-linux-gnu --crate-type=lib //@ needs-llvm-components: riscv //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core, riscv_target_feature)] #![no_core] diff --git a/tests/ui/target-feature/forbidden-hardfloat-target-feature-cfg.rs b/tests/ui/target-feature/forbidden-hardfloat-target-feature-cfg.rs index 7e7d7fd256fd..9457d1d2edb4 100644 --- a/tests/ui/target-feature/forbidden-hardfloat-target-feature-cfg.rs +++ b/tests/ui/target-feature/forbidden-hardfloat-target-feature-cfg.rs @@ -1,7 +1,7 @@ //@ compile-flags: --target=x86_64-unknown-linux-gnu --crate-type=lib //@ needs-llvm-components: x86 //@ check-pass -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] #![allow(unexpected_cfgs)] diff --git a/tests/ui/target-feature/forbidden-target-feature-attribute.rs b/tests/ui/target-feature/forbidden-target-feature-attribute.rs index d2c5f14f1b6c..71dedda94bc3 100644 --- a/tests/ui/target-feature/forbidden-target-feature-attribute.rs +++ b/tests/ui/target-feature/forbidden-target-feature-attribute.rs @@ -2,7 +2,7 @@ //@ compile-flags: --target=riscv32e-unknown-none-elf --crate-type=lib //@ needs-llvm-components: riscv //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] diff --git a/tests/ui/target-feature/forbidden-target-feature-cfg.rs b/tests/ui/target-feature/forbidden-target-feature-cfg.rs index b61e83c562bf..db1a7b817bb8 100644 --- a/tests/ui/target-feature/forbidden-target-feature-cfg.rs +++ b/tests/ui/target-feature/forbidden-target-feature-cfg.rs @@ -3,7 +3,7 @@ //@ needs-llvm-components: riscv //@ check-pass //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] #![allow(unexpected_cfgs)] diff --git a/tests/ui/target-feature/forbidden-target-feature-flag-disable.rs b/tests/ui/target-feature/forbidden-target-feature-flag-disable.rs index f0f77700451f..e1f576bb6d89 100644 --- a/tests/ui/target-feature/forbidden-target-feature-flag-disable.rs +++ b/tests/ui/target-feature/forbidden-target-feature-flag-disable.rs @@ -5,7 +5,7 @@ // For now this is just a warning. //@ build-pass //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] diff --git a/tests/ui/target-feature/forbidden-target-feature-flag.rs b/tests/ui/target-feature/forbidden-target-feature-flag.rs index 5cb3997b2e55..ad6d3ee6dfa9 100644 --- a/tests/ui/target-feature/forbidden-target-feature-flag.rs +++ b/tests/ui/target-feature/forbidden-target-feature-flag.rs @@ -5,7 +5,7 @@ // For now this is just a warning. //@ build-pass //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] diff --git a/tests/ui/target-feature/inline-always.rs b/tests/ui/target-feature/inline-always.rs index 17ffcf4255ff..c1334bb6016b 100644 --- a/tests/ui/target-feature/inline-always.rs +++ b/tests/ui/target-feature/inline-always.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ build-pass //@ compile-flags: --crate-type=lib //@ revisions: aarch64 diff --git a/tests/ui/target-feature/no-llvm-leaks.rs b/tests/ui/target-feature/no-llvm-leaks.rs index 707e53f7b37d..fa72c88ead02 100644 --- a/tests/ui/target-feature/no-llvm-leaks.rs +++ b/tests/ui/target-feature/no-llvm-leaks.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: aarch64 x86-64 //@ [aarch64] compile-flags: -Ctarget-feature=+neon,+fp16,+fhm --target=aarch64-unknown-linux-gnu //@ [aarch64] needs-llvm-components: aarch64 diff --git a/tests/ui/target-feature/retpoline-target-feature-flag.rs b/tests/ui/target-feature/retpoline-target-feature-flag.rs index ed3d030e69f3..182b5b86520c 100644 --- a/tests/ui/target-feature/retpoline-target-feature-flag.rs +++ b/tests/ui/target-feature/retpoline-target-feature-flag.rs @@ -1,4 +1,4 @@ -//@ add-core-stubs +//@ add-minicore //@ revisions: by_flag by_feature1 by_feature2 by_feature3 //@ compile-flags: --target=x86_64-unknown-linux-gnu --crate-type=lib //@ needs-llvm-components: x86 diff --git a/tests/ui/target-feature/target-cpu-lacks-required-target-feature.rs b/tests/ui/target-feature/target-cpu-lacks-required-target-feature.rs index 691be0949c63..5e46ea8adf64 100644 --- a/tests/ui/target-feature/target-cpu-lacks-required-target-feature.rs +++ b/tests/ui/target-feature/target-cpu-lacks-required-target-feature.rs @@ -4,7 +4,7 @@ // For now this is just a warning. //@ build-pass //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore #![feature(no_core)] #![no_core] diff --git a/tests/ui/target-feature/tied-features-cli.rs b/tests/ui/target-feature/tied-features-cli.rs index 020c3b187bd0..af151e5520fc 100644 --- a/tests/ui/target-feature/tied-features-cli.rs +++ b/tests/ui/target-feature/tied-features-cli.rs @@ -12,7 +12,7 @@ //@ [four] build-pass //@ [four] compile-flags: -C target-feature=-paca,+pacg -C target-feature=+paca //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore // FIXME(#147881): *disable* the features again for minicore as otherwise that will fail to build. //@ core-stubs-compile-flags: -C target-feature=-pacg,-paca #![feature(no_core)] diff --git a/tests/ui/target-feature/tied-features-no-implication-1.rs b/tests/ui/target-feature/tied-features-no-implication-1.rs index 9cf6eb953bd0..1b8e34221d79 100644 --- a/tests/ui/target-feature/tied-features-no-implication-1.rs +++ b/tests/ui/target-feature/tied-features-no-implication-1.rs @@ -4,7 +4,7 @@ //@[paca] compile-flags: -Ctarget-feature=+paca //@[pacg] compile-flags: -Ctarget-feature=+pacg //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore // FIXME(#147881): *disable* the features again for minicore as otherwise that will fail to build. //@ core-stubs-compile-flags: -C target-feature=-pacg,-paca #![feature(no_core)] diff --git a/tests/ui/target-feature/tied-features-no-implication.rs b/tests/ui/target-feature/tied-features-no-implication.rs index 821a3b802a7d..14631411d89f 100644 --- a/tests/ui/target-feature/tied-features-no-implication.rs +++ b/tests/ui/target-feature/tied-features-no-implication.rs @@ -4,7 +4,7 @@ //@[paca] compile-flags: -Ctarget-feature=+paca //@[pacg] compile-flags: -Ctarget-feature=+pacg //@ ignore-backends: gcc -//@ add-core-stubs +//@ add-minicore // FIXME(#147881): *disable* the features again for minicore as otherwise that will fail to build. //@ core-stubs-compile-flags: -C target-feature=-pacg,-paca diff --git a/tests/ui/target-feature/tied-features.rs b/tests/ui/target-feature/tied-features.rs index 1c3b171a8e1d..f83c09ef1e38 100644 --- a/tests/ui/target-feature/tied-features.rs +++ b/tests/ui/target-feature/tied-features.rs @@ -1,8 +1,7 @@ -//@ add-core-stubs +//@ add-minicore //@ compile-flags: --crate-type=rlib --target=aarch64-unknown-linux-gnu //@ needs-llvm-components: aarch64 //@ ignore-backends: gcc -//@ add-core-stubs #![feature(no_core)] #![no_core] diff --git a/tests/ui/target-feature/tied-features.stderr b/tests/ui/target-feature/tied-features.stderr index 6a2c909e2d8d..b6a97fbbe9d9 100644 --- a/tests/ui/target-feature/tied-features.stderr +++ b/tests/ui/target-feature/tied-features.stderr @@ -1,5 +1,5 @@ error: the target features paca, pacg must all be either enabled or disabled together - --> $DIR/tied-features.rs:13:5 + --> $DIR/tied-features.rs:12:5 | LL | #[target_feature(enable = "pacg")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | #[target_feature(enable = "pacg")] = help: add the missing features in a `target_feature` attribute error: the target features paca, pacg must all be either enabled or disabled together - --> $DIR/tied-features.rs:25:1 + --> $DIR/tied-features.rs:24:1 | LL | #[target_feature(enable = "paca")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | #[target_feature(enable = "paca")] = help: add the missing features in a `target_feature` attribute error: the target features paca, pacg must all be either enabled or disabled together - --> $DIR/tied-features.rs:38:1 + --> $DIR/tied-features.rs:37:1 | LL | #[target_feature(enable = "paca")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^