diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2016-03-24 10:03:50 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2016-03-25 14:07:20 -0400 |
| commit | 814477a8935bb2ee666cc74f861e21cd4d1fa57a (patch) | |
| tree | bc160836115f556286f951b7e5b9ea3b86d7c258 | |
| parent | 4c527457f147881dc864b8b737c4288540b32208 (diff) | |
| download | rust-814477a8935bb2ee666cc74f861e21cd4d1fa57a.tar.gz rust-814477a8935bb2ee666cc74f861e21cd4d1fa57a.zip | |
Revert "workarounds to make link guards work on windows"
This reverts commit b52004d202ddfffa100d4963216e1673a0be0b95.
| -rw-r--r-- | src/rtstartup/rsbegin.rs | 13 | ||||
| -rw-r--r-- | src/rtstartup/rsend.rs | 7 | ||||
| -rw-r--r-- | src/test/run-pass/smallest-hello-world.rs | 2 |
3 files changed, 3 insertions, 19 deletions
diff --git a/src/rtstartup/rsbegin.rs b/src/rtstartup/rsbegin.rs index bbabed20ec1..d1b6fe6655a 100644 --- a/src/rtstartup/rsbegin.rs +++ b/src/rtstartup/rsbegin.rs @@ -23,20 +23,9 @@ // of other runtime components (registered via yet another special image section). #![crate_type="rlib"] -#![feature(no_core, lang_items, optin_builtin_traits)] -#![no_core] +#![no_std] #![allow(non_camel_case_types)] -#[lang="sized"] -trait Sized {} - -#[lang="copy"] -trait Copy {} - -#[lang="sync"] -trait Sync {} -impl Sync for .. {} - #[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))] pub mod eh_frames { diff --git a/src/rtstartup/rsend.rs b/src/rtstartup/rsend.rs index 1ab194d5eb9..5e4e13ebd05 100644 --- a/src/rtstartup/rsend.rs +++ b/src/rtstartup/rsend.rs @@ -11,12 +11,7 @@ // See rsbegin.rs for details. #![crate_type="rlib"] -#![feature(no_core, lang_items, optin_builtin_traits)] -#![no_core] - -#[lang="sync"] -trait Sync {} -impl Sync for .. {} +#![no_std] #[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))] pub mod eh_frames diff --git a/src/test/run-pass/smallest-hello-world.rs b/src/test/run-pass/smallest-hello-world.rs index 7fc6e6ba1b0..b11970560d5 100644 --- a/src/test/run-pass/smallest-hello-world.rs +++ b/src/test/run-pass/smallest-hello-world.rs @@ -22,7 +22,7 @@ extern "rust-intrinsic" { fn transmute<T, U>(t: T) -> U; } #[lang = "eh_personality"] extern fn eh_personality() {} #[lang = "eh_unwind_resume"] extern fn eh_unwind_resume() {} -#[lang = "panic_fmt"] extern fn panic_fmt() -> ! { loop {} } +#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} } #[no_mangle] pub extern fn rust_eh_register_frames () {} #[no_mangle] pub extern fn rust_eh_unregister_frames () {} |