nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 17:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bring back stage0 allocator logic on MSVC

Browse Source 
I think there may still be bugs preventing its removal..
This commit is contained in:
Alex Crichton 2017-08-31 07:07:54 -07:00
parent 7a2a8d7d60
commit 9e5a7e9472
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libstd/lib.rs
View File

@ -322,9 +322,12 @@
// if the user has disabled jemalloc in `./configure`).
// `force_alloc_system` is *only* intended as a workaround for local rebuilds
// with a rustc without jemalloc.
#![cfg_attr(any(stage0, feature = "force_alloc_system"),
// FIXME(#44236) shouldn't need MSVC logic
#![cfg_attr(all(not(target_env = "msvc"),
any(stage0, feature = "force_alloc_system")),
feature(global_allocator))]
#[cfg(any(stage0, feature = "force_alloc_system"))]
#[cfg(all(not(target_env = "msvc"),
any(stage0, feature = "force_alloc_system")))]
#[global_allocator]
static ALLOC: alloc_system::System = alloc_system::System;

1
src/tools/tidy/src/pal.rs
View File

@ -65,6 +65,7 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
"src/rtstartup", // Not sure what to do about this. magic stuff for mingw
// temporary exceptions
"src/libstd/lib.rs", // FIXME(#44217)
"src/libstd/path.rs",
"src/libstd/f32.rs",
"src/libstd/f64.rs",