diff options
| author | bors <bors@rust-lang.org> | 2024-09-25 08:43:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-25 08:43:14 +0000 |
| commit | 2933f68abefa9e56ac336cb686a435a54e8a1f21 (patch) | |
| tree | 6b6f977103ad8c0acd842f4e2c3431fd3255701e /library/std/src/sys/alloc/unix.rs | |
| parent | 4c62024cd5dbafb64941bded422e4fbc2a100e73 (diff) | |
| parent | 9d134cc26a3b8a9d4c6e75c8f61fbd2ad168093b (diff) | |
| download | rust-2933f68abefa9e56ac336cb686a435a54e8a1f21.tar.gz rust-2933f68abefa9e56ac336cb686a435a54e8a1f21.zip | |
Auto merge of #130816 - matthiaskrgr:rollup-jy25phv, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #130549 (Add RISC-V vxworks targets) - #130595 (Initial std library support for NuttX) - #130734 (Fix: ices on virtual-function-elimination about principal trait) - #130787 (Ban combination of GCE and new solver) - #130809 (Update llvm triple for OpenHarmony targets) - #130810 (Don't trap into the debugger on panics under Linux) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/alloc/unix.rs')
| -rw-r--r-- | library/std/src/sys/alloc/unix.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/alloc/unix.rs b/library/std/src/sys/alloc/unix.rs index 266b69cdc1e..1af9d766290 100644 --- a/library/std/src/sys/alloc/unix.rs +++ b/library/std/src/sys/alloc/unix.rs @@ -71,6 +71,7 @@ cfg_if::cfg_if! { } } else { #[inline] + #[cfg_attr(target_os = "vxworks", allow(unused_unsafe))] unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 { let mut out = ptr::null_mut(); // We prefer posix_memalign over aligned_alloc since it is more widely available, and |