about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Kröning <mkroening@posteo.net>2022-03-27 14:14:34 +0200
committerMartin Kröning <mkroening@posteo.net>2022-03-27 14:14:34 +0200
commit8f47635254c9251e6b58c724c6e1fa6b83fb561e (patch)
tree86b9353343b0907489c1dafc6ec3d63e84c24b80
parent5f37001055c29982f4c27ee9edd90449c8e07774 (diff)
downloadrust-8f47635254c9251e6b58c724c6e1fa6b83fb561e.tar.gz
rust-8f47635254c9251e6b58c724c6e1fa6b83fb561e.zip
Use default alloc_error_handler for hermit
Hermit now properly separates kernel from userspace.
Applications for hermit can now use Rust's default alloc_error_handler instead of calling the kernel's __rg_oom.
-rw-r--r--library/alloc/src/alloc.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs
index bd7d721b5e1..7ed9ca5fd87 100644
--- a/library/alloc/src/alloc.rs
+++ b/library/alloc/src/alloc.rs
@@ -385,7 +385,7 @@ pub const fn handle_alloc_error(layout: Layout) -> ! {
 #[cfg(all(not(no_global_oom_handling), test))]
 pub use std::alloc::handle_alloc_error;
 
-#[cfg(all(not(no_global_oom_handling), not(any(target_os = "hermit", test))))]
+#[cfg(all(not(no_global_oom_handling), not(test)))]
 #[doc(hidden)]
 #[allow(unused_attributes)]
 #[unstable(feature = "alloc_internals", issue = "none")]