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

Port #672 and #686 to musl. #699

Merged
merged 5 commits into from Aug 2, 2017
Merged

Port #672 and #686 to musl. #699

merged 5 commits into from Aug 2, 2017

Conversation

marmistrz
Copy link
Contributor

No description provided.

@alexcrichton
Copy link
Member

Looks like CI may be failing?

@marmistrz
Copy link
Contributor Author

It looks like offending syscalls were added in musl 1.16, you're using 1.15.
http://www.openwall.com/lists/musl/2016/12/25/2
What about updating musl on your side?

@alexcrichton
Copy link
Member

Oh certainly! You can update the various scripts in ci/docker for the musl builders

@marmistrz
Copy link
Contributor Author

It's looks like we've run into #665 on musl too:

bad AF_MAX value at byte 0: rust: 42 (0x2a) != c 43 (0x2b)
bad PF_MAX value at byte 0: rust: 42 (0x2a) != c 43 (0x2b)

@alexcrichton
Copy link
Member

Want to update them?

@marmistrz
Copy link
Contributor Author

It's not so easy. These constants are defined in src/unix/notbsd/linux/mod.rs. This means that updating them will break the glibc CI, since Ubuntu 17.10 still has glibc 2.24. We would need to have glibc 2.25 in our glibc CI.

@alexcrichton
Copy link
Member

Oh yeah that's fine, want to duplicate the definition and push them down the module hierarchy?

@marmistrz
Copy link
Contributor Author

The same will have to be added on x86 and x86_64 for Android.
Maybe we should rethink the whole thing? There'll be three copies of the same syscall table which is Linux-specific.

Maybe it would be better to simply generated them based on the installed libc?

@alexcrichton
Copy link
Member

Duplication is fine, we're not going to be generating the libc crate based on what was found at compile time

@marmistrz
Copy link
Contributor Author

marmistrz commented Jul 31, 2017 via email

@alexcrichton
Copy link
Member

Sorry this isn't really quite the PR to debate this on, that question is much broader than just this. If you'd like to land this then the best way will be to duplicate the definitions I believe, otherwise if you'd like to wait and hold off we can continue discussion on perhaps a dedicated issue.

@marmistrz
Copy link
Contributor Author

marmistrz commented Aug 1, 2017

So let's land it with duplication for now and discuss it in a separate issue.

They have been added in musl 1.16 but updating musl is non-trivial.
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 1, 2017

📌 Commit 0ef465a has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Aug 2, 2017

⌛ Testing commit 0ef465a with merge 5e6853b...

bors added a commit that referenced this pull request Aug 2, 2017
@bors
Copy link
Contributor

bors commented Aug 2, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 5e6853b to master...

@bors bors merged commit 0ef465a into rust-lang:master Aug 2, 2017
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.

None yet

3 participants