diff options
| author | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-06 04:55:25 +0000 |
|---|---|---|
| committer | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-06 04:55:25 +0000 |
| commit | 28055868f66cc3a37c07313ac2ee826c06e32b7a (patch) | |
| tree | 6f6f2676ad9b963f2fa9167f048f027f984696c2 | |
| parent | be20c58521a949401cf451813177182c22acbedd (diff) | |
| download | gcc-28055868f66cc3a37c07313ac2ee826c06e32b7a.tar.gz | |
Enable build with sun compiler
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162933 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libffi/ChangeLog | 5 | ||||
| -rw-r--r-- | libffi/src/x86/ffitarget.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index b106384baf6..feb43c5efc9 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -49,6 +49,11 @@ * src/arm/sysv.S (__ARM_ARCH__): Define for processor __ARM_ARCH_7EM__. +2010-01-15 Oliver Kiddle <okiddle@yahoo.co.uk> + + * src/x86/ffitarget.h (ffi_abi): Check for __i386 and __amd64 for + Sun Studio compiler compatibility. + 2010-01-12 Conrad Irwin <conrad.irwin@gmail.com> * doc/libffi.texi: Add closure example. diff --git a/libffi/src/x86/ffitarget.h b/libffi/src/x86/ffitarget.h index b1d3df88f14..89a8983da9a 100644 --- a/libffi/src/x86/ffitarget.h +++ b/libffi/src/x86/ffitarget.h @@ -1,5 +1,5 @@ /* -----------------------------------------------------------------*-C-*- - ffitarget.h - Copyright (c) 1996-2003 Red Hat, Inc. + ffitarget.h - Copyright (c) 1996-2003, 2010 Red Hat, Inc. Copyright (C) 2008 Free Software Foundation, Inc. Target configuration macros for x86 and x86-64. @@ -74,10 +74,10 @@ typedef enum ffi_abi { #else /* ---- Intel x86 and AMD x86-64 - */ -#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__)) +#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__) || defined(__i386) || defined(__amd64)) FFI_SYSV, FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */ -#ifdef __i386__ +#if defined(__i386__) || defined(__i386) FFI_DEFAULT_ABI = FFI_SYSV, #else FFI_DEFAULT_ABI = FFI_UNIX64, |