From 09f8f310f4f53a24289682d3d28f4399d7bafc3b Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Mon, 28 Feb 2011 15:36:07 -0500 Subject: [PATCH] More AIX fixes. rc9. --- .pc/aix-ibm-xlc/configure | 20 ++++++------ .pc/aix-ibm-xlc/configure.ac | 2 +- .pc/bad-abi-fix/ChangeLog | 2 +- .pc/debug-build/configure | 20 ++++++------ .pc/debug-build/configure.ac | 2 +- .pc/fix-grammar/ChangeLog | 2 +- .pc/fix-ppc32/ChangeLog | 2 +- .pc/fix-xfails/ChangeLog | 2 +- .pc/fix_maxopt/ChangeLog | 2 +- .pc/fix_maxopt/configure | 20 ++++++------ .pc/hpux-mallinfo/ChangeLog | 2 +- .pc/interix/ChangeLog | 2 +- .pc/interix/configure | 20 ++++++------ .pc/interix/configure.ac | 2 +- .pc/ios-fixes/ChangeLog | 2 +- .pc/ios/ChangeLog | 2 +- .pc/ios/configure.ac | 2 +- .pc/irix/ChangeLog | 2 +- .pc/irix/include/ffi.h.in | 6 +++- .pc/ppc64-darwin/ChangeLog | 2 +- .pc/ppc64-darwin/configure | 20 ++++++------ .pc/ppc64-darwin/configure.ac | 2 +- .pc/remove-debug-code/ChangeLog | 2 +- .pc/sparc-abi-check/ChangeLog | 2 +- .pc/sparc-v8-aggregate-returns/ChangeLog | 2 +- .pc/ungccify/configure.ac | 2 +- .pc/win64-underscore/configure | 20 ++++++------ .pc/win64-underscore/configure.ac | 2 +- .pc/x86_pcrel_test/configure | 20 ++++++------ .pc/x86_pcrel_test/configure.ac | 2 +- ChangeLog | 2 +- compile | 0 config.guess | 0 config.sub | 0 configure | 20 ++++++------ configure.ac | 2 +- depcomp | 0 doc/stamp-vti | 4 +-- doc/version.texi | 4 +-- include/ffi.h.in | 21 +++---------- install-sh | 0 mdate-sh | 0 missing | 0 patches/aix-ibm-xlc | 23 ++++++++++---- patches/irix | 4 +-- patches/stand-alone | 22 ++++++------- src/arm/sysv.S | 39 +++++++++++++----------- 47 files changed, 169 insertions(+), 162 deletions(-) mode change 100755 => 100644 compile mode change 100755 => 100644 config.guess mode change 100755 => 100644 config.sub mode change 100755 => 100644 depcomp mode change 100755 => 100644 install-sh mode change 100755 => 100644 mdate-sh mode change 100755 => 100644 missing diff --git a/.pc/aix-ibm-xlc/configure b/.pc/aix-ibm-xlc/configure index 3927e9181..c0f10870a 100755 --- a/.pc/aix-ibm-xlc/configure +++ b/.pc/aix-ibm-xlc/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc8. +# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.10rc8' -PACKAGE_STRING='libffi 3.0.10rc8' +PACKAGE_VERSION='3.0.10rc9' +PACKAGE_STRING='libffi 3.0.10rc9' PACKAGE_BUGREPORT='http://sourceware.org/libffi.html' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libffi 3.0.10rc8 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]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libffi 3.0.10rc8:";; + short | recursive ) echo "Configuration of libffi 3.0.10rc9:";; esac cat <<\_ACEOF @@ -1547,7 +1547,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.10rc8 +libffi configure 3.0.10rc9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2148,7 +2148,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libffi $as_me 3.0.10rc8, 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 $@ @@ -3081,7 +3081,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.10rc8' + VERSION='3.0.10rc9' cat >>confdefs.h <<_ACEOF @@ -14127,7 +14127,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libffi $as_me 3.0.10rc8, 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 @@ -14197,7 +14197,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libffi config.status 3.0.10rc8 +libffi config.status 3.0.10rc9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/.pc/aix-ibm-xlc/configure.ac b/.pc/aix-ibm-xlc/configure.ac index 2ab23fc69..43f991d6e 100644 --- a/.pc/aix-ibm-xlc/configure.ac +++ b/.pc/aix-ibm-xlc/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html]) +AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html]) AC_CONFIG_HEADERS([fficonfig.h]) AC_CANONICAL_SYSTEM diff --git a/.pc/bad-abi-fix/ChangeLog b/.pc/bad-abi-fix/ChangeLog index 98ee86a23..8ca0d035a 100644 --- a/.pc/bad-abi-fix/ChangeLog +++ b/.pc/bad-abi-fix/ChangeLog @@ -94,7 +94,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/debug-build/configure b/.pc/debug-build/configure index 3b2b563f7..8af7cafca 100755 --- a/.pc/debug-build/configure +++ b/.pc/debug-build/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc8. +# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.10rc8' -PACKAGE_STRING='libffi 3.0.10rc8' +PACKAGE_VERSION='3.0.10rc9' +PACKAGE_STRING='libffi 3.0.10rc9' PACKAGE_BUGREPORT='http://sourceware.org/libffi.html' PACKAGE_URL='' @@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libffi 3.0.10rc8 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]... @@ -1435,7 +1435,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libffi 3.0.10rc8:";; + short | recursive ) echo "Configuration of libffi 3.0.10rc9:";; esac cat <<\_ACEOF @@ -1544,7 +1544,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.10rc8 +libffi configure 3.0.10rc9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2145,7 +2145,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libffi $as_me 3.0.10rc8, 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 $@ @@ -3078,7 +3078,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.10rc8' + VERSION='3.0.10rc9' cat >>confdefs.h <<_ACEOF @@ -14053,7 +14053,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libffi $as_me 3.0.10rc8, 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 @@ -14123,7 +14123,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libffi config.status 3.0.10rc8 +libffi config.status 3.0.10rc9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/.pc/debug-build/configure.ac b/.pc/debug-build/configure.ac index 88b5ffd8f..ebc90db2f 100644 --- a/.pc/debug-build/configure.ac +++ b/.pc/debug-build/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html]) +AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html]) AC_CONFIG_HEADERS([fficonfig.h]) AC_CANONICAL_SYSTEM diff --git a/.pc/fix-grammar/ChangeLog b/.pc/fix-grammar/ChangeLog index e084246c8..dbd9e141b 100644 --- a/.pc/fix-grammar/ChangeLog +++ b/.pc/fix-grammar/ChangeLog @@ -14,7 +14,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/fix-ppc32/ChangeLog b/.pc/fix-ppc32/ChangeLog index e164096fc..8e43dcfbb 100644 --- a/.pc/fix-ppc32/ChangeLog +++ b/.pc/fix-ppc32/ChangeLog @@ -116,7 +116,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/fix-xfails/ChangeLog b/.pc/fix-xfails/ChangeLog index cc4e49f45..5462f65a1 100644 --- a/.pc/fix-xfails/ChangeLog +++ b/.pc/fix-xfails/ChangeLog @@ -51,7 +51,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/fix_maxopt/ChangeLog b/.pc/fix_maxopt/ChangeLog index ae76404db..f81d9063e 100644 --- a/.pc/fix_maxopt/ChangeLog +++ b/.pc/fix_maxopt/ChangeLog @@ -111,7 +111,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/fix_maxopt/configure b/.pc/fix_maxopt/configure index 1e0db6430..e0a77d965 100755 --- a/.pc/fix_maxopt/configure +++ b/.pc/fix_maxopt/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc8. +# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.10rc8' -PACKAGE_STRING='libffi 3.0.10rc8' +PACKAGE_VERSION='3.0.10rc9' +PACKAGE_STRING='libffi 3.0.10rc9' PACKAGE_BUGREPORT='http://sourceware.org/libffi.html' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libffi 3.0.10rc8 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]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libffi 3.0.10rc8:";; + short | recursive ) echo "Configuration of libffi 3.0.10rc9:";; esac cat <<\_ACEOF @@ -1547,7 +1547,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.10rc8 +libffi configure 3.0.10rc9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2148,7 +2148,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libffi $as_me 3.0.10rc8, 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 $@ @@ -3081,7 +3081,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.10rc8' + VERSION='3.0.10rc9' cat >>confdefs.h <<_ACEOF @@ -14129,7 +14129,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libffi $as_me 3.0.10rc8, 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 @@ -14199,7 +14199,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libffi config.status 3.0.10rc8 +libffi config.status 3.0.10rc9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/.pc/hpux-mallinfo/ChangeLog b/.pc/hpux-mallinfo/ChangeLog index 2eed7cf43..2098c02c7 100644 --- a/.pc/hpux-mallinfo/ChangeLog +++ b/.pc/hpux-mallinfo/ChangeLog @@ -23,7 +23,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/interix/ChangeLog b/.pc/interix/ChangeLog index 3a185641e..01e4eed16 100644 --- a/.pc/interix/ChangeLog +++ b/.pc/interix/ChangeLog @@ -57,7 +57,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/interix/configure b/.pc/interix/configure index 62ee4480e..9157b5032 100755 --- a/.pc/interix/configure +++ b/.pc/interix/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc8. +# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.10rc8' -PACKAGE_STRING='libffi 3.0.10rc8' +PACKAGE_VERSION='3.0.10rc9' +PACKAGE_STRING='libffi 3.0.10rc9' PACKAGE_BUGREPORT='http://sourceware.org/libffi.html' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libffi 3.0.10rc8 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]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libffi 3.0.10rc8:";; + short | recursive ) echo "Configuration of libffi 3.0.10rc9:";; esac cat <<\_ACEOF @@ -1547,7 +1547,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.10rc8 +libffi configure 3.0.10rc9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2148,7 +2148,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libffi $as_me 3.0.10rc8, 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 $@ @@ -3081,7 +3081,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.10rc8' + VERSION='3.0.10rc9' cat >>confdefs.h <<_ACEOF @@ -14129,7 +14129,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libffi $as_me 3.0.10rc8, 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 @@ -14199,7 +14199,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libffi config.status 3.0.10rc8 +libffi config.status 3.0.10rc9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/.pc/interix/configure.ac b/.pc/interix/configure.ac index 3eb9d31d9..2b6d5d932 100644 --- a/.pc/interix/configure.ac +++ b/.pc/interix/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html]) +AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html]) AC_CONFIG_HEADERS([fficonfig.h]) AC_CANONICAL_SYSTEM diff --git a/.pc/ios-fixes/ChangeLog b/.pc/ios-fixes/ChangeLog index 4d0bb126f..2328ce919 100644 --- a/.pc/ios-fixes/ChangeLog +++ b/.pc/ios-fixes/ChangeLog @@ -94,7 +94,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/ios/ChangeLog b/.pc/ios/ChangeLog index 480d625cb..10b9988a2 100644 --- a/.pc/ios/ChangeLog +++ b/.pc/ios/ChangeLog @@ -28,7 +28,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/ios/configure.ac b/.pc/ios/configure.ac index 31863cc2b..77f08a3b7 100644 --- a/.pc/ios/configure.ac +++ b/.pc/ios/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html]) +AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html]) AC_CONFIG_HEADERS([fficonfig.h]) AC_CANONICAL_SYSTEM diff --git a/.pc/irix/ChangeLog b/.pc/irix/ChangeLog index c974316e8..6db9cc499 100644 --- a/.pc/irix/ChangeLog +++ b/.pc/irix/ChangeLog @@ -72,7 +72,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/irix/include/ffi.h.in b/.pc/irix/include/ffi.h.in index 18ced127d..92b033fb5 100644 --- a/.pc/irix/include/ffi.h.in +++ b/.pc/irix/include/ffi.h.in @@ -86,11 +86,15 @@ extern "C" { #else # 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 diff --git a/.pc/ppc64-darwin/ChangeLog b/.pc/ppc64-darwin/ChangeLog index 05d6c42e5..5cc54a129 100644 --- a/.pc/ppc64-darwin/ChangeLog +++ b/.pc/ppc64-darwin/ChangeLog @@ -68,7 +68,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/ppc64-darwin/configure b/.pc/ppc64-darwin/configure index 92109cf43..ca31d4aae 100755 --- a/.pc/ppc64-darwin/configure +++ b/.pc/ppc64-darwin/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc8. +# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.10rc8' -PACKAGE_STRING='libffi 3.0.10rc8' +PACKAGE_VERSION='3.0.10rc9' +PACKAGE_STRING='libffi 3.0.10rc9' PACKAGE_BUGREPORT='http://sourceware.org/libffi.html' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libffi 3.0.10rc8 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]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libffi 3.0.10rc8:";; + short | recursive ) echo "Configuration of libffi 3.0.10rc9:";; esac cat <<\_ACEOF @@ -1547,7 +1547,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.10rc8 +libffi configure 3.0.10rc9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2148,7 +2148,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libffi $as_me 3.0.10rc8, 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 $@ @@ -3081,7 +3081,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.10rc8' + VERSION='3.0.10rc9' cat >>confdefs.h <<_ACEOF @@ -14129,7 +14129,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libffi $as_me 3.0.10rc8, 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 @@ -14199,7 +14199,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libffi config.status 3.0.10rc8 +libffi config.status 3.0.10rc9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/.pc/ppc64-darwin/configure.ac b/.pc/ppc64-darwin/configure.ac index 4b8c041cb..4f81f0830 100644 --- a/.pc/ppc64-darwin/configure.ac +++ b/.pc/ppc64-darwin/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html]) +AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html]) AC_CONFIG_HEADERS([fficonfig.h]) AC_CANONICAL_SYSTEM diff --git a/.pc/remove-debug-code/ChangeLog b/.pc/remove-debug-code/ChangeLog index 142950db6..3f52f6a63 100644 --- a/.pc/remove-debug-code/ChangeLog +++ b/.pc/remove-debug-code/ChangeLog @@ -85,7 +85,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/sparc-abi-check/ChangeLog b/.pc/sparc-abi-check/ChangeLog index 4b5511edd..c246bf083 100644 --- a/.pc/sparc-abi-check/ChangeLog +++ b/.pc/sparc-abi-check/ChangeLog @@ -80,7 +80,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/sparc-v8-aggregate-returns/ChangeLog b/.pc/sparc-v8-aggregate-returns/ChangeLog index 36f506cfa..8ec769a63 100644 --- a/.pc/sparc-v8-aggregate-returns/ChangeLog +++ b/.pc/sparc-v8-aggregate-returns/ChangeLog @@ -18,7 +18,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/.pc/ungccify/configure.ac b/.pc/ungccify/configure.ac index 1e77610b0..2c212cca0 100644 --- a/.pc/ungccify/configure.ac +++ b/.pc/ungccify/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html]) +AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html]) AC_CONFIG_HEADERS([fficonfig.h]) AC_CANONICAL_SYSTEM diff --git a/.pc/win64-underscore/configure b/.pc/win64-underscore/configure index 4b22f16e5..014742f40 100755 --- a/.pc/win64-underscore/configure +++ b/.pc/win64-underscore/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc8. +# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.10rc8' -PACKAGE_STRING='libffi 3.0.10rc8' +PACKAGE_VERSION='3.0.10rc9' +PACKAGE_STRING='libffi 3.0.10rc9' PACKAGE_BUGREPORT='http://sourceware.org/libffi.html' PACKAGE_URL='' @@ -1366,7 +1366,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libffi 3.0.10rc8 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]... @@ -1437,7 +1437,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libffi 3.0.10rc8:";; + short | recursive ) echo "Configuration of libffi 3.0.10rc9:";; esac cat <<\_ACEOF @@ -1546,7 +1546,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.10rc8 +libffi configure 3.0.10rc9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2147,7 +2147,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libffi $as_me 3.0.10rc8, 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 $@ @@ -3080,7 +3080,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.10rc8' + VERSION='3.0.10rc9' cat >>confdefs.h <<_ACEOF @@ -14071,7 +14071,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libffi $as_me 3.0.10rc8, 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 @@ -14141,7 +14141,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libffi config.status 3.0.10rc8 +libffi config.status 3.0.10rc9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/.pc/win64-underscore/configure.ac b/.pc/win64-underscore/configure.ac index a03394bea..956f9ba8a 100644 --- a/.pc/win64-underscore/configure.ac +++ b/.pc/win64-underscore/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html]) +AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html]) AC_CONFIG_HEADERS([fficonfig.h]) AC_CANONICAL_SYSTEM diff --git a/.pc/x86_pcrel_test/configure b/.pc/x86_pcrel_test/configure index ca8ca1821..b228ac4ed 100755 --- a/.pc/x86_pcrel_test/configure +++ b/.pc/x86_pcrel_test/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc8. +# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.10rc8' -PACKAGE_STRING='libffi 3.0.10rc8' +PACKAGE_VERSION='3.0.10rc9' +PACKAGE_STRING='libffi 3.0.10rc9' PACKAGE_BUGREPORT='http://sourceware.org/libffi.html' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libffi 3.0.10rc8 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]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libffi 3.0.10rc8:";; + short | recursive ) echo "Configuration of libffi 3.0.10rc9:";; esac cat <<\_ACEOF @@ -1547,7 +1547,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.10rc8 +libffi configure 3.0.10rc9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2148,7 +2148,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libffi $as_me 3.0.10rc8, 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 $@ @@ -3081,7 +3081,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.10rc8' + VERSION='3.0.10rc9' cat >>confdefs.h <<_ACEOF @@ -14127,7 +14127,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libffi $as_me 3.0.10rc8, 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 @@ -14197,7 +14197,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libffi config.status 3.0.10rc8 +libffi config.status 3.0.10rc9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/.pc/x86_pcrel_test/configure.ac b/.pc/x86_pcrel_test/configure.ac index 0a575e1a7..779097c38 100644 --- a/.pc/x86_pcrel_test/configure.ac +++ b/.pc/x86_pcrel_test/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html]) +AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html]) AC_CONFIG_HEADERS([fficonfig.h]) AC_CANONICAL_SYSTEM diff --git a/ChangeLog b/ChangeLog index 18a968612..a788c187e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,7 +121,7 @@ 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. - * confifure: Rebuilt. + * configure: Rebuilt. 2011-02-07 Joel Sherrill diff --git a/compile b/compile old mode 100755 new mode 100644 diff --git a/config.guess b/config.guess old mode 100755 new mode 100644 diff --git a/config.sub b/config.sub old mode 100755 new mode 100644 diff --git a/configure b/configure index db1b710cf..e63f684bb 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc8. +# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libffi' PACKAGE_TARNAME='libffi' -PACKAGE_VERSION='3.0.10rc8' -PACKAGE_STRING='libffi 3.0.10rc8' +PACKAGE_VERSION='3.0.10rc9' +PACKAGE_STRING='libffi 3.0.10rc9' PACKAGE_BUGREPORT='http://sourceware.org/libffi.html' PACKAGE_URL='' @@ -1375,7 +1375,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libffi 3.0.10rc8 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]... @@ -1446,7 +1446,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libffi 3.0.10rc8:";; + short | recursive ) echo "Configuration of libffi 3.0.10rc9:";; esac cat <<\_ACEOF @@ -1562,7 +1562,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libffi configure 3.0.10rc8 +libffi configure 3.0.10rc9 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2163,7 +2163,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libffi $as_me 3.0.10rc8, 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 $@ @@ -3197,7 +3197,7 @@ fi # Define the identity of the package. PACKAGE='libffi' - VERSION='3.0.10rc8' + VERSION='3.0.10rc9' cat >>confdefs.h <<_ACEOF @@ -15151,7 +15151,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libffi $as_me 3.0.10rc8, 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 @@ -15221,7 +15221,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libffi config.status 3.0.10rc8 +libffi config.status 3.0.10rc9 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f14284f26..2abe9db0b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure AC_PREREQ(2.63) -AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html]) +AC_INIT([libffi], [3.0.10rc9], [http://sourceware.org/libffi.html]) AC_CONFIG_HEADERS([fficonfig.h]) AC_CANONICAL_SYSTEM diff --git a/depcomp b/depcomp old mode 100755 new mode 100644 diff --git a/doc/stamp-vti b/doc/stamp-vti index 32a47b176..200494ee7 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ @set UPDATED 25 February 2011 @set UPDATED-MONTH February 2011 -@set EDITION 3.0.10rc7 -@set VERSION 3.0.10rc7 +@set EDITION 3.0.10rc8 +@set VERSION 3.0.10rc8 diff --git a/doc/version.texi b/doc/version.texi index 32a47b176..200494ee7 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ @set UPDATED 25 February 2011 @set UPDATED-MONTH February 2011 -@set EDITION 3.0.10rc7 -@set VERSION 3.0.10rc7 +@set EDITION 3.0.10rc8 +@set VERSION 3.0.10rc8 diff --git a/include/ffi.h.in b/include/ffi.h.in index 747dd1707..f5a29b02f 100644 --- a/include/ffi.h.in +++ b/include/ffi.h.in @@ -86,11 +86,15 @@ extern "C" { #else # 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 @@ -270,12 +274,7 @@ size_t ffi_java_raw_size (ffi_cif *cif); __declspec(align(8)) #endif typedef struct { -#if @FFI_EXEC_TRAMPOLINE_TABLE@ - void *trampoline_table; - void *trampoline_table_entry; -#else char tramp[FFI_TRAMPOLINE_SIZE]; -#endif ffi_cif *cif; void (*fun)(ffi_cif*,void*,void**,void*); void *user_data; @@ -308,12 +307,7 @@ ffi_prep_closure_loc (ffi_closure*, # pragma pack 8 #endif typedef struct { -#if @FFI_EXEC_TRAMPOLINE_TABLE@ - void *trampoline_table; - void *trampoline_table_entry; -#else char tramp[FFI_TRAMPOLINE_SIZE]; -#endif ffi_cif *cif; @@ -334,12 +328,7 @@ typedef struct { } ffi_raw_closure; typedef struct { -#if @FFI_EXEC_TRAMPOLINE_TABLE@ - void *trampoline_table; - void *trampoline_table_entry; -#else char tramp[FFI_TRAMPOLINE_SIZE]; -#endif ffi_cif *cif; diff --git a/install-sh b/install-sh old mode 100755 new mode 100644 diff --git a/mdate-sh b/mdate-sh old mode 100755 new mode 100644 diff --git a/missing b/missing old mode 100755 new mode 100644 diff --git a/patches/aix-ibm-xlc b/patches/aix-ibm-xlc index 2e0869d42..8f528d6c0 100644 --- a/patches/aix-ibm-xlc +++ b/patches/aix-ibm-xlc @@ -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 + + From Tom Honermann : @@ -19,6 +19,11 @@ Index: libffi/ChangeLog 2011-02-08 Rafael Avila de Espindola * configure.ac: Fix x86 test for pc related relocs. +- * confifure: Rebuilt. ++ * configure: Rebuilt. + + 2011-02-07 Joel Sherrill + 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 diff --git a/patches/irix b/patches/irix index da3c3e915..a4068d641 100644 --- a/patches/irix +++ b/patches/irix @@ -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); diff --git a/patches/stand-alone b/patches/stand-alone index 4970b7b65..2a17231e3 100644 --- a/patches/stand-alone +++ b/patches/stand-alone @@ -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 . # @@ -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(, ..) diff --git a/src/arm/sysv.S b/src/arm/sysv.S index 2b7ea6063..14a7f03f6 100644 --- a/src/arm/sysv.S +++ b/src/arm/sysv.S @@ -147,6 +147,23 @@ _L__\name: .endm #endif +.macro RETLDM regs=, cond=, dirn=ia +#if defined (__INTERWORKING__) + .ifc "\regs","" + ldr\cond lr, [sp], #4 + .else + ldm\cond\dirn sp!, {\regs, lr} + .endif + bx\cond lr +#else + .ifc "\regs","" + ldr\cond pc, [sp], #4 + .else + ldm\cond\dirn sp!, {\regs, pc} + .endif +#endif +.endm + @ r0: ffi_prep_args @ r1: &ecif @ r2: cif->bytes @@ -170,7 +187,7 @@ ARM_FUNC_START ffi_call_SYSV @ r1 already set @ Call ffi_prep_args(stack, &ecif) - bl CNAME(ffi_prep_args) + bl ffi_prep_args @ move first 4 parameters in registers ldmia sp, {r0-r3} @@ -318,12 +335,7 @@ ARM_FUNC_START ffi_closure_SYSV /* Below are VFP hard-float ABI call and closure implementations. Add VFP FPU directive here. */ -#ifndef __APPLE__ - /* XXX - .fpu pseudo-directive is not supported by Apple's assembler, - and VFP hard-float calling conventions are not supported by the - compiler. */ .fpu vfp -#endif @ r0: fn @ r1: &ecif @@ -350,7 +362,7 @@ ARM_FUNC_START ffi_call_VFP sub r2, fp, #64 @ VFP scratch space @ Call ffi_prep_args(stack, &ecif, vfp_space) - bl CNAME(ffi_prep_args) + bl ffi_prep_args @ Load VFP register args if needed cmp r0, #0 @@ -412,18 +424,11 @@ LSYM(Lbase_args): fstmiadeq r2, {d0-d3} LSYM(Lepilogue_vfp): -#if defined (__INTERWORKING__) - ldmia sp!, {r0-r3,fp, lr} - bx lr -#else - ldmia sp!, {r0-r3,fp, pc} -#endif + RETLDM "r0-r3,fp" .ffi_call_VFP_end: UNWIND .fnend -#ifdef __ELF__ .size CNAME(ffi_call_VFP),.ffi_call_VFP_end-CNAME(ffi_call_VFP) -#endif ARM_FUNC_START ffi_closure_VFP @@ -439,7 +444,7 @@ ARM_FUNC_START ffi_closure_VFP sub sp, sp, #72 str sp, [sp, #64] add r1, sp, #64 - bl CNAME(ffi_closure_SYSV_inner) + bl ffi_closure_SYSV_inner cmp r0, #FFI_TYPE_INT beq .Lretint_vfp @@ -485,9 +490,7 @@ ARM_FUNC_START ffi_closure_VFP .ffi_closure_VFP_end: UNWIND .fnend -#ifdef __ELF__ .size CNAME(ffi_closure_VFP),.ffi_closure_VFP_end-CNAME(ffi_closure_VFP) -#endif #if defined __ELF__ && defined __linux__ .section .note.GNU-stack,"",%progbits