diff --git a/graalpython/com.oracle.graal.python.cext/CMakeLists.txt b/graalpython/com.oracle.graal.python.cext/CMakeLists.txt index 346c6fcdd4..8ad41ba7bd 100644 --- a/graalpython/com.oracle.graal.python.cext/CMakeLists.txt +++ b/graalpython/com.oracle.graal.python.cext/CMakeLists.txt @@ -381,9 +381,6 @@ set(CTYPES_SRC "${SRC_DIR}/modules/_ctypes/ctypes.h" "${SRC_DIR}/modules/_ctypes/stgdict.c" ) -if(APPLE) - set(CTYPES_SRC ${CTYPES_SRC} "${SRC_DIR}/modules/_ctypes/malloc_closure.c") -endif() native_module("_ctypes" TRUE "${CTYPES_SRC}") if(WIN32) target_compile_definitions("_ctypes" PRIVATE MS_WIN32 MS_WINDOWS) @@ -434,7 +431,9 @@ elseif(APPLE) HAVE_DECL_RTLD_LOCAL HAVE_DECL_RTLD_GLOBAL HAVE_DYLD_SHARED_CACHE_CONTAINS_PATH - USING_MALLOC_CLOSURE_DOT_C + HAVE_FFI_CLOSURE_ALLOC + HAVE_FFI_PREP_CIF_VAR + HAVE_FFI_PREP_CLOSURE_LOC ) else() target_compile_definitions("_ctypes" PRIVATE diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_ctypes.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_ctypes.txt index 032796088f..9e876d3617 100644 --- a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_ctypes.txt +++ b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_ctypes.txt @@ -21,7 +21,7 @@ test.test_ctypes.test_arrays.ArrayTestCase.test_subclass @ darwin-arm64,linux-aa test.test_ctypes.test_arrays.ArrayTestCase.test_zero_length @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_ctypes.test_as_parameter.AsParamNestedWrapperTestCase.test_byval @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_ctypes.test_as_parameter.AsParamNestedWrapperTestCase.test_callbacks @ linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github -test.test_ctypes.test_as_parameter.AsParamNestedWrapperTestCase.test_callbacks_2 @ linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github +test.test_ctypes.test_as_parameter.AsParamNestedWrapperTestCase.test_callbacks_2 @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_ctypes.test_as_parameter.AsParamNestedWrapperTestCase.test_longlong_callbacks @ linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_ctypes.test_as_parameter.AsParamNestedWrapperTestCase.test_pointers @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github test.test_ctypes.test_as_parameter.AsParamNestedWrapperTestCase.test_recursive_as_param @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github