From 5a005864a895f97b739c9eb9f0c119e5d625cb57 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 14 Apr 2019 13:18:57 -0600
Subject: [PATCH] Fix compilation on redox
---
src/ld_so/tcb.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ld_so/tcb.rs b/src/ld_so/tcb.rs
index 07fced292..d39253bd8 100644
--- a/src/ld_so/tcb.rs
+++ b/src/ld_so/tcb.rs
@@ -172,11 +172,11 @@ impl Tcb {
#[cfg(target_os = "redox")]
unsafe fn os_new(size: usize) -> Result<(&'static mut [u8], &'static mut [u8])> {
let tls = Self::map(size)?;
- Ok(
+ Ok((
tls,
//TODO: Consider allocating TCB as part of TLS
slice::from_raw_parts_mut(0xB000_0000 as *mut u8, PAGE_SIZE)
- )
+ ))
}
/// Architecture specific code to read a usize from the TCB - x86_64
--
GitLab