@@ -7706,7 +7706,7 @@ fn find_main_fn(&@crate_ctxt cx) -> ValueRef {
7706
7706
7707
7707
fn trans_main_fn( @local_ctxt cx, ValueRef llcrate, ValueRef crate_map) {
7708
7708
auto T_main_args = [ T_int ( ) , T_int ( ) ] ;
7709
- auto T_rust_start_args = [ T_int ( ) , T_int ( ) , T_int ( ) , T_int ( ) , T_int ( ) ] ;
7709
+ auto T_rust_start_args = [ T_int ( ) , T_int ( ) , T_int ( ) , T_int ( ) ] ;
7710
7710
7711
7711
auto main_name;
7712
7712
if ( str:: eq( std:: os:: target_os( ) , "win32" ) ) {
@@ -7718,7 +7718,7 @@ fn trans_main_fn(@local_ctxt cx, ValueRef llcrate, ValueRef crate_map) {
7718
7718
auto llmain =
7719
7719
decl_cdecl_fn( cx. ccx. llmod, main_name, T_fn ( T_main_args , T_int ( ) ) ) ;
7720
7720
7721
- auto llrust_start = decl_cdecl_fn( cx. ccx. llmod, "rust_start " ,
7721
+ auto llrust_start = decl_cdecl_fn( cx. ccx. llmod, "new_rust_start " ,
7722
7722
T_fn ( T_rust_start_args , T_int ( ) ) ) ;
7723
7723
7724
7724
auto llargc = llvm:: LLVMGetParam ( llmain , 0 u ) ;
@@ -7737,8 +7737,7 @@ fn trans_main_fn(@local_ctxt cx, ValueRef llcrate, ValueRef crate_map) {
7737
7737
llvm:: LLVMAppendBasicBlock ( llmain, str:: buf( "" ) ) ;
7738
7738
auto b = new_builder( llbb) ;
7739
7739
7740
- auto start_args = [ p2i( llrust_main) , p2i( llcrate) , llargc, llargv,
7741
- p2i( crate_map) ] ;
7740
+ auto start_args = [ p2i( llrust_main) , llargc, llargv, p2i( crate_map) ] ;
7742
7741
7743
7742
b. Ret ( b. Call ( llrust_start, start_args) ) ;
7744
7743
}
0 commit comments