Skip to content

Commit cf2baaa

Browse files
committed
Auto merge of #125244 - RalfJung:android-alloc, r=workingjubilee
android: use posix_memalign for aligned allocations Our target page says > Rust will support the most recent Long Term Support (LTS) Android Native Development Kit (NDK). By default Rust will support all API levels supported by the NDK, but a higher minimum API level may be required if deemed necessary. According to [this](https://github.com/android/ndk/wiki/Changelog-r26), the minimum API level of the current LTS NDK is 21. According to [this](https://stackoverflow.com/questions/44852378/android-ndk-r15b-posix-memalign-undeclared-identifier), posix_memalign exists since API level 16. So I think we should be able to use it here?
2 parents 685a80f + dde1134 commit cf2baaa

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

library/std/src/sys/pal/unix/alloc.rs

+1-18
Original file line numberDiff line numberDiff line change
@@ -59,32 +59,15 @@ unsafe impl GlobalAlloc for System {
5959
}
6060

6161
cfg_if::cfg_if! {
62+
// We use posix_memalign wherever possible, but not all targets have that function.
6263
if #[cfg(any(
63-
target_os = "android",
6464
target_os = "redox",
6565
target_os = "espidf",
6666
target_os = "horizon",
6767
target_os = "vita",
6868
))] {
6969
#[inline]
7070
unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {
71-
// On android we currently target API level 9 which unfortunately
72-
// doesn't have the `posix_memalign` API used below. Instead we use
73-
// `memalign`, but this unfortunately has the property on some systems
74-
// where the memory returned cannot be deallocated by `free`!
75-
//
76-
// Upon closer inspection, however, this appears to work just fine with
77-
// Android, so for this platform we should be fine to call `memalign`
78-
// (which is present in API level 9). Some helpful references could
79-
// possibly be chromium using memalign [1], attempts at documenting that
80-
// memalign + free is ok [2] [3], or the current source of chromium
81-
// which still uses memalign on android [4].
82-
//
83-
// [1]: https://codereview.chromium.org/10796020/
84-
// [2]: https://code.google.com/p/android/issues/detail?id=35391
85-
// [3]: https://bugs.chromium.org/p/chromium/issues/detail?id=138579
86-
// [4]: https://chromium.googlesource.com/chromium/src/base/+/master/
87-
// /memory/aligned_memory.cc
8871
libc::memalign(layout.align(), layout.size()) as *mut u8
8972
}
9073
} else {

0 commit comments

Comments
 (0)