Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-110820: Make sure processor specific defines are correct for Universal 2 build on macOS (#112828) 

* gh-110820: Make sure processor specific defines are correct for Universal 2 build on macOS

A number of processor specific defines are different for x86-64 and
arm64, and need to be adjusted in pymacconfig.h.

* remove debug stuf
This commit is contained in:
Ronald Oussoren 2023-12-08 10:09:34 +01:00 committed by GitHub
parent 4ac1e8fb25
commit 15a80b15af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Include/pymacconfig.h
View File

@ -7,7 +7,9 @@
#define PY_MACCONFIG_H #define PY_MACCONFIG_H
#ifdef __APPLE__ #ifdef __APPLE__
#undef ALIGNOF_MAX_ALIGN_T
#undef SIZEOF_LONG #undef SIZEOF_LONG
#undef SIZEOF_LONG_DOUBLE
#undef SIZEOF_PTHREAD_T #undef SIZEOF_PTHREAD_T
#undef SIZEOF_SIZE_T #undef SIZEOF_SIZE_T
#undef SIZEOF_TIME_T #undef SIZEOF_TIME_T
@ -20,6 +22,7 @@
#undef DOUBLE_IS_BIG_ENDIAN_IEEE754 #undef DOUBLE_IS_BIG_ENDIAN_IEEE754
#undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754
#undef HAVE_GCC_ASM_FOR_X87 #undef HAVE_GCC_ASM_FOR_X87
#undef HAVE_GCC_ASM_FOR_X64
#undef VA_LIST_IS_ARRAY #undef VA_LIST_IS_ARRAY
#if defined(__LP64__) && defined(__x86_64__) #if defined(__LP64__) && defined(__x86_64__)
@ -74,8 +77,14 @@
# define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 # define DOUBLE_IS_LITTLE_ENDIAN_IEEE754
#endif #endif
#ifdef __i386__ #if defined(__i386__) || defined(__x86_64__)
# define HAVE_GCC_ASM_FOR_X87 # define HAVE_GCC_ASM_FOR_X87
# define ALIGNOF_MAX_ALIGN_T 16
# define HAVE_GCC_ASM_FOR_X64 1
# define SIZEOF_LONG_DOUBLE 16
#else
# define ALIGNOF_MAX_ALIGN_T 8
# define SIZEOF_LONG_DOUBLE 8
#endif #endif
#endif // __APPLE__ #endif // __APPLE__

3
Misc/NEWS.d/next/macOS/2023-12-07-14-19-46.gh-issue-110820.DIxb_F.rst Normal file
View File

@ -0,0 +1,3 @@
Make sure the preprocessor definitions for ``ALIGNOF_MAX_ALIGN_T``,
``SIZEOF_LONG_DOUBLE`` and ``HAVE_GCC_ASM_FOR_X64`` are correct for
Universal 2 builds on macOS.