[pypy-commit] pypy default: merge heads

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r73403:b18809f448df
Date: 2014-09-09 19:37 -0400
http://bitbucket.org/pypy/pypy/changeset/b18809f448df/

Log:	merge heads

diff --git a/pypy/doc/release-2.4.0.rst b/pypy/doc/release-2.4.0.rst
--- a/pypy/doc/release-2.4.0.rst
+++ b/pypy/doc/release-2.4.0.rst
@@ -7,10 +7,6 @@
 
 You can already download the PyPy 2.4-beta1 pre-release here:
 
-    https://bitbucket.org/pypy/pypy/downloads
-
-It should also soon be available on:
-
     http://pypy.org/download.html
 
 We would like to thank our donors for the continued support of the PyPy
@@ -87,7 +83,7 @@
   this mostly affects errno handling on linux, which makes external calls
   faster.
 
-* Move to a mixed polling and mutex GIL model that make mutli-threaded jitted
+* Move to a mixed polling and mutex GIL model that make mutlithreaded jitted
   code run *much* faster
 
 * Optimize errno handling in linux (x86 and x86-64 only)
@@ -111,7 +107,7 @@
 .. _resolved: https://bitbucket.org/pypy/pypy/issues?status=resolved
 
 We have further improvements on the way: rpython file handling,
-numpy linalg compatability, as well
+numpy linalg compatibility, as well
 as improved GC and many smaller improvements.
 
 Please try it out and let us know what you think. We especially welcome
diff --git a/rpython/translator/platform/windows.py b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -100,8 +100,8 @@
     cc = 'cl.exe'
     link = 'link.exe'
 
-    cflags = ('/MD', '/O2')
-    link_flags = ()
+    cflags = ('/MD', '/O2', '/Zi')
+    link_flags = ('/debug',)
     standalone_only = ()
     shared_only = ()
     environ = None
@@ -143,7 +143,6 @@
         # Install debug options only when interpreter is in debug mode
         if sys.executable.lower().endswith('_d.exe'):
             self.cflags = ['/MDd', '/Z7', '/Od']
-            self.link_flags = ['/debug']
 
             # Increase stack size, for the linker and the stack check code.
             stack_size = 8 << 20  # 8 Mb