mirror of
https://github.com/partic2/libffi
synced 2026-11-11 02:27:19 +00:00
Refresh from GCC
This commit is contained in:
+24
-13
@@ -2,7 +2,10 @@ Index: libffi/ChangeLog
|
||||
===================================================================
|
||||
--- libffi.orig/ChangeLog
|
||||
+++ libffi/ChangeLog
|
||||
@@ -1,3 +1,26 @@
|
||||
@@ -33,6 +33,29 @@
|
||||
|
||||
* configure: Regenerate.
|
||||
|
||||
+2011-02-09 Anthony Green <green@moxielogic.com>
|
||||
+
|
||||
+ * README: Mention ARM iOS.
|
||||
@@ -146,7 +149,7 @@ Index: libffi/Makefile.in
|
||||
subdir = .
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
|
||||
@@ -142,16 +143,17 @@ am_libffi_la_OBJECTS = src/debug.lo src/
|
||||
@@ -140,16 +141,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
|
||||
@@ -173,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) \
|
||||
@@ -160,17 +162,17 @@ nodist_libffi_la_OBJECTS = $(am__objects
|
||||
@@ -158,17 +160,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) \
|
||||
@@ -195,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) \
|
||||
@@ -178,8 +180,8 @@ am__objects_27 = $(am__objects_1) $(am__
|
||||
@@ -176,8 +178,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) \
|
||||
@@ -206,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@
|
||||
@@ -297,6 +299,7 @@ ECHO_N = @ECHO_N@
|
||||
@@ -295,6 +297,7 @@ ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
@@ -214,7 +217,15 @@ Index: libffi/Makefile.in
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAVE_LONG_DOUBLE = @HAVE_LONG_DOUBLE@
|
||||
@@ -399,37 +402,34 @@ top_builddir = @top_builddir@
|
||||
@@ -384,6 +387,7 @@ psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
+sys_symbol_underscore = @sys_symbol_underscore@
|
||||
sysconfdir = @sysconfdir@
|
||||
target = @target@
|
||||
target_alias = @target_alias@
|
||||
@@ -397,37 +401,34 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AUTOMAKE_OPTIONS = foreign subdir-objects
|
||||
SUBDIRS = include testsuite man
|
||||
@@ -280,7 +291,7 @@ Index: libffi/Makefile.in
|
||||
|
||||
info_TEXINFOS = doc/libffi.texi
|
||||
|
||||
@@ -488,10 +488,10 @@ nodist_libffi_la_SOURCES = $(am__append_
|
||||
@@ -486,10 +487,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) \
|
||||
@@ -293,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)
|
||||
@@ -727,6 +727,8 @@ src/arm/sysv.lo: src/arm/$(am__dirstamp)
|
||||
@@ -725,6 +726,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)
|
||||
@@ -302,7 +313,7 @@ Index: libffi/Makefile.in
|
||||
src/avr32/$(am__dirstamp):
|
||||
@$(MKDIR_P) src/avr32
|
||||
@: > src/avr32/$(am__dirstamp)
|
||||
@@ -814,6 +816,8 @@ mostlyclean-compile:
|
||||
@@ -812,6 +815,8 @@ mostlyclean-compile:
|
||||
-rm -f src/arm/ffi.lo
|
||||
-rm -f src/arm/sysv.$(OBJEXT)
|
||||
-rm -f src/arm/sysv.lo
|
||||
@@ -311,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)
|
||||
@@ -932,6 +936,7 @@ distclean-compile:
|
||||
@@ -930,6 +935,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@
|
||||
@@ -594,15 +605,15 @@ Index: libffi/src/arm/ffi.c
|
||||
#define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX) \
|
||||
({ unsigned char *__tramp = (unsigned char*)(TRAMP); \
|
||||
unsigned int __fun = (unsigned int)(FUN); \
|
||||
@@ -349,6 +564,7 @@ ffi_prep_incoming_args_SYSV(char *stack,
|
||||
__clear_cache((&__tramp[0]), (&__tramp[19])); \
|
||||
@@ -353,6 +568,7 @@ ffi_prep_incoming_args_SYSV(char *stack,
|
||||
mapping. */ \
|
||||
})
|
||||
|
||||
+#endif
|
||||
|
||||
/* the cif must already be prep'ed */
|
||||
|
||||
@@ -368,10 +584,16 @@ ffi_prep_closure_loc (ffi_closure* closu
|
||||
@@ -372,10 +588,16 @@ ffi_prep_closure_loc (ffi_closure* closu
|
||||
else
|
||||
FFI_ASSERT (0);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user