OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #33308 - ollie27:wingnu_jemalloc, r=alexcrichton

Browse Source 
Fix alloc_jemalloc on windows gnu targets

jemalloc prefixes the symbols by default on Windows so we need to account
for that to avoid link errors such as: `undefined reference to 'mallocx'`
when using alloc_jemalloc.
This commit is contained in:
bors 2016-05-02 09:16:23 -07:00
commit d80497e628
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/liballoc_jemalloc/lib.rs
View File

@ -41,28 +41,28 @@ use libc::{c_int, c_void, size_t};
#[cfg(not(cargobuild))] #[cfg(not(cargobuild))]
extern {} extern {}
// Note that the symbols here are prefixed by default on OSX (we don't // Note that the symbols here are prefixed by default on OSX and Windows (we
// explicitly request it), and on Android and DragonFly we explicitly request // don't explicitly request it), and on Android and DragonFly we explicitly
// it as unprefixing cause segfaults (mismatches in allocators). // request it as unprefixing cause segfaults (mismatches in allocators).
extern { extern {
#[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios", #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios",
target_os = "dragonfly"), target_os = "dragonfly", target_os = "windows"),
link_name = "je_mallocx")] link_name = "je_mallocx")]
fn mallocx(size: size_t, flags: c_int) -> *mut c_void; fn mallocx(size: size_t, flags: c_int) -> *mut c_void;
#[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios", #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios",
target_os = "dragonfly"), target_os = "dragonfly", target_os = "windows"),
link_name = "je_rallocx")] link_name = "je_rallocx")]
fn rallocx(ptr: *mut c_void, size: size_t, flags: c_int) -> *mut c_void; fn rallocx(ptr: *mut c_void, size: size_t, flags: c_int) -> *mut c_void;
#[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios", #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios",
target_os = "dragonfly"), target_os = "dragonfly", target_os = "windows"),
link_name = "je_xallocx")] link_name = "je_xallocx")]
fn xallocx(ptr: *mut c_void, size: size_t, extra: size_t, flags: c_int) -> size_t; 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", target_os = "ios", #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios",
target_os = "dragonfly"), target_os = "dragonfly", target_os = "windows"),
link_name = "je_sdallocx")] link_name = "je_sdallocx")]
fn sdallocx(ptr: *mut c_void, size: size_t, flags: c_int); fn sdallocx(ptr: *mut c_void, size: size_t, flags: c_int);
#[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios", #[cfg_attr(any(target_os = "macos", target_os = "android", target_os = "ios",
target_os = "dragonfly"), target_os = "dragonfly", target_os = "windows"),
link_name = "je_nallocx")] link_name = "je_nallocx")]
fn nallocx(size: size_t, flags: c_int) -> size_t; fn nallocx(size: size_t, flags: c_int) -> size_t;
} }