Author: Christian Tismer <tis...@stackless.com>
Branch:
Changeset: r49845:f1598797a877
Date: 2011-11-27 07:02 +0100
http://bitbucket.org/pypy/pypy/changeset/f1598797a877/
Log: rstacklet.py builds ok, but crashes when run. Checking in, anyway.
Can somebody have a look?
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
@@ -179,7 +179,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
@@ -265,7 +265,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]
@@ -296,6 +296,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
