diff options
| author | bgermann <bgermann@users.noreply.github.com> | 2017-09-06 21:31:19 +0200 |
|---|---|---|
| committer | bgermann <bgermann@users.noreply.github.com> | 2017-09-06 21:31:19 +0200 |
| commit | 5b76b8681c088d935b60da05e8ae81e2594f46f5 (patch) | |
| tree | 00d40abbb6e3025463c4b94c8434018d35dae4f1 /src/liballoc_system | |
| parent | a20953906056f85f71896795e762ac242e1891aa (diff) | |
| download | rust-5b76b8681c088d935b60da05e8ae81e2594f46f5.tar.gz rust-5b76b8681c088d935b60da05e8ae81e2594f46f5.zip | |
Use memalign instead of posix_memalign for Solaris
As pointed out in https://github.com/rust-lang/libc/commit/deb61c8, Solaris 10 does not support posix_memalign. Use memalign for all Solaris versions instead. With this change applied I am able to cross-build rustc for Solaris 10.
Diffstat (limited to 'src/liballoc_system')
| -rw-r--r-- | src/liballoc_system/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs index 1defe308713..599d79104c3 100644 --- a/src/liballoc_system/lib.rs +++ b/src/liballoc_system/lib.rs @@ -221,7 +221,7 @@ mod platform { } } - #[cfg(any(target_os = "android", target_os = "redox"))] + #[cfg(any(target_os = "android", target_os = "redox", target_os = "solaris"))] #[inline] unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 { // On android we currently target API level 9 which unfortunately @@ -244,7 +244,7 @@ mod platform { libc::memalign(layout.align(), layout.size()) as *mut u8 } - #[cfg(not(any(target_os = "android", target_os = "redox")))] + #[cfg(not(any(target_os = "android", target_os = "redox", target_os = "solaris")))] #[inline] unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 { let mut out = ptr::null_mut(); |