ffi 1.0.0 → 1.17.1

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex.inc

@@ -0,0 +1,37 @@
+/* -*-c-*- */
+#include "ffitest.h"
+#include <complex.h>
+
+static _Complex T_C_TYPE return_c(_Complex T_C_TYPE c)
+{
+  printf ("%f,%fi\n", T_CONV creal (c), T_CONV cimag (c));
+  return 2 * c;
+}
+int main (void)
+{
+  ffi_cif cif;
+  ffi_type *args[MAX_ARGS];
+  void *values[MAX_ARGS];
+  _Complex T_C_TYPE c, rc, rc2;
+  T_C_TYPE cr, ci;
+
+  args[0] = &T_FFI_TYPE;
+  values[0] = &c;
+
+  /* Initialize the cif */
+  CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1,
+		     &T_FFI_TYPE, args) == FFI_OK);
+
+  for (cr = -127.0; cr <  127; cr++)
+    {
+      ci = 1000.0 - cr;
+      c = cr + ci * I;
+      ffi_call(&cif, FFI_FN(return_c), &rc, values);
+      rc2 = return_c(c);
+      printf ("%f,%fi vs %f,%fi\n",
+	      T_CONV creal (rc), T_CONV cimag (rc),
+	      T_CONV creal (rc2), T_CONV cimag (rc2));
+      CHECK(rc == 2 * c);
+    }
+  exit(0);
+}

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1.inc

@@ -0,0 +1,41 @@
+/* -*-c-*- */
+#include "ffitest.h"
+#include <complex.h>
+
+static _Complex T_C_TYPE return_c(_Complex T_C_TYPE c1, float fl2, unsigned int in3, _Complex T_C_TYPE c4)
+{
+  return c1 + fl2 + in3 + c4;
+}
+int main (void)
+{
+  ffi_cif cif;
+  ffi_type *args[MAX_ARGS];
+  void *values[MAX_ARGS];
+  _Complex T_C_TYPE c1, c4, rc, rc2;
+  float fl2;
+  unsigned int in3;
+  args[0] = &T_FFI_TYPE;
+  args[1] = &ffi_type_float;
+  args[2] = &ffi_type_uint;
+  args[3] = &T_FFI_TYPE;
+  values[0] = &c1;
+  values[1] = &fl2;
+  values[2] = &in3;
+  values[3] = &c4;
+
+  /* Initialize the cif */
+  CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 4,
+		     &T_FFI_TYPE, args) == FFI_OK);
+  c1 = 127.0 + 255.0 * I;
+  fl2 = 128.0;
+  in3 = 255;
+  c4 = 512.7 + 1024.1 * I;
+
+  ffi_call(&cif, FFI_FN(return_c), &rc, values);
+  rc2 = return_c(c1, fl2, in3, c4);
+  printf ("%f,%fi vs %f,%fi\n",
+	  T_CONV creal (rc), T_CONV cimag (rc),
+	  T_CONV creal (rc2), T_CONV cimag (rc2));
+  CHECK(rc == rc2);
+  exit(0);
+}

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1_double.c

@@ -0,0 +1,10 @@
+/* Area:	ffi_call
+   Purpose:	Check return value complex.
+   Limitations:	none.
+   PR:		none.
+   Originator:	<vogt@linux.vnet.ibm.com>.  */
+
+/* { dg-do run } */
+
+#include "complex_defs_double.inc"
+#include "return_complex1.inc"

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1_float.c

@@ -0,0 +1,10 @@
+/* Area:	ffi_call
+   Purpose:	Check return value complex.
+   Limitations:	none.
+   PR:		none.
+   Originator:	<vogt@linux.vnet.ibm.com>.  */
+
+/* { dg-do run } */
+
+#include "complex_defs_float.inc"
+#include "return_complex1.inc"

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1_longdouble.c

@@ -0,0 +1,10 @@
+/* Area:	ffi_call
+   Purpose:	Check return value complex.
+   Limitations:	none.
+   PR:		none.
+   Originator:	<vogt@linux.vnet.ibm.com>.  */
+
+/* { dg-do run } */
+
+#include "complex_defs_longdouble.inc"
+#include "return_complex1.inc"

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2.inc

@@ -0,0 +1,44 @@
+/* -*-c-*- */
+#include "ffitest.h"
+#include <complex.h>
+
+_Complex T_C_TYPE
+return_c(_Complex T_C_TYPE c1, _Complex T_C_TYPE c2,
+	 unsigned int in3, _Complex T_C_TYPE c4)
+{
+  volatile _Complex T_C_TYPE r = c1 + c2 + in3 + c4;
+  return r;
+}
+
+int main (void)
+{
+  ffi_cif cif;
+  ffi_type *args[MAX_ARGS];
+  void *values[MAX_ARGS];
+  _Complex T_C_TYPE c1, c2, c4, rc, rc2;
+  unsigned int in3;
+  args[0] = &T_FFI_TYPE;
+  args[1] = &T_FFI_TYPE;
+  args[2] = &ffi_type_uint;
+  args[3] = &T_FFI_TYPE;
+  values[0] = &c1;
+  values[1] = &c2;
+  values[2] = &in3;
+  values[3] = &c4;
+
+  /* Initialize the cif */
+  CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 4,
+		     &T_FFI_TYPE, args) == FFI_OK);
+  c1 = 127.0 + 255.0 * I;
+  c2 = 128.0 + 256.0;
+  in3 = 255;
+  c4 = 512.7 + 1024.1 * I;
+
+  ffi_call(&cif, FFI_FN(return_c), &rc, values);
+  rc2 = return_c(c1, c2, in3, c4);
+  printf ("%f,%fi vs %f,%fi\n",
+	  T_CONV creal (rc), T_CONV cimag (rc),
+	  T_CONV creal (rc2), T_CONV cimag (rc2));
+  CHECK(rc == rc2);
+  exit(0);
+}

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2_double.c

@@ -0,0 +1,10 @@
+/* Area:	ffi_call
+   Purpose:	Check return value complex.
+   Limitations:	none.
+   PR:		none.
+   Originator:	<vogt@linux.vnet.ibm.com>.  */
+
+/* { dg-do run } */
+
+#include "complex_defs_double.inc"
+#include "return_complex2.inc"

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2_float.c

@@ -0,0 +1,10 @@
+/* Area:	ffi_call
+   Purpose:	Check return value complex.
+   Limitations:	none.
+   PR:		none.
+   Originator:	<vogt@linux.vnet.ibm.com>.  */
+
+/* { dg-do run } */
+
+#include "complex_defs_float.inc"
+#include "return_complex2.inc"

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2_longdouble.c

@@ -0,0 +1,10 @@
+/* Area:	ffi_call
+   Purpose:	Check return value complex.
+   Limitations:	none.
+   PR:		none.
+   Originator:	<vogt@linux.vnet.ibm.com>.  */
+
+/* { dg-do run } */
+
+#include "complex_defs_longdouble.inc"
+#include "return_complex2.inc"

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex_double.c

@@ -0,0 +1,10 @@
+/* Area:	ffi_call
+   Purpose:	Check return value complex.
+   Limitations:	none.
+   PR:		none.
+   Originator:	<vogt@linux.vnet.ibm.com>.  */
+
+/* { dg-do run } */
+
+#include "complex_defs_double.inc"
+#include "return_complex.inc"

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex_float.c

@@ -0,0 +1,10 @@
+/* Area:	ffi_call
+   Purpose:	Check return value complex.
+   Limitations:	none.
+   PR:		none.
+   Originator:	<vogt@linux.vnet.ibm.com>.  */
+
+/* { dg-do run } */
+
+#include "complex_defs_float.inc"
+#include "return_complex.inc"

data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex_longdouble.c

@@ -0,0 +1,10 @@
+/* Area:	ffi_call
+   Purpose:	Check return value complex.
+   Limitations:	none.
+   PR:		none.
+   Originator:	<vogt@linux.vnet.ibm.com>.  */
+
+/* { dg-do run } */
+
+#include "complex_defs_longdouble.inc"
+#include "return_complex.inc"

data/ext/ffi_c/libffi/testsuite/libffi.go/aa-direct.c

@@ -0,0 +1,34 @@
+/* { dg-do run } */
+
+#include "static-chain.h"
+
+#if defined(__GNUC__) && !defined(__clang__) && defined(STATIC_CHAIN_REG)
+
+#include "ffitest.h"
+
+/* Blatent assumption here that the prologue doesn't clobber the
+   static chain for trivial functions.  If this is not true, don't
+   define STATIC_CHAIN_REG, and we'll test what we can via other tests.  */
+void *doit(void)
+{
+  register void *chain __asm__(STATIC_CHAIN_REG);
+  return chain;
+}
+
+int main()
+{
+  ffi_cif cif;
+  void *result;
+
+  CHECK(ffi_prep_cif(&cif, ABI_NUM, 0, &ffi_type_pointer, NULL) == FFI_OK);
+
+  ffi_call_go(&cif, FFI_FN(doit), &result, NULL, &result);
+
+  CHECK(result == &result);
+
+  return 0;
+}
+
+#else /* UNSUPPORTED */
+int main() { return 0; }
+#endif

data/ext/ffi_c/libffi/testsuite/libffi.go/closure1.c

@@ -0,0 +1,28 @@
+/* { dg-do run } */
+
+#include "ffitest.h"
+
+void doit(ffi_cif *cif, void *rvalue, void **avalue, void *closure)
+{
+  (void)cif;
+  (void)avalue;
+  *(void **)rvalue = closure;
+}
+
+typedef void * (*FN)(void);
+
+int main()
+{
+  ffi_cif cif;
+  ffi_go_closure cl;
+  void *result;
+
+  CHECK(ffi_prep_cif(&cif, ABI_NUM, 0, &ffi_type_pointer, NULL) == FFI_OK);
+  CHECK(ffi_prep_go_closure(&cl, &cif, doit) == FFI_OK);
+
+  ffi_call_go(&cif, FFI_FN(*(FN *)&cl), &result, NULL, &cl);
+
+  CHECK(result == &cl);
+
+  exit(0);
+}

data/ext/ffi_c/libffi/testsuite/libffi.go/ffitest.h

@@ -0,0 +1 @@
+#include "../libffi.call/ffitest.h"

data/ext/ffi_c/libffi/testsuite/libffi.go/go.exp

@@ -0,0 +1,36 @@
+# Copyright (C) 2003, 2006, 2009, 2010, 2014 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+dg-init
+libffi-init
+
+global srcdir subdir
+
+set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.{c,cc}]]
+
+if { [libffi_feature_test "#ifdef FFI_GO_CLOSURES"] } {
+    run-many-tests $tlist ""
+} else {
+    foreach test $tlist {
+	unsupported "$test"
+    }
+}
+
+dg-finish
+
+# Local Variables:
+# tcl-indent-level:4
+# End:

data/ext/ffi_c/libffi/testsuite/libffi.go/static-chain.h

@@ -0,0 +1,19 @@
+#ifdef __aarch64__
+# define STATIC_CHAIN_REG  "x18"
+#elif defined(__alpha__)
+# define STATIC_CHAIN_REG  "$1"
+#elif defined(__arm__)
+# define STATIC_CHAIN_REG  "ip"
+#elif defined(__sparc__)
+# if defined(__arch64__) || defined(__sparcv9)
+#  define STATIC_CHAIN_REG "g5"
+# else
+#  define STATIC_CHAIN_REG "g2"
+# endif
+#elif defined(__x86_64__)
+# define STATIC_CHAIN_REG  "r10"
+#elif defined(__i386__)
+# ifndef ABI_NUM
+#  define STATIC_CHAIN_REG  "ecx"	/* FFI_DEFAULT_ABI only */
+# endif
+#endif

data/ext/ffi_c/libffi.bsd.mk

@@ -3,11 +3,11 @@
 # Makefile for BSD systems
 #
 
-INCFLAGS += -I${LIBFFI_BUILD_DIR}/include
 LOCAL_LIBS += ${LIBFFI} -lpthread
 
 LIBFFI_CFLAGS = ${FFI_MMAP_EXEC} -pthread
-LIBFFI_BUILD_DIR = ${.CURDIR}/libffi
+LIBFFI_BUILD_DIR = ${.CURDIR}/libffi-${arch}
+INCFLAGS := -I${LIBFFI_BUILD_DIR}/include -I${INCFLAGS}
 
 .if ${srcdir} == "."
   LIBFFI_SRC_DIR := ${.CURDIR}/libffi
@@ -17,17 +17,23 @@ LIBFFI_BUILD_DIR = ${.CURDIR}/libffi
 
 
 LIBFFI = ${LIBFFI_BUILD_DIR}/.libs/libffi_convenience.a
-LIBFFI_CONFIGURE = ${LIBFFI_SRC_DIR}/configure --disable-static \
-	--with-pic=yes --disable-dependency-tracking
+LIBFFI_AUTOGEN = ${LIBFFI_SRC_DIR}/autogen.sh
+LIBFFI_CONFIGURE = ${LIBFFI_SRC_DIR}/configure --disable-shared --enable-static \
+	--with-pic=yes --disable-dependency-tracking --disable-docs $(LIBFFI_DEBUG)
 
 $(OBJS):	${LIBFFI}
 
-$(LIBFFI):		
+$(LIBFFI):
 	@mkdir -p ${LIBFFI_BUILD_DIR}
+	@if [ ! -f $(LIBFFI_SRC_DIR)/configure ]; then \
+		echo "Running autoreconf for libffi"; \
+		cd "$(LIBFFI_SRC_DIR)" && \
+		/bin/sh $(LIBFFI_AUTOGEN) > /dev/null; \
+	fi
 	@if [ ! -f ${LIBFFI_BUILD_DIR}/Makefile ]; then \
-	    echo "Configuring libffi"; \
-	    cd ${LIBFFI_BUILD_DIR} && \
-		/usr/bin/env CC="${CC}" LD="${LD}" CFLAGS="${LIBFFI_CFLAGS}" \
+		echo "Configuring libffi"; \
+		cd ${LIBFFI_BUILD_DIR} && \
+		/usr/bin/env CC="${CC}" LD="${LD}" CFLAGS="${LIBFFI_CFLAGS}" GREP_OPTIONS="" \
 		/bin/sh ${LIBFFI_CONFIGURE} ${LIBFFI_HOST} > /dev/null; \
 	fi
 	@cd ${LIBFFI_BUILD_DIR} && ${MAKE}

data/ext/ffi_c/libffi.darwin.mk

@@ -5,54 +5,84 @@ include ${srcdir}/libffi.gnu.mk
 CCACHE := $(shell type -p ccache)
 BUILD_DIR := $(shell pwd)
 
-INCFLAGS += -I${BUILD_DIR}
+INCFLAGS += -I"$(BUILD_DIR)"
 
 # Work out which arches we need to compile the lib for
-ARCHES := 
-ifneq ($(findstring -arch ppc,$(CFLAGS)),)
+ARCHES :=
+ARCHFLAGS ?= $(filter -arch %, $(CFLAGS))
+
+ifneq ($(findstring -arch ppc,$(ARCHFLAGS)),)
   ARCHES += ppc
 endif
 
-ifneq ($(findstring -arch i386,$(CFLAGS)),)
+ifneq ($(findstring -arch i386,$(ARCHFLAGS)),)
   ARCHES += i386
 endif
 
-ifneq ($(findstring -arch x86_64,$(CFLAGS)),)
+ifneq ($(findstring -arch x86_64,$(ARCHFLAGS)),)
   ARCHES += x86_64
 endif
 
 ifeq ($(strip $(ARCHES)),)
+LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi-$(arch)
 # Just build the one (default) architecture
-$(LIBFFI):		
-	@mkdir -p $(LIBFFI_BUILD_DIR)
-	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
-	    echo "Configuring libffi"; \
-	    cd $(LIBFFI_BUILD_DIR) && \
-		/usr/bin/env CC="$(CC)" LD="$(LD)" CFLAGS="$(LIBFFI_CFLAGS)" \
-		/bin/sh $(LIBFFI_CONFIGURE) $(LIBFFI_HOST) > /dev/null; \
+$(LIBFFI):
+	@mkdir -p "$(LIBFFI_BUILD_DIR)" "$(@D)"
+	@if [ ! -f "$(LIBFFI_SRC_DIR)"/configure ]; then \
+		echo "Running autoreconf for libffi"; \
+		cd "$(LIBFFI_SRC_DIR)" && \
+		/bin/sh $(LIBFFI_AUTOGEN) > /dev/null; \
 	fi
-	cd $(LIBFFI_BUILD_DIR) && $(MAKE)
+	@if [ ! -f "$(LIBFFI_BUILD_DIR)"/Makefile ]; then \
+		echo "Configuring libffi"; \
+		cd "$(LIBFFI_BUILD_DIR)" && \
+		/usr/bin/env CC="$(CC)" LD="$(LD)" CFLAGS="$(LIBFFI_CFLAGS)" GREP_OPTIONS="" \
+		/bin/sh $(LIBFFI_CONFIGURE) $(LIBFFI_HOST) --disable-shared --enable-static > /dev/null; \
+	fi
+	cd "$(LIBFFI_BUILD_DIR)" && $(MAKE)
 
 else
+LIBTARGETS = $(foreach arch,$(ARCHES),"$(BUILD_DIR)"/libffi-$(arch)/.libs/libffi_convenience.a)
+
 # Build a fat binary and assemble
 build_ffi = \
-	mkdir -p $(BUILD_DIR)/libffi-$(1); \
-	(if [ ! -f $(BUILD_DIR)/libffi-$(1)/Makefile ]; then \
+	mkdir -p "$(BUILD_DIR)"/libffi-$(1); \
+	(if [ ! -f "$(LIBFFI_SRC_DIR)"/configure ]; then \
+		echo "Running autoreconf for libffi"; \
+		cd "$(LIBFFI_SRC_DIR)" && \
+		/bin/sh $(LIBFFI_AUTOGEN) > /dev/null; \
+	fi); \
+	(if [ ! -f "$(BUILD_DIR)"/libffi-$(1)/Makefile ]; then \
 	    echo "Configuring libffi for $(1)"; \
-	    cd $(BUILD_DIR)/libffi-$(1) && \
+	    cd "$(BUILD_DIR)"/libffi-$(1) && \
 	      env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(LIBFFI_CFLAGS)" LDFLAGS="-arch $(1)" \
-		$(LIBFFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \
+		$(LIBFFI_CONFIGURE) --host=$(1)-apple-darwin --disable-shared --enable-static > /dev/null; \
 	fi); \
-	env MACOSX_DEPLOYMENT_TARGET=10.4 $(MAKE) -C $(BUILD_DIR)/libffi-$(1)
+	$(MAKE) -C "$(BUILD_DIR)"/libffi-$(1)
 
-$(LIBFFI):
-	@for arch in $(ARCHES); do $(call build_ffi,$$arch);done	
+target_ffi = "$(BUILD_DIR)"/libffi-$(1)/.libs/libffi_convenience.a:; $(call build_ffi,$(1))
+
+# Work out which arches we need to compile the lib for
+ifneq ($(findstring ppc,$(ARCHES)),)
+  $(call target_ffi,ppc)
+endif
+
+ifneq ($(findstring i386,$(ARCHES)),)
+  $(call target_ffi,i386)
+endif
+
+ifneq ($(findstring x86_64,$(ARCHES)),)
+  $(call target_ffi,x86_64)
+endif
+
+
+$(LIBFFI):	$(LIBTARGETS)
 	# Assemble into a FAT (x86_64, i386, ppc) library
-	@mkdir -p $(BUILD_DIR)/libffi/.libs
+	@mkdir -p "$(@D)"
 	/usr/bin/libtool -static -o $@ \
-	    $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-$(arch)/.libs/libffi_convenience.a)
-	@mkdir -p $(LIBFFI_BUILD_DIR)/include
-	$(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h
+	    $(foreach arch, $(ARCHES),"$(BUILD_DIR)"/libffi-$(arch)/.libs/libffi_convenience.a)
+	@mkdir -p "$(LIBFFI_BUILD_DIR)"/include
+	$(RM) "$(LIBFFI_BUILD_DIR)"/include/ffi.h
 	@( \
 		printf "#if defined(__i386__)\n"; \
 		printf "#include \"libffi-i386/include/ffi.h\"\n"; \
@@ -61,7 +91,7 @@ $(LIBFFI):
 		printf "#elif defined(__ppc__)\n"; \
 		printf "#include \"libffi-ppc/include/ffi.h\"\n";\
 		printf "#endif\n";\
-	) > $(LIBFFI_BUILD_DIR)/include/ffi.h
+	) > "$(LIBFFI_BUILD_DIR)"/include/ffi.h
 	@( \
 		printf "#if defined(__i386__)\n"; \
 		printf "#include \"libffi-i386/include/ffitarget.h\"\n"; \
@@ -70,6 +100,6 @@ $(LIBFFI):
 		printf "#elif defined(__ppc__)\n"; \
 		printf "#include \"libffi-ppc/include/ffitarget.h\"\n";\
 		printf "#endif\n";\
-	) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h
+	) > "$(LIBFFI_BUILD_DIR)"/include/ffitarget.h
 
 endif

data/ext/ffi_c/libffi.gnu.mk

@@ -5,21 +5,24 @@
 
 
 # Tack the extra deps onto the autogenerated variables
-INCFLAGS += -I$(LIBFFI_BUILD_DIR)/include
 LOCAL_LIBS += $(LIBFFI)
 BUILD_DIR = $(shell pwd)
 LIBFFI_CFLAGS = $(FFI_MMAP_EXEC)
-LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi
+LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi-$(arch)
+INCFLAGS := -I"$(LIBFFI_BUILD_DIR)"/include $(INCFLAGS)
 
 ifeq ($(srcdir),.)
   LIBFFI_SRC_DIR := $(shell pwd)/libffi
+else ifeq ($(srcdir),..)
+  LIBFFI_SRC_DIR := $(shell pwd)/../libffi
 else
-  LIBFFI_SRC_DIR := $(abspath $(srcdir)/libffi)
+  LIBFFI_SRC_DIR := $(realpath $(srcdir)/libffi)
 endif
 
-LIBFFI = $(LIBFFI_BUILD_DIR)/.libs/libffi_convenience.a
-LIBFFI_CONFIGURE = $(LIBFFI_SRC_DIR)/configure --disable-static \
-	--with-pic=yes --disable-dependency-tracking
+LIBFFI = "$(LIBFFI_BUILD_DIR)"/.libs/libffi_convenience.a
+LIBFFI_AUTOGEN = ${LIBFFI_SRC_DIR}/autogen.sh
+LIBFFI_CONFIGURE = "$(LIBFFI_SRC_DIR)"/configure --disable-shared --enable-static \
+	--with-pic=yes --disable-dependency-tracking --disable-docs $(LIBFFI_DEBUG)
 
 $(OBJS):	$(LIBFFI)
 

data/ext/ffi_c/libffi.mk

@@ -2,12 +2,17 @@
 
 include ${srcdir}/libffi.gnu.mk
 
-$(LIBFFI):		
-	@mkdir -p $(LIBFFI_BUILD_DIR)
-	@if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \
-	    echo "Configuring libffi"; \
-	    cd $(LIBFFI_BUILD_DIR) && \
-		/usr/bin/env CFLAGS="$(LIBFFI_CFLAGS)" \
-		/bin/sh $(LIBFFI_CONFIGURE) $(LIBFFI_HOST) > /dev/null; \
+$(LIBFFI):
+	@mkdir -p "$(LIBFFI_BUILD_DIR)" "$@(D)"
+	@if [ ! -f "$(LIBFFI_SRC_DIR)"/configure ]; then \
+		echo "Running autoreconf for libffi"; \
+		cd "$(LIBFFI_SRC_DIR)" && \
+		/bin/sh $(LIBFFI_AUTOGEN) > /dev/null; \
 	fi
-	cd $(LIBFFI_BUILD_DIR) && $(MAKE)
+	@if [ ! -f "$(LIBFFI_BUILD_DIR)"/Makefile ]; then \
+		echo "Configuring libffi"; \
+		cd "$(LIBFFI_BUILD_DIR)" && \
+		env CFLAGS="$(LIBFFI_CFLAGS)" GREP_OPTIONS="" \
+		sh $(LIBFFI_CONFIGURE) $(LIBFFI_HOST) > /dev/null; \
+	fi
+	$(MAKE) -C "$(LIBFFI_BUILD_DIR)"

data/ext/ffi_c/libffi.vc.mk

@@ -0,0 +1,26 @@
+# -*- makefile -*-
+#
+# Makefile for msvc
+#
+
+# Tack the extra deps onto the autogenerated variables
+INCFLAGS = -I$(LIBFFI_BUILD_DIR)/include -I$(LIBFFI_BUILD_DIR)/src/x86 $(INCFLAGS)
+LOCAL_LIBS = $(LOCAL_LIBS) $(LIBFFI)
+BUILD_DIR = $(MAKEDIR)
+LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi
+
+!IF "$(srcdir)" == "."
+LIBFFI_SRC_DIR = $(MAKEDIR)/libffi
+!ELSE
+LIBFFI_SRC_DIR = $(srcdir)/libffi
+!ENDIF
+
+LIBFFI = $(LIBFFI_BUILD_DIR)/.libs/libffi_convenience.lib
+
+$(OBJS):	$(LIBFFI)
+
+$(LIBFFI):		
+	@$(MAKEDIRS) $(LIBFFI_BUILD_DIR)
+	@cd $(LIBFFI_BUILD_DIR) && $(MAKE) -f Makefile.vc
+	
+

data/ext/ffi_c/libffi.vc64.mk

@@ -0,0 +1,26 @@
+# -*- makefile -*-
+#
+# Makefile for msvc
+#
+
+# Tack the extra deps onto the autogenerated variables
+INCFLAGS = -I$(LIBFFI_BUILD_DIR)/include -I$(LIBFFI_BUILD_DIR)/src/x86 $(INCFLAGS)
+LOCAL_LIBS = $(LOCAL_LIBS) $(LIBFFI)
+BUILD_DIR = $(MAKEDIR)
+LIBFFI_BUILD_DIR = $(BUILD_DIR)/libffi
+
+!IF "$(srcdir)" == "."
+LIBFFI_SRC_DIR = $(MAKEDIR)/libffi
+!ELSE
+LIBFFI_SRC_DIR = $(srcdir)/libffi
+!ENDIF
+
+LIBFFI = $(LIBFFI_BUILD_DIR)/.libs/libffi_convenience.lib
+
+$(OBJS):	$(LIBFFI)
+
+$(LIBFFI):		
+	@$(MAKEDIRS) $(LIBFFI_BUILD_DIR)
+	@cd $(LIBFFI_BUILD_DIR) && $(MAKE) -f Makefile.vc64
+	
+