summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-04-16 12:07:30 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-04-16 12:07:30 (GMT)
commitfebecd82762477728ae98580b912ab17981770ff (patch)
tree36fcb86be53e34774948c492dc1b0930d14aa2f2
parentcfa72789c4c38620f05170694ebc21bb61837155 (diff)
downloadcpython-febecd82762477728ae98580b912ab17981770ff.zip
cpython-febecd82762477728ae98580b912ab17981770ff.tar.gz
cpython-febecd82762477728ae98580b912ab17981770ff.tar.bz2
Merged revisions 79892 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79892 | martin.v.loewis | 2010-04-07 13:01:46 +0200 (mer., 07 avril 2010) | 2 lines Issue #8314: Fix unsigned long long bug in libffi on Sparc v8. ........
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_ctypes/libffi/src/sparc/v8.S4
2 files changed, 6 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 18d7ca9..c583fa3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -927,6 +927,8 @@ Library
Extension Modules
-----------------
+- Issue #8314: Fix unsigned long long bug in libffi on Sparc v8.
+
- Issue #8300: When passing a non-integer argument to struct.pack with any
integer format code, struct.pack first attempts to convert the non-integer
using its __index__ method. If that method is non-existent or raises
diff --git a/Modules/_ctypes/libffi/src/sparc/v8.S b/Modules/_ctypes/libffi/src/sparc/v8.S
index 2c4eb60..bef1b68 100644
--- a/Modules/_ctypes/libffi/src/sparc/v8.S
+++ b/Modules/_ctypes/libffi/src/sparc/v8.S
@@ -213,6 +213,10 @@ ffi_closure_v8:
be,a done1
ldd [%fp-8], %i0
+ cmp %o0, FFI_TYPE_UINT64
+ be,a done1
+ ldd [%fp-8], %i0
+
ld [%fp-8], %i0
done1:
jmp %i7+8