diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2016-02-19 14:23:28 -0500 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2016-02-19 14:23:28 -0500 |
| commit | 0f2675a2e6eb74529d61523834fd124296f8431c (patch) | |
| tree | 2f1d54a10e04601ac1c8b1107209de358db8fd83 /src/liballoc_jemalloc | |
| parent | b81fdd4cd2b967e73ac1f3f5cfbe8229853876d9 (diff) | |
| parent | ed015456a114ae907a36af80c06f81ea93182a24 (diff) | |
| download | rust-0f2675a2e6eb74529d61523834fd124296f8431c.tar.gz rust-0f2675a2e6eb74529d61523834fd124296f8431c.zip | |
Rollup merge of #31741 - alexcrichton:fix-ios, r=nikomatsakis
Similar to OSX, these symbols are prefixed by default.
Diffstat (limited to 'src/liballoc_jemalloc')
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index bda001eb4f4..c96d303e6bb 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -45,19 +45,19 @@ extern {} // explicitly request it), and on Android we explicitly request it as // unprefixing cause segfaults (mismatches in allocators). extern { - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_mallocx")] fn mallocx(size: size_t, flags: c_int) -> *mut c_void; - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_rallocx")] fn rallocx(ptr: *mut c_void, size: size_t, flags: c_int) -> *mut c_void; - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_xallocx")] fn xallocx(ptr: *mut c_void, size: size_t, extra: size_t, flags: c_int) -> size_t; - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_sdallocx")] fn sdallocx(ptr: *mut c_void, size: size_t, flags: c_int); - #[cfg_attr(any(target_os = "macos", target_os = "android"), + #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios"), link_name = "je_nallocx")] fn nallocx(size: size_t, flags: c_int) -> size_t; } |