Skip to content

Commit 7efc2a0

Browse files
authored
Merge pull request #3888 from tgross35/backport-broccoli
[0.2] Backport three pull requests
2 parents 567c854 + ff9b210 commit 7efc2a0

File tree

20 files changed

+30
-0
lines changed

20 files changed

+30
-0
lines changed

libc-test/build.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4210,6 +4210,12 @@ fn test_linux(target: &str) {
42104210
true
42114211
}
42124212

4213+
// FIXME: Requires >= 6.6 kernel headers.
4214+
"SYS_fchmodat2" => true,
4215+
4216+
// FIXME: Requires >= 6.10 kernel headers.
4217+
"SYS_mseal" => true,
4218+
42134219
// FIXME: seems to not be available all the time (from <include/linux/sched.h>:
42144220
"PF_VCPU"
42154221
| "PF_IDLE"

libc-test/semver/apple.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,8 @@ NOTE_FORK
10041004
NOTE_LEEWAY
10051005
NOTE_LINK
10061006
NOTE_LOWAT
1007+
NOTE_MACHTIME
1008+
NOTE_MACH_CONTINUOUS_TIME
10071009
NOTE_NONE
10081010
NOTE_NSECONDS
10091011
NOTE_PCTRLMASK

libc-test/semver/linux-i686.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ SYS_mknod
132132
SYS_mmap2
133133
SYS_modify_ldt
134134
SYS_mpx
135+
SYS_mseal
135136
SYS_nice
136137
SYS_oldfstat
137138
SYS_oldlstat

libc-test/semver/linux-powerpc.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ SYS_mknod
8282
SYS_mmap2
8383
SYS_modify_ldt
8484
SYS_mpx
85+
SYS_mseal
8586
SYS_multiplexer
8687
SYS_nice
8788
SYS_oldfstat

libc-test/semver/linux-s390x.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ SYS_link
5959
SYS_lstat
6060
SYS_mkdir
6161
SYS_mknod
62+
SYS_mseal
6263
SYS_newfstatat
6364
SYS_nice
6465
SYS_open

libc-test/semver/linux-x86_64.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ SYS_lstat
107107
SYS_mkdir
108108
SYS_mknod
109109
SYS_modify_ldt
110+
SYS_mseal
110111
SYS_open
111112
SYS_pause
112113
SYS_pipe

src/unix/bsd/apple/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4522,6 +4522,8 @@ pub const NOTE_ABSOLUTE: u32 = 0x00000008;
45224522
pub const NOTE_LEEWAY: u32 = 0x00000010;
45234523
pub const NOTE_CRITICAL: u32 = 0x00000020;
45244524
pub const NOTE_BACKGROUND: u32 = 0x00000040;
4525+
pub const NOTE_MACH_CONTINUOUS_TIME: u32 = 0x00000080;
4526+
pub const NOTE_MACHTIME: u32 = 0x00000100;
45254527
pub const NOTE_TRACK: u32 = 0x00000001;
45264528
pub const NOTE_TRACKERR: u32 = 0x00000002;
45274529
pub const NOTE_CHILD: u32 = 0x00000004;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,7 @@ pub const SYS_memfd_secret: ::c_long = 447;
855855
pub const SYS_process_mrelease: ::c_long = 448;
856856
pub const SYS_futex_waitv: ::c_long = 449;
857857
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
858+
pub const SYS_mseal: ::c_long = 462;
858859

859860
cfg_if! {
860861
if #[cfg(libc_align)] {

src/unix/linux_like/linux/gnu/b32/powerpc.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -823,3 +823,4 @@ pub const SYS_memfd_secret: ::c_long = 447;
823823
pub const SYS_process_mrelease: ::c_long = 448;
824824
pub const SYS_futex_waitv: ::c_long = 449;
825825
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
826+
pub const SYS_mseal: ::c_long = 462;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,8 @@ pub const SYS_memfd_secret: ::c_long = 447;
10441044
pub const SYS_process_mrelease: ::c_long = 448;
10451045
pub const SYS_futex_waitv: ::c_long = 449;
10461046
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
1047+
pub const SYS_fchmodat2: ::c_long = 452;
1048+
pub const SYS_mseal: ::c_long = 462;
10471049

10481050
// offsets in user_regs_structs, from sys/reg.h
10491051
pub const EBX: ::c_int = 0;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -892,6 +892,7 @@ pub const SYS_memfd_secret: ::c_long = 447;
892892
pub const SYS_process_mrelease: ::c_long = 448;
893893
pub const SYS_futex_waitv: ::c_long = 449;
894894
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
895+
pub const SYS_mseal: ::c_long = 462;
895896

896897
pub const PROT_BTI: ::c_int = 0x10;
897898
pub const PROT_MTE: ::c_int = 0x20;

src/unix/linux_like/linux/gnu/b64/s390x.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -946,6 +946,7 @@ pub const SYS_memfd_secret: ::c_long = 447;
946946
pub const SYS_process_mrelease: ::c_long = 448;
947947
pub const SYS_futex_waitv: ::c_long = 449;
948948
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
949+
pub const SYS_mseal: ::c_long = 462;
949950

950951
extern "C" {
951952

src/unix/linux_like/linux/gnu/b64/x86_64/not_x32.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,8 @@ pub const SYS_memfd_secret: ::c_long = 447;
438438
pub const SYS_process_mrelease: ::c_long = 448;
439439
pub const SYS_futex_waitv: ::c_long = 449;
440440
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
441+
pub const SYS_fchmodat2: ::c_long = 452;
442+
pub const SYS_mseal: ::c_long = 462;
441443

442444
extern "C" {
443445
pub fn sysctl(

src/unix/linux_like/linux/gnu/b64/x86_64/x32.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ pub const SYS_memfd_secret: ::c_long = __X32_SYSCALL_BIT + 447;
366366
pub const SYS_process_mrelease: ::c_long = __X32_SYSCALL_BIT + 448;
367367
pub const SYS_futex_waitv: ::c_long = __X32_SYSCALL_BIT + 449;
368368
pub const SYS_set_mempolicy_home_node: ::c_long = __X32_SYSCALL_BIT + 450;
369+
pub const SYS_fchmodat2: ::c_long = __X32_SYSCALL_BIT + 452;
369370
pub const SYS_rt_sigaction: ::c_long = __X32_SYSCALL_BIT + 512;
370371
pub const SYS_rt_sigreturn: ::c_long = __X32_SYSCALL_BIT + 513;
371372
pub const SYS_ioctl: ::c_long = __X32_SYSCALL_BIT + 514;

src/unix/linux_like/linux/musl/b32/arm/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,7 @@ pub const SYS_memfd_secret: ::c_long = 447;
840840
pub const SYS_process_mrelease: ::c_long = 448;
841841
pub const SYS_futex_waitv: ::c_long = 449;
842842
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
843+
pub const SYS_mseal: ::c_long = 462;
843844

844845
extern "C" {
845846
pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;

src/unix/linux_like/linux/musl/b32/powerpc.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,7 @@ pub const SYS_memfd_secret: ::c_long = 447;
796796
pub const SYS_process_mrelease: ::c_long = 448;
797797
pub const SYS_futex_waitv: ::c_long = 449;
798798
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
799+
pub const SYS_mseal: ::c_long = 462;
799800

800801
extern "C" {
801802
pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t;

src/unix/linux_like/linux/musl/b32/x86/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -936,6 +936,7 @@ pub const SYS_memfd_secret: ::c_long = 447;
936936
pub const SYS_process_mrelease: ::c_long = 448;
937937
pub const SYS_futex_waitv: ::c_long = 449;
938938
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
939+
pub const SYS_fchmodat2: ::c_long = 452;
939940

940941
// offsets in user_regs_structs, from sys/reg.h
941942
pub const EBX: ::c_int = 0;

src/unix/linux_like/linux/musl/b64/aarch64/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,6 +561,7 @@ pub const SYS_memfd_secret: ::c_long = 447;
561561
pub const SYS_process_mrelease: ::c_long = 448;
562562
pub const SYS_futex_waitv: ::c_long = 449;
563563
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
564+
pub const SYS_mseal: ::c_long = 462;
564565

565566
pub const MCL_CURRENT: ::c_int = 0x0001;
566567
pub const MCL_FUTURE: ::c_int = 0x0002;

src/unix/linux_like/linux/musl/b64/s390x.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,3 +722,4 @@ pub const SYS_memfd_secret: ::c_long = 447;
722722
pub const SYS_process_mrelease: ::c_long = 448;
723723
pub const SYS_futex_waitv: ::c_long = 449;
724724
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
725+
pub const SYS_mseal: ::c_long = 462;

src/unix/linux_like/linux/musl/b64/x86_64/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,8 @@ pub const SYS_memfd_secret: ::c_long = 447;
608608
pub const SYS_process_mrelease: ::c_long = 448;
609609
pub const SYS_futex_waitv: ::c_long = 449;
610610
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
611+
pub const SYS_fchmodat2: ::c_long = 452;
612+
pub const SYS_mseal: ::c_long = 462;
611613

612614
// offsets in user_regs_structs, from sys/reg.h
613615
pub const R15: ::c_int = 0;

0 commit comments

Comments
 (0)