diff options
| author | bors <bors@rust-lang.org> | 2017-05-13 09:12:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-13 09:12:09 +0000 |
| commit | 453cad6e658e095c6beacf12c589609dac3f4e52 (patch) | |
| tree | 1cf5a6a3971cc8da94b4ac915a3de02022cb3b93 /src/liballoc_jemalloc | |
| parent | 4f3886abf1b52d0804564c043fd699da039a12fb (diff) | |
| parent | 65d0be3b7b540145c22409b1a79f7d263422e19b (diff) | |
| download | rust-453cad6e658e095c6beacf12c589609dac3f4e52.tar.gz rust-453cad6e658e095c6beacf12c589609dac3f4e52.zip | |
Auto merge of #41861 - arthurprs:update-jemalloc, r=alexcrichton
Update jemalloc to 4.5.0 * pointing jemalloc submodule to the 4.5.0 HEAD + generated configure script * removed the now unnecessary extra config for windows. jemalloc is now much better at configuring itself overall. Let's see what the CI think.
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index f3a0eebe698..859e414a6fe 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -93,29 +93,7 @@ fn main() { .env("AR", &ar) .env("RANLIB", format!("{} s", ar.display())); - if target.contains("windows") { - // A bit of history here, this used to be --enable-lazy-lock added in - // #14006 which was filed with jemalloc in jemalloc/jemalloc#83 which - // was also reported to MinGW: - // - // http://sourceforge.net/p/mingw-w64/bugs/395/ - // - // When updating jemalloc to 4.0, however, it was found that binaries - // would exit with the status code STATUS_RESOURCE_NOT_OWNED indicating - // that a thread was unlocking a mutex it never locked. Disabling this - // "lazy lock" option seems to fix the issue, but it was enabled by - // default for MinGW targets in 13473c7 for jemalloc. - // - // As a result of all that, force disabling lazy lock on Windows, and - // after reading some code it at least *appears* that the initialization - // of mutexes is otherwise ok in jemalloc, so shouldn't cause problems - // hopefully... - // - // tl;dr: make windows behave like other platforms by disabling lazy - // locking, but requires passing an option due to a historical - // default with jemalloc. - cmd.arg("--disable-lazy-lock"); - } else if target.contains("ios") { + if target.contains("ios") { cmd.arg("--disable-tls"); } else if target.contains("android") { // We force android to have prefixed symbols because apparently |