From 65371511b9cd89474ee9fee12d8fec2faa63c745 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sat, 9 Dec 2023 15:53:16 +0100
Subject: [PATCH] [3.12] gh-110820: Disable
 test_signal.test_stress_modifying_handlers on macOS (GH-112834)

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

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

(cherry picked from commit 15a80b15af9a0b0ebe6bd538a1919712ce7d4ef9)
---
 Include/pymacconfig.h                                 | 11 ++++++++++-
 .../2023-12-07-14-19-46.gh-issue-110820.DIxb_F.rst    |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 Misc/NEWS.d/next/macOS/2023-12-07-14-19-46.gh-issue-110820.DIxb_F.rst

diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h
index 00459a03b980be..61f08e368efb0b 100644
--- a/Include/pymacconfig.h
+++ b/Include/pymacconfig.h
@@ -10,7 +10,9 @@
 
 #if defined(__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
@@ -23,6 +25,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__)
@@ -80,8 +83,14 @@
 #define DOUBLE_IS_LITTLE_ENDIAN_IEEE754
 #endif /* __BIG_ENDIAN */
 
-#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
 
 
diff --git a/Misc/NEWS.d/next/macOS/2023-12-07-14-19-46.gh-issue-110820.DIxb_F.rst b/Misc/NEWS.d/next/macOS/2023-12-07-14-19-46.gh-issue-110820.DIxb_F.rst
new file mode 100644
index 00000000000000..0badace7928745
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2023-12-07-14-19-46.gh-issue-110820.DIxb_F.rst
@@ -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.