From 5568bb5a8acdcc6b75a78eedf6e8774f77816f18 Mon Sep 17 00:00:00 2001 From: Anhad Singh Date: Wed, 18 Feb 2026 10:57:08 +1100 Subject: [PATCH] Revert "fix(ld.so): temporary rollback" This reverts commit 5cf865189d01bff50536e5d637e98a958e66d8cb. --- src/ld_so/dso.rs | 2 +- src/ld_so/start.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ld_so/dso.rs b/src/ld_so/dso.rs index b8ce022539..0533b3117a 100644 --- a/src/ld_so/dso.rs +++ b/src/ld_so/dso.rs @@ -534,7 +534,7 @@ impl DSO { let size = end - start; let mut flags = sys_mman::MAP_ANONYMOUS | sys_mman::MAP_PRIVATE; if start != 0 { - flags |= sys_mman::MAP_FIXED; + flags |= sys_mman::MAP_FIXED_NOREPLACE; } log::trace!(" mmap({:#x}, {:x}, {:x})", start, size, flags); let ptr = Sys::mmap( diff --git a/src/ld_so/start.rs b/src/ld_so/start.rs index 0e638cf714..355f1474fa 100644 --- a/src/ld_so/start.rs +++ b/src/ld_so/start.rs @@ -286,7 +286,7 @@ pub unsafe extern "C" fn relibc_ld_so_start( } let mut base_addr = None; - if !is_manual && cfg!(not(target_os = "redox")) { + if !is_manual { // if we are not running in manual mode, then the main // program is already loaded by the kernel and we want // to use it. on redox, we treat it the same.