Skip to content

Commit 2cf15be

Browse files
authored
Fix some libc version checks for Bionic
1 parent 242102f commit 2cf15be

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

lib/std/fs/File.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1940,7 +1940,7 @@ pub const Writer = struct {
19401940

19411941
const copy_file_range = switch (native_os) {
19421942
.freebsd => std.os.freebsd.copy_file_range,
1943-
.linux => if (std.c.versionCheck(.{ .major = 2, .minor = 27, .patch = 0 })) std.os.linux.wrapped.copy_file_range else {},
1943+
.linux => if (std.c.versionCheck(if (builtin.abi.isAndroid()) .{ .major = 34, .minor = 0, .patch = 0 } else .{ .major = 2, .minor = 27, .patch = 0 })) std.os.linux.wrapped.copy_file_range else {},
19441944
else => {},
19451945
};
19461946
if (@TypeOf(copy_file_range) != void) cfr: {

lib/std/posix.zig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ pub inline fn fchmodat(dirfd: fd_t, path: []const u8, mode: mode_t, flags: u32)
375375
// No special handling for linux is needed if we can use the libc fallback
376376
// or `flags` is empty. Glibc only added the fallback in 2.32.
377377
const skip_fchmodat_fallback = native_os != .linux or
378-
std.c.versionCheck(.{ .major = 2, .minor = 32, .patch = 0 }) or
378+
(!builtin.abi.isAndroid() and std.c.versionCheck(.{ .major = 2, .minor = 32, .patch = 0 })) or
379379
flags == 0;
380380

381381
// This function is marked inline so that when flags is comptime-known,
@@ -628,7 +628,7 @@ pub fn getrandom(buffer: []u8) GetRandomError!void {
628628
if (@TypeOf(system.getrandom) != void) {
629629
var buf = buffer;
630630
const use_c = native_os != .linux or
631-
std.c.versionCheck(std.SemanticVersion{ .major = 2, .minor = 25, .patch = 0 });
631+
std.c.versionCheck(if (builtin.abi.isAndroid()) .{ .major = 28, .minor = 0, .patch = 0 } else .{ .major = 2, .minor = 25, .patch = 0 });
632632

633633
while (buf.len != 0) {
634634
const num_read: usize, const err = if (use_c) res: {
@@ -6390,7 +6390,7 @@ pub const CopyFileRangeError = error{
63906390
/// Maximum offsets on Linux and FreeBSD are `maxInt(i64)`.
63916391
pub fn copy_file_range(fd_in: fd_t, off_in: u64, fd_out: fd_t, off_out: u64, len: usize, flags: u32) CopyFileRangeError!usize {
63926392
if (builtin.os.tag == .freebsd or
6393-
(comptime builtin.os.tag == .linux and std.c.versionCheck(.{ .major = 2, .minor = 27, .patch = 0 })))
6393+
(comptime builtin.os.tag == .linux and std.c.versionCheck(if (builtin.abi.isAndroid()) .{ .major = 34, .minor = 0, .patch = 0 } else .{ .major = 2, .minor = 27, .patch = 0 })))
63946394
{
63956395
var off_in_copy: i64 = @bitCast(off_in);
63966396
var off_out_copy: i64 = @bitCast(off_out);
@@ -6699,8 +6699,8 @@ pub const MemFdCreateError = error{
66996699
pub fn memfd_createZ(name: [*:0]const u8, flags: u32) MemFdCreateError!fd_t {
67006700
switch (native_os) {
67016701
.linux => {
6702-
// memfd_create is available only in glibc versions starting with 2.27.
6703-
const use_c = std.c.versionCheck(.{ .major = 2, .minor = 27, .patch = 0 });
6702+
// memfd_create is available only in glibc versions starting with 2.27 and bionic versions starting with 30.
6703+
const use_c = std.c.versionCheck(if (builtin.abi.isAndroid()) .{ .major = 30, .minor = 0, .patch = 0 } else .{ .major = 2, .minor = 27, .patch = 0 });
67046704
const sys = if (use_c) std.c else linux;
67056705
const rc = sys.memfd_create(name, flags);
67066706
switch (errno(rc)) {

0 commit comments

Comments
 (0)