Commit bbef54b
deps: libffi: cherry-pick 9ca53a19833d
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>1 parent 9761385 commit bbef54b
1 file changed
Lines changed: 32 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -39,6 +39,33 @@ struct ffi_aix_trampoline_struct { | |||
| 39 | 39 | void * static_chain; /* Pointer to closure */ | |
| 40 | 40 | }; | |
| 41 | 41 | ||
| 42 | + /* Closure jump table indexes returned by ffi_closure_helper_common and | ||
| 43 | + consumed by the jump tables in aix_closure.S. These mirror the | ||
| 44 | + definitions in ffi_powerpc.h, which this file cannot include because | ||
| 45 | + it defines its own (differing) FLAG_* and ffi_dblfl. */ | ||
| 46 | + #define PPC_LD_NONE 0 | ||
| 47 | + #define PPC_LD_R3 1 | ||
| 48 | + #define PPC_LD_R3R4 2 | ||
| 49 | + #define PPC_LD_F32 3 | ||
| 50 | + #define PPC_LD_F64 4 | ||
| 51 | + #define PPC_LD_F128 5 | ||
| 52 | + #define PPC_LD_U8 6 | ||
| 53 | + #define PPC_LD_S8 7 | ||
| 54 | + #define PPC_LD_U16 8 | ||
| 55 | + #define PPC_LD_S16 9 | ||
| 56 | + | ||
| 57 | + #ifndef POWERPC64 | ||
| 58 | + # define PPC_LD_U32 PPC_LD_R3 | ||
| 59 | + # define PPC_LD_S32 PPC_LD_R3 | ||
| 60 | + # define PPC_LD_PTR PPC_LD_R3 | ||
| 61 | + # define PPC_LD_I64 PPC_LD_R3R4 | ||
| 62 | + #else | ||
| 63 | + # define PPC_LD_U32 10 | ||
| 64 | + # define PPC_LD_S32 11 | ||
| 65 | + # define PPC_LD_PTR PPC_LD_R3 | ||
| 66 | + # define PPC_LD_I64 PPC_LD_R3 | ||
| 67 | + #endif | ||
| 68 | + | ||
| 42 | 69 | extern void ffi_closure_ASM (void); | |
| 43 | 70 | ||
| 44 | 71 | #if defined (FFI_GO_CLOSURES) | |
@@ -1192,12 +1219,12 @@ typedef union | |||
| 1192 | 1219 | double d; | |
| 1193 | 1220 | } ffi_dblfl; | |
| 1194 | 1221 | ||
| 1195 | - ffi_type * | ||
| 1222 | + int | ||
| 1196 | 1223 | ffi_closure_helper_DARWIN (ffi_closure *, void *, | |
| 1197 | 1224 | unsigned long *, ffi_dblfl *); | |
| 1198 | 1225 | ||
| 1199 | 1226 | #if defined (FFI_GO_CLOSURES) | |
| 1200 | - ffi_type * | ||
| 1227 | + int | ||
| 1201 | 1228 | ffi_go_closure_helper_DARWIN (ffi_go_closure*, void *, | |
| 1202 | 1229 | unsigned long *, ffi_dblfl *); | |
| 1203 | 1230 | #endif | |
@@ -1209,7 +1236,7 @@ ffi_go_closure_helper_DARWIN (ffi_go_closure*, void *, | |||
| 1209 | 1236 | up space for a return value, ffi_closure_ASM invokes the | |
| 1210 | 1237 | following helper function to do most of the work. */ | |
| 1211 | 1238 | ||
| 1212 | - static ffi_type * | ||
| 1239 | + static int | ||
| 1213 | 1240 | ffi_closure_helper_common (ffi_cif* cif, | |
| 1214 | 1241 | void (*fun)(ffi_cif*, void*, void**, void*), | |
| 1215 | 1242 | void *user_data, void *rvalue, | |
@@ -1485,7 +1512,7 @@ ffi_closure_helper_common (ffi_cif* cif, | |||
| 1485 | 1512 | } | |
| 1486 | 1513 | } | |
| 1487 | 1514 | ||
| 1488 | - ffi_type * | ||
| 1515 | + int | ||
| 1489 | 1516 | ffi_closure_helper_DARWIN (ffi_closure *closure, void *rvalue, | |
| 1490 | 1517 | unsigned long *pgr, ffi_dblfl *pfr) | |
| 1491 | 1518 | { | |
@@ -1494,7 +1521,7 @@ ffi_closure_helper_DARWIN (ffi_closure *closure, void *rvalue, | |||
| 1494 | 1521 | } | |
| 1495 | 1522 | ||
| 1496 | 1523 | #if defined (FFI_GO_CLOSURES) | |
| 1497 | - ffi_type * | ||
| 1524 | + int | ||
| 1498 | 1525 | ffi_go_closure_helper_DARWIN (ffi_go_closure *closure, void *rvalue, | |
| 1499 | 1526 | unsigned long *pgr, ffi_dblfl *pfr) | |
| 1500 | 1527 | { | |
0 commit comments