From ef63f09dcd65729f84a4f49432467ad5ace86906 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Oct 2011 13:48:10 +0200
Subject: Don't rely on main.ll anymore

I'll remove the actual file after I register a snapshot.

Issue #992
---
 src/rt/main.ll.in | 11 -----------
 src/rt/rust.cpp   |  4 +---
 2 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'src/rt')

diff --git a/src/rt/main.ll.in b/src/rt/main.ll.in
index a953ef90444..8c19b2df251 100644
--- a/src/rt/main.ll.in
+++ b/src/rt/main.ll.in
@@ -11,14 +11,3 @@
 %task = type { i32, i32, i32, i32, i32, i32, i32, i32 }
 
 %vec = type { i32, i32, [0 x i8] }
-
-@_rust_crate_map_toplevel = external global %0
-
-declare i32 @rust_start(i32, i32, i32, i32)
-
-declare external void @_rust_main(i1* nocapture, %task*, %2* nocapture, %vec*)
-
-define i32 @"MAIN"(i32, i32) {
-  %result = tail call i32 @rust_start(i32 ptrtoint (void (i1*, %task*, %2*, %vec*)* @_rust_main to i32), i32 %0, i32 %1, i32 ptrtoint (%0* @_rust_crate_map_toplevel to i32))
-  ret i32 %result
-}
diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp
index 122c7b306bf..b8a3cde5a93 100644
--- a/src/rt/rust.cpp
+++ b/src/rt/rust.cpp
@@ -74,9 +74,7 @@ command_line_args : public kernel_owned<command_line_args>
 int check_claims = 0;
 
 extern "C" CDECL int
-rust_start(uintptr_t main_fn, int argc, char **argv,
-           void* crate_map) {
-
+rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
     rust_env *env = load_env();
 
     update_log_settings(crate_map, env->logspec);
-- 
cgit 1.4.1-3-g733a5