ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Many new patches

Browse Source
This commit is contained in:
Anthony Green
2011-08-22 14:50:10 -04:00
parent 3b7efa4e74
commit 049d8386ff
73 changed files with 26661 additions and 18252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/debug-build
View File

@@ -78,7 +78,7 @@ Index: libffi/Makefile.in
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
@@ -484,7 +489,7 @@ nodist_libffi_la_SOURCES = $(am__append_
@@ -486,7 +491,7 @@ nodist_libffi_la_SOURCES = $(am__append_
$(am__append_24) $(am__append_25)
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)

13
patches/interix-patch Normal file
View File

@@ -0,0 +1,13 @@
Index: libffi/src/closures.c
===================================================================
--- libffi.orig/src/closures.c
+++ libffi/src/closures.c
@@ -172,7 +172,7 @@ selinux_enabled_check (void)
#endif /* !FFI_MMAP_EXEC_SELINUX */
-#elif defined (__CYGWIN__)
+#elif defined (__CYGWIN__) || defined(__INTERIX)
#include <sys/mman.h>

20
patches/ios
View File

@@ -149,7 +149,7 @@ Index: libffi/Makefile.in
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
@@ -140,16 +141,17 @@ am_libffi_la_OBJECTS = src/debug.lo src/
@@ -142,16 +143,17 @@ am_libffi_la_OBJECTS = src/debug.lo src/
@POWERPC_FREEBSD_TRUE@ src/powerpc/sysv.lo \
@POWERPC_FREEBSD_TRUE@ src/powerpc/ppc_closure.lo
@ARM_TRUE@am__objects_16 = src/arm/sysv.lo src/arm/ffi.lo
@@ -176,7 +176,7 @@ Index: libffi/Makefile.in
nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
$(am__objects_3) $(am__objects_4) $(am__objects_5) \
$(am__objects_6) $(am__objects_7) $(am__objects_8) \
@@ -158,17 +160,17 @@ nodist_libffi_la_OBJECTS = $(am__objects
@@ -160,17 +162,17 @@ nodist_libffi_la_OBJECTS = $(am__objects
$(am__objects_15) $(am__objects_16) $(am__objects_17) \
$(am__objects_18) $(am__objects_19) $(am__objects_20) \
$(am__objects_21) $(am__objects_22) $(am__objects_23) \
@@ -198,7 +198,7 @@ Index: libffi/Makefile.in
$(am__objects_4) $(am__objects_5) $(am__objects_6) \
$(am__objects_7) $(am__objects_8) $(am__objects_9) \
$(am__objects_10) $(am__objects_11) $(am__objects_12) \
@@ -176,8 +178,8 @@ am__objects_27 = $(am__objects_1) $(am__
@@ -178,8 +180,8 @@ am__objects_27 = $(am__objects_1) $(am__
$(am__objects_16) $(am__objects_17) $(am__objects_18) \
$(am__objects_19) $(am__objects_20) $(am__objects_21) \
$(am__objects_22) $(am__objects_23) $(am__objects_24) \
@@ -209,7 +209,7 @@ Index: libffi/Makefile.in
libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \
$(nodist_libffi_convenience_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@
@@ -295,6 +297,7 @@ ECHO_N = @ECHO_N@
@@ -297,6 +299,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
@@ -217,7 +217,7 @@ Index: libffi/Makefile.in
FGREP = @FGREP@
GREP = @GREP@
HAVE_LONG_DOUBLE = @HAVE_LONG_DOUBLE@
@@ -384,6 +387,7 @@ psdir = @psdir@
@@ -386,6 +389,7 @@ psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -225,7 +225,7 @@ Index: libffi/Makefile.in
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
@@ -397,37 +401,34 @@ top_builddir = @top_builddir@
@@ -399,37 +403,34 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign subdir-objects
SUBDIRS = include testsuite man
@@ -291,7 +291,7 @@ Index: libffi/Makefile.in
info_TEXINFOS = doc/libffi.texi
@@ -486,10 +487,10 @@ nodist_libffi_la_SOURCES = $(am__append_
@@ -488,10 +489,10 @@ nodist_libffi_la_SOURCES = $(am__append_
$(am__append_15) $(am__append_16) $(am__append_17) \
$(am__append_18) $(am__append_19) $(am__append_20) \
$(am__append_21) $(am__append_22) $(am__append_23) \
@@ -304,7 +304,7 @@ Index: libffi/Makefile.in
libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
AM_CCASFLAGS = $(AM_CPPFLAGS)
@@ -725,6 +726,8 @@ src/arm/sysv.lo: src/arm/$(am__dirstamp)
@@ -727,6 +728,8 @@ src/arm/sysv.lo: src/arm/$(am__dirstamp)
src/arm/$(DEPDIR)/$(am__dirstamp)
src/arm/ffi.lo: src/arm/$(am__dirstamp) \
src/arm/$(DEPDIR)/$(am__dirstamp)
@@ -313,7 +313,7 @@ Index: libffi/Makefile.in
src/avr32/$(am__dirstamp):
@$(MKDIR_P) src/avr32
@: > src/avr32/$(am__dirstamp)
@@ -812,6 +815,8 @@ mostlyclean-compile:
@@ -814,6 +817,8 @@ mostlyclean-compile:
-rm -f src/arm/ffi.lo
-rm -f src/arm/sysv.$(OBJEXT)
-rm -f src/arm/sysv.lo
@@ -322,7 +322,7 @@ Index: libffi/Makefile.in
-rm -f src/avr32/ffi.$(OBJEXT)
-rm -f src/avr32/ffi.lo
-rm -f src/avr32/sysv.$(OBJEXT)
@@ -930,6 +935,7 @@ distclean-compile:
@@ -932,6 +937,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/alpha/$(DEPDIR)/osf.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/ffi.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/arm/$(DEPDIR)/sysv.Plo@am__quote@

1560
patches/more-openbsd Normal file
View File

File diff suppressed because it is too large Load Diff

43
patches/more-openbsd-mips Normal file
View File

@@ -0,0 +1,43 @@
Index: libffi/configure.ac
===================================================================
--- libffi.orig/configure.ac
+++ libffi/configure.ac
@@ -133,7 +133,7 @@ case "$host" in
mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
TARGET=MIPS; TARGETDIR=mips
;;
- mips*-*-linux*)
+ mips*-*-linux* | mips*-*-openbsd*)
# Support 128-bit long double for NewABI.
HAVE_LONG_DOUBLE='defined(__mips64)'
TARGET=MIPS; TARGETDIR=mips
Index: libffi/src/mips/ffi.c
===================================================================
--- libffi.orig/src/mips/ffi.c
+++ libffi/src/mips/ffi.c
@@ -38,7 +38,11 @@
#endif
#ifndef USE__BUILTIN___CLEAR_CACHE
-#include <sys/cachectl.h>
+# if defined(__OpenBSD__)
+# include <mips64/sysarch.h>
+# else
+# include <sys/cachectl.h>
+# endif
#endif
#ifdef FFI_DEBUG
Index: libffi/src/mips/ffitarget.h
===================================================================
--- libffi.orig/src/mips/ffitarget.h
+++ libffi/src/mips/ffitarget.h
@@ -36,7 +36,7 @@
#define _MIPS_SIM_ABI32 1
#define _MIPS_SIM_NABI32 2
#define _MIPS_SIM_ABI64 3
-#else
+#elif !defined(__OpenBSD__)
# include <sgidefs.h>
#endif

2
patches/msvcc
View File

@@ -17,7 +17,7 @@ Index: libffi/Makefile.in
===================================================================
--- libffi.orig/Makefile.in
+++ libffi/Makefile.in
@@ -426,7 +426,8 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
@@ -428,7 +428,8 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c \
src/moxie/eabi.S libtool-version ChangeLog.libffi \
m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \

5
patches/series
View File

@@ -25,3 +25,8 @@ msvcc
fix_maxopt
fix-ppc32
darwin-EH-fix
more-openbsd
more-openbsd-mips
minix
interix-patch

7
patches/sparc-abi-check
View File

@@ -18,15 +18,16 @@ Index: libffi/src/sparc/ffi.c
===================================================================
--- libffi.orig/src/sparc/ffi.c
+++ libffi/src/sparc/ffi.c
@@ -1,5 +1,6 @@
@@ -1,6 +1,6 @@
/* -----------------------------------------------------------------------
- ffi.c - Copyright (c) 1996, 2003, 2004, 2007, 2008 Red Hat, Inc.
- Copyright (c) 2011 Anthony Green
+ ffi.c - Copyright (c) 2011 Anthony Green
+ Copyright (c) 1996, 2003-2004, 2007-2008 Red Hat, Inc.
SPARC Foreign Function Interface
@@ -485,7 +486,8 @@ ffi_prep_closure_loc (ffi_closure* closu
@@ -489,7 +489,8 @@ ffi_prep_closure_loc (ffi_closure* closu
#ifdef SPARC64
/* Trampoline address is equal to the closure address. We take advantage
of that to reduce the trampoline size by 8 bytes. */
@@ -36,7 +37,7 @@ Index: libffi/src/sparc/ffi.c
fn = (unsigned long) ffi_closure_v9;
tramp[0] = 0x83414000; /* rd %pc, %g1 */
tramp[1] = 0xca586010; /* ldx [%g1+16], %g5 */
@@ -494,7 +496,8 @@ ffi_prep_closure_loc (ffi_closure* closu
@@ -498,7 +499,8 @@ ffi_prep_closure_loc (ffi_closure* closu
*((unsigned long *) &tramp[4]) = fn;
#else
unsigned long ctx = (unsigned long) codeloc;

45
patches/sparc-v8-aggregate-returns
View File

@@ -2,14 +2,15 @@ Index: libffi/ChangeLog
===================================================================
--- libffi.orig/ChangeLog
+++ libffi/ChangeLog
@@ -33,6 +33,11 @@
@@ -33,6 +33,12 @@
* configure: Regenerate.
+2011-02-08 Ginn Chen <ginn.chen@oracle.com>
+
+ * src/sparc/ffi.c (ffi_call): Make compatible with Solaris Studio
+ aggregate return ABI.
+ aggregate return ABI. Flush cache.
+ (ffi_prep_closure_loc): Flush cache.
+
2011-02-11 Anthony Green <green@moxielogic.com>
@@ -18,7 +19,14 @@ Index: libffi/src/sparc/ffi.c
===================================================================
--- libffi.orig/src/sparc/ffi.c
+++ libffi/src/sparc/ffi.c
@@ -406,8 +406,46 @@ void ffi_call(ffi_cif *cif, void (*fn)(v
@@ -1,5 +1,6 @@
/* -----------------------------------------------------------------------
ffi.c - Copyright (c) 1996, 2003, 2004, 2007, 2008 Red Hat, Inc.
+ Copyright (c) 2011 Anthony Green
SPARC Foreign Function Interface
@@ -406,8 +407,50 @@ void ffi_call(ffi_cif *cif, void (*fn)(v
/* We don't yet support calling 32bit code from 64bit */
FFI_ASSERT(0);
#else
@@ -49,6 +57,10 @@ Index: libffi/src/sparc/ffi.c
+ call_struct[5] = 0x01000000; /* nop */
+ call_struct[6] = 0x81c7e008; /* ret */
+ call_struct[7] = 0xbe100017; /* mov %l7, %i7 */
+ asm volatile ("iflush %0; iflush %0+8; iflush %0+16; iflush %0+24" : :
+ "r" (call_struct) : "memory");
+ /* SPARC v8 requires 5 instructions for flush to be visible */
+ asm volatile ("nop; nop; nop; nop; nop");
+ ffi_call_v8(ffi_prep_args_v8, &ecif, cif->bytes,
+ cif->flags, rvalue, call_struct);
+ ffi_closure_free(call_struct);
@@ -67,3 +79,30 @@ Index: libffi/src/sparc/ffi.c
#endif
break;
case FFI_V9:
@@ -425,7 +468,6 @@ void ffi_call(ffi_cif *cif, void (*fn)(v
FFI_ASSERT(0);
break;
}
-
}
@@ -468,13 +510,13 @@ ffi_prep_closure_loc (ffi_closure* closu
closure->fun = fun;
closure->user_data = user_data;
- /* Flush the Icache. FIXME: alignment isn't certain, assume 8 bytes */
+ /* Flush the Icache. closure is 8 bytes aligned. */
#ifdef SPARC64
- asm volatile ("flush %0" : : "r" (closure) : "memory");
- asm volatile ("flush %0" : : "r" (((char *) closure) + 8) : "memory");
+ asm volatile ("flush %0; flush %0+8" : : "r" (closure) : "memory");
#else
- asm volatile ("iflush %0" : : "r" (closure) : "memory");
- asm volatile ("iflush %0" : : "r" (((char *) closure) + 8) : "memory");
+ asm volatile ("iflush %0; iflush %0+8" : : "r" (closure) : "memory");
+ /* SPARC v8 requires 5 instructions for flush to be visible */
+ asm volatile ("nop; nop; nop; nop; nop");
#endif
return FFI_OK;

49
patches/stand-alone
View File

@@ -696,7 +696,7 @@ Index: libffi/configure
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libffi 3.0.9.
+# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc9.
+# Generated by GNU Autoconf 2.68 for libffi 3.0.10rc10.
#
-# Report bugs to <http://gcc.gnu.org/bugs.html>.
+# Report bugs to <http://sourceware.org/libffi.html>.
@@ -719,8 +719,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.10rc9'
+PACKAGE_STRING='libffi 3.0.10rc9'
+PACKAGE_VERSION='3.0.10rc10'
+PACKAGE_STRING='libffi 3.0.10rc10'
+PACKAGE_BUGREPORT='http://sourceware.org/libffi.html'
PACKAGE_URL=''
@@ -755,7 +755,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.10rc9 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.10rc10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -764,7 +764,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.10rc9:";;
+ short | recursive ) echo "Configuration of libffi 3.0.10rc10:";;
esac
cat <<\_ACEOF
@@ -790,7 +790,7 @@ Index: libffi/configure
if $ac_init_version; then
cat <<\_ACEOF
-libffi configure 3.0.9
+libffi configure 3.0.10rc9
+libffi configure 3.0.10rc10
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -812,7 +812,7 @@ Index: libffi/configure
running configure, to aid debugging if configure makes a mistake.
-It was created by libffi $as_me 3.0.9, which was
+It was created by libffi $as_me 3.0.10rc9, which was
+It was created by libffi $as_me 3.0.10rc10, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -866,7 +866,7 @@ Index: libffi/configure
# Define the identity of the package.
PACKAGE='libffi'
- VERSION='3.0.9'
+ VERSION='3.0.10rc9'
+ VERSION='3.0.10rc10'
cat >>confdefs.h <<_ACEOF
@@ -878,6 +878,33 @@ Index: libffi/configure
# By default we simply use the C compiler to build assembly code.
test "${CCAS+set}" = set || CCAS=$CC
@@ -8326,6 +8288,10 @@ _lt_linker_boilerplate=`cat conftest.err
$RM -r conftest*
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
@@ -10876,14 +10842,10 @@ fi
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -11865,6 +11827,7 @@ CC="$lt_save_CC"
@@ -976,7 +1003,7 @@ Index: libffi/configure
# values after options handling.
ac_log="
-This file was extended by libffi $as_me 3.0.9, which was
+This file was extended by libffi $as_me 3.0.10rc9, which was
+This file was extended by libffi $as_me 3.0.10rc10, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -992,7 +1019,7 @@ Index: libffi/configure
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libffi config.status 3.0.9
+libffi config.status 3.0.10rc9
+libffi config.status 3.0.10rc10
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -1056,7 +1083,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.10rc9], [http://sourceware.org/libffi.html])
+AC_INIT([libffi], [3.0.10rc10], [http://sourceware.org/libffi.html])
AC_CONFIG_HEADERS([fficonfig.h])
-AM_ENABLE_MULTILIB(, ..)

2
patches/ungccify
View File

@@ -31,7 +31,7 @@ Index: libffi/Makefile.in
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
@@ -490,7 +488,7 @@ nodist_libffi_la_SOURCES = $(am__append_
@@ -492,7 +490,7 @@ nodist_libffi_la_SOURCES = $(am__append_
$(am__append_24) $(am__append_25) $(am__append_26)
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)

6
patches/win64-underscore
View File

@@ -94,9 +94,9 @@ Index: libffi/aclocal.m4
===================================================================
--- libffi.orig/aclocal.m4
+++ libffi/aclocal.m4
@@ -8450,6 +8450,817 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_L
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
@@ -19,6 +19,817 @@ You have another version of autoconf. I
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
+# ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
+#