More AIX fixes. rc9.

This commit is contained in:
Anthony Green
2011-02-28 15:36:07 -05:00
parent 53d7b16564
commit 09f8f310f4
47 changed files with 169 additions and 162 deletions

View File

@@ -2,7 +2,7 @@ Index: libffi/ChangeLog
===================================================================
--- libffi.orig/ChangeLog
+++ libffi/ChangeLog
@@ -1,3 +1,16 @@
@@ -1,7 +1,20 @@
+2011-02-11 Anthony Green <green@moxielogic.com>
+
+ From Tom Honermann <tom.honermann@oracle.com>:
@@ -19,6 +19,11 @@ Index: libffi/ChangeLog
2011-02-08 Rafael Avila de Espindola <respindola@mozilla.com>
* configure.ac: Fix x86 test for pc related relocs.
- * confifure: Rebuilt.
+ * configure: Rebuilt.
2011-02-07 Joel Sherrill <joel.sherrill@oarcorp.com>
Index: libffi/include/ffi.h.in
===================================================================
--- libffi.orig/include/ffi.h.in
@@ -51,7 +56,7 @@ Index: libffi/include/ffi.h.in
THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
@@ -77,6 +78,9 @@ extern "C" {
@@ -77,15 +78,31 @@ extern "C" {
/* LONG_LONG_MAX is not always defined (not if STRICT_ANSI, for example).
But we can find it either under the correct ANSI name, or under GNU
C's internal name. */
@@ -61,11 +66,17 @@ Index: libffi/include/ffi.h.in
#ifdef LONG_LONG_MAX
# define FFI_LONG_LONG_MAX LONG_LONG_MAX
#else
@@ -86,6 +90,15 @@ extern "C" {
# ifdef LLONG_MAX
# define FFI_LONG_LONG_MAX LLONG_MAX
+# ifdef _AIX52 /* or newer has C99 LLONG_MAX */
+# undef FFI_64_BIT_MAX
+# define FFI_64_BIT_MAX 9223372036854775807LL
+# endif /* _AIX52 or newer */
# else
# ifdef __GNUC__
# define FFI_LONG_LONG_MAX __LONG_LONG_MAX__
# endif
+# ifdef _AIX
+# ifdef _AIX /* AIX 5.1 and earlier have LONGLONG_MAX */
+# ifndef __PPC64__
+# if defined (__IBMC__) || defined (__IBMCPP__)
+# define FFI_LONG_LONG_MAX LONGLONG_MAX
@@ -77,7 +88,7 @@ Index: libffi/include/ffi.h.in
# endif
#endif
@@ -132,17 +145,17 @@ typedef struct _ffi_type
@@ -132,17 +149,17 @@ typedef struct _ffi_type
#endif
#if LONG_MAX == 2147483647
@@ -98,7 +109,7 @@ Index: libffi/include/ffi.h.in
# define ffi_type_ulong ffi_type_uint64
# define ffi_type_slong ffi_type_sint64
#else
@@ -195,7 +208,7 @@ typedef struct {
@@ -195,7 +212,7 @@ typedef struct {
#ifndef FFI_SIZEOF_ARG
# if LONG_MAX == 2147483647
# define FFI_SIZEOF_ARG 4