Skip to content

rustc: Use "main" entry point on Windows #8806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+4 −12
Closed

rustc: Use "main" entry point on Windows #8806

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions src/librustc/middle/trans/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2366,20 +2366,12 @@ pub fn create_entry_wrapper(ccx: @mut CrateContext,
&ccx.int_type);

// FIXME #4404 android JNI hacks
let llfn = if *ccx.sess.building_library {
decl_cdecl_fn(ccx.llmod, "amain", llfty)
let main_name = if *ccx.sess.building_library {
"amain"
} else {
let main_name = match ccx.sess.targ_cfg.os {
session::os_win32 => {
match ccx.sess.targ_cfg.arch {
X86 => ~"WinMain@16",
_ => ~"WinMain",
}
},
_ => ~"main",
};
decl_cdecl_fn(ccx.llmod, main_name, llfty)
"main"
};
let llfn = decl_cdecl_fn(ccx.llmod, main_name, llfty);
let llbb = do "top".with_c_str |buf| {
unsafe {
llvm::LLVMAppendBasicBlockInContext(ccx.llcx, llfn, buf)
Expand Down