[pypy-commit] pypy win64-stage1: cleanup of merge conflicts

[ctismer]

Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r49637:0c8590e158a9
Date: 2011-11-21 17:48 +0100
http://bitbucket.org/pypy/pypy/changeset/0c8590e158a9/

Log:	cleanup of merge conflicts

diff --git a/pypy/rlib/_rffi_stacklet.py b/pypy/rlib/_rffi_stacklet.py
--- a/pypy/rlib/_rffi_stacklet.py
+++ b/pypy/rlib/_rffi_stacklet.py
@@ -14,7 +14,12 @@
     separate_module_sources = ['#include "src/stacklet/stacklet.c"\n'],
 )
 if sys.platform == 'win32':
-    eci.separate_module_files += (cdir / "src/stacklet/switch_x86_msvc.asm", )
+    import platform
+    if platform.architecture()[0] == '32bit':
+        asmfile = "src/stacklet/switch_x86_msvc.asm"
+    else:
+        asmfile = "src/stacklet/switch_x64_msvc.asm"
+    eci.separate_module_files += (cdir / asmfile, )
     eci.export_symbols += (
         'stacklet_newthread',
         'stacklet_deletethread',
diff --git a/pypy/translator/platform/windows.py b/pypy/translator/platform/windows.py
--- a/pypy/translator/platform/windows.py
+++ b/pypy/translator/platform/windows.py
@@ -90,7 +90,7 @@
     shared_only = ()
     environ = None
 
-    def __init__(self, cc=None, x64):
+    def __init__(self, cc, x64):
         if x64:
             msvc_compiler_environ = msvc_compiler_environ64
         else: