Skip to content

Commit 7579d46

Browse files
committed
Remove rvv-off feature
1 parent a8c813e commit 7579d46

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

Cargo-zng.toml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,5 @@ libc = "0.2.43"
3838
[build-dependencies]
3939
cmake = "0.1.50"
4040

41-
[features]
42-
# Experimental: This feature only affects zlib-ng, is only relevant to riscv64
43-
# targets, and currently only has an effect when `cmake` is used. It builds
44-
# binaries portable to machines without RVV, even if the build machine is
45-
# riscv64 and detected to support RVV. This is useful for building a more
46-
# portable binary, or on systems where auto-detection is incorrect (as in
47-
# https://github.com/zlib-ng/zlib-ng/issues/1705). Building with the `RVV_OFF`
48-
# environment variable set (to any value) is equivalent to this feature.
49-
rvv-off = []
50-
5141
[lints.rust]
5242
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zng)'] }

Cargo.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,6 @@ zlib-ng = ["libc", "cmake"]
8989
# or be completely removed in the future
9090
zlib-ng-no-cmake-experimental-community-maintained = ["libc"]
9191
stock-zlib = []
92-
# Experimental: This feature only affects zlib-ng, is only relevant to riscv64
93-
# targets, and currently only has an effect when `cmake` is used. It builds
94-
# binaries portable to machines without RVV, even if the build machine is
95-
# riscv64 and detected to support RVV. This is useful for building a more
96-
# portable binary, or on systems where auto-detection is incorrect (as in
97-
# https://github.com/zlib-ng/zlib-ng/issues/1705). Building with the `RVV_OFF`
98-
# environment variable set (to any value) is equivalent to this feature.
99-
rvv-off = []
10092
# Deprecated: the assembly routines are outdated, and either reduce performance
10193
# or cause segfaults.
10294
asm = []

zng/cmake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn build_zlib_ng(target: &str, compat: bool) {
1414
.define("WITH_DFLTCC_INFLATE", "1")
1515
.cflag("-DDFLTCC_LEVEL_MASK=0x7e");
1616
}
17-
if target.contains("riscv64") && (cfg!(feature = "rvv-off") || env::var_os("RVV_OFF").is_some()) {
17+
if target.contains("riscv64") && env::var_os("RVV_OFF").is_some() {
1818
cmake.define("WITH_RVV", "OFF");
1919
}
2020
if target == "i686-pc-windows-msvc" {

0 commit comments

Comments
 (0)