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

Update openbsd libc #30837

Merged
merged 4 commits into from
Jan 14, 2016
Merged

Update openbsd libc #30837

merged 4 commits into from
Jan 14, 2016

Conversation

semarie
Copy link
Contributor

@semarie semarie commented Jan 12, 2016

The following PR updates libc version to latest commits for correctly support openbsd.
It corrects several points in rustc to be compatible with libc changes.

r? @alexcrichton

use the `getentropy()` function instead of `syscall()` and
syscall-numbers.
define `num_cpus()` function for openbsd that use `HW_NCPU` for grabbing
the current number of cpus that could be used.
`siginfo_si_addr()` function is used once, and the returned value is
casted to `usize`. So make the function returns a `usize`.

it simplifies OpenBSD case, where the return type wouldn't be a `*mut
libc::c_void` but a `*mut libc::c_char`.
@alexcrichton
Copy link
Member

@bors: r+ 8a631b83dc5ca30389b909a8889bbe8b7e8988fa

Thanks!

@bors
Copy link
Contributor

bors commented Jan 13, 2016

☔ The latest upstream changes (presumably #30601) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Copy link
Member

Ah note that the libc update in #30601 I think is the most recent, so the libc update here is likely no longer necessary

@semarie
Copy link
Contributor Author

semarie commented Jan 13, 2016

I have removed the commit for updating libc, so it should be good now.

@alexcrichton
Copy link
Member

@bors: r+ 667ee8a

Manishearth added a commit to Manishearth/rust that referenced this pull request Jan 14, 2016
The following PR updates libc version to latest commits for correctly support openbsd.
It corrects several points in rustc to be compatible with libc changes.

r? @alexcrichton
bors added a commit that referenced this pull request Jan 14, 2016
@bors bors merged commit 667ee8a into rust-lang:master Jan 14, 2016
@semarie semarie deleted the openbsd-libc branch January 14, 2016 19:20
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