Merge branch 'master' into preload

* master:
  Update NEWS [ci skip]
  Update NEWS [ci skip]
  Update libmagic.patch [ci skip]
  Update libmagic.patch [ci skip]
  Declare function proto in header
  Declare function proto in header
  Fix #76825: Undefined symbols ___cpuid_count
  NEWS
  Fix: #77110 undefined symbol zend_string_equal_val in C++ build
  Fix #77105: Use position:sticky for <th> in `phpinfo()`
  Implement handling for JIT recognition when cross compiling
  Backport 7f5f460 for 7.2
  Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
  Rework places in libmagic regarding previous CVE-2014-3538 fixes
  Change the way JIT availability is checked
  Fix a test for ldap extension
  Fixed bug #77092
  Future-proof email addresses

Author: dstogov

Zend/Zend.m4

@@ -491,3 +491,21 @@ dnl This is the most probable fallback so we assume yes in case of cross compile
 if test "$ac_cv_huge_val_nan" = "yes"; then
   AC_DEFINE([HAVE_HUGE_VAL_NAN], 1, [whether HUGE_VAL + -HUGEVAL == NAN])
 fi
+
+dnl
+dnl Check whether __cpuid_count is available
+dnl
+AC_CACHE_CHECK(whether __cpuid_count is available, ac_cv_cpuid_count_available, [
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+  #include <cpuid.h>
+]], [[
+  unsigned eax, ebx, ecx, edx;
+  __cpuid_count(0, 0, eax, ebx, ecx, edx);
+]])], [
+  ac_cv_cpuid_count_available=yes
+], [
+  ac_cv_cpuid_count_available=no
+])])
+if test "$ac_cv_cpuid_count_available" = "yes"; then
+  AC_DEFINE([HAVE_CPUID_COUNT], 1, [whether __cpuid_count is available])
+fi

Zend/zend_cpuinfo.c

@@ -29,7 +29,7 @@ typedef struct _zend_cpu_info {
 static zend_cpu_info cpuinfo = {0};
 
 #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-# ifdef HAVE_CPUID_H
+# if defined(HAVE_CPUID_H) && defined(HAVE_CPUID_COUNT)
 # include <cpuid.h>
 static void __zend_cpuid(uint32_t func, uint32_t subfunc, zend_cpu_info *cpuinfo) {
 	__cpuid_count(func, subfunc, cpuinfo->eax, cpuinfo->ebx, cpuinfo->ecx, cpuinfo->edx);

Zend/zend_string.h

@@ -294,7 +294,9 @@ static zend_always_inline void zend_string_release_ex(zend_string *s, int persis
 }
 
 #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+BEGIN_EXTERN_C()
 ZEND_API zend_bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2);
+END_EXTERN_C()
 #else
 static zend_always_inline zend_bool zend_string_equal_val(zend_string *s1, zend_string *s2)
 {