Merge branch 'PHP-8.3'

Author: petk

cmake/Zend/CMakeLists.txt

@@ -291,7 +291,8 @@ cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
   check_source_compiles(C [[
     #include <cpuid.h>
-    int main(void) {
+    int main(void)
+    {
       unsigned eax, ebx, ecx, edx;
       __cpuid_count(0, 0, eax, ebx, ecx, edx);
       return 0;

cmake/cmake/ConfigureChecks.cmake

@@ -241,7 +241,8 @@ message(CHECK_START "Checking for asm goto support")
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
   check_source_compiles(C [[
-    int main(void) {
+    int main(void)
+    {
       #if defined(__x86_64__) || defined(__i386__)
         __asm__ goto("jmp %l0\n" :::: end);
       #elif defined(__aarch64__)
@@ -500,7 +501,8 @@ message(CHECK_START "Checking whether the compiler supports __alignof__")
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_QUIET TRUE)
   check_source_compiles(C [[
-    int main(void) {
+    int main(void)
+    {
       int align = __alignof__(int);
       (void)align;
       return 0;

cmake/cmake/modules/FindACL.cmake

@@ -68,7 +68,8 @@ function(_acl_check result)
       check_source_compiles(C [[
         #include <sys/acl.h>
 
-        int main(void) {
+        int main(void)
+        {
           acl_t acl;
           acl_entry_t user, group;
           acl = acl_init(1);

cmake/cmake/modules/FindAtomic.cmake

@@ -22,7 +22,8 @@ block()
   set(test [[
     #include <stdatomic.h>
 
-    int main(void) {
+    int main(void)
+    {
       atomic_flag n8_flag = ATOMIC_FLAG_INIT;
       atomic_ullong n64 = ATOMIC_VAR_INIT(0);
 

cmake/cmake/modules/FindBerkeleyDB.cmake

@@ -79,7 +79,8 @@ if(BerkeleyDB_USE_DB1)
 
     check_source_compiles(C [[
       #include <db_185.h>
-      int main(void) {
+      int main(void)
+      {
         DB * dbp = dbopen("", 0, 0, DB_HASH, 0);
         return 0;
       }
@@ -102,7 +103,8 @@ if(BerkeleyDB_LIBRARY)
     check_source_compiles(C [[
       #include <db.h>
 
-      int main(void) {
+      int main(void)
+      {
         (void)db_create((DB**)0, (DB_ENV*)0, 0);
         return 0;
       }

cmake/cmake/modules/FindRE2C.cmake

@@ -182,7 +182,8 @@ if(RE2C_USE_COMPUTED_GOTOS)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_QUIET TRUE)
     check_source_compiles(C [[
-      int main(void) {
+      int main(void)
+      {
       label1:
         ;
       label2:

cmake/cmake/modules/PHP/CheckAVX512.cmake

@@ -7,10 +7,10 @@ TODO: Adjust checks for MSVC.
 
 Cache variables:
 
-  PHP_HAVE_AVX512_SUPPORTS
-    Whether compiler supports AVX-512.
-  PHP_HAVE_AVX512_VBMI_SUPPORTS
-    Whether compiler supports AVX-512 VBMI.
+* `PHP_HAVE_AVX512_SUPPORTS`
+  Whether compiler supports AVX-512.
+* `PHP_HAVE_AVX512_VBMI_SUPPORTS`
+  Whether compiler supports AVX-512 VBMI.
 #]=============================================================================]
 
 include_guard(GLOBAL)
@@ -29,7 +29,8 @@ cmake_push_check_state(RESET)
   check_source_compiles(C [[
     #include <immintrin.h>
 
-    int main(void) {
+    int main(void)
+    {
       __m512i mask = _mm512_set1_epi32(0x1);
       char out[32];
       _mm512_storeu_si512(out, _mm512_shuffle_epi8(mask, mask));
@@ -48,7 +49,8 @@ cmake_push_check_state(RESET)
   check_source_compiles(C [[
     #include <immintrin.h>
 
-    int main(void) {
+    int main(void)
+    {
       __m512i mask = _mm512_set1_epi32(0x1);
       char out[32];
       _mm512_storeu_si512(out, _mm512_permutexvar_epi8(mask, mask));

cmake/cmake/modules/PHP/CheckAttribute.cmake

@@ -3,24 +3,27 @@ Check if GNU C function or variable attribute is supported by the compiler.
 
 Module exposes the following functions:
 
-  php_check_function_attribute(<attribute> <result>)
-  php_check_variable_attribute(<attribute> <result>)
+```cmake
+php_check_function_attribute(<attribute> <result>)
+php_check_variable_attribute(<attribute> <result>)
+```
 
-    <attribute>
-      Name of the attribute to check.
-    <result>
-      Cache variable name to store the result of whether the compiler supports
-      the attribute <attribute>.
+* `<attribute>`
+  Name of the attribute to check.
+
+* `<result>`
+  Cache variable name to store the result of whether the compiler supports the
+  attribute `<attribute>`.
 
 Supported function attributes:
 
-  ifunc
-  target
-  visibility
+* ifunc
+* target
+* visibility
 
 Supported variable attributes:
 
-  aligned
+* aligned
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/cmake/modules/PHP/CheckBrokenGccStrlenOpt.cmake

@@ -1,13 +1,13 @@
 #[=============================================================================[
 Early GCC 8 versions shipped with a strlen() optimization bug, so it didn't
-properly handle the 'char val[1]' struct hack. Fixed in GCC 8.3. If below check
+properly handle the `char val[1]` struct hack. Fixed in GCC 8.3. If below check
 is successful the -fno-optimize-strlen compiler flag should be added.
 See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86914
 
 Cache variables:
 
-  PHP_HAVE_BROKEN_OPTIMIZE_STRLEN
-    Whether GCC has broken strlen() optimization.
+* `PHP_HAVE_BROKEN_OPTIMIZE_STRLEN`
+  Whether GCC has broken strlen() optimization.
 #]=============================================================================]
 
 include_guard(GLOBAL)

cmake/cmake/modules/PHP/CheckBuiltin.cmake

@@ -1,17 +1,22 @@
 #[=============================================================================[
-Check whether compiler supports one of the built-in functions __builtin_*().
+Check whether compiler supports one of the built-in functions `__builtin_*()`.
 
 Module exposes the following function:
 
-  php_check_builtin(<symbol_name> <result_var>)
+```cmake
+php_check_builtin(<builtin> <result_var>)
+```
+
+If builtin `<builtin>` is supported by the C compiler, store the check result in
+the cache variable `<result_var>`.
+
 #]=============================================================================]
 
 include_guard(GLOBAL)
 
 include(CheckSourceCompiles)
 include(CMakePushCheckState)
 
-# cmake-lint: disable=R0912
 function(php_check_builtin builtin result)
   message(CHECK_START "Checking for ${builtin}")
 
@@ -58,7 +63,8 @@ function(php_check_builtin builtin result)
     set(CMAKE_REQUIRED_QUIET TRUE)
 
     check_source_compiles(C "
-      int main(void) {
+      int main(void)
+      {
         ${call}
 
         return 0;