diff options
| author | bors <bors@rust-lang.org> | 2018-05-17 16:44:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-05-17 16:44:38 +0000 |
| commit | 90463a6bdcd18c60e18a1cc810fc6453b96f7d54 (patch) | |
| tree | 73a99c27209c97d623333dabb38158550c0cd6c0 /src/liballoc_jemalloc | |
| parent | dbd10f81758381339f98994b8d31814cf5e98707 (diff) | |
| parent | a22af69c8f5b3838a8822b9e6dbe2199cfb8f297 (diff) | |
| download | rust-90463a6bdcd18c60e18a1cc810fc6453b96f7d54.tar.gz rust-90463a6bdcd18c60e18a1cc810fc6453b96f7d54.zip | |
Auto merge of #50629 - Mark-Simulacrum:stage-step, r=alexcrichton
Switch to bootstrapping from 1.27 It's possible the Float trait could be removed from core, but I couldn't tell whether it was intended to be removed or not. @SimonSapin may be able to comment more here; we can presumably also do that in a follow up PR as this one is already quite large.
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index 4b8755877de..ce856eccd83 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -97,13 +97,6 @@ mod contents { ptr } - #[cfg(stage0)] - #[no_mangle] - #[rustc_std_internal_symbol] - pub unsafe extern fn __rde_oom() -> ! { - ::core::intrinsics::abort(); - } - #[no_mangle] #[rustc_std_internal_symbol] pub unsafe extern fn __rde_dealloc(ptr: *mut u8, |