[pypy-commit] pypy default: merge heads

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r71497:7cdf492553dd
Date: 2014-05-13 21:06 +0100
http://bitbucket.org/pypy/pypy/changeset/7cdf492553dd/

Log:	merge heads

diff --git a/rpython/translator/c/gcc/trackgcroot.py b/rpython/translator/c/gcc/trackgcroot.py
--- a/rpython/translator/c/gcc/trackgcroot.py
+++ b/rpython/translator/c/gcc/trackgcroot.py
@@ -522,7 +522,7 @@
         # raw data, not GC pointers
         'movnt', 'mfence', 'lfence', 'sfence',
         # bit manipulations
-        'bextr',
+        'andn', 'bextr', 'blsi', 'blsmask', 'blsr', 'tzcnt', 'lzcnt',
     ])
 
     # a partial list is hopefully good enough for now; it's all to support