mirror of
https://github.com/partic2/libffi
synced 2026-11-11 02:27:19 +00:00
Cleanup symbol exports on darwin and add architecture preprocessor checks to assist in building fat binaries (eg: i386+x86_64 on macOS or arm+aarch64 on iOS) (#450)
* x86: Ensure _efi64 suffixed symbols are not exported * x86: Ensure we do not export ffi_prep_cif_machdep Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> * x86: Ensure we don't export ffi_call_win64, ffi_closure_win64, or ffi_go_closure_win64 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> * closures: Silence a semantic warning libffi/src/closures.c:175:23: This function declaration is not a prototype Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> * aarch64: Ensure we don't export ffi_prep_cif_machdep Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> * arm: Ensure we don't export ffi_prep_cif_machdep Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> * aarch64, arm, x86: Add architecture preprocessor checks to support easier fat builds (eg: iOS) Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> * x86: Silence some static analysis warnings libffi/src/x86/ffi64.c:286:21: The left operand of '!=' is a garbage value due to array index out of bounds libffi/src/x86/ffi64.c:297:22: The left operand of '!=' is a garbage value due to array index out of bounds Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> * aarch: Use FFI_HIDDEN rather than .hidden Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> * ffi.h: Don't advertise ffi_java_rvalue_to_raw, ffi_prep_java_raw_closure, and ffi_prep_java_raw_closure_loc when FFI_NATIVE_RAW_API is 0 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia
committed by
Anthony Green
Anthony Green
parent
3ec522bc1c
commit
05a1796419
+2
-2
@@ -29,7 +29,7 @@
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
----------------------------------------------------------------------- */
|
||||
|
||||
#ifndef __x86_64__
|
||||
#ifdef __i386__
|
||||
#include <ffi.h>
|
||||
#include <ffi_common.h>
|
||||
#include <stdint.h>
|
||||
@@ -756,4 +756,4 @@ ffi_raw_call(ffi_cif *cif, void (*fn)(void), void *rvalue, ffi_raw *avalue)
|
||||
ffi_call_i386 (frame, stack);
|
||||
}
|
||||
#endif /* !FFI_NO_RAW_API */
|
||||
#endif /* !__x86_64__ */
|
||||
#endif /* __i386__ */
|
||||
|
||||
+3
-3
@@ -282,7 +282,7 @@ classify_argument (ffi_type *type, enum x86_64_reg_class classes[],
|
||||
|
||||
/* The X86_64_SSEUP_CLASS should be always preceded by
|
||||
X86_64_SSE_CLASS or X86_64_SSEUP_CLASS. */
|
||||
if (classes[i] == X86_64_SSEUP_CLASS
|
||||
if (i > 1 && classes[i] == X86_64_SSEUP_CLASS
|
||||
&& classes[i - 1] != X86_64_SSE_CLASS
|
||||
&& classes[i - 1] != X86_64_SSEUP_CLASS)
|
||||
{
|
||||
@@ -293,7 +293,7 @@ classify_argument (ffi_type *type, enum x86_64_reg_class classes[],
|
||||
|
||||
/* If X86_64_X87UP_CLASS isn't preceded by X86_64_X87_CLASS,
|
||||
everything should be passed in memory. */
|
||||
if (classes[i] == X86_64_X87UP_CLASS
|
||||
if (i > 1 && classes[i] == X86_64_X87UP_CLASS
|
||||
&& (classes[i - 1] != X86_64_X87_CLASS))
|
||||
{
|
||||
/* The first one should never be X86_64_X87UP_CLASS. */
|
||||
@@ -394,7 +394,7 @@ extern ffi_status
|
||||
ffi_prep_cif_machdep_efi64(ffi_cif *cif);
|
||||
#endif
|
||||
|
||||
ffi_status
|
||||
ffi_status FFI_HIDDEN
|
||||
ffi_prep_cif_machdep (ffi_cif *cif)
|
||||
{
|
||||
int gprcount, ssecount, i, avn, ngpr, nsse;
|
||||
|
||||
+5
-2
@@ -25,6 +25,7 @@
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
----------------------------------------------------------------------- */
|
||||
|
||||
#ifdef __x86_64__
|
||||
#include <ffi.h>
|
||||
#include <ffi_common.h>
|
||||
#include <stdlib.h>
|
||||
@@ -33,7 +34,7 @@
|
||||
#ifdef X86_WIN64
|
||||
#define EFI64(name) name
|
||||
#else
|
||||
#define EFI64(name) name##_efi64
|
||||
#define EFI64(name) FFI_HIDDEN name##_efi64
|
||||
#endif
|
||||
|
||||
struct win64_call_frame
|
||||
@@ -48,7 +49,7 @@ struct win64_call_frame
|
||||
extern void ffi_call_win64 (void *stack, struct win64_call_frame *,
|
||||
void *closure) FFI_HIDDEN;
|
||||
|
||||
ffi_status
|
||||
ffi_status FFI_HIDDEN
|
||||
EFI64(ffi_prep_cif_machdep)(ffi_cif *cif)
|
||||
{
|
||||
int flags, n;
|
||||
@@ -306,3 +307,5 @@ ffi_closure_win64_inner(ffi_cif *cif,
|
||||
fun (cif, rvalue, avalue, user_data);
|
||||
return flags;
|
||||
}
|
||||
|
||||
#endif /* __x86_64__ */
|
||||
|
||||
+2
-2
@@ -26,7 +26,7 @@
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
----------------------------------------------------------------------- */
|
||||
|
||||
#ifndef __x86_64__
|
||||
#ifdef __i386__
|
||||
#ifndef _MSC_VER
|
||||
|
||||
#define LIBFFI_ASM
|
||||
@@ -1122,7 +1122,7 @@ L(EFDE9):
|
||||
#endif /* __APPLE__ */
|
||||
|
||||
#endif /* ifndef _MSC_VER */
|
||||
#endif /* ifndef __x86_64__ */
|
||||
#endif /* ifdef __i386__ */
|
||||
|
||||
#if defined __ELF__ && defined __linux__
|
||||
.section .note.GNU-stack,"",@progbits
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#ifdef __x86_64__
|
||||
#define LIBFFI_ASM
|
||||
#include <fficonfig.h>
|
||||
#include <ffi.h>
|
||||
@@ -42,6 +43,7 @@
|
||||
|
||||
.align 8
|
||||
.globl C(ffi_call_win64)
|
||||
FFI_HIDDEN(C(ffi_call_win64))
|
||||
|
||||
SEH(.seh_proc ffi_call_win64)
|
||||
C(ffi_call_win64):
|
||||
@@ -169,6 +171,7 @@ E(0b, FFI_TYPE_SMALL_STRUCT_4B)
|
||||
|
||||
.align 8
|
||||
.globl C(ffi_go_closure_win64)
|
||||
FFI_HIDDEN(C(ffi_go_closure_win64))
|
||||
|
||||
SEH(.seh_proc ffi_go_closure_win64)
|
||||
C(ffi_go_closure_win64):
|
||||
@@ -188,6 +191,7 @@ C(ffi_go_closure_win64):
|
||||
|
||||
.align 8
|
||||
.globl C(ffi_closure_win64)
|
||||
FFI_HIDDEN(C(ffi_closure_win64))
|
||||
|
||||
SEH(.seh_proc ffi_closure_win64)
|
||||
C(ffi_closure_win64):
|
||||
@@ -226,6 +230,7 @@ C(ffi_closure_win64):
|
||||
|
||||
cfi_endproc
|
||||
SEH(.seh_endproc)
|
||||
#endif /* __x86_64__ */
|
||||
|
||||
#if defined __ELF__ && defined __linux__
|
||||
.section .note.GNU-stack,"",@progbits
|
||||
|
||||
Reference in New Issue
Block a user