about summary refs log tree commit diff
path: root/library/std/src/sys/vxworks/alloc.rs
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2020-10-07 19:09:07 +0200
committerMara Bos <m-ou.se@m-ou.se>2020-10-16 06:19:00 +0200
commit66c9b04e947996c9ac3c573228ed2a641fb6f249 (patch)
treef4c2c99643158b795b624a73c42ea8e5c96af117 /library/std/src/sys/vxworks/alloc.rs
parent678d078950b1a6a822545db44fe3f87ac302f8f3 (diff)
downloadrust-66c9b04e947996c9ac3c573228ed2a641fb6f249.tar.gz
rust-66c9b04e947996c9ac3c573228ed2a641fb6f249.zip
Take sys/vxworks/alloc from sys/unix instead.
Diffstat (limited to 'library/std/src/sys/vxworks/alloc.rs')
-rw-r--r--library/std/src/sys/vxworks/alloc.rs49
1 files changed, 0 insertions, 49 deletions
diff --git a/library/std/src/sys/vxworks/alloc.rs b/library/std/src/sys/vxworks/alloc.rs
deleted file mode 100644
index 97a191d7232..00000000000
--- a/library/std/src/sys/vxworks/alloc.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use crate::alloc::{GlobalAlloc, Layout, System};
-use crate::ptr;
-use crate::sys_common::alloc::{realloc_fallback, MIN_ALIGN};
-
-#[stable(feature = "alloc_system_type", since = "1.28.0")]
-unsafe impl GlobalAlloc for System {
-    #[inline]
-    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
-            libc::malloc(layout.size()) as *mut u8
-        } else {
-            aligned_malloc(&layout)
-        }
-    }
-
-    #[inline]
-    unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
-        if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
-            libc::calloc(layout.size(), 1) as *mut u8
-        } else {
-            let ptr = self.alloc(layout.clone());
-            if !ptr.is_null() {
-                ptr::write_bytes(ptr, 0, layout.size());
-            }
-            ptr
-        }
-    }
-
-    #[inline]
-    unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {
-        libc::free(ptr as *mut libc::c_void)
-    }
-
-    #[inline]
-    unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
-        if layout.align() <= MIN_ALIGN && layout.align() <= new_size {
-            libc::realloc(ptr as *mut libc::c_void, new_size) as *mut u8
-        } else {
-            realloc_fallback(self, ptr, layout, new_size)
-        }
-    }
-}
-
-#[inline]
-unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {
-    let mut out = ptr::null_mut();
-    let ret = libc::posix_memalign(&mut out, layout.align(), layout.size());
-    if ret != 0 { ptr::null_mut() } else { out as *mut u8 }
-}