libffi: update from 3.5.1 to 3.5.2

Author: bgilbert

releases.json

@@ -1896,6 +1896,7 @@
       "libffi"
     ],
     "versions": [
+      "3.5.2-1",
       "3.5.1-2",
       "3.5.1-1",
       "3.4.8-1",

subprojects/libffi.wrap

@@ -1,8 +1,8 @@
 [wrap-file]
-directory = libffi-3.5.1
-source_url = https://github.com/libffi/libffi/releases/download/v3.5.1/libffi-3.5.1.tar.gz
-source_filename = libffi-3.5.1.tar.gz
-source_hash = f99eb68a67c7d54866b7706af245e87ba060d419a062474b456d3bc8d4abdbd1
+directory = libffi-3.5.2
+source_url = https://github.com/libffi/libffi/releases/download/v3.5.2/libffi-3.5.2.tar.gz
+source_filename = libffi-3.5.2.tar.gz
+source_hash = f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc
 patch_directory = libffi
 
 [provide]

subprojects/packagefiles/libffi/meson.build

@@ -1,7 +1,7 @@
 project(
   'libffi',
   'c',
-  version: '3.5.1',
+  version: '3.5.2',
   license: 'MIT',
   meson_version: '>= 0.56.0',
   default_options: ['warning_level=1'],
@@ -90,6 +90,7 @@ endforeach
 # Default values
 c_sources = ['ffi.c']
 asm_sources = ['sysv.S']
+private_c_args = []
 masm_args = []
 targetdir = ''
 have_long_double = ''
@@ -315,9 +316,15 @@ elif host_cpu_family == 'vax'
   # FIXME: vax family is missing in Meson
   target = 'VAX'
   asm_sources = ['elfbsd.S']
-elif host_cpu_family == 'wasm32'
-  target = 'wasm32'  # lowercase
+elif host_cpu_family in ['wasm32', 'wasm64']
+  target = host_cpu_family  # lowercase
+  targetdir = 'wasm'
   asm_sources = []
+  if host_cpu_family == 'wasm64'
+    private_c_args += cc.get_supported_arguments(
+      '-sMEMORY64=' + (get_option('wasm64_compat32') ? '2' : '1'),
+    )
+  endif
 elif host_cpu_family == 'xtensa'
   # FIXME: xtensa family is missing in Meson
   target = 'XTENSA'
@@ -435,6 +442,7 @@ if host_cpu_family in ['arm', 'aarch64'] and host_system == 'darwin'
 elif host_system in [
   'android',
   'darwin',
+  'dragonfly',
   'openbsd',
   'freebsd',
   'solaris',

subprojects/packagefiles/libffi/meson_options.txt

@@ -58,3 +58,9 @@ option(
     type: 'array',
     value: [],
 )
+# Toggle this if you want to build with -sMEMORY64=2 on wasm64
+option(
+    'wasm64_compat32',
+    type: 'boolean',
+    value: false,
+)

subprojects/packagefiles/libffi/src/meson.build

@@ -100,7 +100,7 @@ ffi_lib = library(
   'ffi',
   ffi_c_sources,
   ffi_asm_sources,
-  c_args: ['-DFFI_BUILDING_DLL', public_c_args],
+  c_args: ['-DFFI_BUILDING_DLL', public_c_args, private_c_args],
   include_directories: ffiinc,
   link_args: ffi_link_args,
   link_depends: ffi_map_file,

subprojects/packagefiles/libffi/testsuite/meson.build

@@ -385,8 +385,13 @@ foreach suite, sources : tests
             exe_name,
             src,
             dependencies: ffi_dep,
-            c_args: [common_c_args, suite_c_args, matrix_c_args],
-            cpp_args: [common_c_args, suite_c_args, matrix_c_args],
+            c_args: [common_c_args, private_c_args, suite_c_args, matrix_c_args],
+            cpp_args: [
+              common_c_args,
+              private_c_args,
+              suite_c_args,
+              matrix_c_args,
+            ],
             # Not supported by Meson < 0.64, but -Ox in c_args takes precedence
             #override_options: ['optimization=plain'],
           )