-
Notifications
You must be signed in to change notification settings - Fork 13.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use __pthread_get_minstack() when available.
glibc >= 2.15 has a __pthread_get_minstack() function that returns PTHREAD_STACK_MIN plus however many bytes are needed for thread-local storage. Use it when it's available because just PTHREAD_STACK_MIN is not enough in applications that have big thread-local storage requirements. Fixes #6233.
- Loading branch information
1 parent
b02b5cd
commit 431edac
Showing
1 changed file
with
46 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at https://github.com/bnoordhuis/rust/commit/431edacbef23e691d1b192da78b4112c35addfbf
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging bnoordhuis/rust/issue11694 = 431edac into auto
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bnoordhuis/rust/issue11694 = 431edac merged ok, testing candidate = 22174591
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3029
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3923
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1767
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3923
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3938
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/3032
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3940
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3931
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3037
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm unclear on why the CI is failing. Is it hitting some kind of timeout? The build logs all end with the same error when running the tests. FWIW, they pass for me locally on OS X and Linux.
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is something that's in general plaguing the mac64 bots right now, I'm trying to investigate.
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My current suspicions point to cb263e8, trying to confirm right now.
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at https://github.com/bnoordhuis/rust/commit/431edacbef23e691d1b192da78b4112c35addfbf
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging bnoordhuis/rust/issue11694 = 431edac into auto
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bnoordhuis/rust/issue11694 = 431edac merged ok, testing candidate = a1f157b
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3935
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1777
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1779
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3935
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/3035
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3041
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3950
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/3038
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/3044
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3952
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/3038
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/3043
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/3112
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/890
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3943
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/3044
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3049
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3712
431edac
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = a1f157b