diff --git a/Cargo.toml b/Cargo.toml index 50860340..45f0b077 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,3 @@ r0 = "0.2.1" [features] # provides a panic_fmt implementation that calls the abort instruction (`udf 0xfe`) abort-on-panic = [] - -[build-dependencies] -rustc_version = "0.2.1" -chrono = "0.4.0" diff --git a/build.rs b/build.rs index 7784b980..1d0160c0 100644 --- a/build.rs +++ b/build.rs @@ -1,22 +1,9 @@ -extern crate chrono; -extern crate rustc_version; - use std::env; use std::fs::File; use std::io::Write; use std::path::PathBuf; -use chrono::NaiveDate; - fn main() { - let meta = rustc_version::version_meta().unwrap(); - if meta.channel == rustc_version::Channel::Dev - || meta.commit_date.unwrap().parse::().unwrap() - > NaiveDate::from_ymd(2017, 12, 26) - { - println!("cargo:rustc-cfg=has_termination_lang") - } - let target = env::var("TARGET").unwrap(); has_fpu(&target); diff --git a/src/lang_items.rs b/src/lang_items.rs index f3750a09..7d7a598c 100644 --- a/src/lang_items.rs +++ b/src/lang_items.rs @@ -24,7 +24,6 @@ unsafe extern "C" fn panic_fmt(_: ::core::fmt::Arguments, _: &'static str, _: u3 // The final piece is that the entry point of our program, the reset handler, // has to call `rustc_main`. That's covered by the `reset_handler` function in // root of this crate. -#[cfg(has_termination_lang)] #[lang = "start"] extern "C" fn start(main: fn() -> T, _argc: isize, _argv: *const *const u8) -> isize where @@ -35,21 +34,11 @@ where 0 } -#[cfg(not(has_termination_lang))] -#[lang = "start"] -extern "C" fn start(main: fn(), _argc: isize, _argv: *const *const u8) -> isize { - main(); - - 0 -} - #[lang = "termination"] -#[cfg(has_termination_lang)] pub trait Termination { fn report(self) -> i32; } -#[cfg(has_termination_lang)] impl Termination for () { fn report(self) -> i32 { 0