diff options
| author | bors <bors@rust-lang.org> | 2016-12-09 04:02:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-09 04:02:51 +0000 |
| commit | 6a495f71fffbc4b378c032295c0fc3ad20bc7e5e (patch) | |
| tree | a5358a9a205b3eb26453670c001a232b812b595f /src/liballoc/lib.rs | |
| parent | 97bfeadfd8eb4db591d9fb0fcfef7472d7480415 (diff) | |
| parent | abe6fc73e0d5d58d12b069a8b27514086ebbefa1 (diff) | |
| download | rust-6a495f71fffbc4b378c032295c0fc3ad20bc7e5e.tar.gz rust-6a495f71fffbc4b378c032295c0fc3ad20bc7e5e.zip | |
Auto merge of #37492 - japaric:no-atomics-alloc, r=brson
make `alloc` and `collections` compilable for thumbv6m-none-eabi by cfging away `alloc::Arc` and changing OOM to abort for this target r? @alexcrichton cc @thejpster
Diffstat (limited to 'src/liballoc/lib.rs')
| -rw-r--r-- | src/liballoc/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index acce4ce0358..f9dfdc0e075 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -74,6 +74,7 @@ #![feature(allocator)] #![feature(box_syntax)] +#![feature(cfg_target_has_atomic)] #![feature(coerce_unsized)] #![feature(const_fn)] #![feature(core_intrinsics)] @@ -122,6 +123,7 @@ mod boxed { } #[cfg(test)] mod boxed_test; +#[cfg(target_has_atomic = "ptr")] pub mod arc; pub mod rc; pub mod raw_vec; |