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

Re-add aarch64 stuff removed by previous PR #1028

Merged
merged 1 commit into from
Jul 1, 2018
Merged

Conversation

est31
Copy link
Member

@est31 est31 commented Jul 1, 2018

Previous PR #1023 has removed stuff from mod.rs and added it to some submodules, but
missed the aarch64 submodule.

This caused a build failure for rust on aarch64, see rust-lang/rust#51864.

This copies the stuff that that commit added to the x86_64.rs submodule
and puts it into aarch64.rs.

It's been tested in the rust-lang/rust PR above: https://travis-ci.org/rust-lang/rust/builds/398750336

Previous commit

dcff154
"libc: changes to ppc64le musl branch to support building of rust on Alpine"

has removed stuff from mod.rs and added it to some submodules, but
missed the aarch64 submodule.

This copies the stuff that that commit added to the x86_64.rs submodule
and puts it into aarch64.rs.
@rust-highfive
Copy link

r? @alexcrichton

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

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 1, 2018

📌 Commit 90c01fa has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jul 1, 2018

⌛ Testing commit 90c01fa with merge b6d23ed...

bors added a commit that referenced this pull request Jul 1, 2018
Re-add aarch64 stuff removed by previous PR

Previous PR #1023 has removed stuff from mod.rs and added it to some submodules, but
missed the aarch64 submodule.

This caused a build failure for rust on aarch64, see rust-lang/rust#51864.

This copies the stuff that that commit added to the x86_64.rs submodule
and puts it into aarch64.rs.

It's been tested in the rust-lang/rust PR above: https://travis-ci.org/rust-lang/rust/builds/398750336
@bors
Copy link
Contributor

bors commented Jul 1, 2018

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

@bors bors merged commit 90c01fa into rust-lang:master Jul 1, 2018
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.

4 participants