From 6e5199ed9b52e2ba74082375c5e0cfe7e982544c Mon Sep 17 00:00:00 2001
From: nielsdos <7771979+nielsdos@users.noreply.github.com>
Date: Fri, 23 Jun 2023 17:29:49 +0200
Subject: [PATCH] Fix GH-11514: PHP 8.3 build fails with --enable-mbstring
 enabled

I tweaked the #if check such that the workaround only applies on GCC
versions older than 8.0.
I tested this with GCC 7.5, 8.4, 9.4, GCC 13.1.1, and Clang 10.0.
---
 ext/mbstring/mbstring.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 05c26c652c2b9..c97112f0ba60a 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -4981,6 +4981,12 @@ static void init_check_utf8(void)
 
 #if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER)
 
+/* GCC prior to version 8 does not define all intrinsics. See GH-11514.
+ * Use a workaround from https://stackoverflow.com/questions/32630458/setting-m256i-to-the-value-of-two-m128i-values */
+#if defined(__GNUC__) && !defined(__llvm__) && !defined(__INTEL_COMPILER) && __GNUC__ < 8
+# define _mm256_set_m128i(v0, v1)  _mm256_insertf128_si256(_mm256_castsi128_si256(v1), (v0), 1)
+#endif
+
 /* Take (256-bit) `hi` and `lo` as a 512-bit value, shift down by some
  * number of bytes, then take the low 256 bits
  * This is used to take some number of trailing bytes from the previous 32-byte