Skip to content

Commit 56cfe97

Browse files
committed
Revert "Add a test config for __gnu_h2f_ieee and __gnu_f2h_ieee"
This turned out to not be useful, so remove it. This reverts commit b7b9310.
1 parent 7aa9d0b commit 56cfe97

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

testcrate/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ no-sys-f128 = ["no-sys-f128-int-convert", "no-sys-f16-f128-convert"]
4444
no-sys-f128-int-convert = []
4545
no-sys-f16-f128-convert = []
4646
no-sys-f16-f64-convert = []
47-
no-sys-f16-gnu-convert = []
4847
# Skip tests that rely on f16 symbols being available on the system
49-
no-sys-f16 = ["no-sys-f16-f64-convert", "no-sys-f16-gnu-convert"]
48+
no-sys-f16 = ["no-sys-f16-f64-convert"]
5049

5150
# Enable report generation without bringing in more dependencies by default
5251
benchmarking-reports = ["criterion/plotters", "criterion/html_reports"]

testcrate/build.rs

+1-17
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,16 @@ enum Feature {
1212
NoSysF16,
1313
NoSysF16F64Convert,
1414
NoSysF16F128Convert,
15-
NoSysF16GnuConvert,
1615
}
1716

1817
impl Feature {
1918
fn implies(self) -> &'static [Self] {
2019
match self {
2120
Self::NoSysF128 => [Self::NoSysF128IntConvert, Self::NoSysF16F128Convert].as_slice(),
2221
Self::NoSysF128IntConvert => [].as_slice(),
23-
Self::NoSysF16 => [
24-
Self::NoSysF16F64Convert,
25-
Self::NoSysF16F128Convert,
26-
Feature::NoSysF16GnuConvert,
27-
]
28-
.as_slice(),
22+
Self::NoSysF16 => [Self::NoSysF16F64Convert, Self::NoSysF16F128Convert].as_slice(),
2923
Self::NoSysF16F64Convert => [].as_slice(),
3024
Self::NoSysF16F128Convert => [].as_slice(),
31-
Self::NoSysF16GnuConvert => [].as_slice(),
3225
}
3326
}
3427
}
@@ -92,11 +85,6 @@ fn main() {
9285
features.insert(Feature::NoSysF16F64Convert);
9386
}
9487

95-
// These platforms do not have `__gnu_f2h_ieee` or `__gnu_h2f_ieee`.
96-
if false {
97-
features.insert(Feature::NoSysF16GnuConvert);
98-
}
99-
10088
// Add implied features. Collection is required for borrows.
10189
features.extend(
10290
features
@@ -121,10 +109,6 @@ fn main() {
121109
"no-sys-f16-f128-convert",
122110
"using apfloat fallback for f16 <-> f128 conversions",
123111
),
124-
Feature::NoSysF16GnuConvert => (
125-
"no-sys-f16-gnu-convert",
126-
"using apfloat fallback for __gnu f16",
127-
),
128112
Feature::NoSysF16 => ("no-sys-f16", "using apfloat fallback for f16"),
129113
};
130114
println!("cargo:warning={warning}");

testcrate/tests/conv.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ mod extend {
314314
f_to_f! {
315315
extend,
316316
f16 => f32, Half => Single, __extendhfsf2, not(feature = "no-sys-f16");
317-
f16 => f32, Half => Single, __gnu_h2f_ieee, not(feature = "no-sys-f16-gnu-convert");
317+
f16 => f32, Half => Single, __gnu_h2f_ieee, not(feature = "no-sys-f16");
318318
f16 => f64, Half => Double, __extendhfdf2, not(feature = "no-sys-f16-f64-convert");
319319
f16 => f128, Half => Quad, __extendhftf2, not(feature = "no-sys-f16-f128-convert");
320320
f32 => f128, Single => Quad, __extendsftf2, not(feature = "no-sys-f128");
@@ -348,7 +348,7 @@ mod trunc {
348348
f_to_f! {
349349
trunc,
350350
f32 => f16, Single => Half, __truncsfhf2, not(feature = "no-sys-f16");
351-
f32 => f16, Single => Half, __gnu_f2h_ieee, not(feature = "no-sys-f16-gnu-convert");
351+
f32 => f16, Single => Half, __gnu_f2h_ieee, not(feature = "no-sys-f16");
352352
f64 => f16, Double => Half, __truncdfhf2, not(feature = "no-sys-f16-f64-convert");
353353
f128 => f16, Quad => Half, __trunctfhf2, not(feature = "no-sys-f16-f128-convert");
354354
f128 => f32, Quad => Single, __trunctfsf2, not(feature = "no-sys-f128");

0 commit comments

Comments
 (0)