summary refs log tree commit diff
path: root/library/alloc/src
diff options
context:
space:
mode:
authorStefan Lankes <slankes@eonerc.rwth-aachen.de>2020-10-13 12:06:48 +0200
committerStefan Lankes <slankes@eonerc.rwth-aachen.de>2020-10-13 12:06:48 +0200
commitbc6b2ac449a0f6d9a8bd87788a0eae9516cb58ce (patch)
tree16d881b3c22654ef13697bc24c08515c0725d44b /library/alloc/src
parent1741e5b8f581960a6e9cb9f0b8261b5f0c26e92d (diff)
downloadrust-bc6b2ac449a0f6d9a8bd87788a0eae9516cb58ce.tar.gz
rust-bc6b2ac449a0f6d9a8bd87788a0eae9516cb58ce.zip
move __rg_oom to the libos to avoid duplicated symbols
Diffstat (limited to 'library/alloc/src')
-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 4646d4a8335..850451bb29e 100644
--- a/library/alloc/src/alloc.rs
+++ b/library/alloc/src/alloc.rs
@@ -372,7 +372,7 @@ pub fn handle_alloc_error(layout: Layout) -> ! {
     unsafe { oom_impl(layout) }
 }
 
-#[cfg(not(any(test, bootstrap)))]
+#[cfg(not(any(target_os="hermit", test, bootstrap)))]
 #[doc(hidden)]
 #[allow(unused_attributes)]
 #[unstable(feature = "alloc_internals", issue = "none")]