 @@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.27 2015/03/07 16:37:51 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2016/01/25 17:56:38 jperkin Exp $
 DISTNAME=	libffi-3.2.1
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://sourceware.org/pub/libffi/
 MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	https://www.sourceware.org/libffi/
 COMMENT=	Foreign function interface
 LICENSE=	mit
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--includedir=${PREFIX}/include

 @@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.41 2015/11/03 03:27:40 agc Exp $
+$NetBSD: distinfo,v 1.42 2016/01/25 17:56:38 jperkin Exp $
 SHA1 (libffi-3.2.1.tar.gz) = 280c265b789e041c02e5c97815793dfc283fb1e6
 RMD160 (libffi-3.2.1.tar.gz) = 9b546a3d002380bec3f00d86fc47d730abf51dfd
 SHA512 (libffi-3.2.1.tar.gz) = 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 Size (libffi-3.2.1.tar.gz) = 940837 bytes
-SHA1 (patch-aa) = 7748465dc903b53568999fc8e0caf4ea3fbc5778
+SHA1 (patch-aa) = 5218c8d895f97c812b7ca8d07c55b82ebcdc87d4
-SHA1 (patch-ac) = f3c6324f4334d23e684b4eca25173a13be5d37eb
+SHA1 (patch-ac) = 63fba2e9486b73485a4f633927f5041110c43239
-SHA1 (patch-ad) = 8bb3ec9ea69a8c06b0b1963b3f24018c6384c249
+SHA1 (patch-ad) = db57395ff721d7b56edec8a3a64b4b529258341c
-SHA1 (patch-ae) = 3d8cd3bcd834876f6e60ae519dca8c0b0ba0d4d1
+SHA1 (patch-ae) = cf294d57eb0c8aa11033ec9ec26bc7b73c43cba2
-SHA1 (patch-af) = 2c7ca79ef980a2561333bf79a18df1ecb0bbb9f7
+SHA1 (patch-af) = d7dbe79be31cbcc5726269b26271bd0e598e47fd
-SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2
+SHA1 (patch-ag) = ae6a89f6b2be00c52139be6dcd14d0ebfe85d8f7
-SHA1 (patch-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153
+SHA1 (patch-aj) = 5179cfd150bc7de15eb1c5ee0a327016c2c32b3e
-SHA1 (patch-src_alpha_osf.S) = 3fa2aab1924bc445fa2f76835c3fd38e5a3898f9
+SHA1 (patch-src_alpha_osf.S) = 50d564a1d88284f04f6896719fa3613e9b0be70b
-SHA1 (patch-src_arm_sysv.S) = ea294af156566c6e6f63810358de89cba6213c4f
+SHA1 (patch-src_arm_sysv.S) = 2c97e0d069a4df2e1f5b6604e54b2d02c92691e2
-SHA1 (patch-src_m88k_elfbsd.S) = fae3e425dcff3e924ef195eab165f9bbc6ec4077
+SHA1 (patch-src_m88k_elfbsd.S) = 6572c7fa39c00096cb4a80bb88993ff1b4aaa8cc
 SHA1 (patch-src_x86_win32.S) = 8a41cbc7237d6a171605a66e91d8d92a57181569

 @@ -1,14 +1,17 @@
-$NetBSD: patch-aa,v 1.23 2014/11/19 13:49:35 wiz Exp $
+$NetBSD: patch-aa,v 1.24 2016/01/25 17:56:39 jperkin Exp $
 Add more platforms to list which don't support writeable and executable heap.
 Other various platform changes.
 --- configure.orig	2014-11-12 11:59:57.000000000 +0000
 +++ configure
 @@ -654,6 +654,8 @@ VAX_FALSE
  VAX_TRUE
  TILE_FALSE
  TILE_TRUE
 +VAX_FALSE
 +VAX_TRUE
  PA64_HPUX_FALSE
  PA64_HPUX_TRUE
  PA_HPUX_FALSE
 @@ -17120,7 +17122,7 @@ case "$host" in
 @@ -72,27 +75,27 @@ $NetBSD: patch-aa,v 1.23 2014/11/19 13:4
 +else
 +  VAX_TRUE='#'
 +  VAX_FALSE=
 +fi
++
   if test x$TARGET = xXTENSA; then
    XTENSA_TRUE=
    XTENSA_FALSE='#'
 @@ -18530,7 +18544,7 @@ case "$target" in
  $as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h
       ;;
 -     *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
-+     *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-netbsd* | *-*-openbsd* | *-pc-solaris*)
++     *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-netbsd* | *-*-openbsd* | *-*-solaris*)
  $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h
 @@ -18725,11 +18739,6 @@ if test "x$GCC" = "xyes"; then
      toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
      toolexeclibdir="${libdir}"
    fi
 -  multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
 -  case $multi_os_directory in
 -    .) ;; # Avoid trailing /.
 -    ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
 -  esac

 @@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2010/01/16 16:28:58 asau Exp $
+$NetBSD: patch-ac,v 1.3 2016/01/25 17:56:39 jperkin Exp $
 Install header files in backwards compatible way.
---- include/Makefile.in.orig	2009-12-31 15:41:01.000000000 +0300
+--- include/Makefile.in.orig	2014-11-12 11:59:58.000000000 +0000
-+++ include/Makefile.in	2010-01-12 12:43:57.000000000 +0300
++++ include/Makefile.in
-@@ -203,7 +203,7 @@
+@@ -314,7 +314,7 @@ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign
  DISTCLEANFILES = ffitarget.h
  EXTRA_DIST = ffi.h.in ffi_common.h
 -includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
 +includesdir = $(includedir)
  nodist_includes_HEADERS = ffi.h ffitarget.h
  all: all-am

 @@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.2 2014/10/28 12:51:03 adam Exp $
+$NetBSD: patch-ad,v 1.3 2016/01/25 17:56:39 jperkin Exp $
 Install header files in backwards compatible way.
---- libffi.pc.in.orig	2014-04-25 17:45:13.000000000 +0000
+--- libffi.pc.in.orig	2014-11-08 12:47:24.000000000 +0000
 +++ libffi.pc.in
 @@ -2,7 +2,7 @@ prefix=@prefix@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
  toolexeclibdir=@toolexeclibdir@
 -includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
 +includedir=@includedir@
  Name: @PACKAGE_NAME@
  Description: Library supporting Foreign Function Interfaces

 @@ -1,18 +1,18 @@
-$NetBSD: patch-ae,v 1.6 2014/02/11 07:21:28 dholland Exp $
+$NetBSD: patch-ae,v 1.7 2016/01/25 17:56:39 jperkin Exp $
 Make a minimal adjustment to support the various NetBSD mips ports.
---- src/mips/ffitarget.h.orig	2012-04-12 02:46:06.000000000 +0000
+--- src/mips/ffitarget.h.orig	2014-11-08 12:47:24.000000000 +0000
 +++ src/mips/ffitarget.h
 @@ -32,7 +32,7 @@
  #error "Please do not include ffitarget.h directly into your source.  Use ffi.h instead."
  #endif
 -#ifdef linux
 +#if defined(linux)
  # include <asm/sgidefs.h>
  #elif defined(__rtems__)
  /*
 @@ -41,8 +41,10 @@
  #define _MIPS_SIM_ABI32		1
  #define _MIPS_SIM_NABI32	2

 @@ -1,16 +1,18 @@
-$NetBSD: patch-src_arm_sysv.S,v 1.6 2014/11/10 21:29:40 joerg Exp $
+$NetBSD: patch-src_arm_sysv.S,v 1.7 2016/01/25 17:56:39 jperkin Exp $
---- src/arm/sysv.S.orig	2014-04-25 17:45:13.000000000 +0000
+ARM fixes.
 --- src/arm/sysv.S.orig	2014-11-08 12:47:24.000000000 +0000
 +++ src/arm/sysv.S
 @@ -25,6 +25,8 @@
     DEALINGS IN THE SOFTWARE.
     ----------------------------------------------------------------------- */
 +.syntax unified
++
  #define LIBFFI_ASM
  #include <fficonfig.h>
  #include <ffi.h>
 @@ -103,7 +105,7 @@
  #endif

 @@ -1,59 +1,59 @@
-$NetBSD: patch-af,v 1.3 2012/09/14 23:45:27 asau Exp $
+$NetBSD: patch-af,v 1.4 2016/01/25 17:56:39 jperkin Exp $
 Fixes to support the various NetBSD mips ports.
---- src/mips/ffi.c.orig	2011-08-23 18:28:08.000000000 +0400
+--- src/mips/ffi.c.orig	2014-11-08 12:47:24.000000000 +0000
-+++ src/mips/ffi.c	2012-02-19 20:04:17.000000000 +0400
++++ src/mips/ffi.c
 @@ -33,12 +33,17 @@
  #ifdef __GNUC__
  #  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
 -#    define USE__BUILTIN___CLEAR_CACHE 1
 +#    if !defined(__NetBSD__)
 +#      define USE__BUILTIN___CLEAR_CACHE 1
 +#    endif
  #  endif
  #endif
  #ifndef USE__BUILTIN___CLEAR_CACHE
 -#  if defined(__OpenBSD__)
 +#  if defined(__NetBSD__)
 +#    include <mips/cachectl.h>
 +#    define cacheflush _cacheflush
 +#  elif defined(__OpenBSD__)
  #    include <mips64/sysarch.h>
  #  else
  #    include <sys/cachectl.h>
-@@ -465,6 +470,7 @@
+@@ -472,6 +477,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif
                ((cif->arg_types)[index]->type << (arg_reg * FFI_FLAG_BITS));
  	    arg_reg++;
  	    break;
 +#ifdef __mips64
            case FFI_TYPE_LONGDOUBLE:
              /* Align it.  */
              arg_reg = ALIGN(arg_reg, 2);
-@@ -483,7 +489,7 @@
+@@ -490,7 +496,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif
  		arg_reg++;
+ 	      }
              break;
+-
 +#endif
  	  case FFI_TYPE_STRUCT:
              loc = arg_reg * FFI_SIZEOF_ARG;
  	    cif->flags += calc_n32_struct_flags(soft_float,
-@@ -545,6 +551,7 @@
+@@ -552,6 +558,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif
  	  cif->flags += cif->rtype->type << (FFI_FLAG_BITS * 8);
  	break;
 +#ifdef __mips64
        case FFI_TYPE_LONGDOUBLE:
  	/* Long double is returned as if it were a struct containing
  	   two doubles.  */
-@@ -561,6 +568,7 @@
+@@ -568,6 +575,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif
  					      << (4 + (FFI_FLAG_BITS * 8));
+ 	  }
  	break;
 +#endif
        default:
  	cif->flags += FFI_TYPE_INT << (FFI_FLAG_BITS * 8);
  	break;

 @@ -1,15 +1,15 @@
-$NetBSD: patch-ag,v 1.1 2009/05/26 12:27:12 he Exp $
+$NetBSD: patch-ag,v 1.2 2016/01/25 17:56:39 jperkin Exp $
 The %Lf printf format expects "long double", so cast args accordingly.
---- testsuite/libffi.call/float2.c.orig	2008-01-29 16:15:20.000000000 +0100
+--- testsuite/libffi.call/float2.c.orig	2014-11-08 12:47:24.000000000 +0000
 +++ testsuite/libffi.call/float2.c
-@@ -44,7 +44,7 @@ int main (void)
+@@ -45,7 +45,7 @@ int main (void)
    /* This is ifdef'd out for now. long double support under SunOS/gcc
       is pretty much non-existent.  You'll get the odd bus error in library
       routines like printf().  */
 -  printf ("%Lf, %Lf, %Lf, %Lf\n", ld, ldblit(f), ld - ldblit(f), LDBL_EPSILON);
 +  printf ("%Lf, %Lf, %Lf, %Lf\n", (long double)ld, (long double)ldblit(f), (long double)(ld - ldblit(f)), (long double)LDBL_EPSILON);
  #endif
    /* These are not always the same!! Check for a reasonable delta */

 @@ -1,21 +1,21 @@
-$NetBSD: patch-src_alpha_osf.S,v 1.1 2015/01/09 15:10:51 martin Exp $
+$NetBSD: patch-src_alpha_osf.S,v 1.2 2016/01/25 17:56:39 jperkin Exp $
 Band-aid update of the alpha asm code to make it compile past the addition
 of type complex. Someone with clue on the alpha ELF ABI should provide
 real support for complex arguments.
---- src/alpha/osf.S.orig	2014-11-08 13:47:24.000000000 +0100
+--- src/alpha/osf.S.orig	2014-11-08 12:47:24.000000000 +0000
-+++ src/alpha/osf.S	2014-12-26 13:02:32.000000000 +0100
++++ src/alpha/osf.S
 @@ -279,6 +279,7 @@ $load_table:
  	.gprel32 $load_64	# FFI_TYPE_SINT64
  	.gprel32 $load_none	# FFI_TYPE_STRUCT
  	.gprel32 $load_64	# FFI_TYPE_POINTER
 +	.gprel32 $load_none	# FFI_TYPE_COMPLEX
  /* Assert that the table above is in sync with ffi.h.  */
 @@ -294,7 +295,8 @@ $load_table:
  	|| FFI_TYPE_SINT64 != 12	\
  	|| FFI_TYPE_STRUCT != 13	\
  	|| FFI_TYPE_POINTER != 14	\
 -	|| FFI_TYPE_LAST != 14

 @@ -1,16 +1,18 @@
-$NetBSD: patch-src_m88k_elfbsd.S,v 1.1 2013/11/03 23:51:51 jklos Exp $
+$NetBSD: patch-src_m88k_elfbsd.S,v 1.2 2016/01/25 17:56:39 jperkin Exp $
---- src/m88k/elfbsd.S.orig	2013-11-03 22:57:57.000000000 +0000
+m88k support.
 --- src/m88k/elfbsd.S.orig	2016-01-25 17:24:51.000000000 +0000
 +++ src/m88k/elfbsd.S
 @@ -0,0 +1,195 @@
 +/*
 + * Copyright (c) 2013 Miodrag Vallat.  <miod@openbsd.org>
 + *
 + * Permission is hereby granted, free of charge, to any person obtaining
 + * a copy of this software and associated documentation files (the
 + * ``Software''), to deal in the Software without restriction, including
 + * without limitation the rights to use, copy, modify, merge, publish,
 + * distribute, sublicense, and/or sell copies of the Software, and to
 + * permit persons to whom the Software is furnished to do so, subject to
 + * the following conditions:
 + *

 @@ -1,29 +1,31 @@
-$NetBSD: patch-aj,v 1.4 2012/09/14 23:45:27 asau Exp $
+$NetBSD: patch-aj,v 1.5 2016/01/25 17:56:39 jperkin Exp $
---- src/m68k/ffi.c.orig	2012-04-12 02:46:06.000000000 +0000
+NetBSD/m68k support.
 --- src/m68k/ffi.c.orig	2014-11-08 12:47:24.000000000 +0000
 +++ src/m68k/ffi.c
 @@ -9,8 +9,11 @@
  #include <stdlib.h>
  #include <unistd.h>
 -#ifdef __rtems__
 +#if defined(__rtems__)
  void rtems_cache_flush_multiple_data_lines( const void *, size_t );
 +#elif defined(__NetBSD__)
 +#include <sys/types.h>
 +#include <m68k/sync_icache.h>
  #else
  #include <sys/syscall.h>
  #ifdef __MINT__
-@@ -335,8 +338,10 @@ ffi_prep_closure_loc (ffi_closure* closu
+@@ -345,8 +348,10 @@ ffi_prep_closure_loc (ffi_closure* closu
    else
      *(void **)(closure->tramp + 8) = ffi_closure_SYSV;
 -#ifdef __rtems__
 +#if defined(__rtems__)
    rtems_cache_flush_multiple_data_lines( codeloc, FFI_TRAMPOLINE_SIZE );
 +#elif defined(__NetBSD__)
 +  m68k_sync_icache(codeloc, FFI_TRAMPOLINE_SIZE);
  #elif defined(__MINT__)
    Ssystem(S_FLUSHCACHE, codeloc, FFI_TRAMPOLINE_SIZE);
  #else