Skip to content

Commit 814477a

Browse files
committed
Revert "workarounds to make link guards work on windows"
This reverts commit b52004d.
1 parent 4c52745 commit 814477a

File tree

3 files changed

+3
-19
lines changed

3 files changed

+3
-19
lines changed

src/rtstartup/rsbegin.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,9 @@
2323
// of other runtime components (registered via yet another special image section).
2424

2525
#![crate_type="rlib"]
26-
#![feature(no_core, lang_items, optin_builtin_traits)]
27-
#![no_core]
26+
#![no_std]
2827
#![allow(non_camel_case_types)]
2928

30-
#[lang="sized"]
31-
trait Sized {}
32-
33-
#[lang="copy"]
34-
trait Copy {}
35-
36-
#[lang="sync"]
37-
trait Sync {}
38-
impl Sync for .. {}
39-
4029
#[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))]
4130
pub mod eh_frames
4231
{

src/rtstartup/rsend.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@
1111
// See rsbegin.rs for details.
1212

1313
#![crate_type="rlib"]
14-
#![feature(no_core, lang_items, optin_builtin_traits)]
15-
#![no_core]
16-
17-
#[lang="sync"]
18-
trait Sync {}
19-
impl Sync for .. {}
14+
#![no_std]
2015

2116
#[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))]
2217
pub mod eh_frames

src/test/run-pass/smallest-hello-world.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extern "rust-intrinsic" { fn transmute<T, U>(t: T) -> U; }
2222

2323
#[lang = "eh_personality"] extern fn eh_personality() {}
2424
#[lang = "eh_unwind_resume"] extern fn eh_unwind_resume() {}
25-
#[lang = "panic_fmt"] extern fn panic_fmt() -> ! { loop {} }
25+
#[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} }
2626
#[no_mangle] pub extern fn rust_eh_register_frames () {}
2727
#[no_mangle] pub extern fn rust_eh_unregister_frames () {}
2828

0 commit comments

Comments
 (0)