Skip to content

Commit 2995d71

Browse files
committed
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`
2 parents bc30283 + f1d18c6 commit 2995d71

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.github/workflows/bors.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,9 @@ jobs:
116116
i686-unknown-linux-musl,
117117
mips-unknown-linux-gnu,
118118
mips-unknown-linux-musl,
119-
mips64-unknown-linux-gnuabi64,
120-
mips64el-unknown-linux-gnuabi64,
119+
# FIXME: Disabled because of the `relocation truncated to fit` error
120+
# mips64-unknown-linux-gnuabi64,
121+
# mips64el-unknown-linux-gnuabi64,
121122
mipsel-unknown-linux-musl,
122123
powerpc-unknown-linux-gnu,
123124
powerpc64-unknown-linux-gnu,

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,11 +729,13 @@ pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
729729
pub const AFS_SUPER_MAGIC: ::c_long = 0x5346414f;
730730
pub const AUTOFS_SUPER_MAGIC: ::c_long = 0x0187;
731731
pub const BINDERFS_SUPER_MAGIC: ::c_long = 0x6c6f6f70;
732+
pub const BPF_FS_MAGIC: ::c_long = 0xcafe4a11;
732733
pub const BTRFS_SUPER_MAGIC: ::c_long = 0x9123683e;
733734
pub const CGROUP2_SUPER_MAGIC: ::c_long = 0x63677270;
734735
pub const CGROUP_SUPER_MAGIC: ::c_long = 0x27e0eb;
735736
pub const CODA_SUPER_MAGIC: ::c_long = 0x73757245;
736737
pub const CRAMFS_MAGIC: ::c_long = 0x28cd3d45;
738+
pub const DEBUGFS_MAGIC: ::c_long = 0x64626720;
737739
pub const DEVPTS_SUPER_MAGIC: ::c_long = 0x1cd1;
738740
pub const ECRYPTFS_SUPER_MAGIC: ::c_long = 0xf15f;
739741
pub const EFS_SUPER_MAGIC: ::c_long = 0x00414a53;
@@ -765,7 +767,9 @@ pub const QNX6_SUPER_MAGIC: ::c_long = 0x68191122;
765767
pub const RDTGROUP_SUPER_MAGIC: ::c_long = 0x7655821;
766768
pub const REISERFS_SUPER_MAGIC: ::c_long = 0x52654973;
767769
pub const SMB_SUPER_MAGIC: ::c_long = 0x0000517b;
770+
pub const SYSFS_MAGIC: ::c_long = 0x62656572;
768771
pub const TMPFS_MAGIC: ::c_long = 0x01021994;
772+
pub const TRACEFS_MAGIC: ::c_long = 0x74726163;
769773
pub const UDF_SUPER_MAGIC: ::c_long = 0x15013346;
770774
pub const USBDEVICE_SUPER_MAGIC: ::c_long = 0x00009fa2;
771775
pub const XENFS_SUPER_MAGIC: ::c_long = 0xabba1974;

src/unix/linux_like/linux/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3230,6 +3230,12 @@ extern "C" {
32303230
offset: *mut off_t,
32313231
count: ::size_t,
32323232
) -> ::ssize_t;
3233+
pub fn sendfile64(
3234+
out_fd: ::c_int,
3235+
in_fd: ::c_int,
3236+
offset: *mut off64_t,
3237+
count: ::size_t,
3238+
) -> ::ssize_t;
32333239
pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int;
32343240
pub fn getgrgid_r(
32353241
gid: ::gid_t,

0 commit comments

Comments
 (0)