diff --git a/Cargo.lock b/Cargo.lock index cd703b4..a9c4b0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -258,9 +258,9 @@ dependencies = [ [[package]] name = "linked_list_allocator" -version = "0.8.11" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822add9edb1860698b79522510da17bef885171f75aa395cff099d770c609c24" +checksum = "e322f259d225fbae43a1b053b2dc6a5968a6bdf8b205f5de684dab485b95030e" [[package]] name = "log" diff --git a/third_party/lang-items/Cargo.toml b/third_party/lang-items/Cargo.toml index 5d109f3..442a314 100644 --- a/third_party/lang-items/Cargo.toml +++ b/third_party/lang-items/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] libtock_core = { path = "../../third_party/libtock-rs/core", default-features = false, features = ["alloc_init", "custom_panic_handler", "custom_alloc_error_handler"] } libtock_drivers = { path = "../libtock-drivers" } -linked_list_allocator = { version = "0.8.7", default-features = false, features = ["const_mut_refs"] } +linked_list_allocator = { version = "0.10.2", default-features = false, features = ["const_mut_refs"] } [features] debug_allocations = [] diff --git a/third_party/lang-items/src/allocator.rs b/third_party/lang-items/src/allocator.rs index 991c135..3184f7f 100644 --- a/third_party/lang-items/src/allocator.rs +++ b/third_party/lang-items/src/allocator.rs @@ -16,7 +16,7 @@ static mut HEAP: Heap = Heap::empty(); #[no_mangle] unsafe fn libtock_alloc_init(app_heap_start: usize, app_heap_size: usize) { - HEAP.init(app_heap_start, app_heap_size); + HEAP.init(app_heap_start as *mut u8, app_heap_size); } // With the "debug_allocations" feature, we use `AtomicUsize` to store the