[pypy-commit] pypy default: fix so tests pass, even though vmprof is not supported in win32

mattip noreply at buildbot.pypy.org
Sat Apr 25 22:21:14 CEST 2015


Author: mattip <matti.picus at gmail.com>
Branch: 
Changeset: r76936:c0a4171c4d0f
Date: 2015-04-25 23:21 +0300
http://bitbucket.org/pypy/pypy/changeset/c0a4171c4d0f/

Log:	fix so tests pass, even though vmprof is not supported in win32

diff --git a/rpython/jit/backend/llsupport/codemap.py b/rpython/jit/backend/llsupport/codemap.py
--- a/rpython/jit/backend/llsupport/codemap.py
+++ b/rpython/jit/backend/llsupport/codemap.py
@@ -25,6 +25,10 @@
 
 srcdir = os.path.join(os.path.dirname(__file__), 'src')
 
+libraries = []
+if os.name == 'nt':
+    libraries.append('Kernel32')
+
 eci = ExternalCompilationInfo(post_include_bits=["""
 RPY_EXTERN long pypy_jit_codemap_add(unsigned long addr,
                                      unsigned int machine_code_size,
@@ -43,7 +47,7 @@
 """], separate_module_sources=[
     open(os.path.join(srcdir, 'skiplist.c'), 'r').read() +
     open(os.path.join(srcdir, 'codemap.c'), 'r').read()
-], include_dirs=[cdir])
+], include_dirs=[cdir], libraries=libraries)
 
 def llexternal(name, args, res):
     return rffi.llexternal(name, args, res, compilation_info=eci,
diff --git a/rpython/jit/backend/llsupport/src/codemap.c b/rpython/jit/backend/llsupport/src/codemap.c
--- a/rpython/jit/backend/llsupport/src/codemap.c
+++ b/rpython/jit/backend/llsupport/src/codemap.c
@@ -15,7 +15,7 @@
     else
         __sync_lock_release(&pypy_codemap_currently_invalid);
 #else
-    InterlockedExchange((long volatile *)&pypy_codemap_currently_invalid,
+    _InterlockedExchange((long volatile *)&pypy_codemap_currently_invalid,
                         (long)value);
 #endif
 }


More information about the pypy-commit mailing list