Skip to content

Conversation

@fardragon
Copy link
Contributor

Fixes for the std.os.linux compilation errors reported in #21094

@fardragon fardragon force-pushed the 21094-std-linux-fixes branch from e85bb51 to febfd18 Compare August 19, 2024 16:27

/// Wait on a futex.
/// Identical to `FUTEX.FUTEX_WAIT_BITSET`, except it is part of the futex2 family of calls.
/// Identical to the traditional FUTEX_WAIT_BITSET op, except it is part of the
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Please keep the backticks (futex2 below should really use them as well).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've restored them. Is it just a stylistic choice or do they serve some kind of purpose? I'm asking out of curiosity.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doc comments currently use a subset of Markdown.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right, that makes sense. Thanks

@andrewrk andrewrk force-pushed the 21094-std-linux-fixes branch from c11c542 to a5bd5b2 Compare August 23, 2024 07:48
pub const IntInfo = packed struct(u32) {
bits: u8,
unused: u8,
reserved_1: u8,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reserved_1: u8,
reserved_1: u8 = 0,

char = 1 << 1,
boolean = 1 << 2,
},
reserved_2: u4,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reserved_2: u4,
reserved_2: u4 = 0,

@andrewrk andrewrk enabled auto-merge (squash) August 23, 2024 07:51
@andrewrk andrewrk merged commit 206e5e4 into ziglang:master Aug 23, 2024
richerfu pushed a commit to richerfu/zig that referenced this pull request Oct 28, 2024
* Correct layout of IntInfo according to https://www.kernel.org/doc/html/latest/bpf/btf.html#btf-kind-int

* Fix VFS errors

* Fix std.os.linux.sendmmsg

* Fix std.os.linux.sigismember. Add tests

* Fix futex2 functions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants