[pypy-svn] r72050 - in pypy/release/1.2.x/pypy: module/_ssl translator/c/gcc translator/platform

[arigo at codespeak.net]

Author: arigo
Date: Wed Mar 10 14:41:13 2010
New Revision: 72050

Modified:
   pypy/release/1.2.x/pypy/module/_ssl/interp_ssl.py
   pypy/release/1.2.x/pypy/translator/c/gcc/trackgcroot.py
   pypy/release/1.2.x/pypy/translator/platform/windows.py
Log:
svn merge svn+ssh://codespeak.net/svn/pypy/trunk -r72044:72045


Modified: pypy/release/1.2.x/pypy/module/_ssl/interp_ssl.py
==============================================================================
--- pypy/release/1.2.x/pypy/module/_ssl/interp_ssl.py	(original)
+++ pypy/release/1.2.x/pypy/module/_ssl/interp_ssl.py	Wed Mar 10 14:41:13 2010
@@ -4,13 +4,14 @@
 from pypy.interpreter.typedef import TypeDef
 from pypy.interpreter.gateway import interp2app
 from pypy.rpython.tool import rffi_platform
+from pypy.translator.platform import platform
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
 
 from pypy.rlib import rpoll
 
 import sys
 
-if sys.platform == 'win32':
+if sys.platform == 'win32' and platform.name != 'mingw32':
     libraries = ['libeay32', 'ssleay32', 'user32', 'advapi32', 'gdi32']
 else:
     libraries = ['ssl', 'crypto']

Modified: pypy/release/1.2.x/pypy/translator/c/gcc/trackgcroot.py
==============================================================================
--- pypy/release/1.2.x/pypy/translator/c/gcc/trackgcroot.py	(original)
+++ pypy/release/1.2.x/pypy/translator/c/gcc/trackgcroot.py	Wed Mar 10 14:41:13 2010
@@ -804,6 +804,12 @@
 class Mingw32FunctionGcRootTracker(DarwinFunctionGcRootTracker):
     format = 'mingw32'
 
+    FUNCTIONS_NOT_RETURNING = {
+        '_abort': None,
+        '_exit': None,
+        '__assert': None,
+        }
+
 class MsvcFunctionGcRootTracker(FunctionGcRootTracker):
     format = 'msvc'
     ESP = 'esp'

Modified: pypy/release/1.2.x/pypy/translator/platform/windows.py
==============================================================================
--- pypy/release/1.2.x/pypy/translator/platform/windows.py	(original)
+++ pypy/release/1.2.x/pypy/translator/platform/windows.py	Wed Mar 10 14:41:13 2010
@@ -303,7 +303,7 @@
     name = 'mingw32'
     standalone_only = []
     shared_only = []
-    cflags = []
+    cflags = ['-O3']
     link_flags = []
     so_ext = 'dll'