bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Start finishing up the rust_start signature transition.

Browse source
This commit is contained in:
Rafael Ávila de Espíndola 2011-05-31 11:13:57 -04:00
parent 7d68cbdff0
commit e66f9e46f6
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/comp/middle/trans.rs
View file

@ -7835,7 +7835,7 @@ fn trans_main_fn(@local_ctxt cx, ValueRef crate_map) {
auto llmain = auto llmain =
decl_cdecl_fn(cx.ccx.llmod, main_name, T_fn(T_main_args, T_int())); decl_cdecl_fn(cx.ccx.llmod, main_name, T_fn(T_main_args, T_int()));
auto llrust_start = decl_cdecl_fn(cx.ccx.llmod, "new_rust_start", auto llrust_start = decl_cdecl_fn(cx.ccx.llmod, "rust_start",
T_fn(T_rust_start_args, T_int())); T_fn(T_rust_start_args, T_int()));
auto llargc = llvm::LLVMGetParam(llmain, 0u); auto llargc = llvm::LLVMGetParam(llmain, 0u);

6
src/rt/rust.cpp
View file

@ -77,7 +77,7 @@ command_line_args : public dom_owned<command_line_args>
*/ */
extern "C" CDECL int extern "C" CDECL int
new_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) {
update_log_settings(crate_map, getenv("RUST_LOG")); update_log_settings(crate_map, getenv("RUST_LOG"));
rust_srv *srv = new rust_srv(); rust_srv *srv = new rust_srv();
@ -114,8 +114,8 @@ new_rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
} }
extern "C" CDECL int extern "C" CDECL int
rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) { new_rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
return new_rust_start(main_fn, argc, argv, crate_map); return rust_start(main_fn, argc, argv, crate_map);
} }
// //