Skip to content

Commit

Permalink
Auto merge of rust-lang#124798 - devnexen:illumos_memalign_fix, r=Ral…
Browse files Browse the repository at this point in the history
…fJung

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 rust-langGH-124787
  • Loading branch information
bors committed May 12, 2024
2 parents 4fd98a4 + 1e232fe commit b71fa82
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions library/std/src/sys/pal/unix/alloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit b71fa82

Please sign in to comment.