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.
rust-lang · Apr 18, 2023 · 8077351 · 8077351
2 parents 3bba713 + 0ba1fc4
commit 8077351
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 1 deletion.
diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
@@ -2025,6 +2025,7 @@ RESOLVE_IN_ROOT
 RESOLVE_NO_MAGICLINKS
 RESOLVE_NO_SYMLINKS
 RESOLVE_NO_XDEV
+RLIM64_INFINITY
 RLIMIT_AS
 RLIMIT_CORE
 RLIMIT_CPU

diff --git 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
@@ -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
@@ -556,6 +556,14 @@ pub const PROT_EXEC: ::c_int = 4;
 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;

diff --git 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")]