Set main_name "WinMain" on Win64

2013-08-12 10:27:16 +09:00 · 2013-08-12 10:27:16 +09:00 · e41a81b1ee
commit e41a81b1ee
parent a35bfa2e9b
1 changed files with 6 additions and 1 deletions
--- a/src/librustc/middle/trans/base.rs
+++ b/src/librustc/middle/trans/base.rs
@ -2370,7 +2370,12 @@ pub fn create_entry_wrapper(ccx: @mut CrateContext,
            decl_cdecl_fn(ccx.llmod, "amain", llfty)
        } else {
            let main_name = match ccx.sess.targ_cfg.os {
-                session::os_win32 => ~"WinMain@16",
+                session::os_win32 => {
+                    match ccx.sess.targ_cfg.arch {
+                        X86 => ~"WinMain@16",
+                        _ => ~"WinMain",
+                    }
+                },
                _ => ~"main",
            };
            decl_cdecl_fn(ccx.llmod, main_name, llfty)