Auto merge of #1946 - JohnTitor:rollup-66245hd, r=JohnTitor

Rollup of 3 pull requests Successful merges: - #1943 (Add definitions for Linux debug related MAGIC) - #1944 (Include sendfile64() for Linux) - #1945 (Disable libc-test for MIPS64 for now) Failed merges: r? `@ghost`
rust-lang · Oct 20, 2020 · 2995d71 · 2995d71
2 parents bc30283 + f1d18c6
commit 2995d71
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
@@ -116,8 +116,9 @@ jobs:
           i686-unknown-linux-musl,
           mips-unknown-linux-gnu,
           mips-unknown-linux-musl,
-          mips64-unknown-linux-gnuabi64,
-          mips64el-unknown-linux-gnuabi64,
+          # FIXME: Disabled because of the `relocation truncated to fit` error
+          # mips64-unknown-linux-gnuabi64,
+          # mips64el-unknown-linux-gnuabi64,
           mipsel-unknown-linux-musl,
           powerpc-unknown-linux-gnu,
           powerpc64-unknown-linux-gnu,

diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
@@ -729,11 +729,13 @@ pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
 pub const AFS_SUPER_MAGIC: ::c_long = 0x5346414f;
 pub const AUTOFS_SUPER_MAGIC: ::c_long = 0x0187;
 pub const BINDERFS_SUPER_MAGIC: ::c_long = 0x6c6f6f70;
+pub const BPF_FS_MAGIC: ::c_long = 0xcafe4a11;
 pub const BTRFS_SUPER_MAGIC: ::c_long = 0x9123683e;
 pub const CGROUP2_SUPER_MAGIC: ::c_long = 0x63677270;
 pub const CGROUP_SUPER_MAGIC: ::c_long = 0x27e0eb;
 pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
 pub const CRAMFS_MAGIC: ::c_long = 0x28cd3d45;
+pub const DEBUGFS_MAGIC: ::c_long = 0x64626720;
 pub const DEVPTS_SUPER_MAGIC: ::c_long = 0x1cd1;
 pub const ECRYPTFS_SUPER_MAGIC: ::c_long = 0xf15f;
 pub const EFS_SUPER_MAGIC: ::c_long = 0x00414a53;
@@ -765,7 +767,9 @@ pub const QNX6_SUPER_MAGIC: ::c_long = 0x68191122;
 pub const RDTGROUP_SUPER_MAGIC: ::c_long = 0x7655821;
 pub const REISERFS_SUPER_MAGIC: ::c_long = 0x52654973;
 pub const SMB_SUPER_MAGIC: ::c_long = 0x0000517b;
+pub const SYSFS_MAGIC: ::c_long = 0x62656572;
 pub const TMPFS_MAGIC: ::c_long = 0x01021994;
+pub const TRACEFS_MAGIC: ::c_long = 0x74726163;
 pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;
 pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
 pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -3230,6 +3230,12 @@ extern "C" {
         offset: *mut off_t,
         count: ::size_t,
     ) -> ::ssize_t;
+    pub fn sendfile64(
+        out_fd: ::c_int,
+        in_fd: ::c_int,
+        offset: *mut off64_t,
+        count: ::size_t,
+    ) -> ::ssize_t;
     pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int;
     pub fn getgrgid_r(
         gid: ::gid_t,