diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2023-12-08 09:09:34 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 09:09:34 (GMT) |
| commit | 15a80b15af9a0b0ebe6bd538a1919712ce7d4ef9 (patch) | |
| tree | 521a92ed1c10049f57fbc4c557bd2e5da37e702c /Include | |
| parent | 4ac1e8fb25c5c0e1da61784281ab878db671761b (diff) | |
| download | cpython-15a80b15af9a0b0ebe6bd538a1919712ce7d4ef9.zip cpython-15a80b15af9a0b0ebe6bd538a1919712ce7d4ef9.tar.gz cpython-15a80b15af9a0b0ebe6bd538a1919712ce7d4ef9.tar.bz2 | |
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
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/pymacconfig.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h index 806e419..615abe1 100644 --- a/Include/pymacconfig.h +++ b/Include/pymacconfig.h @@ -7,7 +7,9 @@ #define PY_MACCONFIG_H #ifdef __APPLE__ +#undef ALIGNOF_MAX_ALIGN_T #undef SIZEOF_LONG +#undef SIZEOF_LONG_DOUBLE #undef SIZEOF_PTHREAD_T #undef SIZEOF_SIZE_T #undef SIZEOF_TIME_T @@ -20,6 +22,7 @@ #undef DOUBLE_IS_BIG_ENDIAN_IEEE754 #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 #undef HAVE_GCC_ASM_FOR_X87 +#undef HAVE_GCC_ASM_FOR_X64 #undef VA_LIST_IS_ARRAY #if defined(__LP64__) && defined(__x86_64__) @@ -74,8 +77,14 @@ # define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 #endif -#ifdef __i386__ +#if defined(__i386__) || defined(__x86_64__) # 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 // __APPLE__ |