ffi 1.17.1 → 1.17.3

data/ext/ffi_c/libffi/src/aarch64/internal.h

@@ -81,20 +81,66 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 /* Helpers for writing assembly compatible with arm ptr auth */
 #ifdef LIBFFI_ASM
 
-#ifdef HAVE_PTRAUTH
-#define SIGN_LR pacibsp
-#define SIGN_LR_WITH_REG(x) pacib lr, x
-#define AUTH_LR_AND_RET retab
-#define AUTH_LR_WITH_REG(x) autib lr, x
-#define BRANCH_AND_LINK_TO_REG blraaz
-#define BRANCH_TO_REG braaz
-#else
-#define SIGN_LR
-#define SIGN_LR_WITH_REG(x)
-#define AUTH_LR_AND_RET ret
-#define AUTH_LR_WITH_REG(x)
-#define BRANCH_AND_LINK_TO_REG blr
-#define BRANCH_TO_REG br
-#endif
-
-#endif
+  #if defined(HAVE_ARM64E_PTRAUTH)
+  /* ARM64E ABI For Darwin */
+  #define SIGN_LR pacibsp
+  #define SIGN_LR_WITH_REG(x) pacib lr, x
+  #define AUTH_LR_AND_RET retab
+  #define AUTH_LR_WITH_REG(x) autib lr, x
+  #define BRANCH_AND_LINK_TO_REG blraaz
+  #define SIGN_LR_LINUX_ONLY
+  #define BRANCH_TO_REG braaz
+  #define PAC_CFI_WINDOW_SAVE
+  #define GNU_PROPERTY_AARCH64_POINTER_AUTH 0
+  /* Linux PAC Support */
+  #elif defined(__ARM_FEATURE_PAC_DEFAULT)
+    #define GNU_PROPERTY_AARCH64_POINTER_AUTH (1 << 1)
+    #define PAC_CFI_WINDOW_SAVE cfi_window_save
+    #define TMP_REG x9
+    #define BRANCH_TO_REG br
+    #define BRANCH_AND_LINK_TO_REG blr
+	#define SIGN_LR_LINUX_ONLY SIGN_LR
+    /* Which key to sign with? */
+    #if (__ARM_FEATURE_PAC_DEFAULT & 1) == 1
+      /* Signed with A-key */
+      #define SIGN_LR            hint #25  /* paciasp */
+      #define AUTH_LR            hint #29  /* autiasp */
+    #else
+      /* Signed with B-key */
+      #define SIGN_LR            hint #27  /* pacibsp */
+      #define AUTH_LR            hint #31  /* autibsp */
+    #endif /* __ARM_FEATURE_PAC_DEFAULT */
+    #define AUTH_LR_WITH_REG(x) _auth_lr_with_reg x
+.macro _auth_lr_with_reg modifier
+    mov TMP_REG, sp
+    mov sp, \modifier
+    AUTH_LR
+    mov sp, TMP_REG
+.endm
+  #define SIGN_LR_WITH_REG(x) _sign_lr_with_reg x
+.macro _sign_lr_with_reg modifier
+    mov TMP_REG, sp
+    mov sp, \modifier
+    SIGN_LR
+    mov sp, TMP_REG
+.endm
+  #define AUTH_LR_AND_RET _auth_lr_and_ret modifier
+.macro _auth_lr_and_ret modifier
+    AUTH_LR
+    ret
+.endm
+  #undef TMP_REG
+
+  /* No Pointer Auth */
+  #else
+    #define SIGN_LR
+    #define SIGN_LR_WITH_REG(x)
+    #define AUTH_LR_AND_RET ret
+    #define AUTH_LR_WITH_REG(x)
+    #define BRANCH_AND_LINK_TO_REG blr
+    #define SIGN_LR_LINUX_ONLY
+    #define BRANCH_TO_REG br
+    #define PAC_CFI_WINDOW_SAVE
+    #define GNU_PROPERTY_AARCH64_POINTER_AUTH 0
+  #endif /* HAVE_ARM64E_PTRAUTH */
+#endif /* LIBFFI_ASM */

data/ext/ffi_c/libffi/src/aarch64/sysv.S

@@ -74,6 +74,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
 	.text
 	.align 4
 
+#if defined(__ARM_FEATURE_GCS_DEFAULT) && __ARM_FEATURE_GCS_DEFAULT == 1
+#define GNU_PROPERTY_AARCH64_GCS (1<<2)
+#else
+#define GNU_PROPERTY_AARCH64_GCS 0 /* No GCS */
+#endif
+
 /* ffi_call_SYSV
    extern void ffi_call_SYSV (void *stack, void *frame,
 			      void (*fn)(void), void *rvalue,
@@ -89,30 +95,30 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
    x5 closure
 */
 
-	cfi_startproc
 CNAME(ffi_call_SYSV):
+	cfi_startproc
 	BTI_C
-	/* Sign the lr with x1 since that is where it will be stored */
+	PAC_CFI_WINDOW_SAVE
+	/* Sign the lr with x1 since that is the CFA which is the modifer used in auth instructions */
 	SIGN_LR_WITH_REG(x1)
 
-	/* Use a stack frame allocated by our caller.  */
-#if defined(HAVE_PTRAUTH) && defined(__APPLE__)
+#if defined(HAVE_ARM64E_PTRAUTH) && defined(__APPLE__)
 	/* darwin's libunwind assumes that the cfa is the sp and that's the data
 	 * used to sign the lr.  In order to allow unwinding through this
 	 * function it is necessary to point the cfa at the signing register.
 	 */
 	cfi_def_cfa(x1, 0);
-#else
-	cfi_def_cfa(x1, 40);
 #endif
+	/* Use a stack frame allocated by our caller.  */
 	stp	x29, x30, [x1]
+	cfi_def_cfa_register(x1)
+	cfi_rel_offset (x29, 0)
+	cfi_rel_offset (x30, 8)
 	mov	x9, sp
 	str	x9, [x1, #32]
 	mov	x29, x1
-	mov	sp, x0
 	cfi_def_cfa_register(x29)
-	cfi_rel_offset (x29, 0)
-	cfi_rel_offset (x30, 8)
+	mov	sp, x0
 
 	mov	x9, x2			/* save fn */
 	mov	x8, x3			/* install structure return */
@@ -326,6 +332,7 @@ CNAME(ffi_closure_SYSV_V):
 	cfi_startproc
 	BTI_C
 	SIGN_LR
+	PAC_CFI_WINDOW_SAVE
 	stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
 	cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
 	cfi_rel_offset (x29, 0)
@@ -347,10 +354,11 @@ CNAME(ffi_closure_SYSV_V):
 #endif
 
 	.align	4
-	cfi_startproc
 CNAME(ffi_closure_SYSV):
+	cfi_startproc
 	BTI_C
 	SIGN_LR
+	PAC_CFI_WINDOW_SAVE
 	stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
 	cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
 	cfi_rel_offset (x29, 0)
@@ -645,9 +653,11 @@ CNAME(ffi_go_closure_SYSV_V):
 #endif
 
 	.align	4
-	cfi_startproc
 CNAME(ffi_go_closure_SYSV):
+	cfi_startproc
 	BTI_C
+	SIGN_LR_LINUX_ONLY
+	PAC_CFI_WINDOW_SAVE
 	stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
 	cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
 	cfi_rel_offset (x29, 0)
@@ -688,7 +698,7 @@ CNAME(ffi_go_closure_SYSV):
 	.asciz "GNU";
 	.long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
 	.long 4;
-	.long GNU_PROPERTY_AARCH64_BTI;
+	.long GNU_PROPERTY_AARCH64_BTI | GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_GCS;
 	.long 0;
 	.popsection;
 #endif

data/ext/ffi_c/libffi/src/arc/arcompact.S

@@ -39,14 +39,14 @@
 #define LARG ldl
 #define SARG stl
 #define ADDPTR addl
-#define MOVPTR movl_s
+#define MOVPTR movl
 #else
 #define PTRS 4
 #define FLTS 4
 #define LARG ld
 #define SARG st
 #define ADDPTR add
-#define MOVPTR mov_s
+#define MOVPTR mov
 #endif
 
 #define FRAME_LEN (8 * PTRS + 16)

data/ext/ffi_c/libffi/src/arc/ffi.c

@@ -192,9 +192,10 @@ static void unmarshal_atom(call_builder *cb, int type, void *data) {
 /* for arguments passed by reference returns the pointer, otherwise the arg is copied (up to MAXCOPYARG bytes) */
 static void *unmarshal(call_builder *cb, ffi_type *type, int var, void *data) {
   size_t realign[2];
-  void *pointer;
 
 #if defined(__ARC64_ARCH64__)
+  void *pointer;
+
   if (type->size > 2 * __SIZEOF_POINTER__) {
         /* pass by reference */
         unmarshal_atom(cb, FFI_TYPE_POINTER, (char*)&pointer);
@@ -348,7 +349,10 @@ ffi_prep_closure_loc (ffi_closure * closure, ffi_cif * cif,
 		      void *user_data, void *codeloc)
 {
   uint32_t *tramp = (uint32_t *) & (closure->tramp[0]);
+
+#if defined(__ARC64_ARCH64__)
   size_t address_ffi_closure = (size_t) ffi_closure_asm;
+#endif
 
   switch (cif->abi)
     {
@@ -367,7 +371,7 @@ ffi_prep_closure_loc (ffi_closure * closure, ffi_cif * cif,
       FFI_ASSERT (tramp == codeloc);
       tramp[0] = CODE_ENDIAN (0x200a1fc0);	/* mov r8, pcl  */
       tramp[1] = CODE_ENDIAN (0x20200f80);	/* j [long imm] */
-      tramp[2] = CODE_ENDIAN (ffi_closure_asm);
+      tramp[2] = CODE_ENDIAN ((uint32_t) ffi_closure_asm);
       break;
 #endif
 

data/ext/ffi_c/libffi/src/arm/sysv.S

@@ -120,7 +120,7 @@
 #endif
 
 
-#ifndef __clang__
+#ifdef __ELF__
 	/* We require interworking on LDM, which implies ARMv5T,
 	   which implies the existance of BLX.  */
  	.arch	armv5t

data/ext/ffi_c/libffi/src/closures.c

@@ -164,7 +164,7 @@ ffi_tramp_is_present (__attribute__((unused)) void *ptr)
 
 #include <mach/mach.h>
 #include <pthread.h>
-#ifdef HAVE_PTRAUTH
+#ifdef HAVE_ARM64E_PTRAUTH
 #include <ptrauth.h>
 #endif
 #include <stdio.h>
@@ -223,7 +223,7 @@ ffi_trampoline_table_alloc (void)
   /* Remap the trampoline table on top of the placeholder page */
   trampoline_page = config_page + PAGE_MAX_SIZE;
 
-#ifdef HAVE_PTRAUTH
+#ifdef HAVE_ARM64E_PTRAUTH
   trampoline_page_template = (vm_address_t)(uintptr_t)ptrauth_auth_data((void *)&ffi_closure_trampoline_table_page, ptrauth_key_function_pointer, 0);
 #else
   trampoline_page_template = (vm_address_t)&ffi_closure_trampoline_table_page;
@@ -268,7 +268,7 @@ ffi_trampoline_table_alloc (void)
       ffi_trampoline_table_entry *entry = &table->free_list_pool[i];
       entry->trampoline =
 	(void *) (trampoline_page + (i * FFI_TRAMPOLINE_SIZE));
-#ifdef HAVE_PTRAUTH
+#ifdef HAVE_ARM64E_PTRAUTH
       entry->trampoline = ptrauth_sign_unauthenticated(entry->trampoline, ptrauth_key_function_pointer, 0);
 #endif
 

data/ext/ffi_c/libffi/src/dlmalloc.c

@@ -3388,6 +3388,7 @@ static void add_segment(mstate m, char* tbase, size_t tsize, flag_t mmapped) {
   mchunkptr tnext = chunk_plus_offset(sp, ssize);
   mchunkptr p = tnext;
   int nfences = 0;
+  (void)nfences; // Suppress unused variable warning
 
   /* reset top to new space */
   init_top(m, (mchunkptr)tbase, tsize - TOP_FOOT_SIZE);

data/ext/ffi_c/libffi/src/mips/ffitarget.h

@@ -32,16 +32,14 @@
 #error "Please do not include ffitarget.h directly into your source.  Use ffi.h instead."
 #endif
 
-#ifdef __linux__
-# include <asm/sgidefs.h>
-#elif defined(__rtems__)
+#ifdef __rtems__
 /*
  * Subprogram calling convention - copied from sgidefs.h
  */
 #define _MIPS_SIM_ABI32		1
 #define _MIPS_SIM_NABI32	2
 #define _MIPS_SIM_ABI64		3
-#elif !defined(__OpenBSD__) && !defined(__FreeBSD__)
+#elif !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__linux__)
 # include <sgidefs.h>
 #endif
 

data/ext/ffi_c/libffi/src/mips/n32.S

@@ -821,3 +821,7 @@ cls_epilogue:
 #endif /* __GNUC__ */	
 	
 #endif
+
+#if defined __ELF__ && defined __linux__
+	.section .note.GNU-stack,"",%progbits
+#endif

data/ext/ffi_c/libffi/src/mips/o32.S

@@ -559,3 +559,7 @@ $LASFDE2:
 $LEFDE2:
 
 #endif
+
+#if defined __ELF__ && defined __linux__
+	.section .note.GNU-stack,"",%progbits
+#endif

data/ext/ffi_c/libffi/src/or1k/ffi.c

@@ -110,7 +110,7 @@ void* ffi_prep_args(char *stack, extended_cif *ecif)
 
 extern void ffi_call_SYSV(unsigned,
                           extended_cif *,
-                          void *(*)(int *, extended_cif *),
+                          void *(*)(char *, extended_cif *),
                           unsigned *,
                           void (*fn)(void),
                           unsigned);
@@ -180,7 +180,7 @@ void ffi_closure_SYSV(unsigned long r3, unsigned long r4, unsigned long r5,
   register int *r13 __asm__ ("r13");
 
   ffi_closure* closure = (ffi_closure*) r13;
-  char *stack_args = sp;
+  char *stack_args = (char*) sp;
 
   /* Lay the register arguments down in a continuous chunk of memory.  */
   unsigned register_args[6] =

data/ext/ffi_c/libffi/src/pa/linux.S

@@ -425,3 +425,7 @@ ffi_closure_pa32:
 
 	.align 4
 .LEFDE2:
+
+#if defined(__ELF__) && defined(__linux__)
+.section .note.GNU-stack,"",%progbits
+#endif

data/ext/ffi_c/libffi/src/powerpc/ffi.c

@@ -31,6 +31,8 @@
 #include "ffi.h"
 #include "ffi_common.h"
 #include "ffi_powerpc.h"
+#include "internal.h"
+#include <tramp.h>
 
 #if HAVE_LONG_DOUBLE_VARIANT
 /* Adjust ffi_type_longdouble.  */
@@ -173,3 +175,20 @@ ffi_prep_go_closure (ffi_go_closure *closure,
   closure->fun = fun;
   return FFI_OK;
 }
+
+#ifdef FFI_EXEC_STATIC_TRAMP
+void *
+ffi_tramp_arch (size_t *tramp_size, size_t *map_size)
+{
+  extern void *trampoline_code_table;
+  *tramp_size = PPC_TRAMP_SIZE;
+  *map_size = PPC_TRAMP_MAP_SIZE;
+#if defined (_CALL_AIX) || _CALL_ELF == 1
+  /* The caller wants the entry point address of the trampoline code,
+     not the address of the function descriptor.  */
+  return *(void **)trampoline_code_table;
+#else
+  return &trampoline_code_table;
+#endif
+}
+#endif

data/ext/ffi_c/libffi/src/powerpc/ffi_linux64.c

@@ -29,6 +29,7 @@
    ----------------------------------------------------------------------- */
 
 #include "ffi.h"
+#include <tramp.h>
 
 #ifdef POWERPC64
 #include "ffi_common.h"
@@ -820,32 +821,38 @@ ffi_prep_closure_loc_linux64 (ffi_closure *closure,
 			      void *user_data,
 			      void *codeloc)
 {
-#if _CALL_ELF == 2
-  unsigned int *tramp = (unsigned int *) &closure->tramp[0];
-
   if (cif->abi < FFI_LINUX || cif->abi >= FFI_LAST_ABI)
     return FFI_BAD_ABI;
 
-  tramp[0] = 0xe96c0018;	/* 0:	ld	11,2f-0b(12)	*/
-  tramp[1] = 0xe98c0010;	/*	ld	12,1f-0b(12)	*/
-  tramp[2] = 0x7d8903a6;	/*	mtctr	12		*/
-  tramp[3] = 0x4e800420;	/*	bctr			*/
+#ifdef FFI_EXEC_STATIC_TRAMP
+  if (ffi_tramp_is_present(closure))
+    {
+      /* Initialize the static trampoline's parameters. */
+      void (*dest)(void) = ffi_closure_LINUX64;
+      ffi_tramp_set_parms (closure->ftramp, dest, closure);
+    }
+  else
+#endif
+    {
+#if _CALL_ELF == 2
+      unsigned int *tramp = (unsigned int *) &closure->tramp[0];
+      tramp[0] = 0xe96c0018;	/* 0:	ld	11,2f-0b(12)	*/
+      tramp[1] = 0xe98c0010;	/*	ld	12,1f-0b(12)	*/
+      tramp[2] = 0x7d8903a6;	/*	mtctr	12		*/
+      tramp[3] = 0x4e800420;	/*	bctr			*/
 				/* 1:	.quad	function_addr	*/
 				/* 2:	.quad	context		*/
-  *(void **) &tramp[4] = (void *) ffi_closure_LINUX64;
-  *(void **) &tramp[6] = codeloc;
-  flush_icache ((char *) tramp, (char *) codeloc, 4 * 4);
+      *(void **) &tramp[4] = (void *) ffi_closure_LINUX64;
+      *(void **) &tramp[6] = codeloc;
+      flush_icache ((char *) tramp, (char *) codeloc, 4 * 4);
 #else
-  void **tramp = (void **) &closure->tramp[0];
-
-  if (cif->abi < FFI_LINUX || cif->abi >= FFI_LAST_ABI)
-    return FFI_BAD_ABI;
-
-  /* Copy function address and TOC from ffi_closure_LINUX64 OPD.  */
-  memcpy (&tramp[0], (void **) ffi_closure_LINUX64, sizeof (void *));
-  tramp[1] = codeloc;
-  memcpy (&tramp[2], (void **) ffi_closure_LINUX64 + 1, sizeof (void *));
+      /* Copy function address and TOC from ffi_closure_LINUX64 OPD.  */
+      void **tramp = (void **) &closure->tramp[0];
+      memcpy (&tramp[0], (void **) ffi_closure_LINUX64, sizeof (void *));
+      tramp[1] = codeloc;
+      memcpy (&tramp[2], (void **) ffi_closure_LINUX64 + 1, sizeof (void *));
 #endif
+    }
 
   closure->cif = cif;
   closure->fun = fun;

data/ext/ffi_c/libffi/src/powerpc/ffi_sysv.c

@@ -29,6 +29,7 @@
    ----------------------------------------------------------------------- */
 
 #include "ffi.h"
+#include <tramp.h>
 
 #ifndef POWERPC64
 #include "ffi_common.h"
@@ -636,25 +637,34 @@ ffi_prep_closure_loc_sysv (ffi_closure *closure,
 			   void *user_data,
 			   void *codeloc)
 {
-  unsigned int *tramp;
-
   if (cif->abi < FFI_SYSV || cif->abi >= FFI_LAST_ABI)
     return FFI_BAD_ABI;
 
-  tramp = (unsigned int *) &closure->tramp[0];
-  tramp[0] = 0x7c0802a6;  /*   mflr    r0 */
-  tramp[1] = 0x429f0005;  /*   bcl     20,31,.+4 */
-  tramp[2] = 0x7d6802a6;  /*   mflr    r11 */
-  tramp[3] = 0x7c0803a6;  /*   mtlr    r0 */
-  tramp[4] = 0x800b0018;  /*   lwz     r0,24(r11) */
-  tramp[5] = 0x816b001c;  /*   lwz     r11,28(r11) */
-  tramp[6] = 0x7c0903a6;  /*   mtctr   r0 */
-  tramp[7] = 0x4e800420;  /*   bctr */
-  *(void **) &tramp[8] = (void *) ffi_closure_SYSV; /* function */
-  *(void **) &tramp[9] = codeloc;                   /* context */
-
-  /* Flush the icache.  */
-  flush_icache ((char *)tramp, (char *)codeloc, 8 * 4);
+#ifdef FFI_EXEC_STATIC_TRAMP
+  if (ffi_tramp_is_present(closure))
+    {
+      /* Initialize the static trampoline's parameters. */
+      void (*dest)(void) = ffi_closure_SYSV;
+      ffi_tramp_set_parms (closure->ftramp, dest, closure);
+    }
+  else
+#endif
+    {
+      unsigned int *tramp = (unsigned int *) &closure->tramp[0];
+      tramp[0] = 0x7c0802a6;  /*   mflr    r0 */
+      tramp[1] = 0x429f0005;  /*   bcl     20,31,.+4 */
+      tramp[2] = 0x7d6802a6;  /*   mflr    r11 */
+      tramp[3] = 0x7c0803a6;  /*   mtlr    r0 */
+      tramp[4] = 0x800b0018;  /*   lwz     r0,24(r11) */
+      tramp[5] = 0x816b001c;  /*   lwz     r11,28(r11) */
+      tramp[6] = 0x7c0903a6;  /*   mtctr   r0 */
+      tramp[7] = 0x4e800420;  /*   bctr */
+      *(void **) &tramp[8] = (void *) ffi_closure_SYSV; /* function */
+      *(void **) &tramp[9] = codeloc;			/* context */
+
+      /* Flush the icache.  */
+      flush_icache ((char *)tramp, (char *)codeloc, 8 * 4);
+    }
 
   closure->cif = cif;
   closure->fun = fun;

data/ext/ffi_c/libffi/src/powerpc/internal.h

@@ -0,0 +1,10 @@
+#ifdef FFI_EXEC_STATIC_TRAMP
+/* For the trampoline code table mapping, a mapping size of 64K is chosen.  */
+#define PPC_TRAMP_MAP_SHIFT	16
+#define PPC_TRAMP_MAP_SIZE	(1 << PPC_TRAMP_MAP_SHIFT)
+# ifdef __PCREL__
+#  define PPC_TRAMP_SIZE	24
+# else
+#  define PPC_TRAMP_SIZE	40
+# endif /* __PCREL__ */
+#endif /* FFI_EXEC_STATIC_TRAMP */

data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S

@@ -27,6 +27,7 @@
 #define LIBFFI_ASM
 #include <fficonfig.h>
 #include <ffi.h>
+#include "internal.h"
 
 	.file	"linux64_closure.S"
 
@@ -559,7 +560,53 @@ ffi_go_closure_linux64:
 	.size	.ffi_go_closure_linux64,.-.ffi_go_closure_linux64
 #  endif
 # endif
+
+#ifdef FFI_EXEC_STATIC_TRAMP
+	.text
+	.align PPC_TRAMP_MAP_SHIFT
+	FFI_HIDDEN (trampoline_code_table)
+	.globl  trampoline_code_table
+# if _CALL_ELF == 2
+	.type   trampoline_code_table,@function
+trampoline_code_table:
+	.localentry trampoline_code_table,.-trampoline_code_table
+# else
+	.section	".opd","aw"
+	.align  3
+trampoline_code_table:
+	.quad   .L.trampoline_code_table,.TOC.@tocbase,0
+	.type   trampoline_code_table,@function
+	.text
+.L.trampoline_code_table:
+# endif
+	.rept	PPC_TRAMP_MAP_SIZE / PPC_TRAMP_SIZE
+#ifdef __PCREL__
+	pla	%r2,PPC_TRAMP_MAP_SIZE
+	ld	%r11,0(%r2)
+	ld	%r12,8(%r2)
+	mtctr	%r12
+	bctr
+#else
+	mflr	%r0
+	bcl	20,31,$+4
+	mflr	%r11
+	addis	%r11,%r11,PPC_TRAMP_MAP_SIZE@ha
+	mtlr	%r0
+	ld	%r12,(PPC_TRAMP_MAP_SIZE+0)@l(%r11)
+	mtctr	%r12
+	ld	%r11,(PPC_TRAMP_MAP_SIZE-8)@l(%r11)
+	bctr
+	nop
+#endif
+	.endr
+	.align PPC_TRAMP_MAP_SHIFT
+#if _CALL_ELF == 2
+	.size	trampoline_code_table,.-trampoline_code_table
+#else
+	.size	trampoline_code_table,.-.L.trampoline_code_table
 #endif
+#endif /* FFI_EXEC_STATIC_TRAMP */
+#endif /* POWERPC64 */
 
 #if (defined __ELF__ && defined __linux__) || _CALL_ELF == 2
 	.section	.note.GNU-stack,"",@progbits

data/ext/ffi_c/libffi/src/powerpc/ppc_closure.S

@@ -27,6 +27,7 @@
 #define LIBFFI_ASM
 #include <fficonfig.h>
 #include <ffi.h>
+#include "internal.h"
 #include <powerpc/asm.h>
 
 	.file   "ppc_closure.S"
@@ -391,6 +392,29 @@ ENTRY(ffi_go_closure_sysv)
 	.cfi_endproc
 END(ffi_go_closure_sysv)
 
+#ifdef FFI_EXEC_STATIC_TRAMP
+	.text
+	.align PPC_TRAMP_MAP_SHIFT
+	FFI_HIDDEN (trampoline_code_table)
+	.globl  trampoline_code_table
+	.type   trampoline_code_table,@function
+trampoline_code_table:
+	.rept   PPC_TRAMP_MAP_SIZE / PPC_TRAMP_SIZE
+	mflr    %r0
+	bcl     20,31,$+4
+	mflr    %r11
+	addis   %r11,%r11,PPC_TRAMP_MAP_SIZE@ha
+	mtlr    %r0
+	lwz     %r0,(PPC_TRAMP_MAP_SIZE-4)@l(%r11)
+	mtctr   %r0
+	lwz     %r11,(PPC_TRAMP_MAP_SIZE-8)@l(%r11)
+	bctr
+	nop
+	.endr
+	.size   trampoline_code_table,.-trampoline_code_table
+	.align PPC_TRAMP_MAP_SHIFT
+#endif /* FFI_EXEC_STATIC_TRAMP */
+
 #if defined __ELF__ && defined __linux__
 	.section	.note.GNU-stack,"",@progbits
 #endif

data/ext/ffi_c/libffi/src/prep_cif.c

@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------
-   prep_cif.c - Copyright (c) 2011, 2012, 2021  Anthony Green
+   prep_cif.c - Copyright (c) 2011, 2012, 2021, 2025  Anthony Green
                 Copyright (c) 1996, 1998, 2007  Red Hat, Inc.
                 Copyright (c) 2022 Oracle and/or its affiliates.
 
@@ -158,9 +158,6 @@ ffi_status FFI_HIDDEN ffi_prep_cif_core(ffi_cif *cif, ffi_abi abi,
 #endif
 #ifdef XTENSA
       && (cif->rtype->size > 16)
-#endif
-#ifdef NIOS2
-      && (cif->rtype->size > 8)
 #endif
      )
     bytes = STACK_ARG_SIZE(sizeof(void*));