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

Add builtin targets for mips64(el)-unknown-linux-muslabi64 #63165

Merged
merged 1 commit into from Aug 15, 2019

Conversation

@xen0n
Copy link
Contributor

commented Jul 31, 2019

This is prerequisite for rust-lang/libc#1449.

Tested locally to produce working static and dynamic binaries, but CI config is untested for now CI is to be added in a follow-up PR.

edit: dynamic binaries also confirmed working!

edit 2: changed triples to include ABI, and removed stray crt_static_default = false declarations to be consistent with other musl targets

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jul 31, 2019

r? @eddyb

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

@xen0n xen0n force-pushed the xen0n:mips64-musl-targets branch from 0d5c644 to e1bd8cb Aug 9, 2019

@xen0n xen0n changed the title [WIP] Add MIPS64 musl targets Add builtin targets for mips64(el)-unknown-linux-musl Aug 9, 2019

@xen0n xen0n marked this pull request as ready for review Aug 9, 2019

@xen0n

This comment has been minimized.

Copy link
Contributor Author

commented Aug 9, 2019

This is ready for review, for unblocking the libc changes.

@xen0n

This comment has been minimized.

Copy link
Contributor Author

commented Aug 9, 2019

@rust-highfive rust-highfive assigned alexcrichton and unassigned eddyb Aug 9, 2019

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Aug 9, 2019

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2019

📌 Commit e1bd8cb has been approved by alexcrichton

Centril added a commit to Centril/rust that referenced this pull request Aug 9, 2019

Rollup merge of rust-lang#63165 - xen0n:mips64-musl-targets, r=alexcr…
…ichton

Add builtin targets for mips64(el)-unknown-linux-musl

This is prerequisite for rust-lang/libc#1449.

Tested locally to produce working static and dynamic binaries, ~~but CI config is untested for now~~ CI is to be added in a follow-up PR.

*edit: dynamic binaries also confirmed working!*

@Centril Centril referenced this pull request Aug 9, 2019

Closed

Rollup of 5 pull requests #63412

bors added a commit that referenced this pull request Aug 9, 2019

Auto merge of #63412 - Centril:rollup-5lvzexh, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #63165 (Add builtin targets for mips64(el)-unknown-linux-musl)
 - #63337 (Tweak mismatched types error)
 - #63346 (Lint on some incorrect uses of mem::zeroed / mem::uninitialized)
 - #63350 (Use associated_type_bounds where applicable - closes #61738)
 - #63394 (Add test for issue 36804)

Failed merges:

r? @ghost

@Centril Centril added this to the 1.38 milestone Aug 9, 2019

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2019

⌛️ Testing commit e1bd8cb with merge 0329c99...

bors added a commit that referenced this pull request Aug 9, 2019

Auto merge of #63165 - xen0n:mips64-musl-targets, r=alexcrichton
Add builtin targets for mips64(el)-unknown-linux-musl

This is prerequisite for rust-lang/libc#1449.

Tested locally to produce working static and dynamic binaries, ~~but CI config is untested for now~~ CI is to be added in a follow-up PR.

*edit: dynamic binaries also confirmed working!*
@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2019

💔 Test failed - checks-azure

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 9, 2019

The job dist-x86_64-musl of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-08-09T18:58:18.5153259Z do so (now or later) by using -b with the checkout command again. Example:
2019-08-09T18:58:18.5153308Z 
2019-08-09T18:58:18.5153547Z   git checkout -b <new-branch-name>
2019-08-09T18:58:18.5153603Z 
2019-08-09T18:58:18.5153892Z HEAD is now at 0329c99a4 Auto merge of #63165 - xen0n:mips64-musl-targets, r=alexcrichton
2019-08-09T18:58:18.5313819Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-08-09T18:58:18.5316707Z ==============================================================================
2019-08-09T18:58:18.5316810Z Task         : Bash
2019-08-09T18:58:18.5316876Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-08-09T21:07:40.0677910Z     Finished release [optimized] target(s) in 5m 20s
2019-08-09T21:07:40.0840987Z [TIMING] ToolBuild { compiler: Compiler { stage: 1, host: "x86_64-unknown-linux-musl" }, target: "x86_64-unknown-linux-musl", tool: "rls", path: "src/tools/rls", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: ["clippy"] } -- 320.848
2019-08-09T21:07:59.0686344Z 
2019-08-09T21:07:59.0688007Z 
2019-08-09T21:07:59.0689732Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-musl/stage0-tools-bin/fabricate" "generate" "--product-name=Rust" "--rel-manifest-dir=rustlib" "--success-message=RLS-ready-to-serve." "--image-dir" "/checkout/obj/build/tmp/dist/rls-image" "--work-dir" "/checkout/obj/build/tmp/dist" "--output-dir" "/checkout/obj/build/dist" "--non-installed-overlay" "/checkout/obj/build/tmp/dist/rls-overlay" "--package-name=rls-nightly-x86_64-unknown-linux-musl" "--legacy-manifest-dirs=rustlib,cargo" "--component-name=rls-preview"
2019-08-09T21:07:59.0690489Z expected success, got: signal: 11
2019-08-09T21:07:59.0690903Z 
2019-08-09T21:07:59.0693928Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --build x86_64-unknown-linux-musl
2019-08-09T21:07:59.0694383Z Build completed unsuccessfully in 2:01:25
2019-08-09T21:07:59.0694383Z Build completed unsuccessfully in 2:01:25
2019-08-09T21:08:02.7663572Z ##[error]Bash exited with code '1'.
2019-08-09T21:08:02.7699022Z ##[section]Starting: Upload CPU usage statistics
2019-08-09T21:08:02.7710334Z ==============================================================================
2019-08-09T21:08:02.7710447Z Task         : Bash
2019-08-09T21:08:02.7710518Z Description  : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Aug 9, 2019

@bors: retry

rustc_target: add n64 musl targets for MIPS64 arches
Hard-float (unlike mips32 musl targets but consistent with any other
musl target), MIPS64r2, n64 ABI.

The triples are renamed to carry the `abi64` ABI suffix found on all
other MIPS64 targets, for consistency and forward compatibility, should
Rust gain support for the n32 ABI one day.

@xen0n xen0n force-pushed the xen0n:mips64-musl-targets branch from e1bd8cb to 30fcd50 Aug 10, 2019

@xen0n xen0n changed the title Add builtin targets for mips64(el)-unknown-linux-musl Add builtin targets for mips64(el)-unknown-linux-muslabi64 Aug 10, 2019

@xen0n

This comment has been minimized.

Copy link
Contributor Author

commented Aug 10, 2019

I just took the opportunity of the (unrelated) CI failure to fix some bits:

  • The original patch said crt_static_default = false which is not the case in other musl targets, only MIPS32 musl targets have it.
    Since the MIPS32 toolchains are configured differently (they come from OpenWRT), MIPS64 targets should behave like others, not the MIPS32 counterparts.
  • The original patch had bare -musl suffix not reflecting the ABI like the other MIPS64 triples do.
    LLVM doesn't support things like -muslabi64 or -muslabin32, but seeing armv7-unknown-linux-musleabihf doing similar things for consistency, I think adding the non-standard-for-now suffix is good for forward compatibility. In case someone decides to add n32 ABI support to Rust someday.

Sorry for the noise!

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 12, 2019

📌 Commit 30fcd50 has been approved by alexcrichton

Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019

Rollup merge of rust-lang#63165 - xen0n:mips64-musl-targets, r=alexcr…
…ichton

Add builtin targets for mips64(el)-unknown-linux-muslabi64

This is prerequisite for rust-lang/libc#1449.

Tested locally to produce working static and dynamic binaries, ~~but CI config is untested for now~~ CI is to be added in a follow-up PR.

*edit: dynamic binaries also confirmed working!*

*edit 2: changed triples to include ABI, and removed stray `crt_static_default = false` declarations to be consistent with other musl targets`

@Centril Centril removed the relnotes label Aug 13, 2019

@Centril Centril removed this from the 1.38 milestone Aug 13, 2019

Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019

Rollup merge of rust-lang#63165 - xen0n:mips64-musl-targets, r=alexcr…
…ichton

Add builtin targets for mips64(el)-unknown-linux-muslabi64

This is prerequisite for rust-lang/libc#1449.

Tested locally to produce working static and dynamic binaries, ~~but CI config is untested for now~~ CI is to be added in a follow-up PR.

*edit: dynamic binaries also confirmed working!*

*edit 2: changed triples to include ABI, and removed stray `crt_static_default = false` declarations to be consistent with other musl targets*

bors added a commit that referenced this pull request Aug 15, 2019

Auto merge of #63583 - Centril:rollup-5s17x9k, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #63155 (Add UWP MSVC targets)
 - #63165 (Add builtin targets for mips64(el)-unknown-linux-muslabi64)
 - #63306 (Adapt AddRetag for shallow retagging)
 - #63470 (Utilize -Zbinary-dep-depinfo in rustbuild)
 - #63491 (Update RLS)
 - #63559 (rustc_codegen_utils: account for 1-indexed anonymous lifetimes in v0 mangling.)
 - #63572 (remove unused Level::PhaseFatal)
 - #63577 (Test HRTB issue accepted by compiler)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019

Rollup merge of rust-lang#63165 - xen0n:mips64-musl-targets, r=alexcr…
…ichton

Add builtin targets for mips64(el)-unknown-linux-muslabi64

This is prerequisite for rust-lang/libc#1449.

Tested locally to produce working static and dynamic binaries, ~~but CI config is untested for now~~ CI is to be added in a follow-up PR.

*edit: dynamic binaries also confirmed working!*

*edit 2: changed triples to include ABI, and removed stray `crt_static_default = false` declarations to be consistent with other musl targets*

bors added a commit that referenced this pull request Aug 15, 2019

Auto merge of #63588 - Centril:rollup-9ad6qs2, r=Centril
Rollup of 12 pull requests

Successful merges:

 - #63155 (Add UWP MSVC targets)
 - #63165 (Add builtin targets for mips64(el)-unknown-linux-muslabi64)
 - #63467 (Add Catalyst (iOS apps running on macOS) target)
 - #63470 (Utilize -Zbinary-dep-depinfo in rustbuild)
 - #63495 ( Remove redundant `ty` fields from `mir::Constant` and `hair::pattern::PatternRange`.)
 - #63525 (Make sure that all file loading happens via SourceMap)
 - #63546 (Remove uses of `mem::uninitialized()` from cloudabi)
 - #63559 (rustc_codegen_utils: account for 1-indexed anonymous lifetimes in v0 mangling.)
 - #63572 (remove unused Level::PhaseFatal)
 - #63577 (Test HRTB issue accepted by compiler)
 - #63582 (Fix ICE #63226)
 - #63586 (cleanup: Remove `Spanned` where possible)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019

Rollup merge of rust-lang#63165 - xen0n:mips64-musl-targets, r=alexcr…
…ichton

Add builtin targets for mips64(el)-unknown-linux-muslabi64

This is prerequisite for rust-lang/libc#1449.

Tested locally to produce working static and dynamic binaries, ~~but CI config is untested for now~~ CI is to be added in a follow-up PR.

*edit: dynamic binaries also confirmed working!*

*edit 2: changed triples to include ABI, and removed stray `crt_static_default = false` declarations to be consistent with other musl targets*

bors added a commit that referenced this pull request Aug 15, 2019

Auto merge of #63592 - Centril:rollup-7c6dg3e, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #63155 (Add UWP MSVC targets)
 - #63165 (Add builtin targets for mips64(el)-unknown-linux-muslabi64)
 - #63306 (Adapt AddRetag for shallow retagging)
 - #63467 (Add Catalyst (iOS apps running on macOS) target)
 - #63546 (Remove uses of `mem::uninitialized()` from cloudabi)
 - #63572 (remove unused Level::PhaseFatal)
 - #63577 (Test HRTB issue accepted by compiler)
 - #63582 (Fix ICE #63226)
 - #63586 (cleanup: Remove `Spanned` where possible)

Failed merges:

r? @ghost

@bors bors merged commit 30fcd50 into rust-lang:master Aug 15, 2019

3 of 4 checks passed

pr (Linux mingw-check)
Details
pr Build #20190810.14 succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2019

⌛️ Testing commit 30fcd50 with merge f7af19c...

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2019

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

@xen0n xen0n deleted the xen0n:mips64-musl-targets branch Aug 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.