2 files changed, 4 insertions, 10 deletions
diff --git a/vendor/rustix/src/mm/mmap.rs b/vendor/rustix/src/mm/mmap.rs
index 31d3a77b3..715c662ec 100644
--- a/vendor/rustix/src/mm/mmap.rs
+++ b/vendor/rustix/src/mm/mmap.rs
@@ -12,7 +12,7 @@ use core::ffi::c_void;
 
 #[cfg(any(target_os = "android", target_os = "linux"))]
 pub use backend::mm::types::MlockFlags;
-#[cfg(any(linux_raw, all(libc, target_os = "linux")))]
+#[cfg(any(target_os = "emscripten", target_os = "linux"))]
 pub use backend::mm::types::MremapFlags;
 pub use backend::mm::types::{MapFlags, MprotectFlags, ProtFlags};
 
@@ -101,7 +101,7 @@ pub unsafe fn munmap(ptr: *mut c_void, len: usize) -> io::Result<()> {
 ///  - [Linux]
 ///
 /// [Linux]: https://man7.org/linux/man-pages/man2/mremap.2.html
-#[cfg(any(linux_raw, all(libc, target_os = "linux")))]
+#[cfg(any(target_os = "emscripten", target_os = "linux"))]
 #[inline]
 pub unsafe fn mremap(
     old_address: *mut c_void,
@@ -126,7 +126,7 @@ pub unsafe fn mremap(
 ///  - [Linux]
 ///
 /// [Linux]: https://man7.org/linux/man-pages/man2/mremap.2.html
-#[cfg(any(linux_raw, all(libc, target_os = "linux")))]
+#[cfg(any(target_os = "emscripten", target_os = "linux"))]
 #[inline]
 #[doc(alias = "mremap")]
 pub unsafe fn mremap_fixed(
diff --git a/vendor/rustix/src/mm/mod.rs b/vendor/rustix/src/mm/mod.rs
index 9fabea87f..5a439b34b 100644
--- a/vendor/rustix/src/mm/mod.rs
+++ b/vendor/rustix/src/mm/mod.rs
@@ -9,13 +9,7 @@ mod userfaultfd;
 
 #[cfg(not(target_os = "redox"))]
 pub use madvise::{madvise, Advice};
-pub use mmap::{
-    mlock, mmap, mmap_anonymous, mprotect, munlock, munmap, MapFlags, MprotectFlags, ProtFlags,
-};
-#[cfg(any(target_os = "android", target_os = "linux"))]
-pub use mmap::{mlock_with, MlockFlags};
-#[cfg(any(linux_raw, all(libc, target_os = "linux")))]
-pub use mmap::{mremap, mremap_fixed, MremapFlags};
+pub use mmap::*;
 pub use msync::{msync, MsyncFlags};
 #[cfg(any(target_os = "android", target_os = "linux"))]
 pub use userfaultfd::{userfaultfd, UserfaultfdFlags};