Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-21 17:52:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

auto merge of #8806 : klutzy/rust/winmain, r=cmr

Browse Source 
Fixes #8510.
This commit is contained in:
bors
2013-08-28 07:25:42 -07:00
parent 9bfdd42703 eaa565829d
commit 9708ef03a6
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/librustc/middle/trans/base.rs
+4 -12
View File
@@ -2366,20 +2366,12 @@ fn create_entry_fn(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)