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

Revert compiler-rt updates from #29233 #29477

Merged
merged 2 commits into from
Oct 31, 2015

Conversation

alexcrichton
Copy link
Member

This ended up causing regressions in a few builds I've seen:

I suspect the problems are along the lines of:

  • The emutls support needs to be disabled on Windows, it currently always used pthreads which isn't available
  • The objects in compiler-rt either need to be built without a CRT or not specifically against the static one.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@alexcrichton
Copy link
Member Author

r? @brson

I'm hoping to keep the window of breakage fairly small here while we work out a fix, cc @angelsl

@rust-highfive rust-highfive assigned brson and unassigned nikomatsakis Oct 30, 2015
@alexcrichton
Copy link
Member Author

It would also be great to figure out how this passed bors without catching the regression when a fix is posted...

@angelsl
Copy link
Contributor

angelsl commented Oct 30, 2015

I'm so sorry for this, I assumed if compiler-rt.lib was built it would work, clearly that isn't the case..

@alexcrichton
Copy link
Member Author

Ah no worries! Stuff like this is notoriously hard to catch ahead of time

@brson
Copy link
Contributor

brson commented Oct 30, 2015

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Oct 30, 2015

📌 Commit f351b69 has been approved by brson

bors added a commit that referenced this pull request Oct 31, 2015
This ended up causing regressions in a few builds I've seen:

* MinGW -- [64-bit](https://ci.appveyor.com/project/alexcrichton/gcc-rs/build/1.0.338/job/2c4pkxgxa2dvqs25) and [32-bit](https://ci.appveyor.com/project/alexcrichton/gcc-rs/build/1.0.338/job/d0n7kml3k5el9gla)
- MSVC - [64-bit with VS 12.0](https://ci.appveyor.com/project/alexcrichton/gcc-rs/build/job/ugldcage9ydoy1k6) and [32-bit with VS 12.0](https://ci.appveyor.com/project/alexcrichton/gcc-rs/build/job/pn59p4rhnj8gybei).

I suspect the problems are along the lines of:

* The emutls support needs to be disabled on Windows, it currently always used pthreads which isn't available
* The objects in compiler-rt either need to be built without a CRT or not specifically against the static one.
@bors
Copy link
Collaborator

bors commented Oct 31, 2015

⌛ Testing commit f351b69 with merge 11ba81e...

@bors bors merged commit f351b69 into rust-lang:master Oct 31, 2015
@alexcrichton alexcrichton deleted the revert-compiler-rt branch October 31, 2015 16:27
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.

6 participants