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
+17 -6
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
+2 -2
View File
@@ -18,7 +18,7 @@ Index: libffi/include/ffi.h.in
===================================================================
--- libffi.orig/include/ffi.h.in
+++ libffi/include/ffi.h.in
@@ -278,6 +278,9 @@ typedef struct {
@@ -282,6 +282,9 @@ typedef struct {
} ffi_closure __attribute__((aligned (8)));
#else
} ffi_closure;
@@ -28,7 +28,7 @@ Index: libffi/include/ffi.h.in
#endif
void *ffi_closure_alloc (size_t size, void **code);
@@ -296,6 +299,9 @@ ffi_prep_closure_loc (ffi_closure*,
@@ -300,6 +303,9 @@ ffi_prep_closure_loc (ffi_closure*,
void *user_data,
void*codeloc);
+11 -11
View File
@@ -4059,7 +4059,7 @@ Index: libffi/configure
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for libffi 3.0.9.
+# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc6.
+# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9.
+#
+# Report bugs to <http://sourceware.org/libffi.html>.
#
@@ -4169,8 +4169,8 @@ Index: libffi/configure
-PACKAGE_VERSION='3.0.9'
-PACKAGE_STRING='libffi 3.0.9'
-PACKAGE_BUGREPORT='http://gcc.gnu.org/bugs.html'
+PACKAGE_VERSION='3.0.10rc6'
+PACKAGE_STRING='libffi 3.0.10rc6'
+PACKAGE_VERSION='3.0.10rc9'
+PACKAGE_STRING='libffi 3.0.10rc9'
+PACKAGE_BUGREPORT='http://sourceware.org/libffi.html'
PACKAGE_URL=''
@@ -4363,7 +4363,7 @@ Index: libffi/configure
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libffi 3.0.9 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.10rc6 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.10rc9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -4381,7 +4381,7 @@ Index: libffi/configure
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libffi 3.0.9:";;
+ short | recursive ) echo "Configuration of libffi 3.0.10rc6:";;
+ short | recursive ) echo "Configuration of libffi 3.0.10rc9:";;
esac
cat <<\_ACEOF
@@ -4426,7 +4426,7 @@ Index: libffi/configure
cat <<\_ACEOF
-libffi configure 3.0.9
-generated by GNU Autoconf 2.64
+libffi configure 3.0.10rc6
+libffi configure 3.0.10rc9
+generated by GNU Autoconf 2.68
-Copyright (C) 2009 Free Software Foundation, Inc.
@@ -4649,7 +4649,7 @@ Index: libffi/configure
-It was created by libffi $as_me 3.0.9, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+It was created by libffi $as_me 3.0.10rc6, which was
+It was created by libffi $as_me 3.0.10rc9, which was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -5048,7 +5048,7 @@ Index: libffi/configure
# Define the identity of the package.
PACKAGE='libffi'
- VERSION='3.0.9'
+ VERSION='3.0.10rc6'
+ VERSION='3.0.10rc9'
cat >>confdefs.h <<_ACEOF
@@ -7959,7 +7959,7 @@ Index: libffi/configure
ac_log="
-This file was extended by libffi $as_me 3.0.9, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+This file was extended by libffi $as_me 3.0.10rc6, which was
+This file was extended by libffi $as_me 3.0.10rc9, which was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7986,7 +7986,7 @@ Index: libffi/configure
-libffi config.status 3.0.9
-configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+libffi config.status 3.0.10rc6
+libffi config.status 3.0.10rc9
+configured by $0, generated by GNU Autoconf 2.68,
+ with options \\"\$ac_cs_config\\"
@@ -9016,7 +9016,7 @@ Index: libffi/configure.ac
+AC_PREREQ(2.63)
-AC_INIT([libffi], [3.0.9], [http://gcc.gnu.org/bugs.html])
+AC_INIT([libffi], [3.0.10rc6], [http://sourceware.org/libffi.html])
+AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html])
AC_CONFIG_HEADERS([fficonfig.h])
-AM_ENABLE_MULTILIB(, ..)