Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linux/uclibc: resync syscall tables #3061

Merged
merged 1 commit into from
Jan 22, 2023

Conversation

lucab
Copy link
Contributor

@lucab lucab commented Jan 9, 2023

This adds some missing syscall constants for uclibc on arm and mips32. The two syscall tables are now again in sync with the musl ones that they are based on.

@rustbot
Copy link
Collaborator

rustbot commented Jan 9, 2023

r? @JohnTitor

(rustbot has picked a reviewer for you, use r? to override)

@@ -884,11 +884,34 @@ pub const SYS_pwritev2: ::c_long = 393;
pub const SYS_pkey_mprotect: ::c_long = 394;
pub const SYS_pkey_alloc: ::c_long = 395;
pub const SYS_pkey_free: ::c_long = 396;
pub const SYS_statx: ::c_int = 397;
pub const SYS_statx: ::c_long = 397;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note for reviewers: I think this was a buggy definition, probably a copy-paste mistake that slipped in through #2403.

Copy link
Member

Choose a reason for hiding this comment

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

Could you add a FIXME instead of changing its type? it was added in 2021 and I guess it could break some code 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ack, changed.

@lucab lucab force-pushed the ups/linux-uclibc-resync-syscalls branch from 16f3cc7 to 5d7953d Compare January 13, 2023 07:54
@lucab
Copy link
Contributor Author

lucab commented Jan 17, 2023

@JohnTitor ping, may I get this reviewed/merged?

@JohnTitor
Copy link
Member

Sorry for the delay, I've been a bit busy/tired. Left one comment, otherwise LGTM 👍

This adds some missing syscall constants for uclibc on `arm` and `mips32`.
The two syscall tables are now again in sync with the musl ones
that they are based on.
@lucab lucab force-pushed the ups/linux-uclibc-resync-syscalls branch from 5d7953d to 798eeeb Compare January 18, 2023 18:25
@JohnTitor
Copy link
Member

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Jan 22, 2023

📌 Commit 798eeeb has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 22, 2023

⌛ Testing commit 798eeeb with merge c1ce30e...

@bors
Copy link
Contributor

bors commented Jan 22, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing c1ce30e to master...

1 similar comment
@bors
Copy link
Contributor

bors commented Jan 22, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing c1ce30e to master...

@bors bors merged commit c1ce30e into rust-lang:master Jan 22, 2023
@bors
Copy link
Contributor

bors commented Jan 22, 2023

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants