Author: Manuel Jacob
Branch: refactor-str-types
Changeset: r68687:eb520c9ebbd8
Date: 2014-01-15 18:50 +0100
http://bitbucket.org/pypy/pypy/changeset/eb520c9ebbd8/
Log: hg merge default
diff --git a/pypy/goal/getnightly.py b/pypy/goal/getnightly.py
--- a/pypy/goal/getnightly.py
+++ b/pypy/goal/getnightly.py
@@ -26,7 +26,12 @@
if branch == 'default':
branch = 'trunk'
-filename = 'pypy-c-jit-latest-%s.tar.bz2' % arch
+if '--nojit' in sys.argv:
+ kind = 'nojit'
+else:
+ kind = 'jit'
+
+filename = 'pypy-c-%s-latest-%s.tar.bz2' % (kind, arch)
url = 'http://buildbot.pypy.org/nightly/%s/%s' % (branch, filename)
tmp = py.path.local.mkdtemp()
mydir = tmp.chdir()
diff --git a/rpython/annotator/binaryop.py b/rpython/annotator/binaryop.py
--- a/rpython/annotator/binaryop.py
+++ b/rpython/annotator/binaryop.py
@@ -435,11 +435,6 @@
return SomeChar(no_nul=no_nul)
-class __extend__(pairtype(SomeChar, SomeUnicodeCodePoint),
- pairtype(SomeUnicodeCodePoint, SomeChar)):
- def union((uchr1, uchr2)):
- return SomeUnicodeCodePoint()
-
class __extend__(pairtype(SomeUnicodeCodePoint, SomeUnicodeCodePoint)):
def union((uchr1, uchr2)):
return SomeUnicodeCodePoint()
diff --git a/rpython/config/translationoption.py
b/rpython/config/translationoption.py
--- a/rpython/config/translationoption.py
+++ b/rpython/config/translationoption.py
@@ -177,6 +177,9 @@
BoolOption("lldebug",
"If true, makes an lldebug build", default=False,
cmdline="--lldebug"),
+ BoolOption("lldebug0",
+ "If true, makes an lldebug0 build", default=False,
+ cmdline="--lldebug0"),
OptionDescription("backendopt", "Backend Optimization Options", [
# control inlining
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
@@ -364,6 +364,8 @@
extra_opts += ['-j', str(self.config.translation.make_jobs)]
if self.config.translation.lldebug:
extra_opts += ["lldebug"]
+ elif self.config.translation.lldebug0:
+ extra_opts += ["lldebug0"]
self.translator.platform.execute_makefile(self.targetdir,
extra_opts)
if shared:
@@ -398,6 +400,7 @@
('linuxmemchk', '', '$(MAKE) CFLAGS="$(DEBUGFLAGS) -DRPY_ASSERT
-DPPY_USE_LINUXMEMCHK" debug_target'),
('llsafer', '', '$(MAKE) CFLAGS="-O2 -DRPY_LL_ASSERT" $(TARGET)'),
('lldebug', '', '$(MAKE) CFLAGS="$(DEBUGFLAGS) -DRPY_ASSERT
-DRPY_LL_ASSERT" debug_target'),
+ ('lldebug0','', '$(MAKE) CFLAGS="-O0 $(DEBUGFLAGS) -DRPY_ASSERT
-DRPY_LL_ASSERT" debug_target'),
('profile', '', '$(MAKE) CFLAGS="-g -O1 -pg $(CFLAGS)
-fno-omit-frame-pointer" LDFLAGS="-pg $(LDFLAGS)" $(TARGET)'),
]
if self.has_profopt():
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
