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

Fix no_integrated_as option to work with new codegen architecture. #47453

Merged
merged 2 commits into from
Jan 26, 2018

Conversation

pftbest
Copy link
Contributor

@pftbest pftbest commented Jan 15, 2018

Old implementation called the assembler once per crate, but we need to call
it for each object file instead, because a single crate can now have more
than one object file.

This patch fixes #45836 (Can't compile core for msp430 in release mode)

This change can be tested on x86_64 using

export RUSTFLAGS="-C no_integrated_as -C save_temps"

r? @alexcrichton
cc @japaric

Old implementation called the assembler once per crate, but we need to call
it for each object file instead, because a single crate can now have more
than one object file.

This patch fixes issue rust-lang#45836 (Can't compile core for msp430 in release mode)
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (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.

@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Contributor

bors commented Jan 15, 2018

📌 Commit 3f61742 has been approved by alexcrichton

@nagisa
Copy link
Member

nagisa commented Jan 15, 2018

This change can be tested on x86_64 using

export RUSTFLAGS="-C no_integrated_as -C save_temps"

Is it possible to add a make-run test that tests this, then?

@pftbest
Copy link
Contributor Author

pftbest commented Jan 16, 2018

@nagisa I've added the test, but it's primitive.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 16, 2018

📌 Commit 98dee04 has been approved by alexcrichton

@kennytm kennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 17, 2018
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Jan 25, 2018
Fix no_integrated_as option to work with new codegen architecture.

Old implementation called the assembler once per crate, but we need to call
it for each object file instead, because a single crate can now have more
than one object file.

This patch fixes issue rust-lang#45836 (Can't compile core for msp430 in release mode)

This change can be tested on x86_64 using
```sh
export RUSTFLAGS="-C no_integrated_as -C save_temps"
```

r? @alexcrichton
cc @japaric
bors added a commit that referenced this pull request Jan 26, 2018
@bors bors merged commit 98dee04 into rust-lang:master Jan 26, 2018
@bors
Copy link
Contributor

bors commented Jan 26, 2018

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

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't compile core for msp430 in release mode
6 participants