libffi: update to 3.4.7

releases.json

@@ -1693,6 +1693,7 @@
       "libffi"
     ],
     "versions": [
+      "3.4.7-1",
       "3.4.6-3",
       "3.4.6-2",
       "3.4.6-1",

subprojects/libffi.wrap

@@ -1,8 +1,8 @@
 [wrap-file]
-directory = libffi-3.4.6
-source_url = https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz
-source_filename = libffi-3.4.6.tar.gz
-source_hash = b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e
+directory = libffi-3.4.7
+source_url = https://github.com/libffi/libffi/releases/download/v3.4.7/libffi-3.4.7.tar.gz
+source_filename = libffi-3.4.7.tar.gz
+source_hash = 138607dee268bdecf374adf9144c00e839e38541f75f24a1fcf18b78fda48b2d
 patch_directory = libffi
 
 [provide]

subprojects/packagefiles/libffi/fficonfig.h.meson

@@ -31,6 +31,9 @@
 /* Define to 1 if you have the <alloca.h> header file. */
 #mesondefine HAVE_ALLOCA_H
 
+/* Define if your compiler supports pointer authentication. */
+#mesondefine HAVE_ARM64E_PTRAUTH
+
 /* Define if your assembler supports .cfi_* directives. */
 #mesondefine HAVE_AS_CFI_PSEUDO_OP
 
@@ -71,9 +74,6 @@
 /* Define to 1 if you have the `memfd_create' function. */
 #mesondefine HAVE_MEMFD_CREATE
 
-/* Define if your compiler supports pointer authentication. */
-#mesondefine HAVE_PTRAUTH
-
 /* Define if .eh_frame sections should be read-only. */
 #mesondefine HAVE_RO_EH_FRAME
 

subprojects/packagefiles/libffi/meson.build

@@ -1,4 +1,4 @@
-project('libffi', 'c', version : '3.4.6',
+project('libffi', 'c', version : '3.4.7',
         meson_version : '>= 0.56.0',
         default_options : ['debug=true',
                            'optimization=3',
@@ -225,9 +225,6 @@ elif host_cpu_family in ['mips', 'mips64'] and host_system in ['linux', 'openbsd
   asm_sources = ['o32.S', 'n32.S']
   # Support 128-bit long double for NewABI.
   have_long_double = 'defined(__mips64)'
-elif host_cpu_family == 'nios2' and host_system == 'linux'
-  # FIXME: nios2 family is missing in Meson
-  target = 'NIOS2'
 elif host_cpu_family == 'or1k'
   # FIXME: or1k family is missing in Meson
   target = 'OR1K'
@@ -344,17 +341,17 @@ endif
 ptrauth_code = '''
 #ifdef __clang__
 # if __has_feature(ptrauth_calls)
-#  define HAVE_PTRAUTH 1
+#  define HAVE_ARM64E_PTRAUTH 1
 # endif
 #endif
 
-#ifndef HAVE_PTRAUTH
+#ifndef HAVE_ARM64E_PTRAUTH
 # error Pointer authentication not supported
 #endif
 '''
 
 if cc.compiles(ptrauth_code)
-  ffi_conf.set('HAVE_PTRAUTH', 1)
+  ffi_conf.set('HAVE_ARM64E_PTRAUTH', 1)
 endif
 
 if get_option('pax_emutramp')
@@ -423,7 +420,7 @@ if get_option('exe_static_tramp')
     if is_gnu_like
       ffi_conf.set('FFI_EXEC_STATIC_TRAMP', 1)
     endif
-  elif host_system == 'linux' and host_cpu_family in ['arm', 'aarch64', 'x86', 'x86_64', 'loongarch']
+  elif host_system == 'linux' and host_cpu_family in ['arm', 'aarch64', 'x86', 'x86_64', 'loongarch', 's390x']
     ffi_conf.set('FFI_EXEC_STATIC_TRAMP', 1)
   endif
 endif

subprojects/packagefiles/libffi/testsuite/meson.build

@@ -63,6 +63,9 @@ tests = {
     'struct_by_value_4f.c',
     'struct_by_value_big.c',
     'struct_by_value_small.c',
+    'struct_int_float.c',
+    'struct_return_2H.c',
+    'struct_return_8H.c',
     'uninitialized.c',
     'va_1.c',
     'va_2.c',