Skip to content

fix debuginfo for windows_gnullvm_base.rs#104067

Merged
bors merged 1 commit intorust-lang:masterfrom
jeremyd2019:patch-1
Nov 8, 2022
Merged

fix debuginfo for windows_gnullvm_base.rs#104067
bors merged 1 commit intorust-lang:masterfrom
jeremyd2019:patch-1

Conversation

@jeremyd2019
Copy link
Copy Markdown
Contributor

@jeremyd2019 jeremyd2019 commented Nov 6, 2022

These lines (including the FIXME comment) were added to windows_gnu_base.rs in cf2c492 but windows_gnullvm_base.rs was not updated. This resulted in an error LLVM ERROR: dwo only supported with ELF and Wasm attempting to build on aarch64-pc-windows-gnullvm.

See also msys2/MINGW-packages#13921 (comment)

/cc @mati865 @davidtwco

r? @davidtwco

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Nov 6, 2022

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

Please see the contribution instructions for more information.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Nov 6, 2022

These commits modify compiler targets.
(See the Target Tier Policy.)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 6, 2022
@rustbot rustbot assigned davidtwco and unassigned petrochenkov Nov 6, 2022
Comment thread compiler/rustc_target/src/spec/windows_gnullvm_base.rs Outdated
@jeremyd2019
Copy link
Copy Markdown
Contributor Author

This is my first attempt to open a pull request against rust. I don't even really use/understand rust, I just happen to be the person with the machine to build for this target at msys2. Please have patience with me 😉

Comment thread compiler/rustc_target/src/spec/windows_gnullvm_base.rs Outdated
@mati865
Copy link
Copy Markdown
Member

mati865 commented Nov 7, 2022

The policy is to merge commits as they are so to keep clean history users are expected rebase + squash/fixup "fixup" commits.

These lines (including the FIXME comment) were added to windows_gnu_base.rs in cf2c492 but windows_gnullvm_base.rs was not updated.  This resulted in an error `LLVM ERROR: dwo only supported with ELF and Wasm` attempting to build on aarch64-pc-windows-gnullvm.

Signed-off-by: Jeremy Drake <github@jdrake.com>
@davidtwco
Copy link
Copy Markdown
Member

@bors r+ rollup

@bors
Copy link
Copy Markdown
Collaborator

bors commented Nov 7, 2022

📌 Commit 6994651 has been approved by davidtwco

It is now in the queue for this repository.

@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 Nov 7, 2022
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 7, 2022
fix debuginfo for windows_gnullvm_base.rs

These lines (including the FIXME comment) were added to windows_gnu_base.rs in cf2c492 but windows_gnullvm_base.rs was not updated.  This resulted in an error `LLVM ERROR: dwo only supported with ELF and Wasm` attempting to build on aarch64-pc-windows-gnullvm.

See also msys2/MINGW-packages#13921 (comment)

/cc `@mati865` `@davidtwco`

r? `@davidtwco`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 7, 2022
fix debuginfo for windows_gnullvm_base.rs

These lines (including the FIXME comment) were added to windows_gnu_base.rs in cf2c492 but windows_gnullvm_base.rs was not updated.  This resulted in an error `LLVM ERROR: dwo only supported with ELF and Wasm` attempting to build on aarch64-pc-windows-gnullvm.

See also msys2/MINGW-packages#13921 (comment)

/cc ``@mati865`` ``@davidtwco``

r? ``@davidtwco``
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2022
Rollup of 7 pull requests

Successful merges:

 - rust-lang#103446 (Specialize `iter::ArrayChunks::fold` for TrustedRandomAccess iterators)
 - rust-lang#103651 (Fix `rustc_parse_format` spans following escaped utf-8 multibyte chars)
 - rust-lang#103865 (Move `fallback_has_occurred` state tracking to `FnCtxt`)
 - rust-lang#103955 (Update linker-plugin-lto.md to contain up to Rust 1.65)
 - rust-lang#103987 (Remove `in_tail_expr` from FnCtxt)
 - rust-lang#104067 (fix debuginfo for windows_gnullvm_base.rs)
 - rust-lang#104094 (fully move `on_unimplemented` to `error_reporting`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2b9e099 into rust-lang:master Nov 8, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 8, 2022
@jeremyd2019 jeremyd2019 deleted the patch-1 branch November 8, 2022 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants