Author: Armin Rigo <ar...@tunes.org>
Branch: vmprof-review
Changeset: r78368:81c9b346a396
Date: 2015-06-30 17:23 +0200
http://bitbucket.org/pypy/pypy/changeset/81c9b346a396/
Log: hg merge default
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -465,9 +465,9 @@
mk.rule('%.o %.gcmap', '%.vmprof.s', [
'$(PYTHON) $(RPYDIR)/translator/c/gcc/trackgcroot.py '
'-t $*.vmprof.s > $*.gctmp',
- '$(CC) -o $*.o -c $*.asmgcc.lbl.s',
+ '$(CC) -o $*.o -c $*.vmprof.lbl.s',
'mv $*.gctmp $*.gcmap',
- 'rm $*.asmgcc.lbl.s'])
+ 'rm $*.vmprof.lbl.s'])
# the rule to compute gcmaptable.s
mk.rule('gcmaptable.s', '$(GCMAPFILES)',
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
