Skip to content

bpo-41100: ctypes fixes for arm64 Mac OS #21249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lawrence-danna-apple wants to merge 10 commits into from
Closed

bpo-41100: ctypes fixes for arm64 Mac OS #21249

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ff883bc
use system libffi for Mac OS 10.15 and up
lawrence-danna-apple Jun 30, 2020
36b35bc
ctypes: use the correct ABI for variadic functions
lawrence-danna-apple Jun 30, 2020
bacf128
ctypes: probe libffi for ffi_closure_alloc and ffi_prep_cif_var
lawrence-danna-apple Jul 1, 2020
971ef00
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 1, 2020
da30587
fix spelling in Doc/library/ctypes.rst
lawrence-danna-apple Jul 13, 2020
80f852b
use system libffi for older releases of Mac OS
lawrence-danna-apple Jul 15, 2020
aeac14b
remove FUNCFLAG_VARIADIC
lawrence-danna-apple Jul 15, 2020
62fe20a
fixup! use system libffi for older releases of Mac OS
lawrence-danna-apple Jul 16, 2020
e160a59
fixup! use system libffi for older releases of Mac OS
lawrence-danna-apple Jul 16, 2020
bca75fd
Fix build failure on Mac OS 10.10 / Xcode 6, remove libffi_osx
lawrence-danna-apple Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix build failure on Mac OS 10.10 / Xcode 6, remove libffi_osx
  • Loading branch information
@lawrence-danna-apple
lawrence-danna-apple committed Jul 20, 2020
commit bca75fd87beaa4f07499673e14af133e7cad1efb
1 change: 1 addition & 0 deletions Doc/library/ctypes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2545,3 +2545,4 @@ Arrays and pointers

Returns the object to which to pointer points. Assigning to this
attribute changes the pointer to point to the assigned object.

6 changes: 5 additions & 1 deletion Modules/_ctypes/callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
}
#if HAVE_FFI_PREP_CLOSURE_LOC
# if USING_APPLE_OS_LIBFFI
# define HAVE_FFI_PREP_CLOSURE_LOC_RUNTIME __builtin_available(macos 11, ios 13, watchos 6, tvos 13, *)
# define HAVE_FFI_PREP_CLOSURE_LOC_RUNTIME __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *)
# else
# define HAVE_FFI_PREP_CLOSURE_LOC_RUNTIME true
# endif
Expand All @@ -426,10 +426,14 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
PyErr_Format(PyExc_NotImplementedError, "ffi_prep_closure_loc() is missing");
goto error;
#else
#if __clang__
#pragma clang diagnostic push
Copy link
Copy Markdown
Member

@ned-deily ned-deily Jul 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should avoid -Wunknown-pragmas warnings when building on other platforms.

Copy link
Copy Markdown
Contributor Author

@lawrence-danna-apple lawrence-danna-apple Jul 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

#pragma clang diagnostic ignored "-Wdeprecated-declarations"
Copy link
Copy Markdown
Member

@ned-deily ned-deily Jul 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

#endif
result = ffi_prep_closure(p->pcl_write, &p->cif, closure_fcn, p);
#if __clang__
#pragma clang diagnostic pop
Copy link
Copy Markdown
Member

@ned-deily ned-deily Jul 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

#endif
#endif
}
if (result != FFI_OK) {
Expand Down
2 changes: 1 addition & 1 deletion Modules/_ctypes/callproc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ static int _call_function_pointer(int flags,
#endif

# if USING_APPLE_OS_LIBFFI
Copy link
Copy Markdown
Contributor

@ronaldoussoren ronaldoussoren Jul 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proposed change:

#if USING_APPLE_OS_LIBFFI && HAVE_FFI_PREP_CIF_VAR

This way the __builtin_available is not used when building on older macOS versions.

# define HAVE_FFI_PREP_CIF_VAR_RUNTIME __builtin_available(macos 11, ios 13, watchos 6, tvos 13, *)
# define HAVE_FFI_PREP_CIF_VAR_RUNTIME __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *)
# elif HAVE_FFI_PREP_CIF_VAR
# define HAVE_FFI_PREP_CIF_VAR_RUNTIME true
# else
Expand Down
20 changes: 0 additions & 20 deletions Modules/_ctypes/libffi_osx/LICENSE
View file
Open in desktop

This file was deleted.

Loading