about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-05-12 11:22:40 +0000
committerbors <bors@rust-lang.org>2024-05-12 11:22:40 +0000
commitb71fa82d786ae1b5866510f1b3a7e5b7e1890e4c (patch)
treeb1e6d05052907c8b62680c1a7649486df784980e
parent4fd98a4b1b100f5329c6efae18031791f64372d2 (diff)
parent1e232fea1b0e5bcf43230a8a28a24f9e2cbac988 (diff)
downloadrust-b71fa82d786ae1b5866510f1b3a7e5b7e1890e4c.tar.gz
rust-b71fa82d786ae1b5866510f1b3a7e5b7e1890e4c.zip
Auto merge of #124798 - devnexen:illumos_memalign_fix, r=RalfJung
std::alloc: use posix_memalign instead of memalign on solarish

`memalign` on Solarish requires the alignment to be at least the size of a pointer, which we did not honor. `posix_memalign` also requires that, but that code path already takes care of this requirement.

close GH-124787
-rw-r--r--library/std/src/sys/pal/unix/alloc.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/library/std/src/sys/pal/unix/alloc.rs b/library/std/src/sys/pal/unix/alloc.rs
index 9938c0bac25..993bf55edcf 100644
--- a/library/std/src/sys/pal/unix/alloc.rs
+++ b/library/std/src/sys/pal/unix/alloc.rs
@@ -61,9 +61,7 @@ unsafe impl GlobalAlloc for System {
 cfg_if::cfg_if! {
     if #[cfg(any(
         target_os = "android",
-        target_os = "illumos",
         target_os = "redox",
-        target_os = "solaris",
         target_os = "espidf",
         target_os = "horizon",
         target_os = "vita",