Remove start functions, use newlib instead of openlibm + ralloc

Author: jackpot51

src/librustc_back/target/redox_base.rs

@@ -27,21 +27,22 @@ pub fn opts() -> TargetOptions {
             // Always enable NX protection when it is available
             "-Wl,-z,noexecstack".to_string(),
 
-            // Do not link libc
-            "-nostdlib".to_string(),
-
             // Static link
             "-static".to_string()
         ],
+        late_link_args: vec![
+            "-lc".to_string(),
+            "-lm".to_string()
+        ],
         executables: true,
         relocation_model: "static".to_string(),
         disable_redzone: true,
         eliminate_frame_pointer: false,
         target_family: Some("redox".to_string()),
         linker_is_gnu: true,
         no_default_libraries: true,
-        lib_allocation_crate: "ralloc".to_string(),
-        exe_allocation_crate: "ralloc".to_string(),
+        lib_allocation_crate: "alloc_system".to_string(),
+        exe_allocation_crate: "alloc_system".to_string(),
         has_elf_tls: true,
         panic_strategy: PanicStrategy::Abort,
         .. Default::default()

src/libstd/build.rs

@@ -62,8 +62,6 @@ fn main() {
         println!("cargo:rustc-link-lib=magenta");
         println!("cargo:rustc-link-lib=mxio");
         println!("cargo:rustc-link-lib=launchpad"); // for std::process
-    } else if target.contains("redox") {
-        println!("cargo:rustc-link-lib=openlibm");
     }
 }
 

src/libstd/lib.rs

@@ -299,7 +299,6 @@
 #![feature(unwind_attributes)]
 #![feature(vec_push_all)]
 #![feature(zero_one)]
-#![cfg_attr(target_os = "redox", feature(naked_functions))]
 #![cfg_attr(test, feature(update_panic_count))]
 
 // Explicitly import the prelude. The compiler uses this same unstable attribute

src/libstd/rt.rs

@@ -25,10 +25,6 @@
 // Reexport some of our utilities which are expected by other crates.
 pub use panicking::{begin_panic, begin_panic_fmt, update_panic_count};
 
-// Reexport the start module on platforms that provide it
-#[unstable(feature = "sys_rt", issue="0")]
-pub use sys::rt::*;
-
 #[cfg(not(test))]
 #[lang = "start"]
 fn lang_start(main: *const u8, argc: isize, argv: *const *const u8) -> isize {

src/libstd/sys/redox/mod.rs

@@ -30,7 +30,6 @@ pub mod path;
 pub mod pipe;
 pub mod process;
 pub mod rand;
-pub mod rt;
 pub mod rwlock;
 pub mod stack_overflow;
 pub mod stdio;

src/libstd/sys/redox/rt.rs

@@ -50,7 +50,6 @@ pub mod path;
 pub mod pipe;
 pub mod process;
 pub mod rand;
-pub mod rt;
 pub mod rwlock;
 pub mod stack_overflow;
 pub mod thread;

src/libstd/sys/unix/mod.rs

@@ -36,7 +36,6 @@ pub mod path;
 pub mod pipe;
 pub mod process;
 pub mod rand;
-pub mod rt;
 pub mod rwlock;
 pub mod stack_overflow;
 pub mod thread;