Skip to content

Commit c49fe92

Browse files
authored
Merge pull request #3975 from tgross35/backport-raddish
[0.2] Backports
2 parents f4f1ae9 + c185415 commit c49fe92

File tree

8 files changed

+29
-3
lines changed

8 files changed

+29
-3
lines changed

.cirrus.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ task:
77
- name: nightly freebsd-14
88
freebsd_instance:
99
image: freebsd-14-0-release-amd64-ufs
10-
- name: nightly freebsd-15
11-
freebsd_instance:
12-
image_family: freebsd-15-0-snap
10+
# Temporarily disable CI on FreeBSD 15.0-CURRENT until the libmd solib
11+
# fallout is cleaned up.
12+
# FIXME https://github.com/rust-lang/libc/issues/3967
13+
# https://github.com/rust-lang/libc/issues/3967
14+
#- name: nightly freebsd-15
15+
# freebsd_instance:
16+
# image_family: freebsd-15-0-snap
1317
setup_script:
1418
- pkg install -y libnghttp2 curl
1519
- curl https://sh.rustup.rs -sSf --output rustup.sh

libc-test/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4834,6 +4834,7 @@ fn test_haiku(target: &str) {
48344834
"libutil.h",
48354835
"link.h",
48364836
"pty.h",
4837+
"stdlib.h",
48374838
"stringlist.h",
48384839
"sys/link_elf.h",
48394840
}

libc-test/semver/apple.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ F_SPECULATIVE_READ
455455
F_TEST
456456
F_THAW_FS
457457
F_TLOCK
458+
F_TRANSFEREXTENTS
458459
F_TRIM_ACTIVE_FILE
459460
F_ULOCK
460461
F_UNLCK

libc-test/semver/linux-musl.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ getloadavg
8080
lio_listio
8181
ntptimeval
8282
open_wmemstream
83+
posix_spawn_file_actions_addchdir_np
84+
posix_spawn_file_actions_addfchdir_np
8385
preadv2
8486
preadv64
8587
prlimit

src/unix/bsd/apple/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3618,6 +3618,7 @@ pub const F_PUNCHHOLE: ::c_int = 99;
36183618
pub const F_TRIM_ACTIVE_FILE: ::c_int = 100;
36193619
pub const F_SPECULATIVE_READ: ::c_int = 101;
36203620
pub const F_GETPATH_NOFIRMLINK: ::c_int = 102;
3621+
pub const F_TRANSFEREXTENTS: ::c_int = 110;
36213622

36223623
pub const F_ALLOCATECONTIG: ::c_uint = 0x02;
36233624
pub const F_ALLOCATEALL: ::c_uint = 0x04;

src/unix/haiku/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,6 +2133,10 @@ extern "C" {
21332133
>,
21342134
data: *mut ::c_void,
21352135
) -> ::c_int;
2136+
2137+
pub fn arc4random() -> u32;
2138+
pub fn arc4random_uniform(upper_bound: u32) -> u32;
2139+
pub fn arc4random_buf(buf: *mut ::c_void, n: ::size_t);
21362140
}
21372141

21382142
#[link(name = "gnu")]

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -983,6 +983,17 @@ extern "C" {
983983

984984
pub fn dirname(path: *mut ::c_char) -> *mut ::c_char;
985985
pub fn basename(path: *mut ::c_char) -> *mut ::c_char;
986+
987+
// Added in `musl` 1.1.24
988+
pub fn posix_spawn_file_actions_addchdir_np(
989+
actions: *mut ::posix_spawn_file_actions_t,
990+
path: *const ::c_char,
991+
) -> ::c_int;
992+
// Added in `musl` 1.1.24
993+
pub fn posix_spawn_file_actions_addfchdir_np(
994+
actions: *mut ::posix_spawn_file_actions_t,
995+
fd: ::c_int,
996+
) -> ::c_int;
986997
}
987998

988999
// Alias <foo> to <foo>64 to mimic glibc's LFS64 support

src/unix/newlib/rtems/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,5 +137,7 @@ extern "C" {
137137
clock_id: ::clockid_t,
138138
) -> ::c_int;
139139

140+
pub fn getentropy(buf: *mut ::c_void, buflen: ::size_t) -> ::c_int;
141+
140142
pub fn setgroups(ngroups: ::c_int, grouplist: *const ::gid_t) -> ::c_int;
141143
}

0 commit comments

Comments
 (0)