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

freebsd proposal to move sockcred2 usage in the root mod while ignori… #2589

Merged
merged 1 commit into from
Dec 12, 2021

Conversation

devnexen
Copy link
Contributor

@devnexen devnexen commented Dec 12, 2021

…ng it for FreeBSD 12.

@rust-highfive
Copy link

r? @Amanieu

(rust-highfive has picked a reviewer for you, use r? to override)

@devnexen devnexen force-pushed the sockcred2_fbsd_fix_proposal branch 3 times, most recently from a72a80d to 9de7043 Compare December 12, 2021 10:22
@Amanieu
Copy link
Member

Amanieu commented Dec 12, 2021

cc @asomers @GuillaumeGomez

@@ -3701,6 +3712,15 @@ f! {
let (idx, offset) = (cpu / bitset_bits, cpu % bitset_bits);
0 != cpuset.__bits[idx] & (1 << offset)
}

pub fn SOCKCRED2SIZE(ngrps: usize) -> usize {
Copy link
Member

Choose a reason for hiding this comment

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

Won't it be an issue on freebsd 11 to link to a non-existing function?

Copy link
Member

Choose a reason for hiding this comment

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

Ah no, nevermind me...

@GuillaumeGomez
Copy link
Member

Looks good to me since the struct has the same layout between 13 and 14 and the function is implemented, not linked.

Copy link
Contributor

@asomers asomers left a comment

Choose a reason for hiding this comment

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

LGTM. This is the best way to do with new symbols in the OS, rather than changed symbols.

@Amanieu
Copy link
Member

Amanieu commented Dec 12, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Dec 12, 2021

📌 Commit da089ce has been approved by Amanieu

@bors
Copy link
Contributor

bors commented Dec 12, 2021

⌛ Testing commit da089ce with merge 18bfd17...

@bors
Copy link
Contributor

bors commented Dec 12, 2021

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: Amanieu
Pushing 18bfd17 to master...

@bors bors merged commit 18bfd17 into rust-lang:master Dec 12, 2021
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.

6 participants