diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-04-04 18:57:48 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-04-12 22:53:21 +0200 |
| commit | eae0d468932660ca383e35bb9d8b0cb4943a82ae (patch) | |
| tree | 818c14771c58c3fe97bd5d6c18bb94e30fe2064e /src/libstd | |
| parent | 96c9d225a9667bc5ffcbc1594d44c29b201e999c (diff) | |
| download | rust-eae0d468932660ca383e35bb9d8b0cb4943a82ae.tar.gz rust-eae0d468932660ca383e35bb9d8b0cb4943a82ae.zip | |
Restore Global.oom() functionality
… now that #[global_allocator] does not define a symbol for it
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/alloc.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index 335dc7e0412..4e728df010a 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -37,6 +37,12 @@ pub mod __default_lib_allocator { #[no_mangle] #[rustc_std_internal_symbol] + pub unsafe extern fn __rdl_oom() -> ! { + System.oom() + } + + #[no_mangle] + #[rustc_std_internal_symbol] pub unsafe extern fn __rdl_dealloc(ptr: *mut u8, size: usize, align: usize) { |