Skip to content

Update musl to 1.1.22 #61252

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

Merged
merged 1 commit into from
Jun 30, 2019
Merged

Update musl to 1.1.22 #61252

merged 1 commit into from
Jun 30, 2019

Conversation

indygreg
Copy link
Contributor

This is the latest available version. I noticed Rust wasn't using the
latest version when I attempted to have Cargo link object files produced
outside of Cargo / Rust's toolchain and was getting missing symbol
errors. Those missing symbols were added in 1.1.21 and 1.1.22.

I'm not fully sure of the implications of this change or how
comprehensive the test coverage is. Upstream changes in 1.1.21 and
1.1.22 can be found at
https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v1.1.22&id=e97681d6f2c44bf5fa9ecdd30607cb63c780062e#n1989.

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @kennytm (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 28, 2019
@@ -3,7 +3,7 @@
#
# Versions of the toolchain components are configurable in `musl-cross-make/Makefile` and
# musl unlike GLIBC is forward compatible so upgrading it shouldn't break old distributions.
# Right now we have: Binutils 2.27, GCC 6.3.0, musl 1.1.18
# Right now we have: Binutils 2.27, GCC 6.3.0, musl 1.1.22
Copy link
Member

Choose a reason for hiding this comment

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

This seems wrong. Looking at https://github.com/richfelker/musl-cross-make/blob/v0.9.7/Makefile, this still uses musl 1.1.18. Maybe you want to update to v0.9.8, or do this as another PR?

@tesuji
Copy link
Contributor

tesuji commented May 28, 2019

cc @mati865 in case you interested.

@mati865
Copy link
Contributor

mati865 commented May 28, 2019

I saw it but sanxiyn already explained what is wrong.

This is the latest available version. I noticed Rust wasn't using the
latest version when I attempted to have Cargo link object files produced
outside of Cargo / Rust's toolchain and was getting missing symbol
errors. Those missing symbols were added in 1.1.21 and 1.1.22.

I'm not fully sure of the implications of this change or how
comprehensive the test coverage is. Upstream changes in 1.1.21 and
1.1.22 can be found at
https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v1.1.22&id=e97681d6f2c44bf5fa9ecdd30607cb63c780062e#n1989.
@indygreg
Copy link
Contributor Author

I saw that reference to musl 1.1.18 and figured it was missed when musl was last updated from 1.1.18 to 1.1.20. But I see now it belongs to an external project.

I may very well submit another PR to get musl-cross-make bumped to the latest/greatest versions.

@sanxiyn
Copy link
Member

sanxiyn commented May 29, 2019

As far as I can tell, this PR is harmless but won't be useful for you, because dist-x86_64-musl does not use musl.sh at all. It uses musl-toolchain.sh.

@sanxiyn
Copy link
Member

sanxiyn commented Jun 12, 2019

Note: another PR was #61300 and it got merged.

@indygreg
Copy link
Contributor Author

Gentle ping on review.

@alexcrichton
Copy link
Member

@bors: r+

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Jun 27, 2019

📌 Commit aaf6698 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 27, 2019
@bors
Copy link
Collaborator

bors commented Jun 29, 2019

⌛ Testing commit aaf6698 with merge ebcd2b81c2ff69b9cba1f33e3e8312ef448ab510...

@bors
Copy link
Collaborator

bors commented Jun 29, 2019

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 29, 2019
@alexcrichton
Copy link
Member

@bors: retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 30, 2019
@bors
Copy link
Collaborator

bors commented Jun 30, 2019

⌛ Testing commit aaf6698 with merge c06f80a...

bors added a commit that referenced this pull request Jun 30, 2019
Update musl to 1.1.22

This is the latest available version. I noticed Rust wasn't using the
latest version when I attempted to have Cargo link object files produced
outside of Cargo / Rust's toolchain and was getting missing symbol
errors. Those missing symbols were added in 1.1.21 and 1.1.22.

I'm not fully sure of the implications of this change or how
comprehensive the test coverage is. Upstream changes in 1.1.21 and
1.1.22 can be found at
https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v1.1.22&id=e97681d6f2c44bf5fa9ecdd30607cb63c780062e#n1989.
@bors
Copy link
Collaborator

bors commented Jun 30, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: alexcrichton
Pushing c06f80a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 30, 2019
@bors bors merged commit aaf6698 into rust-lang:master Jun 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants