From 23a8855e50e570c2fbc8adf761b0a67617bba1cb Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Wed, 8 Aug 2018 10:41:25 +0200
Subject: [PATCH] Fix garbage env pointer to main on redox
---
src/crt0/src/lib.rs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/crt0/src/lib.rs b/src/crt0/src/lib.rs
index 2d2ce8f5e..a4e49a3dd 100644
--- a/src/crt0/src/lib.rs
+++ b/src/crt0/src/lib.rs
@@ -63,10 +63,7 @@ impl Stack {
#[no_mangle]
pub unsafe extern "C" fn _start_rust(sp: &'static Stack) -> ! {
extern "C" {
- #[cfg(not(target_os = "redox"))]
fn main(argc: isize, argv: *const *const c_char, envp: *const *const c_char) -> c_int;
- #[cfg(target_os = "redox")]
- fn main(argc: isize, argv: *const *const c_char) -> c_int;
}
let argc = sp.argc();
@@ -119,6 +116,7 @@ pub unsafe extern "C" fn _start_rust(sp: &'static Stack) -> ! {
platform::exit(main(
argc,
argv as *const *const c_char,
+ platform::environ as *const *const c_char
));
}
--
GitLab