Author: Christian Tismer <tis...@stackless.com> Branch: win64-stage1 Changeset: r49860:2806a10c34cb Date: 2011-11-27 16:51 +0100 http://bitbucket.org/pypy/pypy/changeset/2806a10c34cb/
Log: Merge with default diff --git a/pypy/config/translationoption.py b/pypy/config/translationoption.py --- a/pypy/config/translationoption.py +++ b/pypy/config/translationoption.py @@ -69,8 +69,8 @@ "statistics": [("translation.gctransformer", "framework")], "generation": [("translation.gctransformer", "framework")], "hybrid": [("translation.gctransformer", "framework")], - "boehm": [("translation.gctransformer", "boehm"), - ("translation.continuation", False)], # breaks + "boehm": [("translation.continuation", False), # breaks + ("translation.gctransformer", "boehm")], "markcompact": [("translation.gctransformer", "framework")], "minimark": [("translation.gctransformer", "framework")], }, diff --git a/pypy/rlib/test/test_rstacklet.py b/pypy/rlib/test/test_rstacklet.py --- a/pypy/rlib/test/test_rstacklet.py +++ b/pypy/rlib/test/test_rstacklet.py @@ -1,4 +1,4 @@ -import gc +import gc, sys import py from pypy.rpython.tool.rffi_platform import CompilationError try: @@ -228,6 +228,8 @@ cls.old_values = Runner.config, Runner.STATUSMAX Runner.config = config Runner.STATUSMAX = 25000 + if cls.gcrootfinder == "asmgcc" and sys.platform == "win32": + py.test.skip("fails with asmgcc on win32") def teardown_class(cls): Runner.config, Runner.STATUSMAX = cls.old_values diff --git a/pypy/translator/c/genc.py b/pypy/translator/c/genc.py --- a/pypy/translator/c/genc.py +++ b/pypy/translator/c/genc.py @@ -542,7 +542,7 @@ mk.rule(*rule) if self.config.translation.gcrootfinder == 'asmgcc': - trackgcfiles = [cfile[:-2] for cfile in mk.cfiles] + trackgcfiles = [cfile[:cfile.rfind('.')] for cfile in mk.cfiles] if self.translator.platform.name == 'msvc': trackgcfiles = [f for f in trackgcfiles if f.startswith(('implement', 'testing', @@ -579,7 +579,7 @@ if self.translator.platform.name == 'msvc': lblofiles = [] for cfile in mk.cfiles: - f = cfile[:-2] + f = cfile[:cfile.rfind('.')] if f in trackgcfiles: ofile = '%s.lbl.obj' % (f,) else: 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 @@ -194,7 +194,7 @@ # The c compiler accepts any order of arguments, while # the assembler still has the old behavior that all options # must come first, and after the file name all options are ignored. - # So please be careful with the oder of parameters! ;-) + # So please be careful with the order of parameters! ;-) args = ['/nologo', '/c'] + compile_args + ['/Fo%s' % (oname,), str(cfile)] self._execute_c_compiler(cc, args, oname) return oname @@ -280,7 +280,7 @@ return fpath rel_cfiles = [m.pathrel(cfile) for cfile in cfiles] - rel_ofiles = [rel_cfile[:-2]+'.obj' for rel_cfile in rel_cfiles] + rel_ofiles = [rel_cfile[:rel_cfile.rfind('.')]+'.obj' for rel_cfile in rel_cfiles] m.cfiles = rel_cfiles rel_includedirs = [pypyrel(incldir) for incldir in eci.include_dirs] @@ -314,6 +314,7 @@ rules = [ ('all', '$(DEFAULT_TARGET)', []), ('.c.obj', '', '$(CC) /nologo $(CFLAGS) $(CFLAGSEXTRA) /Fo$@ /c $< $(INCLUDEDIRS)'), + ('.asm.obj', '', '$(MASM) /nologo /Fo$@ /c $< $(INCLUDEDIRS)'), ] for rule in rules: _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit