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

libcompiler_builtins: Don't build emutls.c #38877

Merged
merged 1 commit into from
Jan 14, 2017
Merged

Conversation

jdub
Copy link
Contributor

@jdub jdub commented Jan 6, 2017

Rather than improving the check, let's ditch emutls.c entirely.

@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 @nikomatsakis (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.

@jdub
Copy link
Contributor Author

jdub commented Jan 6, 2017

I double-checked that rustc +nightly --print cfg for Windows (both MSVC and GNU) doesn't contain target_thread_local, but I'm not sure about Redox.

It correctly builds without emutls.c on my bare metal target, and with emutls.c on Linux with nightly.

@nikomatsakis
Copy link
Contributor

r? @alexcrichton

I have no idea what this is about. =)

@alexcrichton
Copy link
Member

@jdub in theory we never actually even use this file and we should actually stop compiling it. Did you find this necessary to fix something though?

@jdub
Copy link
Contributor Author

jdub commented Jan 7, 2017

Yeah, it fails to build on my non-Redox, non-Windows target because it's a bare metal target without POSIX/pthreads. 😄 If emutls.c is truly unnecessary (about which I can only have blind trust!), should I update this PR to ditch it?

@alexcrichton
Copy link
Member

Yeah let's just update this to avoid compiling it entirely

Rather than improving the check, let's ditch emutls.c entirely.
@jdub jdub changed the title libcompiler_builtins: Better check for emutls.c libcompiler_builtins: Don't build emutls.c Jan 7, 2017
@sanxiyn
Copy link
Member

sanxiyn commented Jan 10, 2017

You may want to edit the first comment which is included as a commit message by bors, since it is now incorrect and probably will confuse future readers of git log.

@jdub
Copy link
Contributor Author

jdub commented Jan 10, 2017

@sanxiyn Thanks -- done.

@sanxiyn
Copy link
Member

sanxiyn commented Jan 10, 2017

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 10, 2017

📌 Commit 9f92d4f has been approved by sanxiyn

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 13, 2017
libcompiler_builtins: Don't build emutls.c

Rather than improving the check, let's ditch emutls.c entirely.
bors added a commit that referenced this pull request Jan 13, 2017
Rollup of 10 pull requests

- Successful merges: #38362, #38636, #38877, #38946, #38965, #38986, #38994, #38995, #39024, #39027
- Failed merges:
@bors bors merged commit 9f92d4f into rust-lang:master Jan 14, 2017
@jdub jdub deleted the patch-1 branch January 14, 2017 04:05
japaric pushed a commit to rust-lang/compiler-builtins that referenced this pull request Feb 6, 2017
Rather than improving the check, let's ditch emutls.c entirely.

rust-lang/rust#38877
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