deps: libffi: cherry-pick 9ca53a19833d

atgreen · aduh95 · commit bbef54b41330 · 2026-06-22T08:58:18.000+02:00
Original commit message: powerpc: fix aix/darwin closure build errors unbuildable: the PPC_LD_* jump-table indexes (defined in ffi_powerpc.h, which this file cannot include) were missing, and the closure helper functions still declared an ffi_type* return type inconsistent with the PPC_LD_* constants they now return. Define the PPC_LD_* constants locally and change the closure helper return types to int. Fixes #987 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Refs: libffi/libffi@9ca53a1 PR-URL: #64040 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: René <contact.9a5d6388@renegade334.me.uk> Reviewed-By: Paolo Insogna <paolo@cowtech.it>
diff --git a/deps/libffi/src/powerpc/ffi_darwin.c b/deps/libffi/src/powerpc/ffi_darwin.c
@@ -39,6 +39,33 @@ struct ffi_aix_trampoline_struct {
     void * static_chain;	/* Pointer to closure */
 };
 
+/* Closure jump table indexes returned by ffi_closure_helper_common and
+   consumed by the jump tables in aix_closure.S.  These mirror the
+   definitions in ffi_powerpc.h, which this file cannot include because
+   it defines its own (differing) FLAG_* and ffi_dblfl.  */
+#define PPC_LD_NONE		0
+#define PPC_LD_R3		1
+#define PPC_LD_R3R4		2
+#define PPC_LD_F32		3
+#define PPC_LD_F64		4
+#define PPC_LD_F128		5
+#define PPC_LD_U8		6
+#define PPC_LD_S8		7
+#define PPC_LD_U16		8
+#define PPC_LD_S16		9
+
+#ifndef POWERPC64
+# define PPC_LD_U32		PPC_LD_R3
+# define PPC_LD_S32		PPC_LD_R3
+# define PPC_LD_PTR		PPC_LD_R3
+# define PPC_LD_I64		PPC_LD_R3R4
+#else
+# define PPC_LD_U32		10
+# define PPC_LD_S32		11
+# define PPC_LD_PTR		PPC_LD_R3
+# define PPC_LD_I64		PPC_LD_R3
+#endif
+
 extern void ffi_closure_ASM (void);
 
 #if defined (FFI_GO_CLOSURES)
@@ -1192,12 +1219,12 @@ typedef union
   double d;
 } ffi_dblfl;
 
-ffi_type *
+int
 ffi_closure_helper_DARWIN (ffi_closure *, void *,
 			   unsigned long *, ffi_dblfl *);
 
 #if defined (FFI_GO_CLOSURES)
-ffi_type *
+int
 ffi_go_closure_helper_DARWIN (ffi_go_closure*, void *,
 			      unsigned long *, ffi_dblfl *);
 #endif
@@ -1209,7 +1236,7 @@ ffi_go_closure_helper_DARWIN (ffi_go_closure*, void *,
    up space for a return value, ffi_closure_ASM invokes the
    following helper function to do most of the work.  */
 
-static ffi_type *
+static int
 ffi_closure_helper_common (ffi_cif* cif,
 			   void (*fun)(ffi_cif*, void*, void**, void*),
 			   void *user_data, void *rvalue,
@@ -1485,7 +1512,7 @@ ffi_closure_helper_common (ffi_cif* cif,
     }
 }
 
-ffi_type *
+int
 ffi_closure_helper_DARWIN (ffi_closure *closure, void *rvalue,
 			   unsigned long *pgr, ffi_dblfl *pfr)
 {
@@ -1494,7 +1521,7 @@ ffi_closure_helper_DARWIN (ffi_closure *closure, void *rvalue,
 }
 
 #if defined (FFI_GO_CLOSURES)
-ffi_type *
+int
 ffi_go_closure_helper_DARWIN (ffi_go_closure *closure, void *rvalue,
 			      unsigned long *pgr, ffi_dblfl *pfr)
 {
