From eaa565829db10ad5926f6fe19881010119c54162 Mon Sep 17 00:00:00 2001 From: klutzy Date: Wed, 28 Aug 2013 13:43:11 +0900 Subject: [PATCH] rustc: Use "main" entry point on Windows Fixes #8510. --- src/librustc/middle/trans/base.rs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index 1fc682912b35f..e8186477877f4 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -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)