Skip to content

Commit b7a9454

Browse files
committed
libc: use upstreamed SIGEMT support for mips and sparc
1 parent 5245b81 commit b7a9454

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ rustc-std-workspace-alloc = { version = "1.0.0", optional = true } # not aliased
3535
[target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_endian = "little", any(target_arch = "s390x", target_arch = "powerpc")), any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc"), all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "s390x"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"))))'.dependencies]
3636
linux-raw-sys = { version = "0.11.0", default-features = false, features = ["auxvec", "general", "errno", "ioctl", "no_std", "elf"] }
3737
libc_errno = { package = "errno", version = "0.3.10", default-features = false, optional = true }
38-
libc = { version = "0.2.171", default-features = false, optional = true }
38+
libc = { version = "0.2.177", default-features = false, optional = true }
3939

4040
# Dependencies for platforms where only libc is supported:
4141
#
4242
# On all other Unix-family platforms, and under Miri, we always use the libc
4343
# backend, so enable its dependencies unconditionally.
4444
[target.'cfg(all(not(windows), any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_endian = "little", any(target_arch = "s390x", target_arch = "powerpc")), any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "riscv64", all(rustix_use_experimental_asm, target_arch = "powerpc"), all(rustix_use_experimental_asm, target_arch = "powerpc64"), all(rustix_use_experimental_asm, target_arch = "s390x"), all(rustix_use_experimental_asm, target_arch = "mips"), all(rustix_use_experimental_asm, target_arch = "mips32r6"), all(rustix_use_experimental_asm, target_arch = "mips64"), all(rustix_use_experimental_asm, target_arch = "mips64r6"), target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64")))))))'.dependencies]
4545
libc_errno = { package = "errno", version = "0.3.10", default-features = false }
46-
libc = { version = "0.2.171", default-features = false }
46+
libc = { version = "0.2.177", default-features = false }
4747

4848
# Additional dependencies for Linux with the libc backend:
4949
#

src/backend/libc/c.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,6 @@ pub(crate) const ETH_P_MCTP: c_int = linux_raw_sys::if_ether::ETH_P_MCTP as _;
6666
#[cfg(all(linux_raw_dep, feature = "mount"))]
6767
pub(crate) const MS_NOSYMFOLLOW: c_ulong = linux_raw_sys::general::MS_NOSYMFOLLOW as _;
6868

69-
#[cfg(all(
70-
linux_kernel,
71-
any(
72-
target_arch = "mips",
73-
target_arch = "mips32r6",
74-
target_arch = "mips64",
75-
target_arch = "mips64r6",
76-
target_arch = "sparc",
77-
target_arch = "sparc64"
78-
)
79-
))]
80-
pub(crate) const SIGEMT: c_int = linux_raw_sys::general::SIGEMT as _;
81-
8269
// TODO: Upstream these.
8370
#[cfg(all(linux_raw_dep, feature = "termios"))]
8471
pub(crate) const IUCLC: tcflag_t = linux_raw_sys::general::IUCLC as _;

0 commit comments

Comments
 (0)