From: Victor Stinner Date: Fri, 16 Apr 2010 12:07:30 +0000 (+0000) Subject: Merged revisions 79892 via svnmerge from X-Git-Tag: v3.2a1~1143 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=febecd82762477728ae98580b912ab17981770ff;p=python 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. ........ --- diff --git a/Misc/NEWS b/Misc/NEWS index 18d7ca9bb7..c583fa372f 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 2c4eb60a0f..bef1b681ee 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