Fix build for old gcc.

Only enable ZEND_INTRIN_SSE4_2_PCLMUL_FUNC_PROTO for gcc9 later,
__builtin_cpu_supports support pclmul later.

Also use _mm_move_epi64 instead.

Signed-off-by: Frank Du <[email protected]>

Author: frankdjx

Zend/zend_cpuinfo.h

@@ -159,13 +159,16 @@ static zend_always_inline int zend_cpu_supports_sse42() {
 	return __builtin_cpu_supports("sse4.2");
 }
 
+/* __builtin_cpu_supports has pclmul from gcc9 */
+#if (!defined(__GNUC__) || (ZEND_GCC_VERSION >= 9000))
 ZEND_NO_SANITIZE_ADDRESS
 static zend_always_inline int zend_cpu_supports_pclmul() {
 #if PHP_HAVE_BUILTIN_CPU_INIT
         __builtin_cpu_init();
 #endif
         return __builtin_cpu_supports("pclmul");
 }
+#endif
 
 ZEND_NO_SANITIZE_ADDRESS
 static zend_always_inline int zend_cpu_supports_avx() {

Zend/zend_portability.h

@@ -559,7 +559,8 @@ extern "C++" {
 #endif
 
 /* Do not use for conditional declaration of API functions! */
-#if defined(ZEND_INTRIN_PCLMUL_RESOLVER) && defined(ZEND_INTRIN_HAVE_IFUNC_TARGET)
+#if defined(ZEND_INTRIN_PCLMUL_RESOLVER) && defined(ZEND_INTRIN_HAVE_IFUNC_TARGET) && (!defined(__GNUC__) || (ZEND_GCC_VERSION >= 9000))
+/* __builtin_cpu_supports has pclmul from gcc9 */
 # define ZEND_INTRIN_PCLMUL_FUNC_PROTO 1
 #elif defined(ZEND_INTRIN_PCLMUL_RESOLVER)
 # define ZEND_INTRIN_PCLMUL_FUNC_PTR 1
@@ -584,7 +585,8 @@ extern "C++" {
 #endif
 
 /* Do not use for conditional declaration of API functions! */
-#if defined(ZEND_INTRIN_SSE4_2_PCLMUL_RESOLVER) && defined(ZEND_INTRIN_HAVE_IFUNC_TARGET)
+#if defined(ZEND_INTRIN_SSE4_2_PCLMUL_RESOLVER) && defined(ZEND_INTRIN_HAVE_IFUNC_TARGET) && (!defined(__GNUC__) || (ZEND_GCC_VERSION >= 9000))
+/* __builtin_cpu_supports has pclmul from gcc9 */
 # define ZEND_INTRIN_SSE4_2_PCLMUL_FUNC_PROTO 1
 #elif defined(ZEND_INTRIN_SSE4_2_PCLMUL_RESOLVER)
 # define ZEND_INTRIN_SSE4_2_PCLMUL_FUNC_PTR 1

ext/standard/crc32_x86.c

@@ -173,7 +173,7 @@ size_t crc32_pclmul_batch(uint32_t *crc, const unsigned char *p, size_t nr, cons
 
 	/* barrett reduction */
 	k = _mm_loadu_si128((__m128i*)consts->uPx);
-	x1 = _mm_loadu_si64(&x0);
+	x1 = _mm_move_epi64(x0);
 	x1 = _mm_srli_si128(x1, 4);
 	x1 = _mm_clmulepi64_si128(x1, k, 0x00);
 	x1 = _mm_srli_si128(x1, 4);

ext/standard/crc32_x86.h

@@ -28,7 +28,7 @@ typedef enum {
 	*/
 	X86_CRC32B,
 	/*
-	 polynomial: 0x1EDC6F41 witn reversed ordering,
+	 polynomial: 0x1EDC6F41 with reversed ordering,
 	 used by iSCSI, SCTP, Btrfs, ext4, etc
 	*/
 	X86_CRC32C,