Modules/_ctypes/libffi.diff

   1 This file contains the diffs between the files in the libffi
   2 subdirectory and the 'official' source files from
   3 ftp://sourceware.org/pub/libffi/libffi-3.0.5.tar.gz
   4
   5 Index: libffi/aclocal.m4
   6 ===================================================================
   7 --- libffi/aclocal.m4   (working copy)
   8 +++ libffi/aclocal.m4   (revision 72475)
   9 @@ -1155,7 +1155,7 @@
  10     test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
  11     test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
  12
  13 -  # We can hardcode non-existant directories.
  14 +  # We can hardcode non-existent directories.
  15    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
  16       # If the only mechanism to avoid hardcoding is shlibpath_var, we
  17       # have to relink, otherwise we might link with an installed library
  18 Index: libffi/configure.ac
  19 ===================================================================
  20 --- libffi/configure.ac (working copy)
  21 +++ libffi/configure.ac (revision 72475)
  22 @@ -1,4 +1,7 @@
  23  dnl Process this with autoconf to create configure
  24 +#
  25 +# file from libffi - slightly patched for ctypes
  26 +#
  27
  28  AC_PREREQ(2.59)
  29
  30 @@ -83,6 +86,9 @@
  31    i?86-*-solaris2.1[[0-9]]*)
  32         TARGET=X86_64; TARGETDIR=x86
  33         ;;
  34 +  i*86-*-nto-qnx*)
  35 +        TARGET=X86; TARGETDIR=x86
  36 +        ;;
  37    i?86-*-*)
  38         TARGET=X86; TARGETDIR=x86
  39         ;;
  40 @@ -100,10 +106,10 @@
  41         ;;
  42
  43    mips-sgi-irix5.* | mips-sgi-irix6.*)
  44 -       TARGET=MIPS; TARGETDIR=mips
  45 +       TARGET=MIPS_IRIX; TARGETDIR=mips
  46         ;;
  47    mips*-*-linux*)
  48 -       TARGET=MIPS; TARGETDIR=mips
  49 +       TARGET=MIPS_LINUX; TARGETDIR=mips
  50         ;;
  51
  52    powerpc*-*-linux* | powerpc-*-sysv*)
  53 @@ -156,7 +162,7 @@
  54    AC_MSG_ERROR(["libffi has not been ported to $host."])
  55  fi
  56
  57 -AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
  58 +AM_CONDITIONAL(MIPS,[expr x$TARGET : 'xMIPS' > /dev/null])
  59  AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
  60  AM_CONDITIONAL(X86, test x$TARGET = xX86)
  61  AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
  62 @@ -360,6 +366,10 @@
  63
  64  AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
  65
  66 -AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc)
  67 +AC_CONFIG_FILES(include/ffi.h)
  68
  69 +AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
  70 +
  71 +AC_CONFIG_FILES(fficonfig.py)
  72 +
  73  AC_OUTPUT
  74 Index: libffi/configure
  75 ===================================================================
  76 --- libffi/configure    (working copy)
  77 +++ libffi/configure    (revision 72475)
  78 @@ -9546,7 +9546,7 @@
  79     test -n "$runpath_var" || \
  80     test "X$hardcode_automatic" = "Xyes" ; then
  81
  82 -  # We can hardcode non-existant directories.
  83 +  # We can hardcode non-existent directories.
  84    if test "$hardcode_direct" != no &&
  85       # If the only mechanism to avoid hardcoding is shlibpath_var, we
  86       # have to relink, otherwise we might link with an installed library
  87 @@ -13514,7 +13514,7 @@
  88     test -n "$runpath_var_CXX" || \
  89     test "X$hardcode_automatic_CXX" = "Xyes" ; then
  90
  91 -  # We can hardcode non-existant directories.
  92 +  # We can hardcode non-existent directories.
  93    if test "$hardcode_direct_CXX" != no &&
  94       # If the only mechanism to avoid hardcoding is shlibpath_var, we
  95       # have to relink, otherwise we might link with an installed library
  96 @@ -16117,7 +16117,7 @@
  97     test -n "$runpath_var_F77" || \
  98     test "X$hardcode_automatic_F77" = "Xyes" ; then
  99
 100 -  # We can hardcode non-existant directories.
 101 +  # We can hardcode non-existent directories.
 102    if test "$hardcode_direct_F77" != no &&
 103       # If the only mechanism to avoid hardcoding is shlibpath_var, we
 104       # have to relink, otherwise we might link with an installed library
 105 @@ -18720,7 +18720,7 @@
 106     test -n "$runpath_var_GCJ" || \
 107     test "X$hardcode_automatic_GCJ" = "Xyes" ; then
 108
 109 -  # We can hardcode non-existant directories.
 110 +  # We can hardcode non-existent directories.
 111    if test "$hardcode_direct_GCJ" != no &&
 112       # If the only mechanism to avoid hardcoding is shlibpath_var, we
 113       # have to relink, otherwise we might link with an installed library
 114 @@ -20406,6 +20406,9 @@
 115    i?86-*-solaris2.1[0-9]*)
 116         TARGET=X86_64; TARGETDIR=x86
 117         ;;
 118 +  i*86-*-nto-qnx*)
 119 +        TARGET=X86; TARGETDIR=x86
 120 +        ;;
 121    i?86-*-*)
 122         TARGET=X86; TARGETDIR=x86
 123         ;;
 124 @@ -20423,10 +20426,10 @@
 125         ;;
 126
 127    mips-sgi-irix5.* | mips-sgi-irix6.*)
 128 -       TARGET=MIPS; TARGETDIR=mips
 129 +       TARGET=MIPS_IRIX; TARGETDIR=mips
 130         ;;
 131    mips*-*-linux*)
 132 -       TARGET=MIPS; TARGETDIR=mips
 133 +       TARGET=MIPS_LINUX; TARGETDIR=mips
 134         ;;
 135
 136    powerpc*-*-linux* | powerpc-*-sysv*)
 137 @@ -20481,7 +20484,7 @@
 138     { (exit 1); exit 1; }; }
 139  fi
 140
 141 - if test x$TARGET = xMIPS; then
 142 + if expr x$TARGET : 'xMIPS' > /dev/null; then
 143    MIPS_TRUE=
 144    MIPS_FALSE='#'
 145  else
 146 @@ -22712,9 +22715,15 @@
 147  ac_config_links="$ac_config_links include/ffitarget.h:src/$TARGETDIR/ffitarget.h"
 148
 149
 150 -ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile man/Makefile libffi.pc"
 151 +ac_config_files="$ac_config_files include/ffi.h"
 152
 153
 154 +ac_config_links="$ac_config_links include/ffi_common.h:include/ffi_common.h"
 155 +
 156 +
 157 +ac_config_files="$ac_config_files fficonfig.py"
 158 +
 159 +
 160  cat >confcache <<\_ACEOF
 161  # This file is a shell script that caches the results of configure
 162  # tests run on this system so they can be shared between configure
 163 @@ -23498,12 +23507,9 @@
 164      "include") CONFIG_COMMANDS="$CONFIG_COMMANDS include" ;;
 165      "src") CONFIG_COMMANDS="$CONFIG_COMMANDS src" ;;
 166      "include/ffitarget.h") CONFIG_LINKS="$CONFIG_LINKS include/ffitarget.h:src/$TARGETDIR/ffitarget.h" ;;
 167 -    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
 168      "include/ffi.h") CONFIG_FILES="$CONFIG_FILES include/ffi.h" ;;
 169 -    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 170 -    "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
 171 -    "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
 172 -    "libffi.pc") CONFIG_FILES="$CONFIG_FILES libffi.pc" ;;
 173 +    "include/ffi_common.h") CONFIG_LINKS="$CONFIG_LINKS include/ffi_common.h:include/ffi_common.h" ;;
 174 +    "fficonfig.py") CONFIG_FILES="$CONFIG_FILES fficonfig.py" ;;
 175
 176    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 177  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 178 Index: libffi/src/x86/ffi.c
 179 ===================================================================
 180 --- libffi/src/x86/ffi.c        (working copy)
 181 +++ libffi/src/x86/ffi.c        (revision 72475)
 182 @@ -388,10 +388,10 @@
 183      return FFI_BAD_ABI;
 184    }
 185
 186 -  // we currently don't support certain kinds of arguments for raw
 187 +  /* we currently don't support certain kinds of arguments for raw
 188    // closures.  This should be implemented by a separate assembly language
 189    // routine, since it would require argument processing, something we
 190 -  // don't do now for performance.
 191 +  // don't do now for performance. */
 192
 193    for (i = cif->nargs-1; i >= 0; i--)
 194      {
 195 Index: libffi/src/x86/ffi64.c
 196 ===================================================================
 197 --- libffi/src/x86/ffi64.c      (working copy)
 198 +++ libffi/src/x86/ffi64.c      (revision 72475)
 199 @@ -52,7 +52,7 @@
 200  /* Register class used for passing given 64bit part of the argument.
 201     These represent classes as documented by the PS ABI, with the exception
 202     of SSESF, SSEDF classes, that are basically SSE class, just gcc will
 203 -   use SF or DFmode move instead of DImode to avoid reformating penalties.
 204 +   use SF or DFmode move instead of DImode to avoid reformatting penalties.
 205
 206     Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves
 207     whenever possible (upper half does contain padding).  */