git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define libffi macros carefully 

From-SVN: r162945
This commit is contained in:
Dan Horák 2010-08-06 14:26:52 +02:00 committed by Anthony Green
parent 0b4b14ac40
commit 3d420bdf4d
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libffi/ChangeLog
View File

@ -2,6 +2,13 @@
* src/closures.c (selinux_enabled_check): Fix strncmp usage bug. * src/closures.c (selinux_enabled_check): Fix strncmp usage bug.
2010-07-07 Dan Horák <dan@danny.cz>
* include/ffi.h.in: Protect #define with #ifndef.
* src/powerpc/ffitarget.h: Ditto.
* src/s390/ffitarget.h: Ditto.
* src/sparc/ffitarget.h: Ditto.
2010-07-07 Neil Roberts <neil@linux.intel.com> 2010-07-07 Neil Roberts <neil@linux.intel.com>
* src/x86/sysv.S (ffi_call_SYSV): Align the stack pointer to * src/x86/sysv.S (ffi_call_SYSV): Align the stack pointer to

2
libffi/include/ffi.h.in
View File

@ -57,7 +57,9 @@ extern "C" {
#endif #endif
/* Specify which architecture libffi is configured for. */ /* Specify which architecture libffi is configured for. */
#ifndef @TARGET@
#define @TARGET@ #define @TARGET@
#endif
/* ---- System configuration information --------------------------------- */ /* ---- System configuration information --------------------------------- */

6
libffi/src/powerpc/ffitarget.h
View File

@ -31,12 +31,18 @@
/* ---- System specific configurations ----------------------------------- */ /* ---- System specific configurations ----------------------------------- */
#if defined (POWERPC) && defined (__powerpc64__) /* linux64 */ #if defined (POWERPC) && defined (__powerpc64__) /* linux64 */
#ifndef POWERPC64
#define POWERPC64 #define POWERPC64
#endif
#elif defined (POWERPC_DARWIN) && defined (__ppc64__) /* Darwin */ #elif defined (POWERPC_DARWIN) && defined (__ppc64__) /* Darwin */
#ifndef POWERPC64
#define POWERPC64 #define POWERPC64
#endif
#elif defined (POWERPC_AIX) && defined (__64BIT__) /* AIX64 */ #elif defined (POWERPC_AIX) && defined (__64BIT__) /* AIX64 */
#ifndef POWERPC64
#define POWERPC64 #define POWERPC64
#endif #endif
#endif
#ifndef LIBFFI_ASM #ifndef LIBFFI_ASM
typedef unsigned long ffi_arg; typedef unsigned long ffi_arg;

2
libffi/src/s390/ffitarget.h
View File

@ -28,8 +28,10 @@
#define LIBFFI_TARGET_H #define LIBFFI_TARGET_H
#if defined (__s390x__) #if defined (__s390x__)
#ifndef S390X
#define S390X #define S390X
#endif #endif
#endif
/* ---- System specific configurations ----------------------------------- */ /* ---- System specific configurations ----------------------------------- */

2
libffi/src/sparc/ffitarget.h
View File

@ -30,8 +30,10 @@
/* ---- System specific configurations ----------------------------------- */ /* ---- System specific configurations ----------------------------------- */
#if defined(__arch64__) || defined(__sparcv9) #if defined(__arch64__) || defined(__sparcv9)
#ifndef SPARC64
#define SPARC64 #define SPARC64
#endif #endif
#endif
#ifndef LIBFFI_ASM #ifndef LIBFFI_ASM
typedef unsigned long ffi_arg; typedef unsigned long ffi_arg;