Skip to content

Commit 8c8d354

Browse files
bgilbertneheb
authored andcommitted
libffi: update to 3.4.6
1 parent 04b377e commit 8c8d354

File tree

5 files changed

+25
-10
lines changed

5 files changed

+25
-10
lines changed

releases.json

+1
Original file line numberDiff line numberDiff line change
@@ -1611,6 +1611,7 @@
16111611
"libffi"
16121612
],
16131613
"versions": [
1614+
"3.4.6-1",
16141615
"3.4.4-4",
16151616
"3.4.4-3",
16161617
"3.4.4-2",

subprojects/libffi.wrap

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[wrap-file]
2-
directory = libffi-3.4.4
3-
source_url = https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz
4-
source_filename = libffi-3.4.4.tar.gz
5-
source_hash = d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676
2+
directory = libffi-3.4.6
3+
source_url = https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz
4+
source_filename = libffi-3.4.6.tar.gz
5+
source_hash = b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e
66
patch_directory = libffi
77

88
[provide]

subprojects/packagefiles/libffi/meson-scripts/test-cc-supports-hidden-visibility.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
res = subprocess.run(args, stdout=subprocess.PIPE, universal_newlines=True, check=True)
2020

2121
with open(outfile, 'r') as f:
22-
if re.search('(\.hidden|\.private_extern).*foo', f.read()):
22+
if re.search('(\.hidden|\.private_extern).*foo|foo.*,hidden', f.read()):
2323
sys.exit(0)
2424
print('.hidden not found in the outputted assembly')
2525
sys.exit(1)

subprojects/packagefiles/libffi/meson.build

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project('libffi', 'c', version : '3.4.4',
1+
project('libffi', 'c', version : '3.4.6',
22
meson_version : '>= 0.56.0',
33
default_options : ['debug=true',
44
'optimization=3',
@@ -128,9 +128,15 @@ elif (host_cpu_family in ['hppa', 'hppa64'] and host_system in ['linux', 'openbs
128128
asm_sources = ['linux.S']
129129
elif host_cpu_family == 'hppa' and host_system in ['hpux']
130130
# FIXME: hppa family is missing in Meson
131-
target = 'PA_HPUX'
132131
targetdir = 'pa'
133-
asm_sources = ['hpux32.S']
132+
if size_t == 4
133+
target = 'PA_HPUX'
134+
asm_sources = ['hpux32.S']
135+
else
136+
target = 'PA64_HPUX'
137+
c_sources = ['ffi64.c']
138+
asm_sources = ['hpux64.S']
139+
endif
134140
elif host_cpu_family == 'x86' and host_system in ['freebsd', 'openbsd']
135141
target = 'X86_FREEBSD'
136142
targetdir = 'x86'
@@ -226,7 +232,7 @@ elif host_cpu_family == 'or1k'
226232
# FIXME: or1k family is missing in Meson
227233
target = 'OR1K'
228234
elif (host_cpu_family in ['ppc', 'ppc64'] and \
229-
host_system in ['linux', 'sysv', 'amigaos', 'eabi', 'beos', 'rtems']) or \
235+
host_system in ['linux', 'sysv', 'amigaos', 'eabi', 'beos', 'haiku', 'rtems']) or \
230236
(host_cpu_family == 'ppc64' and host_system == 'freebsd')
231237
target = 'POWERPC'
232238
c_sources = ['ffi.c', 'ffi_sysv.c', 'ffi_linux64.c']
@@ -274,6 +280,8 @@ elif host_cpu_family == 'vax'
274280
# FIXME: vax family is missing in Meson
275281
target = 'VAX'
276282
asm_sources = ['elfbsd.S']
283+
elif host_cpu_family == 'wasm32'
284+
target = 'wasm32' # lowercase
277285
elif host_cpu_family == 'xtensa'
278286
# FIXME: xtensa family is missing in Meson
279287
target = 'XTENSA'

subprojects/packagefiles/libffi/testsuite/meson.build

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ tests = {
66
'call': [
77
'align_mixed.c',
88
'align_stdcall.c',
9-
'bpo-38748.c',
9+
'bpo_38748.c',
10+
'callback.c',
11+
'callback2.c',
12+
'callback3.c',
13+
'callback4.c',
1014
'err_bad_typedef.c',
1115
'float1.c',
1216
'float2.c',
@@ -54,7 +58,9 @@ tests = {
5458
'struct9.c',
5559
'struct_by_value_2.c',
5660
'struct_by_value_3.c',
61+
'struct_by_value_3f.c',
5762
'struct_by_value_4.c',
63+
'struct_by_value_4f.c',
5864
'struct_by_value_big.c',
5965
'struct_by_value_small.c',
6066
'uninitialized.c',

0 commit comments

Comments
 (0)