Skip to content

Commit e66f9e4

Browse files
committed
Start finishing up the rust_start signature transition.
1 parent 7d68cbd commit e66f9e4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/comp/middle/trans.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7835,7 +7835,7 @@ fn trans_main_fn(@local_ctxt cx, ValueRef crate_map) {
78357835
auto llmain =
78367836
decl_cdecl_fn(cx.ccx.llmod, main_name, T_fn(T_main_args, T_int()));
78377837

7838-
auto llrust_start = decl_cdecl_fn(cx.ccx.llmod, "new_rust_start",
7838+
auto llrust_start = decl_cdecl_fn(cx.ccx.llmod, "rust_start",
78397839
T_fn(T_rust_start_args, T_int()));
78407840

78417841
auto llargc = llvm::LLVMGetParam(llmain, 0u);

src/rt/rust.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ command_line_args : public dom_owned<command_line_args>
7777
*/
7878

7979
extern "C" CDECL int
80-
new_rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
80+
rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
8181

8282
update_log_settings(crate_map, getenv("RUST_LOG"));
8383
rust_srv *srv = new rust_srv();
@@ -114,8 +114,8 @@ new_rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
114114
}
115115

116116
extern "C" CDECL int
117-
rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
118-
return new_rust_start(main_fn, argc, argv, crate_map);
117+
new_rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
118+
return rust_start(main_fn, argc, argv, crate_map);
119119
}
120120

121121
//

0 commit comments

Comments
 (0)