From 295f923de10f12d6e3f052e7aeec0899916b13b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 24 Jun 2024 08:23:42 +0200 Subject: [PATCH] Revert "loongarch: add frecipe and relax target feature" This reverts commit e81df3f3225ce53921a87b9e490959c41b783b02. Debian: this commit breaks a lot of tests on loong64 since our rustc build is still based on LLVM-17. This revert should be dropped once we switch over to LLVM 18. Bug: https://github.com/rust-lang/rust/issues/114661 Gbp-Pq: Topic upstream Gbp-Pq: Name Revert-loongarch-add-frecipe-and-relax-target-feature.patch --- compiler/rustc_target/src/target_features.rs | 2 -- tests/ui/abi/compatibility.rs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/compiler/rustc_target/src/target_features.rs b/compiler/rustc_target/src/target_features.rs index 1b507bb2a1..800907bc54 100644 --- a/compiler/rustc_target/src/target_features.rs +++ b/compiler/rustc_target/src/target_features.rs @@ -378,12 +378,10 @@ const LOONGARCH_ALLOWED_FEATURES: &[(&str, Stability)] = &[ // tidy-alphabetical-start ("d", Unstable(sym::loongarch_target_feature)), ("f", Unstable(sym::loongarch_target_feature)), - ("frecipe", Unstable(sym::loongarch_target_feature)), ("lasx", Unstable(sym::loongarch_target_feature)), ("lbt", Unstable(sym::loongarch_target_feature)), ("lsx", Unstable(sym::loongarch_target_feature)), ("lvz", Unstable(sym::loongarch_target_feature)), - ("relax", Unstable(sym::loongarch_target_feature)), ("ual", Unstable(sym::loongarch_target_feature)), // tidy-alphabetical-end ]; diff --git a/tests/ui/abi/compatibility.rs b/tests/ui/abi/compatibility.rs index 373d1cce1d..f77766b89b 100644 --- a/tests/ui/abi/compatibility.rs +++ b/tests/ui/abi/compatibility.rs @@ -39,7 +39,7 @@ //@ revisions: loongarch64 //@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu //@[loongarch64] needs-llvm-components: loongarch -//@[loongarch64] min-llvm-version: 18 +//@[loongarch64] min-llvm-version: 17 //@ revisions: wasm //@[wasm] compile-flags: --target wasm32-unknown-unknown //@[wasm] needs-llvm-components: webassembly -- 2.30.2