1 Index: libffi/ChangeLog.libffi
2 ===================================================================
3 --- libffi.orig/ChangeLog.libffi
4 +++ libffi/ChangeLog.libffi
6 +2010-01-15 Oliver Kiddle <okiddle@yahoo.co.uk>
8 + * src/x86/ffitarget.h (ffi_abi): Check for __i386 and __amd64 for
9 + Sun Studio compiler compatibility.
11 2010-01-12 Conrad Irwin <conrad.irwin@gmail.com>
13 * doc/libffi.texi: Add closure example.
14 Index: libffi/src/x86/ffitarget.h
15 ===================================================================
16 --- libffi.orig/src/x86/ffitarget.h
17 +++ libffi/src/x86/ffitarget.h
19 /* -----------------------------------------------------------------*-C-*-
20 - ffitarget.h - Copyright (c) 1996-2003 Red Hat, Inc.
21 + ffitarget.h - Copyright (c) 1996-2003, 2010 Red Hat, Inc.
22 Copyright (C) 2008 Free Software Foundation, Inc.
24 Target configuration macros for x86 and x86-64.
25 @@ -74,10 +74,10 @@ typedef enum ffi_abi {
28 /* ---- Intel x86 and AMD x86-64 - */
29 -#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
30 +#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__) || defined(__i386) || defined(__amd64))
32 FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */
34 +#if defined(__i386__) || defined(__i386)
35 FFI_DEFAULT_ABI = FFI_SYSV,
37 FFI_DEFAULT_ABI = FFI_UNIX64,