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.

Sign up for GitHub

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

Jump to bottom

Cleanup and document -Z tls-model #71558

Merged
merged 2 commits into from
Apr 28, 2020
Merged

Cleanup and document -Z tls-model #71558

merged 2 commits into from
Apr 28, 2020

Conversation

petrochenkov
Copy link
Contributor

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 25, 2020
Amanieu
Amanieu reviewed Apr 25, 2020
View reviewed changes
Copy link
Member

@Amanieu Amanieu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some clarifications for the documentation.

src/doc/unstable-book/src/compiler-flags/tls-model.md
------------------------

Option `-Z tls-model` controls [TLS model](https://www.akkadia.org/drepper/tls.pdf) used to
generate code for accessing `#[thread_local]` `static` items.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically speaking, the TLS model is supposed to be a per-variable attribute rather than a global one. However we don't currently have such an attribute, only a global setting which sets the default TLS model for all variables.

src/doc/unstable-book/src/compiler-flags/tls-model.md Outdated Show resolved Hide resolved
src/doc/unstable-book/src/compiler-flags/tls-model.md Outdated Show resolved Hide resolved
@petrochenkov
Copy link
Contributor Author

Updated.

@Amanieu
Copy link
Member

Amanieu commented Apr 26, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Apr 26, 2020

📌 Commit 66e41723c8694612efddd2f2e6d70abc557f61f3 has been approved by Amanieu

@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 Apr 26, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 26, 2020
Merged
@bors
Copy link
Contributor

bors commented Apr 26, 2020

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 26, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2020
@bors
Auto merge of rust-lang#71593 - Dylan-DPC:rollup-ms7j94u, r=Dylan-DPC
e83f756 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71421 (Add a function to turn Box<T> into Box<[T]>)
 - rust-lang#71537 (Remove support for self-opening)
 - rust-lang#71551 (Minor refactoring around IndexVec usage in generator transformation)
 - rust-lang#71569 ([miri] Throw UB if target size and data size don't match)
 - rust-lang#71576 (check that `AsRef` and `AsMut` are inlined)

Failed merges:

 - rust-lang#71558 (Cleanup and document `-Z tls-model` )

r? @ghost
@petrochenkov
Copy link
Contributor Author

@bors r=Amanieu

@bors
Copy link
Contributor

bors commented Apr 26, 2020

📌 Commit 45dc435 has been approved by Amanieu

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 26, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 27, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 27, 2020
@bors
Auto merge of rust-lang#71620 - Dylan-DPC:rollup-9wgtisb, r=Dylan-DPC
c354509 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#67841 (Add Read/Write::can_read/write_vectored)
 - rust-lang#71524 (Minimize parameter of coerce_borrowed_pointer())
 - rust-lang#71558 (Cleanup and document `-Z tls-model` )
 - rust-lang#71578 (linkchecker: fix typo in main.rs)
 - rust-lang#71596 (Fix broken link in `QPath` documentation)
 - rust-lang#71604 (make recursive-zst test unleashed)
 - rust-lang#71605 (No need to whitelist E0750 anymore)

Failed merges:

r? @ghost
@bors bors merged commit f81a41a into rust-lang:master Apr 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Amanieu Amanieu Amanieu left review comments

Assignees

@Amanieu Amanieu

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@petrochenkov @Amanieu @bors @rust-highfive