diff options
| author | bors <bors@rust-lang.org> | 2015-12-22 07:23:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-22 07:23:16 +0000 |
| commit | 5178449f1c40b8b3a69f71e4db4e745c87b2ba67 (patch) | |
| tree | 00905b79d27d878a6271b0647925a7c8becc1d05 /src/liballoc_jemalloc | |
| parent | 439e1843b9f53a2ad9e83861f47f95227737e998 (diff) | |
| parent | 2f42ac438ef4bc2773f5ac0a55ae45b08e575b17 (diff) | |
| download | rust-5178449f1c40b8b3a69f71e4db4e745c87b2ba67.tar.gz rust-5178449f1c40b8b3a69f71e4db4e745c87b2ba67.zip | |
Auto merge of #30175 - alexcrichton:less-c-code, r=brson
All these definitions can now be written in Rust, so do so!
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index 413eac3cf79..eaaa9391d31 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -108,3 +108,14 @@ pub extern "C" fn __rust_usable_size(size: usize, align: usize) -> usize { let flags = align_to_flags(align); unsafe { je_nallocx(size as size_t, flags) as usize } } + +// These symbols are used by jemalloc on android but the really old android +// we're building on doesn't have them defined, so just make sure the symbols +// are available. +#[no_mangle] +#[cfg(target_os = "android")] +pub extern fn pthread_atfork(_prefork: *mut u8, + _postfork_parent: *mut u8, + _postfork_child: *mut u8) -> i32 { + 0 +} |
