diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/alloc/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/alloc/alloc.rs | 17 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/alloc/Cargo.toml b/src/alloc/Cargo.toml index 2c7f4b8..2e94e3e 100644 --- a/src/alloc/Cargo.toml +++ b/src/alloc/Cargo.toml @@ -13,3 +13,4 @@ test = false [dependencies] core = { path= "../../../libcore" } +alloc = { path = "../../../liballoc" } diff --git a/src/alloc/alloc.rs b/src/alloc/alloc.rs index 963c3e3..6408f23 100644 --- a/src/alloc/alloc.rs +++ b/src/alloc/alloc.rs @@ -1,18 +1,21 @@ //! Kernel Mode Allocator -// The compiler needs to be instructed that this crate is an allocator in order -// to realize that when this is linked in another allocator like jemalloc should -// not be linked in -#![feature(allocator)] -#![allocator] +#![crate_name = "alloc_system"] +#![crate_type = "rlib"] // Allocators are not allowed to depend on the standard library which in turn // requires an allocator in order to avoid circular dependencies. This crate, // however, can use all of libcore. #![no_std] -#![crate_name = "alloc_system"] -#![crate_type = "rlib"] +// The compiler needs to be instructed that this crate is an allocator in order +// to realize that when this is linked in another allocator like jemalloc should +// not be linked in +#![feature(global_allocator)] +#![feature(default_lib_allocator)] +//#![allocator] + + mod pool; |