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.
........

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

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