pool/libffi
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1009331 from home:dirkmueller:Factory

Browse Source 
- add riscv64-handle-big-structures.patch

OBS-URL: https://build.opensuse.org/request/show/1009331
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libffi?expand=0&rev=28
This commit is contained in:
Richard Biener 2022-10-10 12:16:48 +00:00 committed by Git OBS Bridge
parent 80bd7df03c
commit d268898770
3 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libffi.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 10 09:46:39 UTC 2022 - Dirk Müller <dmueller@suse.com>
- add riscv64-handle-big-structures.patch
-------------------------------------------------------------------
Fri Sep 23 13:17:48 UTC 2022 - Richard Biener <rguenther@suse.com>

3
libffi.spec
View File

@ -26,6 +26,7 @@ Group: Development/Languages/C and C++
URL: https://sourceware.org/libffi/
Source: https://github.com/libffi/libffi/releases/download/v%{version}/libffi-%{version}.tar.gz
Source99: baselibs.conf
Patch1: riscv64-handle-big-structures.patch
# for make check
BuildRequires: dejagnu
BuildRequires: expect
@ -64,7 +65,7 @@ time.
%postun -n libffi%{libffi_sover} -p /sbin/ldconfig
%prep
%setup -q
%autosetup -p1
%build
# https://github.com/libffi/libffi/issues/733

46
riscv64-handle-big-structures.patch Normal file
View File

@ -0,0 +1,46 @@
--- libffi-3.4.3.orig/src/riscv/ffi.c
+++ libffi-3.4.3/src/riscv/ffi.c
@@ -61,6 +61,7 @@ typedef struct call_builder
int used_integer;
int used_float;
size_t *used_stack;
+ void *struct_stack;
} call_builder;
/* integer (not pointer) less than ABI XLEN */
@@ -227,7 +228,9 @@ static void marshal(call_builder *cb, ff
#endif
if (type->size > 2 * __SIZEOF_POINTER__) {
- /* pass by reference */
+ /* copy to stack and pass by reference */
+ data = memcpy (cb->struct_stack, data, type->size);
+ cb->struct_stack = (size_t *) FFI_ALIGN ((char *) cb->struct_stack + type->size, __SIZEOF_POINTER__);
marshal_atom(cb, FFI_TYPE_POINTER, &data);
} else if (IS_INT(type->type) || type->type == FFI_TYPE_POINTER) {
marshal_atom(cb, type->type, data);
@@ -335,10 +338,12 @@ ffi_call_int (ffi_cif *cif, void (*fn) (
that all remaining arguments are long long / __int128 */
size_t arg_bytes = cif->nargs <= 3 ? 0 :
FFI_ALIGN(2 * sizeof(size_t) * (cif->nargs - 3), STKALIGN);
+ /* Allocate space for copies of big structures. */
+ size_t struct_bytes = FFI_ALIGN (cif->bytes, STKALIGN);
size_t rval_bytes = 0;
if (rvalue == NULL && cif->rtype->size > 2*__SIZEOF_POINTER__)
rval_bytes = FFI_ALIGN(cif->rtype->size, STKALIGN);
- size_t alloc_size = arg_bytes + rval_bytes + sizeof(call_context);
+ size_t alloc_size = arg_bytes + rval_bytes + struct_bytes + sizeof(call_context);
/* the assembly code will deallocate all stack data at lower addresses
than the argument region, so we need to allocate the frame and the
@@ -358,8 +363,9 @@ ffi_call_int (ffi_cif *cif, void (*fn) (
call_builder cb;
cb.used_float = cb.used_integer = 0;
- cb.aregs = (call_context*)(alloc_base + arg_bytes + rval_bytes);
+ cb.aregs = (call_context*)(alloc_base + arg_bytes + rval_bytes + struct_bytes);
cb.used_stack = (void*)alloc_base;
+ cb.struct_stack = (void *) (alloc_base + arg_bytes + rval_bytes);
int return_by_ref = passed_by_ref(&cb, cif->rtype, 0);
if (return_by_ref)