diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-09-01 22:08:59 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-09-01 23:25:33 -0700 |
| commit | 9c173f17c0fb10a3923da890c1204e0a71d3c9c7 (patch) | |
| tree | be9eb6a7f717bd898bd5006dfebb1f0e92583b9b /src/rt | |
| parent | 1d3eb4911a227500c51858cdb830fe27cb5b9ca7 (diff) | |
| download | rust-9c173f17c0fb10a3923da890c1204e0a71d3c9c7.tar.gz rust-9c173f17c0fb10a3923da890c1204e0a71d3c9c7.zip | |
Remove lots of estr code from rustc. Issue #855
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/main.ll.in | 6 | ||||
| -rw-r--r-- | src/rt/rust.cpp | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/rt/main.ll.in b/src/rt/main.ll.in index 0a3cb38ef11..6df51e67503 100644 --- a/src/rt/main.ll.in +++ b/src/rt/main.ll.in @@ -24,13 +24,7 @@ define void @_rust_main_wrap(i1* nocapture, %task *, %2* nocapture, %vec *) ret void } -; FIXME: Transitional. Please remove -@_rust_main_takes_istr = external global i32 -declare void @set_main_takes_istr(i32) - define i32 @"MAIN"(i32, i32) { - %i = load i32* @_rust_main_takes_istr - call void @set_main_takes_istr(i32 %i) %3 = tail call i32 @rust_start(i32 ptrtoint (void (i1*, %task*, %2*, %vec*)* @_rust_main_wrap to i32), i32 %0, i32 %1, i32 ptrtoint (%0* @_rust_crate_map_toplevel to i32)) ret i32 %3 } diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp index c3b6526a4a3..c20f93102c0 100644 --- a/src/rt/rust.cpp +++ b/src/rt/rust.cpp @@ -97,8 +97,7 @@ command_line_args : public kernel_owned<command_line_args> }; -// FIXME: Transitional. Please remove. -bool main_takes_istr = false; +bool main_takes_istr = true; extern "C" CDECL void set_main_takes_istr(uintptr_t flag) { |