diff options
| author |   Dirkjan Ochtman <djc@gentoo.org> | 2012-02-16 12:18:54 +0000 |
|---|---|---|
| committer | Dirkjan Ochtman <djc@gentoo.org> | 2012-02-16 12:18:54 +0000 |
| commit | a6d1b6a4fdd3b7b7875ae57f19d2bfd856b9a74a (patch) | |
| tree | d1e04445bef618523fcd00aeb92216a184607f2d /dev-python/pypy/files | |
| parent | Fix build with new automake, bug #398971 by Juergen Rose and Rolf S. Arvidson... (diff) | |
| download | gentoo-2-a6d1b6a4fdd3b7b7875ae57f19d2bfd856b9a74a.tar.gz gentoo-2-a6d1b6a4fdd3b7b7875ae57f19d2bfd856b9a74a.tar.bz2 gentoo-2-a6d1b6a4fdd3b7b7875ae57f19d2bfd856b9a74a.zip | |
Made xml mandatory, stackless is built by default, split patches.
(Portage version: 2.1.10.46/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/pypy/files')
| -rw-r--r-- | dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch | 10 | ||||
| -rw-r--r-- | dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch | 22 |
2 files changed, 32 insertions, 0 deletions
diff --git a/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch b/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch new file mode 100644 index 000000000000..d58137350e2d --- /dev/null +++ b/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch @@ -0,0 +1,10 @@ +--- pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py.bak 2011-11-29 14:22:29.000000000 +0100 ++++ pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py 2011-11-29 14:22:55.000000000 +0100 +@@ -1694,6 +1694,7 @@ + } + """ + elif self.format in ('elf64', 'darwin64'): ++ print >> output, "\t.section .note.GNU-stack,\"\",%progbits" + print >> output, "\t.text" + print >> output, "\t.globl %s" % _globalname('pypy_asm_stackwalk') + _variant(elf64='.type pypy_asm_stackwalk, @function', diff --git a/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch b/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch new file mode 100644 index 000000000000..6528479e098c --- /dev/null +++ b/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch @@ -0,0 +1,22 @@ +--- pypy/translator/c/gcc/trackgcroot.py.old 2012-02-15 14:11:38.551479431 -0800 ++++ pypy/translator/c/gcc/trackgcroot.py 2012-02-15 00:55:20.082136135 -0800 +@@ -471,8 +471,8 @@ + return [] + + IGNORE_OPS_WITH_PREFIXES = dict.fromkeys([ +- 'cmp', 'test', 'set', 'sahf', 'lahf', 'cltd', 'cld', 'std', +- 'rep', 'movs', 'lods', 'stos', 'scas', 'cwtl', 'cwde', 'prefetch', ++ 'cmp', 'test', 'set', 'sahf', 'lahf', 'cld', 'std', ++ 'rep', 'movs', 'lods', 'stos', 'scas', 'cwde', 'prefetch', + # floating-point operations cannot produce GC pointers + 'f', + 'cvt', 'ucomi', 'comi', 'subs', 'subp' , 'adds', 'addp', 'xorp', +@@ -485,6 +485,8 @@ + 'bswap', 'bt', 'rdtsc', + 'punpck', 'pshufd', 'pcmp', 'pand', 'psllw', 'pslld', 'psllq', + 'paddq', 'pinsr', ++ # sign-extending moves should not produce GC pointers ++ 'cbtw', 'cwtl', 'cwtd', 'cltd', 'cltq', 'cqto', + # zero-extending moves should not produce GC pointers + 'movz', + # locked operations should not move GC pointers, at least so far |