Skip to content

Commit 649b2dc

Browse files
committed
---
yaml --- r: 194111 b: refs/heads/beta c: 737bb30 h: refs/heads/master i: 194109: 5bb2148 194107: b55eadf 194103: 1959341 194095: e7b8dd2 194079: 2c816d6 194047: e8752a7 v: v3
1 parent c870e8c commit 649b2dc

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: b6641c1595687a6c7c8ba381b46b931a58a3ada4
34+
refs/heads/beta: 737bb30f0af5b27785a006a91a8792a06478de87
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/src/libstd/sys/unix/thread.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,12 @@ pub fn sleep(dur: Duration) {
316316
// is created in an application with big thread-local storage requirements.
317317
// See #6233 for rationale and details.
318318
//
319-
// Use dlsym to get the symbol value at runtime, for compatibility
320-
// with older versions of glibc. Assumes that we've been dynamically
321-
// linked to libpthread but that is currently always the case. We
322-
// previously used weak linkage (under the same assumption), but that
323-
// caused Debian to detect an unnecessarily strict versioned
319+
// Use dlsym to get the symbol value at runtime, both for
320+
// compatibility with older versions of glibc, and to avoid creating
321+
// dependencies on GLIBC_PRIVATE symbols. Assumes that we've been
322+
// dynamically linked to libpthread but that is currently always the
323+
// case. We previously used weak linkage (under the same assumption),
324+
// but that caused Debian to detect an unnecessarily strict versioned
324325
// dependency on libc6 (#23628).
325326
#[cfg(target_os = "linux")]
326327
fn min_stack_size(attr: *const libc::pthread_attr_t) -> libc::size_t {

0 commit comments

Comments
 (0)