Skip to content

Commit e98681d

Browse files
committed
---
yaml --- r: 192210 b: refs/heads/master c: 737bb30 h: refs/heads/master v: v3
1 parent 956a1c6 commit e98681d

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
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: b6641c1595687a6c7c8ba381b46b931a58a3ada4
2+
refs/heads/master: 737bb30f0af5b27785a006a91a8792a06478de87
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a923278c6278c63468d74772c58dbf788e88f58c
55
refs/heads/try: ce76bff75603a754d092456285ff455eb871633d

trunk/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)