Skip to content

Commit 23b9ee4

Browse files
committed
---
yaml --- r: 111039 b: refs/heads/snap-stage3 c: 9e8a270 h: refs/heads/master i: 111037: 6d50486 111035: 59dd5e9 111031: 8bc6ade 111023: 677f278 111007: ae9f097 110975: 1b7bc4a v: v3
1 parent fdd52c8 commit 23b9ee4

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 296e60be6b027a52de58251848037a92f23a0878
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: c8f5b701dcf0b7dc4d78ef0d29f10e4f080b2517
4+
refs/heads/snap-stage3: 9e8a270681aa22b56cdb41f5e2537dace5c7fe75
55
refs/heads/try: 38201d7c6bf0c32b0e5bdc8ecd63976ebc1b3a4c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/run-pass/smallest-hello-world.rs

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,21 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-test - FIXME(#8538) some kind of problem linking induced by extern "C" fns
12-
1311
// Smallest hello world with no runtime
1412

1513
#![no_std]
1614

17-
// This is an unfortunate thing to have to do on linux :(
18-
#[cfg(target_os = "linux")]
19-
#[doc(hidden)]
20-
pub mod linkhack {
21-
#[link_args="-lrustrt -lrt"]
22-
extern {}
23-
}
15+
extern crate libc;
2416

25-
extern {
26-
fn puts(s: *u8);
27-
}
17+
extern { fn puts(s: *u8); }
18+
extern "rust-intrinsic" { fn transmute<T, U>(t: T) -> U; }
2819

29-
extern "rust-intrinsic" {
30-
fn transmute<T, U>(t: T) -> U;
31-
}
20+
#[no_mangle]
21+
pub extern fn rust_stack_exhausted() {}
3222

3323
#[start]
34-
pub fn main(_: int, _: **u8, _: *u8) -> int {
24+
#[no_split_stack]
25+
fn main(_: int, _: **u8) -> int {
3526
unsafe {
3627
let (ptr, _): (*u8, uint) = transmute("Hello!");
3728
puts(ptr);

0 commit comments

Comments
 (0)