Skip to content

libcompiler_builtins: Don't build emutls.c - #38877

Merged
bors merged 1 commit into
rust-lang:masterfrom
jdub:patch-1
Jan 14, 2017
Merged

libcompiler_builtins: Don't build emutls.c#38877
bors merged 1 commit into
rust-lang:masterfrom
jdub:patch-1

Conversation

@jdub

@jdubjdub commented Jan 6, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

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

@rust-highfive

rust-highfive commented Jan 6, 2017

Copy link
Copy Markdown
Contributor

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

jdub commented Jan 6, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

nikomatsakis commented Jan 7, 2017

Copy link
Copy Markdown
Contributor

r? @alexcrichton

I have no idea what this is about. =)

@alexcrichton

alexcrichton commented Jan 7, 2017

Copy link
Copy Markdown
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

jdub commented Jan 7, 2017

Copy link
Copy Markdown
ContributorAuthor

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

alexcrichton commented Jan 7, 2017

Copy link
Copy Markdown
Member

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

@jdub
libcompiler_builtins: Don't build emutls.c
9f92d4f
Rather than improving the check, let's ditch emutls.c entirely.
@jdubjdub changed the title libcompiler_builtins: Better check for emutls.clibcompiler_builtins: Don't build emutls.cJan 7, 2017
@sanxiyn

sanxiyn commented Jan 10, 2017

Copy link
Copy Markdown
Contributor

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

jdub commented Jan 10, 2017

Copy link
Copy Markdown
ContributorAuthor

@sanxiyn Thanks -- done.

@sanxiyn

sanxiyn commented Jan 10, 2017

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jan 10, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 9f92d4f has been approved by sanxiyn

@GuillaumeGomezGuillaumeGomez mentioned this pull request Jan 12, 2017
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 13, 2017
@GuillaumeGomez
Rollup merge ofrust-lang#38877- jdub:patch-1, r=sanxiyn
ef2c921
libcompiler_builtins: Don't build emutls.c
Rather than improving the check, let's ditch emutls.c entirely.
@GuillaumeGomezGuillaumeGomez mentioned this pull request Jan 13, 2017
Merged
bors added a commit that referenced this pull request Jan 13, 2017
@bors
Auto merge of#39030- GuillaumeGomez:rollup, r=GuillaumeGomez
7789881
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:masterJan 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
Jorge Aparicio
libcompiler_builtins: Don't build emutls.c
6d3cab2
Rather than improving the check, let's ditch emutls.c entirely.
rust-lang/rust#38877
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jdub@rust-highfive@nikomatsakis@alexcrichton@sanxiyn@bors