diff options
author | bors <bors@rust-lang.org> | 2023-04-18 10:29:43 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2023-04-18 10:29:43 +0000 |
commit | 8077351f4b28a1b9fc46e2ac11a530d782264273 (patch) | |
tree | a60140a24d96f03108be266abc8316287fd7d3bd /src | |
parent | 3bba713e5037bb8208f2cb8b8a3a738b60a29d82 (diff) | |
parent | 0ba1fc4d6658317ca1ad79e5b62677ba4c772f0c (diff) | |
download | rust-libc-8077351f4b28a1b9fc46e2ac11a530d782264273.tar.gz |
Auto merge of #3173 - sunfishcode:sunfishcode/upstream, r=JohnTitor
Upstream a few more constants from rustix.
Add a definition of `CIBAUD` for powerpc and powerpc64 on glibc.
And a definition for `RLIM64_INFINITY` on linux_like platforms.
Diffstat (limited to 'src')
-rw-r--r-- | src/unix/linux_like/android/mod.rs | 18 | ||||
-rw-r--r-- | src/unix/linux_like/linux/arch/generic/mod.rs | 11 | ||||
-rw-r--r-- | src/unix/linux_like/mod.rs | 8 | ||||
-rw-r--r-- | src/unix/solarish/mod.rs | 2 |
4 files changed, 38 insertions, 1 deletions
diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index e2fa0826f2..fd4b0593b4 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -1579,6 +1579,23 @@ pub const FIONREAD: ::c_int = 0x541B; pub const TIOCCONS: ::c_int = 0x541D; pub const TIOCSBRK: ::c_int = 0x5427; pub const TIOCCBRK: ::c_int = 0x5428; +cfg_if! { + if #[cfg(any(target_arch = "x86", + target_arch = "x86_64", + target_arch = "arm", + target_arch = "aarch64", + target_arch = "riscv64", + target_arch = "s390x"))] { + pub const FICLONE: ::c_int = 0x40049409; + pub const FICLONERANGE: ::c_int = 0x4020940D; + } else if #[cfg(any(target_arch = "mips", + target_arch = "mips64", + target_arch = "powerpc", + target_arch = "powerpc64"))] { + pub const FICLONE: ::c_int = 0x80049409; + pub const FICLONERANGE: ::c_int = 0x8020940D; + } +} pub const ST_RDONLY: ::c_ulong = 1; pub const ST_NOSUID: ::c_ulong = 2; @@ -3531,6 +3548,7 @@ extern "C" { longindex: *mut ::c_int, ) -> ::c_int; + pub fn sync(); pub fn syncfs(fd: ::c_int) -> ::c_int; } diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs index cffe748de9..4693978311 100644 --- a/src/unix/linux_like/linux/arch/generic/mod.rs +++ b/src/unix/linux_like/linux/arch/generic/mod.rs @@ -108,9 +108,18 @@ cfg_if! { cfg_if! { if #[cfg(any(target_arch = "x86", target_arch = "x86_64", - target_arch = "aarch64"))] { + target_arch = "arm", + target_arch = "aarch64", + target_arch = "riscv64", + target_arch = "s390x"))] { pub const FICLONE: ::c_ulong = 0x40049409; pub const FICLONERANGE: ::c_ulong = 0x4020940D; + } else if #[cfg(any(target_arch = "mips", + target_arch = "mips64", + target_arch = "powerpc", + target_arch = "powerpc64"))] { + pub const FICLONE: ::c_ulong = 0x80049409; + pub const FICLONERANGE: ::c_ulong = 0x8020940D; } } // pub const SO_PREFER_BUSY_POLL: ::c_int = 69; diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs index db57745967..584e308ce2 100644 --- a/src/unix/linux_like/mod.rs +++ b/src/unix/linux_like/mod.rs @@ -557,6 +557,14 @@ pub const XATTR_CREATE: ::c_int = 0x1; pub const XATTR_REPLACE: ::c_int = 0x2; cfg_if! { + if #[cfg(target_os = "android")] { + pub const RLIM64_INFINITY: ::c_ulonglong = !0; + } else { + pub const RLIM64_INFINITY: ::rlim64_t = !0; + } +} + +cfg_if! { if #[cfg(target_env = "ohos")] { pub const LC_CTYPE: ::c_int = 0; pub const LC_NUMERIC: ::c_int = 1; diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index 88f9cab9d6..12c88f31a1 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -3196,6 +3196,8 @@ extern "C" { longopts: *const option, longindex: *mut ::c_int, ) -> ::c_int; + + pub fn sync(); } #[link(name = "sendfile")] |