rpm/libffi
SHA256
1
0
Fork 0
forked from pool/libffi
Code Pull Requests Activity

Accepting request 1030896 from home:Andreas_Schwab:Factory

Browse Source 
- Update to libffi 3.4.4
  * Important aarch64 fixes, including support for linux builds
      with Link Time Optimization (-flto).
  * Fix x86 stdcall stack alignment.
  * Fix x86 Windows msvc assembler compatibility.
  * Fix moxie and or1k small structure args.
- drop riscv64-handle-big-structures.patch
- reenable LTO

OBS-URL: https://build.opensuse.org/request/show/1030896
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libffi?expand=0&rev=30
This commit is contained in:
Richard Biener 2022-10-25 06:48:52 +00:00 committed by Git OBS Bridge
parent d268898770
commit 74d1b2c03c
5 changed files with 16 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libffi-3.4.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4416dd92b6ae8fcb5b10421e711c4d3cb31203d77521a77d85d0102311e6c3b8
size 1358634

BIN
libffi-3.4.4.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

12
libffi.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Oct 24 13:07:19 UTC 2022 - Andreas Schwab <schwab@suse.de>
- Update to libffi 3.4.4
* Important aarch64 fixes, including support for linux builds
with Link Time Optimization (-flto).
* Fix x86 stdcall stack alignment.
* Fix x86 Windows msvc assembler compatibility.
* Fix moxie and or1k small structure args.
- drop riscv64-handle-big-structures.patch
- reenable LTO
-------------------------------------------------------------------
Mon Oct 10 09:46:39 UTC 2022 - Dirk Müller <dmueller@suse.com>

5
libffi.spec
View File

@ -18,7 +18,7 @@
%define libffi_sover 8
Name: libffi
Version: 3.4.3
Version: 3.4.4
Release: 0
Summary: Foreign Function Interface Library
License: MIT
@ -26,7 +26,6 @@ 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
@ -68,8 +67,6 @@ time.
%autosetup -p1
%build
# https://github.com/libffi/libffi/issues/733
%define _lto_cflags %{nil}
# https://github.com/libffi/libffi/pull/647
%configure --disable-exec-static-tramp
%make_build

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

@ -1,46 +0,0 @@
--- 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)