Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r63130:9cbd1b5985f9
Date: 2013-04-08 11:45 +0200
http://bitbucket.org/pypy/pypy/changeset/9cbd1b5985f9/
Log: merge
diff --git a/pypy/doc/stackless.rst b/pypy/doc/stackless.rst
--- a/pypy/doc/stackless.rst
+++ b/pypy/doc/stackless.rst
@@ -17,8 +17,8 @@
Continulets can be directly used by application code, or it is possible
to write (entirely at app-level) more user-friendly interfaces.
-Currently PyPy implements greenlets_ on top of continulets. It would be
-easy to implement tasklets and channels as well, emulating the model
+Currently PyPy implements greenlets_ on top of continulets. It also
+implements (an approximation of) tasklets and channels, emulating the model
of `Stackless Python`_.
Continulets are extremely light-weight, which means that PyPy should be
diff --git a/rpython/config/translationoption.py
b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -115,7 +115,7 @@
("translation.gcrootfinder", DEFL_ROOTFINDER_WITHJIT),
("translation.list_comprehension_operations", True)]),
ChoiceOption("jit_backend", "choose the backend for the JIT",
- ["auto", "x86", "x86-without-sse2", 'armv7'],
+ ["auto", "x86", "x86-without-sse2", 'armv7', 'armv7hf',
'armv6hf'],
default="auto", cmdline="--jit-backend"),
ChoiceOption("jit_profiler", "integrate profiler support into the JIT",
["off", "oprofile"],
diff --git a/rpython/translator/goal/translate.py
b/rpython/translator/goal/translate.py
--- a/rpython/translator/goal/translate.py
+++ b/rpython/translator/goal/translate.py
@@ -50,7 +50,7 @@
return result
translate_optiondescr = OptionDescription("translate", "XXX", [
- StrOption("targetspec", "XXX",
default='../../../pypy/goal/targetpypystandalone',
+ StrOption("targetspec", "XXX", default='targetpypystandalone',
cmdline=None),
ChoiceOption("opt",
"optimization level", OPT_LEVELS, default=DEFAULT_OPT_LEVEL,
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
