Commit 586fc22acc0 for php

commit 586fc22acc019f8370a8bd152dd72a05b35de960
Author: Tim Düsterhus <tim@tideways-gmbh.com>
Date:   Mon Sep 28 12:38:53 2026 +0200

    opcache: Rely on `alignof()` for `PLATFORM_ALIGNMENT` (#23906)

diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index e6c7ed992b4..a4f72d76881 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -56,6 +56,7 @@
 # include <unix.h>
 #endif

+#include <stdalign.h>
 #include <stdarg.h>
 #include <stddef.h>

diff --git a/ext/opcache/zend_shared_alloc.h b/ext/opcache/zend_shared_alloc.h
index cf0bb10d893..e9568fc368b 100644
--- a/ext/opcache/zend_shared_alloc.h
+++ b/ext/opcache/zend_shared_alloc.h
@@ -164,15 +164,7 @@ typedef union _align_test {
 	zend_long  lng;
 } align_test;

-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L
-# define PLATFORM_ALIGNMENT (alignof(align_test) < 8 ? 8 : alignof(align_test))
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-# define PLATFORM_ALIGNMENT (_Alignof(align_test) < 8 ? 8 : _Alignof(align_test))
-#elif ZEND_GCC_VERSION >= 2000 || defined(__clang__)
-# define PLATFORM_ALIGNMENT (__alignof__(align_test) < 8 ? 8 : __alignof__(align_test))
-#else
-# define PLATFORM_ALIGNMENT (sizeof(align_test))
-#endif
+#define PLATFORM_ALIGNMENT (alignof(align_test) < 8 ? 8 : alignof(align_test))

 #define ZEND_ALIGNED_SIZE(size) \
 	ZEND_MM_ALIGNED_SIZE_EX(size, PLATFORM_ALIGNMENT)