rustc: riscv: adapt target_feature tests

romancardenas · romancardenas · commit c2571ea25b4d · 2026-05-06T08:13:37.000+02:00
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.riscv.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.riscv.stderr
@@ -1,7 +1,7 @@
 error: target feature `d` cannot be enabled with `#[target_feature]`: this feature is incompatible with the target ABI
   --> $DIR/abi-incompatible-target-feature-attribute.rs:17:90
    |
-LL | #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "d"))]
+LL | #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "v"))]
    |                                                                                          ^^^^^^^^^^^^
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs
@@ -14,6 +14,6 @@
 extern crate minicore;
 use minicore::*;
 
-#[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "d"))]
+#[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "v"))]
 //~^ERROR: cannot be enabled with
 pub unsafe fn my_fun() {}
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-attribute.x86.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-attribute.x86.stderr
@@ -1,7 +1,7 @@
 error: target feature `soft-float` cannot be enabled with `#[target_feature]`: use a soft-float target instead
   --> $DIR/abi-incompatible-target-feature-attribute.rs:17:32
    |
-LL | #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "d"))]
+LL | #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "v"))]
    |                                ^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.riscv.stderr b/tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.riscv.stderr
@@ -1,6 +1,6 @@
 warning: unstable feature specified for `-Ctarget-feature`: `d`
    |
-   = note: this feature is not stably supported; its behavior can change in the future
+   = note: this feature is allowed in cfg but unstable otherwise; its behavior can change in the future
 
 warning: target feature `d` must be disabled to ensure that the ABI of the current target can be implemented correctly
    |
diff --git a/tests/ui/target-feature/abi-required-target-feature-flag-disable.riscv.stderr b/tests/ui/target-feature/abi-required-target-feature-flag-disable.riscv.stderr
@@ -1,6 +1,6 @@
 warning: unstable feature specified for `-Ctarget-feature`: `d`
    |
-   = note: this feature is not stably supported; its behavior can change in the future
+   = note: this feature is allowed in cfg but unstable otherwise; its behavior can change in the future
 
 warning: target feature `d` must be enabled to ensure that the ABI of the current target can be implemented correctly
    |

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	error: target feature `d` cannot be enabled with `#[target_feature]`: this feature is incompatible with the target ABI
`2`	`2`	`--> $DIR/abi-incompatible-target-feature-attribute.rs:17:90`
`3`	`3`	`\|`
`4`		`-LL \| #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "d"))]`
	`4`	`+LL \| #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "v"))]`
`5`	`5`	`\| ^^^^^^^^^^^^`
`6`	`6`
`7`	`7`	`error: aborting due to 1 previous error`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	error: target feature `soft-float` cannot be enabled with `#[target_feature]`: use a soft-float target instead
`2`	`2`	`--> $DIR/abi-incompatible-target-feature-attribute.rs:17:32`
`3`	`3`	`\|`
`4`		`-LL \| #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "d"))]`
	`4`	`+LL \| #[cfg_attr(x86, target_feature(enable = "soft-float"))] #[cfg_attr(riscv, target_feature(enable = "v"))]`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^`
`6`	`6`
`7`	`7`	`error: aborting due to 1 previous error`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	warning: unstable feature specified for `-Ctarget-feature`: `d`
`2`	`2`	`\|`
`3`		`- = note: this feature is not stably supported; its behavior can change in the future`
	`3`	`+ = note: this feature is allowed in cfg but unstable otherwise; its behavior can change in the future`
`4`	`4`
`5`	`5`	warning: target feature `d` must be disabled to ensure that the ABI of the current target can be implemented correctly
`6`	`6`	`\|`