Author: Christian Tismer <tis...@stackless.com> Branch: Changeset: r49541:7a0e4c3ee81a Date: 2011-11-19 01:51 +0100 http://bitbucket.org/pypy/pypy/changeset/7a0e4c3ee81a/
Log: maybe wrong merge or wrong update. Anyway, fixed diff --git a/pypy/jit/codewriter/codewriter.py b/pypy/jit/codewriter/codewriter.py --- a/pypy/jit/codewriter/codewriter.py +++ b/pypy/jit/codewriter/codewriter.py @@ -104,6 +104,8 @@ else: name = 'unnamed' % id(ssarepr) i = 1 + # escape <lambda> names for windows + #name = name.replace('<lambda>', '_(lambda)_') extra = '' while name+extra in self._seen_files: i += 1 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 @@ -80,7 +80,7 @@ shared_only = () environ = None - def __init__(self, cc=None): + def __init__(self, cc=None, x64=False): Platform.__init__(self, 'cl.exe') if msvc_compiler_environ: self.c_environ = os.environ.copy() @@ -103,9 +103,16 @@ env=self.c_environ) r = re.search('Macro Assembler', stderr) if r is None and os.path.exists('c:/masm32/bin/ml.exe'): - self.masm = 'c:/masm32/bin/ml.exe' + masm32 = 'c:/masm32/bin/ml.exe' + masm64 = 'c:/masm64/bin/ml64.exe' else: - self.masm = 'ml.exe' + masm32 = 'ml.exe' + masm64 = 'ml64.exe' + + if x64: + self.masm = masm64 + else: + self.masm = masm32 # Install debug options only when interpreter is in debug mode if sys.executable.lower().endswith('_d.exe'): _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit