Author: Armin Rigo
Branch:
Changeset: r75218:5f188a56b47d
Date: 2015-01-03 16:47 +0100
http://bitbucket.org/pypy/pypy/changeset/5f188a56b47d/
Log:Merged in squeaky/use-cflags-for-compiling-asm (pull request #295)
Use CFLAGS
diff --git a/rpython/translator/c/genc.py b/rpython/transl
Author: Armin Rigo
Branch: squeaky/use-cflags-for-compiling-asm
Changeset: r75217:374ba49279d1
Date: 2015-01-03 16:47 +0100
http://bitbucket.org/pypy/pypy/changeset/374ba49279d1/
Log:Close branch squeaky/use-cflags-for-compiling-asm
___
pypy-commit
Author: Maciej Fijalkowski
Branch: optresult
Changeset: r75219:2baf29ac51a3
Date: 2015-01-03 22:36 +0200
http://bitbucket.org/pypy/pypy/changeset/2baf29ac51a3/
Log:start fixing the merge
diff --git a/rpython/jit/metainterp/history.py
b/rpython/jit/metainterp/history.py
--- a/rpython/jit/met